diff --git a/bots/discord/commands/Verify.go b/bots/discord/commands/Verify.go index e4ca45a4..09ceb41d 100644 --- a/bots/discord/commands/Verify.go +++ b/bots/discord/commands/Verify.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" "github.com/pariz/gountries" "github.com/bwmarrin/discordgo" diff --git a/graphql.go b/graphql.go index 844f1dd9..b224ccbe 100644 --- a/graphql.go +++ b/graphql.go @@ -6,9 +6,9 @@ import ( "reflect" "github.com/aerogo/aero" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/utils/gql" - "github.com/akyoto/color" "github.com/graphql-go/graphql" ) diff --git a/jobs/anime-characters/anime-characters.go b/jobs/anime-characters/anime-characters.go index c5136c18..d8993418 100644 --- a/jobs/anime-characters/anime-characters.go +++ b/jobs/anime-characters/anime-characters.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/jobs/anime-ratings/anime-ratings.go b/jobs/anime-ratings/anime-ratings.go index ebafe21a..56921382 100644 --- a/jobs/anime-ratings/anime-ratings.go +++ b/jobs/anime-ratings/anime-ratings.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) var ratings = map[string][]arn.AnimeListItemRating{} diff --git a/jobs/download-character-images/download-character-images.go b/jobs/download-character-images/download-character-images.go index 46f7971b..9537351e 100644 --- a/jobs/download-character-images/download-character-images.go +++ b/jobs/download-character-images/download-character-images.go @@ -10,8 +10,8 @@ import ( _ "image/png" "github.com/aerogo/http/client" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/jobs/jobs.go b/jobs/jobs.go index d1b0bf12..a87ab7d9 100644 --- a/jobs/jobs.go +++ b/jobs/jobs.go @@ -10,8 +10,8 @@ import ( "time" "github.com/aerogo/log" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) var colorPool = []*color.Color{ diff --git a/jobs/kitsu-characters-parse/kitsu-characters-parse.go b/jobs/kitsu-characters-parse/kitsu-characters-parse.go index 90efdefa..6207a082 100644 --- a/jobs/kitsu-characters-parse/kitsu-characters-parse.go +++ b/jobs/kitsu-characters-parse/kitsu-characters-parse.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/kitsu" - "github.com/akyoto/color" ) func main() { @@ -37,7 +37,7 @@ func main() { Attributes: []*arn.CharacterAttribute{}, HasMappings: arn.HasMappings{ Mappings: []*arn.Mapping{ - &arn.Mapping{ + { Service: "kitsu/character", ServiceID: kitsuCharacter.ID, }, diff --git a/jobs/kitsu-import-anime/kitsu-import-anime.go b/jobs/kitsu-import-anime/kitsu-import-anime.go index dfd6e184..564cc870 100644 --- a/jobs/kitsu-import-anime/kitsu-import-anime.go +++ b/jobs/kitsu-import-anime/kitsu-import-anime.go @@ -3,9 +3,9 @@ package main import ( "fmt" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/kitsu" - "github.com/akyoto/color" ) func main() { diff --git a/jobs/kitsu-import-mappings/kitsu-import-mappings.go b/jobs/kitsu-import-mappings/kitsu-import-mappings.go index 912a5b9b..ca2f872d 100644 --- a/jobs/kitsu-import-mappings/kitsu-import-mappings.go +++ b/jobs/kitsu-import-mappings/kitsu-import-mappings.go @@ -3,9 +3,9 @@ package main import ( "fmt" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/kitsu" - "github.com/akyoto/color" ) func main() { diff --git a/jobs/mal-download/mal-download.go b/jobs/mal-download/mal-download.go index bd7cb758..57a93763 100644 --- a/jobs/mal-download/mal-download.go +++ b/jobs/mal-download/mal-download.go @@ -7,8 +7,8 @@ import ( "github.com/animenotifier/arn/osutils" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" "github.com/aerogo/crawler" ) diff --git a/jobs/mal-parse/anime.go b/jobs/mal-parse/anime.go index bfa3bb0b..c0e8ad48 100644 --- a/jobs/mal-parse/anime.go +++ b/jobs/mal-parse/anime.go @@ -5,10 +5,10 @@ import ( "errors" "os" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/mal" "github.com/animenotifier/mal/parser" - "github.com/akyoto/color" ) // Read anime file diff --git a/jobs/mal-parse/character.go b/jobs/mal-parse/character.go index 44917a65..fee62197 100644 --- a/jobs/mal-parse/character.go +++ b/jobs/mal-parse/character.go @@ -5,9 +5,9 @@ import ( "errors" "os" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/mal/parser" - "github.com/akyoto/color" ) // Read character file diff --git a/jobs/mal-parse/mal-parse.go b/jobs/mal-parse/mal-parse.go index 8681d0bd..8a269b4f 100644 --- a/jobs/mal-parse/mal-parse.go +++ b/jobs/mal-parse/mal-parse.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/jobs/mal-sync/character.go b/jobs/mal-sync/character.go index 9ec18e25..48b722f9 100644 --- a/jobs/mal-sync/character.go +++ b/jobs/mal-sync/character.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func parseCharacterDescription(input string) (output string, attributes []*arn.CharacterAttribute) { diff --git a/jobs/mal-sync/mal-sync.go b/jobs/mal-sync/mal-sync.go index eefa70c3..ab243276 100644 --- a/jobs/mal-sync/mal-sync.go +++ b/jobs/mal-sync/mal-sync.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/mal" - "github.com/akyoto/color" ) const imageWidthThreshold = 225 diff --git a/jobs/mal-sync/sync.go b/jobs/mal-sync/sync.go index 236d5514..5b6cd03c 100644 --- a/jobs/mal-sync/sync.go +++ b/jobs/mal-sync/sync.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/aerogo/http/client" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/mal" - "github.com/akyoto/color" ) // Sync titles diff --git a/jobs/refresh-episodes/refresh-episodes.go b/jobs/refresh-episodes/refresh-episodes.go index 08b0cdca..69717e10 100644 --- a/jobs/refresh-episodes/refresh-episodes.go +++ b/jobs/refresh-episodes/refresh-episodes.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/jobs/refresh-games/ffxiv.go b/jobs/refresh-games/ffxiv.go index dfe2b93e..3e276cfa 100644 --- a/jobs/refresh-games/ffxiv.go +++ b/jobs/refresh-games/ffxiv.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/arn/stringutils" - "github.com/akyoto/color" ) var tickerFFXIV = time.NewTicker(1100 * time.Millisecond) diff --git a/jobs/refresh-games/osu.go b/jobs/refresh-games/osu.go index 3f09d39b..359ad131 100644 --- a/jobs/refresh-games/osu.go +++ b/jobs/refresh-games/osu.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/arn/stringutils" - "github.com/akyoto/color" ) var tickerOsu = time.NewTicker(500 * time.Millisecond) diff --git a/jobs/refresh-games/overwatch.go b/jobs/refresh-games/overwatch.go index a029fe47..316d0989 100644 --- a/jobs/refresh-games/overwatch.go +++ b/jobs/refresh-games/overwatch.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/arn/stringutils" - "github.com/akyoto/color" ) var tickerOW = time.NewTicker(1100 * time.Millisecond) diff --git a/jobs/refresh-games/refresh-games.go b/jobs/refresh-games/refresh-games.go index 41363e67..ee633e8d 100644 --- a/jobs/refresh-games/refresh-games.go +++ b/jobs/refresh-games/refresh-games.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/jobs/soundtrack-download/soundtrack-download.go b/jobs/soundtrack-download/soundtrack-download.go index d73c878d..db5f24a6 100644 --- a/jobs/soundtrack-download/soundtrack-download.go +++ b/jobs/soundtrack-download/soundtrack-download.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/jobs/sync-media-relations/sync-media-relations.go b/jobs/sync-media-relations/sync-media-relations.go index af37f2c3..f7a684c5 100644 --- a/jobs/sync-media-relations/sync-media-relations.go +++ b/jobs/sync-media-relations/sync-media-relations.go @@ -6,8 +6,8 @@ import ( "github.com/animenotifier/arn" - "github.com/animenotifier/kitsu" "github.com/akyoto/color" + "github.com/animenotifier/kitsu" ) func main() { diff --git a/jobs/sync-shoboi/sync-shoboi.go b/jobs/sync-shoboi/sync-shoboi.go index d9d98842..e0ec3328 100644 --- a/jobs/sync-shoboi/sync-shoboi.go +++ b/jobs/sync-shoboi/sync-shoboi.go @@ -3,9 +3,9 @@ package main import ( "time" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/shoboi" - "github.com/akyoto/color" ) func main() { diff --git a/jobs/twist/twist.go b/jobs/twist/twist.go index 24377d03..dcf22560 100644 --- a/jobs/twist/twist.go +++ b/jobs/twist/twist.go @@ -5,9 +5,9 @@ import ( "os" "time" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/twist" - "github.com/akyoto/color" ) var rateLimiter = time.NewTicker(500 * time.Millisecond) diff --git a/middleware/UserInfo.go b/middleware/UserInfo.go index 39f4dac1..5b3c612f 100644 --- a/middleware/UserInfo.go +++ b/middleware/UserInfo.go @@ -7,9 +7,9 @@ import ( "github.com/aerogo/aero" "github.com/aerogo/http/client" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/utils" - "github.com/akyoto/color" "github.com/mssola/user_agent" ) diff --git a/pages/admin/registrations.go b/pages/admin/registrations.go index fb7d190a..c6005358 100644 --- a/pages/admin/registrations.go +++ b/pages/admin/registrations.go @@ -5,10 +5,10 @@ import ( "sort" "github.com/aerogo/aero" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/components" "github.com/animenotifier/notify.moe/utils" - "github.com/akyoto/color" ) // UserRegistrations ... diff --git a/pages/animeimport/kitsu.go b/pages/animeimport/kitsu.go index 43b7acea..a97e387a 100644 --- a/pages/animeimport/kitsu.go +++ b/pages/animeimport/kitsu.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/animenotifier/kitsu" "github.com/akyoto/color" + "github.com/animenotifier/kitsu" "github.com/animenotifier/arn" diff --git a/pages/apiview/api.go b/pages/apiview/api.go index 8fb83891..f1772c3a 100644 --- a/pages/apiview/api.go +++ b/pages/apiview/api.go @@ -5,10 +5,10 @@ import ( "sort" "github.com/aerogo/aero" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/arn/autodocs" "github.com/animenotifier/notify.moe/components" - "github.com/akyoto/color" ) // Get api page. diff --git a/pages/character/character.go b/pages/character/character.go index c2223118..d7b20bad 100644 --- a/pages/character/character.go +++ b/pages/character/character.go @@ -5,10 +5,10 @@ import ( "sort" "github.com/aerogo/aero" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/notify.moe/components" "github.com/animenotifier/notify.moe/utils" - "github.com/akyoto/color" ) const ( diff --git a/pages/editor/jobs/jobs.go b/pages/editor/jobs/jobs.go index b0b237c4..827fceb0 100644 --- a/pages/editor/jobs/jobs.go +++ b/pages/editor/jobs/jobs.go @@ -9,7 +9,7 @@ import ( ) var jobInfo = map[string]*utils.JobInfo{ - "kitsu-import-anime": &utils.JobInfo{ + "kitsu-import-anime": { Name: "kitsu-import-anime", }, // "anime-ratings": &utils.JobInfo{ diff --git a/pages/paypal/paypal.go b/pages/paypal/paypal.go index 75632199..fdb55106 100644 --- a/pages/paypal/paypal.go +++ b/pages/paypal/paypal.go @@ -52,7 +52,7 @@ func CreatePayment(ctx *aero.Context) string { Payer: &paypalsdk.Payer{ PaymentMethod: "paypal", }, - Transactions: []paypalsdk.Transaction{paypalsdk.Transaction{ + Transactions: []paypalsdk.Transaction{{ Amount: &paypalsdk.Amount{ Currency: "JPY", Total: amount, diff --git a/patches/add-character-created-date/add-character-created-date.go b/patches/add-character-created-date/add-character-created-date.go index e4c8ec69..77951e97 100644 --- a/patches/add-character-created-date/add-character-created-date.go +++ b/patches/add-character-created-date/add-character-created-date.go @@ -4,8 +4,8 @@ import ( "strconv" "time" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/add-shop-items/add-shop-items.go b/patches/add-shop-items/add-shop-items.go index 5e6bfa02..aea4aa76 100644 --- a/patches/add-shop-items/add-shop-items.go +++ b/patches/add-shop-items/add-shop-items.go @@ -4,7 +4,7 @@ import "github.com/animenotifier/arn" var items = []*arn.ShopItem{ // 1 month - &arn.ShopItem{ + { ID: "pro-account-1", Name: "PRO Account - 1 month", Price: 300, @@ -27,7 +27,7 @@ Includes: }, // 3 months - &arn.ShopItem{ + { ID: "pro-account-3", Name: "PRO Account - 3 months", Price: 900, @@ -50,7 +50,7 @@ Includes: }, // 6 months - &arn.ShopItem{ + { ID: "pro-account-6", Name: "PRO Account - 6 months", Price: 1600, @@ -71,7 +71,7 @@ Includes: Order: 3, Consumable: true, }, - &arn.ShopItem{ + { ID: "pro-account-12", Name: "PRO Account - 1 year", Price: 3000, @@ -92,7 +92,7 @@ Includes: Order: 4, Consumable: true, }, - &arn.ShopItem{ + { ID: "pro-account-24", Name: "PRO Account - 2 years", Price: 5900, diff --git a/patches/anime-status/anime-status.go b/patches/anime-status/anime-status.go index 5f06d593..89e86203 100644 --- a/patches/anime-status/anime-status.go +++ b/patches/anime-status/anime-status.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/character-split-spoilers/character-split-spoilers.go b/patches/character-split-spoilers/character-split-spoilers.go index b0085d95..d52cf323 100644 --- a/patches/character-split-spoilers/character-split-spoilers.go +++ b/patches/character-split-spoilers/character-split-spoilers.go @@ -3,8 +3,8 @@ package main import ( "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/character-unescape-name/character-unescape-name.go b/patches/character-unescape-name/character-unescape-name.go index 6e2c7e71..0d56d471 100644 --- a/patches/character-unescape-name/character-unescape-name.go +++ b/patches/character-unescape-name/character-unescape-name.go @@ -4,8 +4,8 @@ import ( "fmt" "html" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/christmas-notification/christmas-notification.go b/patches/christmas-notification/christmas-notification.go index 76de9565..4e756c9f 100644 --- a/patches/christmas-notification/christmas-notification.go +++ b/patches/christmas-notification/christmas-notification.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/clear-sessions/clear-sessions.go b/patches/clear-sessions/clear-sessions.go index 74b2ee94..bafad962 100644 --- a/patches/clear-sessions/clear-sessions.go +++ b/patches/clear-sessions/clear-sessions.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/delete-amv-tags/delete-amv-tags.go b/patches/delete-amv-tags/delete-amv-tags.go index 2df379bd..9c8ad152 100644 --- a/patches/delete-amv-tags/delete-amv-tags.go +++ b/patches/delete-amv-tags/delete-amv-tags.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/delete-balance/delete-balance.go b/patches/delete-balance/delete-balance.go index 9a2d9696..d26004f7 100644 --- a/patches/delete-balance/delete-balance.go +++ b/patches/delete-balance/delete-balance.go @@ -3,8 +3,8 @@ package main import ( "flag" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) // Shell parameters diff --git a/patches/delete-old-sessions/delete-old-sessions.go b/patches/delete-old-sessions/delete-old-sessions.go index 58f02a08..e363cbac 100644 --- a/patches/delete-old-sessions/delete-old-sessions.go +++ b/patches/delete-old-sessions/delete-old-sessions.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/aerogo/nano" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/delete-private-data/delete-private-data.go b/patches/delete-private-data/delete-private-data.go index c8e4cbad..fa02517f 100644 --- a/patches/delete-private-data/delete-private-data.go +++ b/patches/delete-private-data/delete-private-data.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/delete-pro/delete-pro.go b/patches/delete-pro/delete-pro.go index f269f2dc..b390038a 100644 --- a/patches/delete-pro/delete-pro.go +++ b/patches/delete-pro/delete-pro.go @@ -3,8 +3,8 @@ package main import ( "flag" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) // Shell parameters diff --git a/patches/delete-unused-characters/delete-unused-characters.go b/patches/delete-unused-characters/delete-unused-characters.go index dfdd79a9..e40e2593 100644 --- a/patches/delete-unused-characters/delete-unused-characters.go +++ b/patches/delete-unused-characters/delete-unused-characters.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/fix-airing-dates/fix-airing-dates.go b/patches/fix-airing-dates/fix-airing-dates.go index f0fe5307..d6b53f52 100644 --- a/patches/fix-airing-dates/fix-airing-dates.go +++ b/patches/fix-airing-dates/fix-airing-dates.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/fix-anime-list-item-status/fix-anime-list-item-status.go b/patches/fix-anime-list-item-status/fix-anime-list-item-status.go index 0b011801..39fa4757 100644 --- a/patches/fix-anime-list-item-status/fix-anime-list-item-status.go +++ b/patches/fix-anime-list-item-status/fix-anime-list-item-status.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/fix-broken-relations/fix-broken-relations.go b/patches/fix-broken-relations/fix-broken-relations.go index 12a30151..2059006b 100644 --- a/patches/fix-broken-relations/fix-broken-relations.go +++ b/patches/fix-broken-relations/fix-broken-relations.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/fix-tvdb-duplicates/fix-tvdb-duplicates.go b/patches/fix-tvdb-duplicates/fix-tvdb-duplicates.go index 279928e0..65366b81 100644 --- a/patches/fix-tvdb-duplicates/fix-tvdb-duplicates.go +++ b/patches/fix-tvdb-duplicates/fix-tvdb-duplicates.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/fix-user-websites/fix-user-websites.go b/patches/fix-user-websites/fix-user-websites.go index 1e8f7b93..b8178403 100644 --- a/patches/fix-user-websites/fix-user-websites.go +++ b/patches/fix-user-websites/fix-user-websites.go @@ -3,9 +3,9 @@ package main import ( "fmt" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/arn/autocorrect" - "github.com/akyoto/color" ) func main() { diff --git a/patches/fix-wrong-ids-in-animelists/fix-wrong-ids-in-animelists.go b/patches/fix-wrong-ids-in-animelists/fix-wrong-ids-in-animelists.go index 0fbff04a..e1ce2c9f 100644 --- a/patches/fix-wrong-ids-in-animelists/fix-wrong-ids-in-animelists.go +++ b/patches/fix-wrong-ids-in-animelists/fix-wrong-ids-in-animelists.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/import-kitsu-mappings/import-kitsu-mappings.go b/patches/import-kitsu-mappings/import-kitsu-mappings.go index 8ec7473c..0e114637 100644 --- a/patches/import-kitsu-mappings/import-kitsu-mappings.go +++ b/patches/import-kitsu-mappings/import-kitsu-mappings.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/import-mal-companies/import-mal-companies.go b/patches/import-mal-companies/import-mal-companies.go index f022a786..85e5bddb 100644 --- a/patches/import-mal-companies/import-mal-companies.go +++ b/patches/import-mal-companies/import-mal-companies.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/mal" - "github.com/akyoto/color" ) var malDB = arn.Node.Namespace("mal").RegisterTypes((*mal.Anime)(nil)) diff --git a/patches/kitsu-anilist/kitsu-anilist.go b/patches/kitsu-anilist/kitsu-anilist.go index 7d337c59..34e1f237 100644 --- a/patches/kitsu-anilist/kitsu-anilist.go +++ b/patches/kitsu-anilist/kitsu-anilist.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/kitsu-download-anime-images/kitsu-download-anime-images.go b/patches/kitsu-download-anime-images/kitsu-download-anime-images.go index 9f1e0667..d6097654 100644 --- a/patches/kitsu-download-anime-images/kitsu-download-anime-images.go +++ b/patches/kitsu-download-anime-images/kitsu-download-anime-images.go @@ -13,8 +13,8 @@ import ( _ "image/png" "github.com/aerogo/http/client" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) var ticker = time.NewTicker(50 * time.Millisecond) diff --git a/patches/mark-month-as-current/mark-month-as-current.go b/patches/mark-month-as-current/mark-month-as-current.go index 7f4208fe..a523e82f 100644 --- a/patches/mark-month-as-current/mark-month-as-current.go +++ b/patches/mark-month-as-current/mark-month-as-current.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/merge-duplicate-characters/merge-duplicate-characters.go b/patches/merge-duplicate-characters/merge-duplicate-characters.go index 3a717e3a..9f5146ab 100644 --- a/patches/merge-duplicate-characters/merge-duplicate-characters.go +++ b/patches/merge-duplicate-characters/merge-duplicate-characters.go @@ -4,8 +4,8 @@ import ( "fmt" "sort" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/notification-delete-old/notification-delete-old.go b/patches/notification-delete-old/notification-delete-old.go index b5a135dd..8c0ec2f5 100644 --- a/patches/notification-delete-old/notification-delete-old.go +++ b/patches/notification-delete-old/notification-delete-old.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) const maxNotificationsPerUser = 30 diff --git a/patches/optimize-all-webm-files/optimize-all-webm-files.go b/patches/optimize-all-webm-files/optimize-all-webm-files.go index a9d41814..5c23bcee 100644 --- a/patches/optimize-all-webm-files/optimize-all-webm-files.go +++ b/patches/optimize-all-webm-files/optimize-all-webm-files.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/post-sort-date/post-sort-date.go b/patches/post-sort-date/post-sort-date.go index d5888b38..5553b061 100644 --- a/patches/post-sort-date/post-sort-date.go +++ b/patches/post-sort-date/post-sort-date.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/post-texts/post-texts.go b/patches/post-texts/post-texts.go index eec3ebf9..9d5c6e3a 100644 --- a/patches/post-texts/post-texts.go +++ b/patches/post-texts/post-texts.go @@ -1,9 +1,9 @@ package main import ( + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/arn/autocorrect" - "github.com/akyoto/color" ) func main() { diff --git a/patches/refresh-anime-average-color/refresh-anime-average-color.go b/patches/refresh-anime-average-color/refresh-anime-average-color.go index 3471df45..6bd0e171 100644 --- a/patches/refresh-anime-average-color/refresh-anime-average-color.go +++ b/patches/refresh-anime-average-color/refresh-anime-average-color.go @@ -9,8 +9,8 @@ import ( "os" "path" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go b/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go index 2f5b8ffa..6c61328b 100644 --- a/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go +++ b/patches/refresh-anime-thumbnails/refresh-anime-thumbnails.go @@ -7,8 +7,8 @@ import ( "os" "path" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/remove-character-borders/remove-character-borders.go b/patches/remove-character-borders/remove-character-borders.go index aa9fe407..21243f03 100644 --- a/patches/remove-character-borders/remove-character-borders.go +++ b/patches/remove-character-borders/remove-character-borders.go @@ -7,8 +7,8 @@ import ( "os" "path" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" icolor "image/color" _ "image/gif" diff --git a/patches/reset-inventories/reset-inventories.go b/patches/reset-inventories/reset-inventories.go index c3bb469e..9c236fdd 100644 --- a/patches/reset-inventories/reset-inventories.go +++ b/patches/reset-inventories/reset-inventories.go @@ -4,8 +4,8 @@ import ( "flag" "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) // Shell parameters diff --git a/patches/show-kitsu-mappings/show-kitsu-mappings.go b/patches/show-kitsu-mappings/show-kitsu-mappings.go index bc65cb10..74bb60aa 100644 --- a/patches/show-kitsu-mappings/show-kitsu-mappings.go +++ b/patches/show-kitsu-mappings/show-kitsu-mappings.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/update-amv-info/update-amv-info.go b/patches/update-amv-info/update-amv-info.go index 6cd0f036..444f98ea 100644 --- a/patches/update-amv-info/update-amv-info.go +++ b/patches/update-amv-info/update-amv-info.go @@ -1,9 +1,9 @@ package main import ( + "github.com/akyoto/color" "github.com/animenotifier/arn" "github.com/animenotifier/arn/stringutils" - "github.com/akyoto/color" ) func main() { diff --git a/patches/user-privacy-location/user-privacy-location.go b/patches/user-privacy-location/user-privacy-location.go index 9761bd21..db0b6522 100644 --- a/patches/user-privacy-location/user-privacy-location.go +++ b/patches/user-privacy-location/user-privacy-location.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/user-references/user-references.go b/patches/user-references/user-references.go index f026cce1..ce830bf3 100644 --- a/patches/user-references/user-references.go +++ b/patches/user-references/user-references.go @@ -1,8 +1,8 @@ package main import ( - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func main() { diff --git a/patches/user-set-social-id/user-set-social-id.go b/patches/user-set-social-id/user-set-social-id.go index 7f8afc2a..1f43533b 100644 --- a/patches/user-set-social-id/user-set-social-id.go +++ b/patches/user-set-social-id/user-set-social-id.go @@ -3,8 +3,8 @@ package main import ( "flag" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) // Shell parameters diff --git a/patches/user-show-intros/user-show-intros.go b/patches/user-show-intros/user-show-intros.go index 7b0e5023..86e2028f 100644 --- a/patches/user-show-intros/user-show-intros.go +++ b/patches/user-show-intros/user-show-intros.go @@ -3,8 +3,8 @@ package main import ( "regexp" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) var flaggedWords = regexp.MustCompile("fuck|fucking|freaking|shit|bad|terrible|awful|wtf") diff --git a/security.go b/security.go index 8a32b46f..82ea4ad3 100644 --- a/security.go +++ b/security.go @@ -5,8 +5,8 @@ import ( "path" "github.com/aerogo/aero" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) func configureHTTPS(app *aero.Application) { diff --git a/utils/JobInfo.go b/utils/JobInfo.go index a8f54600..82e16a1b 100644 --- a/utils/JobInfo.go +++ b/utils/JobInfo.go @@ -5,8 +5,8 @@ import ( "path" "time" - "github.com/animenotifier/arn" "github.com/akyoto/color" + "github.com/animenotifier/arn" ) // JobInfo gives you information about a background job. diff --git a/utils/routetests/All.go b/utils/routetests/All.go index 82fa1744..d1fb76c2 100644 --- a/utils/routetests/All.go +++ b/utils/routetests/All.go @@ -2,7 +2,7 @@ package routetests var routeTests = map[string][]string{ // User - "/user/:nick": []string{ + "/user/:nick": { "/+Akyoto", }, @@ -58,188 +58,188 @@ var routeTests = map[string][]string{ // "/+Akyoto/stats", // }, - "/user/:nick/animelist/anime/:id": []string{ + "/user/:nick/animelist/anime/:id": { "/+Akyoto/animelist/anime/74y2cFiiR", }, - "/user/:nick/animelist/watching": []string{ + "/user/:nick/animelist/watching": { "/+Akyoto/animelist/watching", }, - "/user/:nick/animelist/watching/from/:index": []string{ + "/user/:nick/animelist/watching/from/:index": { "/+Akyoto/animelist/watching/from/1", }, - "/user/:nick/animelist/completed": []string{ + "/user/:nick/animelist/completed": { "/+Akyoto/animelist/completed", }, - "/user/:nick/animelist/completed/from/:index": []string{ + "/user/:nick/animelist/completed/from/:index": { "/+Akyoto/animelist/completed/from/3", }, - "/user/:nick/animelist/planned": []string{ + "/user/:nick/animelist/planned": { "/+Akyoto/animelist/planned", }, - "/user/:nick/animelist/planned/from/:index": []string{ + "/user/:nick/animelist/planned/from/:index": { "/+Akyoto/animelist/planned/from/3", }, - "/user/:nick/animelist/hold": []string{ + "/user/:nick/animelist/hold": { "/+Akyoto/animelist/hold", }, - "/user/:nick/animelist/hold/from/:index": []string{ + "/user/:nick/animelist/hold/from/:index": { "/+Akyoto/animelist/hold/from/3", }, - "/user/:nick/animelist/dropped": []string{ + "/user/:nick/animelist/dropped": { "/+Akyoto/animelist/dropped", }, - "/user/:nick/animelist/dropped/from/:index": []string{ + "/user/:nick/animelist/dropped/from/:index": { "/+Akyoto/animelist/dropped/from/3", }, - "/user/:nick/anime/recommended": []string{ + "/user/:nick/anime/recommended": { "/+Akyoto/anime/recommended", }, - "/user/:nick/anime/sequels": []string{ + "/user/:nick/anime/sequels": { "/+Akyoto/anime/sequels", }, - "/users/country/:country": []string{ + "/users/country/:country": { "/users/country/japan", }, // Pages - "/anime/:id": []string{ + "/anime/:id": { "/anime/74y2cFiiR", }, - "/anime/:id/characters": []string{ + "/anime/:id/characters": { "/anime/74y2cFiiR/characters", }, - "/anime/:id/episodes": []string{ + "/anime/:id/episodes": { "/anime/74y2cFiiR/episodes", }, - "/anime/:id/comments": []string{ + "/anime/:id/comments": { "/anime/74y2cFiiR/comments", }, - "/anime/:id/tracks": []string{ + "/anime/:id/tracks": { "/anime/74y2cFiiR/tracks", }, - "/anime/:id/relations": []string{ + "/anime/:id/relations": { "/anime/74y2cFiiR/relations", }, - "/thread/:id": []string{ + "/thread/:id": { "/thread/HJgS7c2K", }, - "/post/:id": []string{ + "/post/:id": { "/post/B1RzshnK", }, - "/forum/:tag": []string{ + "/forum/:tag": { "/forum/general", }, - "/genre/:name": []string{ + "/genre/:name": { "/genre/action", }, - "/company/:id": []string{ + "/company/:id": { "/company/xCAUr7UkRaz", }, - "/company/:id/history": []string{ + "/company/:id/history": { "/company/xCAUr7UkRaz/history", }, - "/companies/from/:index": []string{ + "/companies/from/:index": { "/companies/from/3", }, - "/explore/color/:color/anime": []string{ + "/explore/color/:color/anime": { "/explore/color/hsl:0.050,0.25,0.5/anime", }, - "/explore/color/:color/anime/from/:index": []string{ + "/explore/color/:color/anime/from/:index": { "/explore/color/hsl:0.050,0.25,0.5/anime/from/3", }, - "/search/:term": []string{ + "/search/:term": { "/search/Dragon Ball", }, - "/quote/:id": []string{ + "/quote/:id": { "/quote/gUZugd6zR", }, - "/quote/:id/edit": []string{ + "/quote/:id/edit": { "/quote/gUZugd6zR/edit", }, - "/quote/:id/history": []string{ + "/quote/:id/history": { "/quote/gUZugd6zR/history", }, - "/quotes/from/:index": []string{ + "/quotes/from/:index": { "/quotes/from/2", }, - "/quotes/best/from/:index": []string{ + "/quotes/best/from/:index": { "/quotes/best/from/2", }, - "/soundtrack/:id": []string{ + "/soundtrack/:id": { "/soundtrack/h0ac8sKkg", }, - "/soundtrack/:id/lyrics": []string{ + "/soundtrack/:id/lyrics": { "/soundtrack/vS64GbpzR/lyrics", }, - "/soundtrack/:id/edit": []string{ + "/soundtrack/:id/edit": { "/soundtrack/h0ac8sKkg/edit", }, - "/soundtrack/:id/history": []string{ + "/soundtrack/:id/history": { "/soundtrack/h0ac8sKkg/history", }, - "/soundtracks": []string{ + "/soundtracks": { "/soundtracks", }, - "/soundtracks/from/:index": []string{ + "/soundtracks/from/:index": { "/soundtracks/from/12", }, - "/soundtracks/best": []string{ + "/soundtracks/best": { "/soundtracks/best", }, - "/soundtracks/best/from/:index": []string{ + "/soundtracks/best/from/:index": { "/soundtracks/best/from/12", }, - "/soundtracks/tag/:tag": []string{ + "/soundtracks/tag/:tag": { "/soundtracks/tag/moe", }, - "/soundtracks/tag/:tag/from/:index": []string{ + "/soundtracks/tag/:tag/from/:index": { "/soundtracks/tag/moe/from/3", }, - "/character/:id": []string{ + "/character/:id": { "/character/dfrNQrmmg-", }, @@ -251,165 +251,165 @@ var routeTests = map[string][]string{ // "/mal/character/498", // }, - "/compare/animelist/:nick-1/:nick-2": []string{ + "/compare/animelist/:nick-1/:nick-2": { "/compare/animelist/Akyoto/Scott", }, - "/explore/anime/:year/:season/:status/:type": []string{ + "/explore/anime/:year/:season/:status/:type": { "/explore/anime/2011/any/finished/tv", }, // AMV - "/amv/:id": []string{ + "/amv/:id": { "/amv/07scvSWmg", }, - "/amv/:id/edit": []string{ + "/amv/:id/edit": { "/amv/07scvSWmg/edit", }, - "/amv/:id/history": []string{ + "/amv/:id/history": { "/amv/07scvSWmg/history", }, // AMVs - "/amvs/from/:index": []string{ + "/amvs/from/:index": { "/amvs/from/3", }, - "/amvs/best/from/:index": []string{ + "/amvs/best/from/:index": { "/amvs/best/from/3", }, // Redirects - "/mal/anime/:id": []string{ + "/mal/anime/:id": { "/mal/anime/33352", }, - "/kitsu/anime/:id": []string{ + "/kitsu/anime/:id": { "/kitsu/anime/12230", }, - "/anilist/anime/:id": []string{ + "/anilist/anime/:id": { "/anilist/anime/21827", }, // API - "/api/anime/:id": []string{ + "/api/anime/:id": { "/api/anime/74y2cFiiR", }, - "/api/thread/:id": []string{ + "/api/thread/:id": { "/api/thread/HJgS7c2K", }, - "/api/post/:id": []string{ + "/api/post/:id": { "/api/post/B1RzshnK", }, - "/api/animelist/:id": []string{ + "/api/animelist/:id": { "/api/animelist/4J6qpK1ve", }, - "/api/settings/:id": []string{ + "/api/settings/:id": { "/api/settings/4J6qpK1ve", }, - "/api/user/:id": []string{ + "/api/user/:id": { "/api/user/4J6qpK1ve", }, - "/api/googletouser/:id": []string{ + "/api/googletouser/:id": { "/api/googletouser/106530160120373282283", }, - "/api/facebooktouser/:id": []string{ + "/api/facebooktouser/:id": { "/api/facebooktouser/10207576239700188", }, - "/api/nicktouser/:id": []string{ + "/api/nicktouser/:id": { "/api/nicktouser/Akyoto", }, - "/api/analytics/:id": []string{ + "/api/analytics/:id": { "/api/analytics/4J6qpK1ve", }, - "/api/soundtrack/:id": []string{ + "/api/soundtrack/:id": { "/api/soundtrack/h0ac8sKkg", }, - "/api/userfollows/:id": []string{ + "/api/userfollows/:id": { "/api/userfollows/4J6qpK1ve", }, - "/api/animecharacters/:id": []string{ + "/api/animecharacters/:id": { "/api/animecharacters/74y2cFiiR", }, - "/api/animerelations/:id": []string{ + "/api/animerelations/:id": { "/api/animerelations/74y2cFiiR", }, - "/api/animeepisodes/:id": []string{ + "/api/animeepisodes/:id": { "/api/animeepisodes/74y2cFiiR", }, - "/anime/:id/episode/:episode-number": []string{ + "/anime/:id/episode/:episode-number": { "/anime/74y2cFiiR/episode/5", }, - "/api/amv/:id": []string{ + "/api/amv/:id": { "/api/amv/07scvSWmg", }, - "/api/character/:id": []string{ + "/api/character/:id": { "/api/character/dfrNQrmmg-", }, - "/api/company/:id": []string{ + "/api/company/:id": { "/api/company/xCAUr7UkRaz", }, - "/api/draftindex/:id": []string{ + "/api/draftindex/:id": { "/api/draftindex/4J6qpK1ve", }, - "/api/inventory/:id": []string{ + "/api/inventory/:id": { "/api/inventory/4J6qpK1ve", }, - "/api/shopitem/:id": []string{ + "/api/shopitem/:id": { "/api/shopitem/pro-account-3", }, - "/api/notification/:id": []string{ + "/api/notification/:id": { "/api/notification/q6Y6eraig", }, - "/api/quote/:id": []string{ + "/api/quote/:id": { "/api/quote/GXp675zmR", }, - "/api/usernotifications/:id": []string{ + "/api/usernotifications/:id": { "/api/usernotifications/4J6qpK1ve", }, - "/api/pushsubscriptions/:id": []string{ + "/api/pushsubscriptions/:id": { "/api/pushsubscriptions/4J6qpK1ve", }, // Images - "/images/*file": []string{ + "/images/*file": { "/images/elements/no-avatar.svg", }, // Extra tests for higher coverage - "/_/+Akyoto": []string{ + "/_/+Akyoto": { "/_/+Akyoto", }, - "/_/search/dragon": []string{ + "/_/search/dragon": { "/_/search/dragon", },