diff --git a/admin/plugin_admin.go b/admin/plugin_admin.go index f2c2c43efe..d402f942f6 100644 --- a/admin/plugin_admin.go +++ b/admin/plugin_admin.go @@ -1,7 +1,7 @@ package admin import ( - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" ) var logger = common.GetPluginLogger(&Plugin{}) diff --git a/admin/web.go b/admin/web.go index 03d800d527..17b1e51a3b 100644 --- a/admin/web.go +++ b/admin/web.go @@ -11,12 +11,12 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/internalapi" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator/rest" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/internalapi" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator/rest" + "github.com/botlabs-gg/yagpdb/v2/web" "goji.io" "goji.io/pat" ) diff --git a/analytics/analytics.go b/analytics/analytics.go index ffdf185c18..76361f9c3f 100644 --- a/analytics/analytics.go +++ b/analytics/analytics.go @@ -3,8 +3,8 @@ package analytics import ( "sync" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" "github.com/mediocregopher/radix/v3" ) diff --git a/analytics/backgroundworker.go b/analytics/backgroundworker.go index d2fbe36749..06643c479c 100644 --- a/analytics/backgroundworker.go +++ b/analytics/backgroundworker.go @@ -7,8 +7,8 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" "github.com/mediocregopher/radix/v3" ) diff --git a/antiphishing/antiphishing.go b/antiphishing/antiphishing.go index c383aa66e5..f9f2dd9969 100644 --- a/antiphishing/antiphishing.go +++ b/antiphishing/antiphishing.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/mediocregopher/radix/v3" "github.com/sirupsen/logrus" ) diff --git a/antiphishing/backgroundworkers.go b/antiphishing/backgroundworkers.go index 2e000fc32a..e30fbbfaff 100644 --- a/antiphishing/backgroundworkers.go +++ b/antiphishing/backgroundworkers.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" ) var _ backgroundworkers.BackgroundWorkerPlugin = (*Plugin)(nil) diff --git a/automod/automod.go b/automod/automod.go index 3847e77dbe..772c15992b 100644 --- a/automod/automod.go +++ b/automod/automod.go @@ -8,10 +8,10 @@ import ( "unicode" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/automod/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/premium" + "github.com/botlabs-gg/yagpdb/v2/automod/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/premium" "github.com/karlseguin/ccache" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/automod/automod_bot.go b/automod/automod_bot.go index 4cf75e6063..f1baa9e1b4 100644 --- a/automod/automod_bot.go +++ b/automod/automod_bot.go @@ -6,16 +6,16 @@ import ( "errors" "sort" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/automod/models" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - schEventsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/automod/models" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + schEventsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/volatiletech/null" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/automod/automod_web.go b/automod/automod_web.go index 91709b3415..03842a4c6e 100644 --- a/automod/automod_web.go +++ b/automod/automod_web.go @@ -12,14 +12,14 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/automod/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/moderation" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/automod/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/moderation" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/fatih/structs" "github.com/gorilla/schema" "github.com/volatiletech/sqlboiler/boil" diff --git a/automod/cachedruleset.go b/automod/cachedruleset.go index 1dd1e872c7..a0f3b2ad22 100644 --- a/automod/cachedruleset.go +++ b/automod/cachedruleset.go @@ -4,7 +4,7 @@ import ( "encoding/json" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/automod/models" + "github.com/botlabs-gg/yagpdb/v2/automod/models" ) type ParsedRuleset struct { diff --git a/automod/commands.go b/automod/commands.go index 17d7ffe603..134789af88 100644 --- a/automod/commands.go +++ b/automod/commands.go @@ -6,14 +6,14 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/automod/models" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/automod/models" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/automod/conditions.go b/automod/conditions.go index b8f5bb2aba..9a1f8d0404 100644 --- a/automod/conditions.go +++ b/automod/conditions.go @@ -3,8 +3,8 @@ package automod import ( "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" ) type Condition interface { diff --git a/automod/effects.go b/automod/effects.go index e1582ec967..db1dd2d525 100644 --- a/automod/effects.go +++ b/automod/effects.go @@ -5,14 +5,14 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/automod/models" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - schEventsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/moderation" + "github.com/botlabs-gg/yagpdb/v2/automod/models" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + schEventsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/moderation" "github.com/volatiletech/null" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/automod/rulepart.go b/automod/rulepart.go index 1551d503be..2bcfcd56e1 100644 --- a/automod/rulepart.go +++ b/automod/rulepart.go @@ -4,9 +4,9 @@ import ( "sort" "strings" - "github.com/botlabs-gg/yagpdb/automod/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/automod/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) // maps rule part indentifiers to actual condition types diff --git a/automod/triggers.go b/automod/triggers.go index 7e414a25af..7629ffbf3a 100644 --- a/automod/triggers.go +++ b/automod/triggers.go @@ -8,14 +8,14 @@ import ( "unicode" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/antiphishing" - "github.com/botlabs-gg/yagpdb/automod/models" - "github.com/botlabs-gg/yagpdb/automod_legacy" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/safebrowsing" + "github.com/botlabs-gg/yagpdb/v2/antiphishing" + "github.com/botlabs-gg/yagpdb/v2/automod/models" + "github.com/botlabs-gg/yagpdb/v2/automod_legacy" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/safebrowsing" ) var forwardSlashReplacer = strings.NewReplacer("\\", "") diff --git a/automod_legacy/automod.go b/automod_legacy/automod.go index cd172404a1..f94619e317 100644 --- a/automod_legacy/automod.go +++ b/automod_legacy/automod.go @@ -2,10 +2,10 @@ package automod_legacy import ( "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web" ) var logger = common.GetPluginLogger(&Plugin{}) diff --git a/automod_legacy/bot.go b/automod_legacy/bot.go index f025b38c45..f76562fcd1 100644 --- a/automod_legacy/bot.go +++ b/automod_legacy/bot.go @@ -3,15 +3,15 @@ package automod_legacy import ( "time" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/moderation" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/moderation" "github.com/karlseguin/ccache" ) diff --git a/automod_legacy/rules.go b/automod_legacy/rules.go index 2a4fab7a75..d2ec85a402 100644 --- a/automod_legacy/rules.go +++ b/automod_legacy/rules.go @@ -8,12 +8,12 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/antiphishing" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/safebrowsing" + "github.com/botlabs-gg/yagpdb/v2/antiphishing" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/safebrowsing" "github.com/mediocregopher/radix/v3" ) diff --git a/automod_legacy/web.go b/automod_legacy/web.go index 1794c0486f..5b79c17347 100644 --- a/automod_legacy/web.go +++ b/automod_legacy/web.go @@ -6,11 +6,11 @@ import ( "html/template" "net/http" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web" "goji.io" "goji.io/pat" ) diff --git a/autorole/autorole.go b/autorole/autorole.go index b17753a1cc..c314f30af6 100644 --- a/autorole/autorole.go +++ b/autorole/autorole.go @@ -1,8 +1,8 @@ package autorole import ( - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var configCache = common.CacheSet.RegisterSlot("autorole_config", func(key interface{}) (interface{}, error) { diff --git a/autorole/bot.go b/autorole/bot.go index e9079de749..ea7ed4636c 100644 --- a/autorole/bot.go +++ b/autorole/bot.go @@ -7,15 +7,15 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - scheduledEventsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + scheduledEventsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" ) diff --git a/autorole/plugin_botrest.go b/autorole/plugin_botrest.go index 6a10257dac..c4a38e0891 100644 --- a/autorole/plugin_botrest.go +++ b/autorole/plugin_botrest.go @@ -5,10 +5,10 @@ import ( "strconv" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/internalapi" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/internalapi" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" "goji.io" "goji.io/pat" diff --git a/autorole/web.go b/autorole/web.go index 8ecbc58a5c..c4ea8b9361 100644 --- a/autorole/web.go +++ b/autorole/web.go @@ -9,12 +9,12 @@ import ( "strconv" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/mediocregopher/radix/v3" "goji.io" "goji.io/pat" diff --git a/aylien/aylien.go b/aylien/aylien.go index e9a043c06f..e2270828d8 100644 --- a/aylien/aylien.go +++ b/aylien/aylien.go @@ -7,12 +7,12 @@ import ( "strings" textapi "github.com/AYLIEN/aylien_textapi_go" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var ( diff --git a/bot/admin_updater.go b/bot/admin_updater.go index 556131430e..7911ae317b 100644 --- a/bot/admin_updater.go +++ b/bot/admin_updater.go @@ -3,10 +3,10 @@ package bot import ( "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" ) diff --git a/bot/batchmemberjob.go b/bot/batchmemberjob.go index 8da96daf1e..b624b19a21 100644 --- a/bot/batchmemberjob.go +++ b/bot/batchmemberjob.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var ( diff --git a/bot/bot.go b/bot/bot.go index d3d2cffe6c..7b6857f45a 100644 --- a/bot/bot.go +++ b/bot/bot.go @@ -9,16 +9,16 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/bot/shardmemberfetcher" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/node" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/lib/dstate/inmemorytracker" - dshardmanager "github.com/botlabs-gg/yagpdb/lib/jdshardmanager" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/shardmemberfetcher" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/node" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate/inmemorytracker" + dshardmanager "github.com/botlabs-gg/yagpdb/v2/lib/jdshardmanager" "github.com/mediocregopher/radix/v3" ) diff --git a/bot/botrest/client.go b/bot/botrest/client.go index 448d430c49..d7083ed9f8 100644 --- a/bot/botrest/client.go +++ b/bot/botrest/client.go @@ -6,10 +6,10 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/internalapi" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/internalapi" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/mediocregopher/radix/v3" ) diff --git a/bot/botrest/server.go b/bot/botrest/server.go index c5c6f45a9e..fbc7c0311d 100644 --- a/bot/botrest/server.go +++ b/bot/botrest/server.go @@ -7,11 +7,11 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/internalapi" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/internalapi" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "goji.io" "goji.io/pat" ) diff --git a/bot/deletequeue.go b/bot/deletequeue.go index 134acebf12..782e4a9631 100644 --- a/bot/deletequeue.go +++ b/bot/deletequeue.go @@ -3,8 +3,8 @@ package bot import ( "sync" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var MessageDeleteQueue = &messageDeleteQueue{ diff --git a/bot/discordevents.go b/bot/discordevents.go index b8e794552a..6fbd5ddbef 100644 --- a/bot/discordevents.go +++ b/bot/discordevents.go @@ -6,13 +6,13 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/bot/joinedguildsupdater" - "github.com/botlabs-gg/yagpdb/bot/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/joinedguildsupdater" + "github.com/botlabs-gg/yagpdb/v2/bot/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/bot/eventlogger.go b/bot/eventlogger.go index e96aaac3aa..c56c4886a0 100644 --- a/bot/eventlogger.go +++ b/bot/eventlogger.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/bot/eventsystem/events.go b/bot/eventsystem/events.go index 039d62609c..4608992583 100644 --- a/bot/eventsystem/events.go +++ b/bot/eventsystem/events.go @@ -6,7 +6,7 @@ package eventsystem import ( - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type Event int diff --git a/bot/eventsystem/events_test.go b/bot/eventsystem/events_test.go index e8dc391ad6..b61fe35bb6 100644 --- a/bot/eventsystem/events_test.go +++ b/bot/eventsystem/events_test.go @@ -3,9 +3,9 @@ package eventsystem import ( "testing" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type mockPlugin struct { diff --git a/bot/eventsystem/eventsystem.go b/bot/eventsystem/eventsystem.go index f48546e037..9969753cef 100644 --- a/bot/eventsystem/eventsystem.go +++ b/bot/eventsystem/eventsystem.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/sirupsen/logrus" ) diff --git a/bot/eventsystem/gen/events_gen.go b/bot/eventsystem/gen/events_gen.go index 3e8b259ecd..3255af1fe2 100644 --- a/bot/eventsystem/gen/events_gen.go +++ b/bot/eventsystem/gen/events_gen.go @@ -29,7 +29,7 @@ const templateSource = `// GENERATED using events_gen.go package eventsystem import ( - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type Event int @@ -114,7 +114,7 @@ func CheckErr(errMsg string, err error) { func main() { pkgs, err := packages.Load(&packages.Config{ Mode: packages.LoadFiles, - }, "github.com/botlabs-gg/yagpdb/lib/discordgo") + }, "github.com/botlabs-gg/yagpdb/v2/lib/discordgo") if err != nil { panic(err) diff --git a/bot/history.go b/bot/history.go index 8b4e4c035e..c1d93bf0ae 100644 --- a/bot/history.go +++ b/bot/history.go @@ -1,8 +1,8 @@ package bot import ( - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) // GetMessages Gets messages from state if possible, if not then it retrieves from the discord api diff --git a/bot/joinedguildsupdater/joinedguildsupdater.go b/bot/joinedguildsupdater/joinedguildsupdater.go index af0ca91924..df399eb84f 100644 --- a/bot/joinedguildsupdater/joinedguildsupdater.go +++ b/bot/joinedguildsupdater/joinedguildsupdater.go @@ -5,10 +5,10 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/bot/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/volatiletech/sqlboiler/boil" ) diff --git a/bot/memberfetcher.go b/bot/memberfetcher.go index a3753d894e..bdb8afe4d8 100644 --- a/bot/memberfetcher.go +++ b/bot/memberfetcher.go @@ -1,9 +1,9 @@ package bot import ( - "github.com/botlabs-gg/yagpdb/bot/shardmemberfetcher" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot/shardmemberfetcher" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var ( diff --git a/bot/memwatcher.go b/bot/memwatcher.go index 60996105e2..fcda3ce598 100644 --- a/bot/memwatcher.go +++ b/bot/memwatcher.go @@ -4,8 +4,8 @@ import ( "runtime/debug" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" "github.com/shirou/gopsutil/mem" ) diff --git a/bot/mergedmessages.go b/bot/mergedmessages.go index c8028c19ea..1cba23d513 100644 --- a/bot/mergedmessages.go +++ b/bot/mergedmessages.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var ( diff --git a/bot/metrics.go b/bot/metrics.go index e2c40d0cd4..654e1688f6 100644 --- a/bot/metrics.go +++ b/bot/metrics.go @@ -3,7 +3,7 @@ package bot import ( "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/bot/nodeimpl.go b/bot/nodeimpl.go index 1cab6a466b..ef62ec549e 100644 --- a/bot/nodeimpl.go +++ b/bot/nodeimpl.go @@ -8,13 +8,13 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" "github.com/mediocregopher/radix/v3" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/node" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/node" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) func init() { diff --git a/bot/paginatedmessages/pageinatedmessage.go b/bot/paginatedmessages/pageinatedmessage.go index 4a9d72bcc4..f501935518 100644 --- a/bot/paginatedmessages/pageinatedmessage.go +++ b/bot/paginatedmessages/pageinatedmessage.go @@ -6,11 +6,11 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var ( diff --git a/bot/paginatedmessages/paginatedcommand.go b/bot/paginatedmessages/paginatedcommand.go index a87a25a753..e71a05c775 100644 --- a/bot/paginatedmessages/paginatedcommand.go +++ b/bot/paginatedmessages/paginatedcommand.go @@ -1,8 +1,8 @@ package paginatedmessages import ( - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type CtxKey int diff --git a/bot/plugin.go b/bot/plugin.go index 1db0acfdbb..5312a8e7d2 100644 --- a/bot/plugin.go +++ b/bot/plugin.go @@ -5,18 +5,18 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/bot/models" - "github.com/botlabs-gg/yagpdb/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/bot/models" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" "github.com/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/volatiletech/null" "github.com/volatiletech/sqlboiler/queries/qm" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) const ( diff --git a/bot/readytracker.go b/bot/readytracker.go index c60b535596..28596617b7 100644 --- a/bot/readytracker.go +++ b/bot/readytracker.go @@ -3,7 +3,7 @@ package bot import ( "sync" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" ) // ReadyTracker tracks process shards and initial readies/resumes, aswell as sending out events diff --git a/bot/shardmemberfetcher/shardmemberfetcher.go b/bot/shardmemberfetcher/shardmemberfetcher.go index 7ce6392430..044a5c1c30 100644 --- a/bot/shardmemberfetcher/shardmemberfetcher.go +++ b/bot/shardmemberfetcher/shardmemberfetcher.go @@ -6,11 +6,11 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/lib/dstate/inmemorytracker" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate/inmemorytracker" "github.com/karlseguin/ccache" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/bot/util.go b/bot/util.go index ab90e7cfee..88d88b9b2d 100644 --- a/bot/util.go +++ b/bot/util.go @@ -8,10 +8,10 @@ import ( "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/bwmarrin/snowflake" "github.com/mediocregopher/radix/v3" "github.com/patrickmn/go-cache" diff --git a/bot/util_test.go b/bot/util_test.go index 5b734f5e75..716f2c1fd7 100644 --- a/bot/util_test.go +++ b/bot/util_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) func TestMemberHighestRole(t *testing.T) { diff --git a/cah/commands.go b/cah/commands.go index a2224d42df..507df65c69 100644 --- a/cah/commands.go +++ b/cah/commands.go @@ -3,11 +3,11 @@ package cah import ( "strings" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/cardsagainstdiscord" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/cardsagainstdiscord" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/sirupsen/logrus" ) diff --git a/cah/plugin_bot.go b/cah/plugin_bot.go index 98971ab4b4..1372f9a9f8 100644 --- a/cah/plugin_bot.go +++ b/cah/plugin_bot.go @@ -3,14 +3,14 @@ package cah import ( "fmt" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/cardsagainstdiscord" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/cardsagainstdiscord" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" ) const ShardMigrationEvtGame = 110 diff --git a/cmd/gen/events.go b/cmd/gen/events.go index 71f30fe6be..a6c478d972 100644 --- a/cmd/gen/events.go +++ b/cmd/gen/events.go @@ -25,7 +25,7 @@ package bot import ( "context" "github.com/sirupsen/logrus" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "runtime/debug" ) diff --git a/cmd/shardorchestrator/main.go b/cmd/shardorchestrator/main.go index 61f8d736c4..112ea82f77 100644 --- a/cmd/shardorchestrator/main.go +++ b/cmd/shardorchestrator/main.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator/rest" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator/rest" "github.com/mediocregopher/radix/v3" "github.com/sirupsen/logrus" - _ "github.com/botlabs-gg/yagpdb/bot" // register the custom orchestrator events + _ "github.com/botlabs-gg/yagpdb/v2/bot" // register the custom orchestrator events ) var () diff --git a/cmd/yagpdb/main.go b/cmd/yagpdb/main.go index 2538527a58..c190d3b5c4 100644 --- a/cmd/yagpdb/main.go +++ b/cmd/yagpdb/main.go @@ -1,49 +1,49 @@ package main import ( - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/antiphishing" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/prom" - "github.com/botlabs-gg/yagpdb/common/run" - "github.com/botlabs-gg/yagpdb/web/discorddata" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/antiphishing" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/prom" + "github.com/botlabs-gg/yagpdb/v2/common/run" + "github.com/botlabs-gg/yagpdb/v2/web/discorddata" // Core yagpdb packages - "github.com/botlabs-gg/yagpdb/admin" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/common/internalapi" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/admin" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/common/internalapi" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" // Plugin imports - "github.com/botlabs-gg/yagpdb/automod" - "github.com/botlabs-gg/yagpdb/automod_legacy" - "github.com/botlabs-gg/yagpdb/autorole" - "github.com/botlabs-gg/yagpdb/aylien" - "github.com/botlabs-gg/yagpdb/cah" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/customcommands" - "github.com/botlabs-gg/yagpdb/discordlogger" - "github.com/botlabs-gg/yagpdb/logs" - "github.com/botlabs-gg/yagpdb/moderation" - "github.com/botlabs-gg/yagpdb/notifications" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/premium/patreonpremiumsource" - "github.com/botlabs-gg/yagpdb/reddit" - "github.com/botlabs-gg/yagpdb/reminders" - "github.com/botlabs-gg/yagpdb/reputation" - "github.com/botlabs-gg/yagpdb/rolecommands" - "github.com/botlabs-gg/yagpdb/rsvp" - "github.com/botlabs-gg/yagpdb/safebrowsing" - "github.com/botlabs-gg/yagpdb/serverstats" - "github.com/botlabs-gg/yagpdb/soundboard" - "github.com/botlabs-gg/yagpdb/stdcommands" - "github.com/botlabs-gg/yagpdb/streaming" - "github.com/botlabs-gg/yagpdb/tickets" - "github.com/botlabs-gg/yagpdb/timezonecompanion" - "github.com/botlabs-gg/yagpdb/twitter" - "github.com/botlabs-gg/yagpdb/verification" - "github.com/botlabs-gg/yagpdb/youtube" + "github.com/botlabs-gg/yagpdb/v2/automod" + "github.com/botlabs-gg/yagpdb/v2/automod_legacy" + "github.com/botlabs-gg/yagpdb/v2/autorole" + "github.com/botlabs-gg/yagpdb/v2/aylien" + "github.com/botlabs-gg/yagpdb/v2/cah" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/customcommands" + "github.com/botlabs-gg/yagpdb/v2/discordlogger" + "github.com/botlabs-gg/yagpdb/v2/logs" + "github.com/botlabs-gg/yagpdb/v2/moderation" + "github.com/botlabs-gg/yagpdb/v2/notifications" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/premium/patreonpremiumsource" + "github.com/botlabs-gg/yagpdb/v2/reddit" + "github.com/botlabs-gg/yagpdb/v2/reminders" + "github.com/botlabs-gg/yagpdb/v2/reputation" + "github.com/botlabs-gg/yagpdb/v2/rolecommands" + "github.com/botlabs-gg/yagpdb/v2/rsvp" + "github.com/botlabs-gg/yagpdb/v2/safebrowsing" + "github.com/botlabs-gg/yagpdb/v2/serverstats" + "github.com/botlabs-gg/yagpdb/v2/soundboard" + "github.com/botlabs-gg/yagpdb/v2/stdcommands" + "github.com/botlabs-gg/yagpdb/v2/streaming" + "github.com/botlabs-gg/yagpdb/v2/tickets" + "github.com/botlabs-gg/yagpdb/v2/timezonecompanion" + "github.com/botlabs-gg/yagpdb/v2/twitter" + "github.com/botlabs-gg/yagpdb/v2/verification" + "github.com/botlabs-gg/yagpdb/v2/youtube" // External plugins ) diff --git a/commands/commands.go b/commands/commands.go index 07c5969437..497da6e864 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -6,14 +6,14 @@ package commands import ( "context" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/featureflags" - prfx "github.com/botlabs-gg/yagpdb/common/prefix" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + prfx "github.com/botlabs-gg/yagpdb/v2/common/prefix" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/commands/help.go b/commands/help.go index 64e5effec0..05cccfc891 100644 --- a/commands/help.go +++ b/commands/help.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var cmdHelp = &YAGCommand{ diff --git a/commands/plugin_bot.go b/commands/plugin_bot.go index a240ab23e7..40552f5ed6 100644 --- a/commands/plugin_bot.go +++ b/commands/plugin_bot.go @@ -10,13 +10,13 @@ import ( "unicode/utf8" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - prfx "github.com/botlabs-gg/yagpdb/common/prefix" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + prfx "github.com/botlabs-gg/yagpdb/v2/common/prefix" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var ( diff --git a/commands/plugin_web.go b/commands/plugin_web.go index 95a3ab5c59..a7ac5b7a0a 100644 --- a/commands/plugin_web.go +++ b/commands/plugin_web.go @@ -12,15 +12,15 @@ import ( "unicode" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/commands/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/featureflags" - prfx "github.com/botlabs-gg/yagpdb/common/prefix" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/commands/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + prfx "github.com/botlabs-gg/yagpdb/v2/common/prefix" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/commands/slashcommands.go b/commands/slashcommands.go index 7f9f42faad..b412834f58 100644 --- a/commands/slashcommands.go +++ b/commands/slashcommands.go @@ -10,14 +10,14 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/mediocregopher/radix/v3" ) diff --git a/commands/tmplexec.go b/commands/tmplexec.go index 0d0c89e315..c4a3852be5 100644 --- a/commands/tmplexec.go +++ b/commands/tmplexec.go @@ -6,12 +6,12 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func init() { diff --git a/commands/util.go b/commands/util.go index 0cecd2aa0d..ba7f6127b8 100644 --- a/commands/util.go +++ b/commands/util.go @@ -8,11 +8,11 @@ import ( "unicode" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) type DurationArg struct { diff --git a/commands/yagcommmand.go b/commands/yagcommmand.go index c430a2156e..beae7b9df8 100644 --- a/commands/yagcommmand.go +++ b/commands/yagcommmand.go @@ -9,13 +9,13 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/common/backgroundworkers/backgroundworkers.go b/common/backgroundworkers/backgroundworkers.go index 1ec65507b3..1d4851011f 100644 --- a/common/backgroundworkers/backgroundworkers.go +++ b/common/backgroundworkers/backgroundworkers.go @@ -5,8 +5,8 @@ import ( "net/http" "sync" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" "goji.io" ) diff --git a/common/common.go b/common/common.go index f189942e9a..8d445446e1 100644 --- a/common/common.go +++ b/common/common.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common/cacheset" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common/cacheset" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/postgres" "github.com/jmoiron/sqlx" diff --git a/common/common_test.go b/common/common_test.go index 66ed047151..e19ffaea95 100644 --- a/common/common_test.go +++ b/common/common_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/botlabs-gg/yagpdb/common/testutils" + "github.com/botlabs-gg/yagpdb/v2/common/testutils" ) func TestMain(m *testing.M) { diff --git a/common/config.go b/common/config.go index 1776a581ed..a5165a545d 100644 --- a/common/config.go +++ b/common/config.go @@ -5,7 +5,7 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/config" ) var ( diff --git a/common/configstore/db.go b/common/configstore/db.go index 82ebe87514..157e08e5f0 100644 --- a/common/configstore/db.go +++ b/common/configstore/db.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" "github.com/jinzhu/gorm" "github.com/karlseguin/ccache" "golang.org/x/net/context" diff --git a/common/configstore/sql.go b/common/configstore/sql.go index 5d997a35d4..359c9e87b3 100644 --- a/common/configstore/sql.go +++ b/common/configstore/sql.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/jinzhu/gorm" "golang.org/x/net/context" ) diff --git a/common/coreserverconf.go b/common/coreserverconf.go index 53cdbcfaf7..5b4c3cbe50 100644 --- a/common/coreserverconf.go +++ b/common/coreserverconf.go @@ -5,7 +5,7 @@ import ( "database/sql" "time" - "github.com/botlabs-gg/yagpdb/common/models" + "github.com/botlabs-gg/yagpdb/v2/common/models" "github.com/karlseguin/rcache" "github.com/volatiletech/sqlboiler/boil" ) diff --git a/common/cplogs/cplogs.go b/common/cplogs/cplogs.go index 8e8efbfb5f..85f726e861 100644 --- a/common/cplogs/cplogs.go +++ b/common/cplogs/cplogs.go @@ -3,7 +3,7 @@ package cplogs import ( "time" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/sirupsen/logrus" ) diff --git a/common/cplogs/models.go b/common/cplogs/models.go index 4098e9a534..c2f0d2f54f 100644 --- a/common/cplogs/models.go +++ b/common/cplogs/models.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" ) const DBSchema = ` diff --git a/common/cplogs_legacy.go b/common/cplogs_legacy.go index 7afcb6401a..7b07073858 100644 --- a/common/cplogs_legacy.go +++ b/common/cplogs_legacy.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" ) diff --git a/common/dutil.go b/common/dutil.go index 7ee9b58e0f..261261b749 100644 --- a/common/dutil.go +++ b/common/dutil.go @@ -1,8 +1,8 @@ package common import ( - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) // IsRoleAbove returns wether role a is above b, checking positions first, and if they're the same diff --git a/common/featureflags/bgworker.go b/common/featureflags/bgworker.go index e73fe1c455..7852cd7655 100644 --- a/common/featureflags/bgworker.go +++ b/common/featureflags/bgworker.go @@ -6,8 +6,8 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" "github.com/mediocregopher/radix/v3" ) diff --git a/common/featureflags/featureflags.go b/common/featureflags/featureflags.go index 6be0768dd8..6e8428e8ec 100644 --- a/common/featureflags/featureflags.go +++ b/common/featureflags/featureflags.go @@ -6,8 +6,8 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" "github.com/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/common/featureflags/featureflags_test.go b/common/featureflags/featureflags_test.go index 344335604a..c701c9baf7 100644 --- a/common/featureflags/featureflags_test.go +++ b/common/featureflags/featureflags_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" ) func TestMain(m *testing.M) { diff --git a/common/featureflags/plugin.go b/common/featureflags/plugin.go index 610aa80dff..d7e683033e 100644 --- a/common/featureflags/plugin.go +++ b/common/featureflags/plugin.go @@ -3,8 +3,8 @@ package featureflags import ( "sync" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" ) var logger = common.GetPluginLogger(&Plugin{}) diff --git a/common/internalapi/clientutil.go b/common/internalapi/clientutil.go index 106e3b88ab..1543fc9926 100644 --- a/common/internalapi/clientutil.go +++ b/common/internalapi/clientutil.go @@ -6,7 +6,7 @@ import ( "net/http" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" ) var ( diff --git a/common/internalapi/server.go b/common/internalapi/server.go index 2d65692c84..88e121cb03 100644 --- a/common/internalapi/server.go +++ b/common/internalapi/server.go @@ -12,8 +12,8 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" "goji.io" "goji.io/pat" ) diff --git a/common/loghooks.go b/common/loghooks.go index 4a596002c2..55325cf3f6 100644 --- a/common/loghooks.go +++ b/common/loghooks.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sirupsen/logrus" diff --git a/common/mqueue/bgworker.go b/common/mqueue/bgworker.go index 5841aa0887..5e365de5ee 100644 --- a/common/mqueue/bgworker.go +++ b/common/mqueue/bgworker.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" "github.com/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/common/mqueue/bot.go b/common/mqueue/bot.go index 39f1e752cb..13bccc2ecb 100644 --- a/common/mqueue/bot.go +++ b/common/mqueue/bot.go @@ -3,13 +3,13 @@ package mqueue import ( "sync" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/botlabs-gg/yagpdb/bot" + "github.com/botlabs-gg/yagpdb/v2/bot" ) // type WebhookCacheKey struct { diff --git a/common/mqueue/discordprocessor.go b/common/mqueue/discordprocessor.go index 3ee4143cb2..7d2d2ead8e 100644 --- a/common/mqueue/discordprocessor.go +++ b/common/mqueue/discordprocessor.go @@ -5,9 +5,9 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" ) diff --git a/common/mqueue/models.go b/common/mqueue/models.go index a193035de6..382defa704 100644 --- a/common/mqueue/models.go +++ b/common/mqueue/models.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) // QueuedElement represents a queued message diff --git a/common/mqueue/mqueue.go b/common/mqueue/mqueue.go index e7dfce013e..d068d4e2ab 100644 --- a/common/mqueue/mqueue.go +++ b/common/mqueue/mqueue.go @@ -5,9 +5,9 @@ import ( "net/http" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/sirupsen/logrus" ) diff --git a/common/mqueue/mqueue_test.go b/common/mqueue/mqueue_test.go index c57eeb0524..239f6bf289 100644 --- a/common/mqueue/mqueue_test.go +++ b/common/mqueue/mqueue_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" ) func TestMain(m *testing.M) { diff --git a/common/mqueue/producer.go b/common/mqueue/producer.go index 36ed69a9b6..52f813c6f0 100644 --- a/common/mqueue/producer.go +++ b/common/mqueue/producer.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" ) type Producer struct { diff --git a/common/mqueue/redisbackend.go b/common/mqueue/redisbackend.go index 5311f07f2c..ad06910896 100644 --- a/common/mqueue/redisbackend.go +++ b/common/mqueue/redisbackend.go @@ -3,7 +3,7 @@ package mqueue import ( "encoding/json" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/mediocregopher/radix/v3" ) diff --git a/common/mqueue/worker.go b/common/mqueue/worker.go index 942dd506cd..f7ac96d0c8 100644 --- a/common/mqueue/worker.go +++ b/common/mqueue/worker.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common/config" ) var confMaxConcurrentSends = config.RegisterOption("yagpdb.mqueue.max_concurrent_sends", "Max number of concurrent sends that mqueue will do", 3) diff --git a/common/patreon/poller.go b/common/patreon/poller.go index da5c62cb59..4d37b8ae76 100644 --- a/common/patreon/poller.go +++ b/common/patreon/poller.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/patreon/patreonapi" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/patreon/patreonapi" "github.com/mediocregopher/radix/v3" "golang.org/x/oauth2" ) diff --git a/common/pqkeydb/pqkeydb_test.go b/common/pqkeydb/pqkeydb_test.go index 214c668c9b..7220a48fe9 100644 --- a/common/pqkeydb/pqkeydb_test.go +++ b/common/pqkeydb/pqkeydb_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/botlabs-gg/yagpdb/common/testutils" + "github.com/botlabs-gg/yagpdb/v2/common/testutils" ) var db *DB diff --git a/common/prefix/prefix.go b/common/prefix/prefix.go index f35af922df..e824322a7c 100644 --- a/common/prefix/prefix.go +++ b/common/prefix/prefix.go @@ -1,9 +1,9 @@ package prefix import ( - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" ) diff --git a/common/prom/prom.go b/common/prom/prom.go index 05b54c50d1..e9298f7f95 100644 --- a/common/prom/prom.go +++ b/common/prom/prom.go @@ -8,7 +8,7 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/config" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" ) diff --git a/common/pubsub/buildin_events.go b/common/pubsub/buildin_events.go index d9d60cca4f..8e9869db87 100644 --- a/common/pubsub/buildin_events.go +++ b/common/pubsub/buildin_events.go @@ -5,9 +5,9 @@ import ( "reflect" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cacheset" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cacheset" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) // PublishRatelimit publishes a new global ratelimit hit on discord diff --git a/common/pubsub/pubsub.go b/common/pubsub/pubsub.go index 1279cc1f99..f0727ba13e 100644 --- a/common/pubsub/pubsub.go +++ b/common/pubsub/pubsub.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/common/run/gen-docs.go b/common/run/gen-docs.go index d39dbe666b..94c38aceef 100644 --- a/common/run/gen-docs.go +++ b/common/run/gen-docs.go @@ -7,10 +7,10 @@ import ( "sort" "strings" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/config" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) func GenCommandsDocs() { diff --git a/common/run/run.go b/common/run/run.go index 3a133d61b2..a531586b9f 100644 --- a/common/run/run.go +++ b/common/run/run.go @@ -11,18 +11,18 @@ import ( "syscall" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/configstore" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/common/sentryhook" - "github.com/botlabs-gg/yagpdb/feeds" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/configstore" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common/sentryhook" + "github.com/botlabs-gg/yagpdb/v2/feeds" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/getsentry/sentry-go" log "github.com/sirupsen/logrus" ) diff --git a/common/run/syslog_linux.go b/common/run/syslog_linux.go index 027f709f0e..c7c9647f42 100644 --- a/common/run/syslog_linux.go +++ b/common/run/syslog_linux.go @@ -3,7 +3,7 @@ package run import ( "log/syslog" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/sirupsen/logrus" lsyslog "github.com/sirupsen/logrus/hooks/syslog" ) diff --git a/common/scheduledevents2/backgroundworker.go b/common/scheduledevents2/backgroundworker.go index 7b7b728e67..83fa6e6e0a 100644 --- a/common/scheduledevents2/backgroundworker.go +++ b/common/scheduledevents2/backgroundworker.go @@ -8,9 +8,9 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/common/scheduledevents2/builtinevents.go b/common/scheduledevents2/builtinevents.go index 1ead45ab42..d1ea01bc3f 100644 --- a/common/scheduledevents2/builtinevents.go +++ b/common/scheduledevents2/builtinevents.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/common/scheduledevents2/migratelegacy.go b/common/scheduledevents2/migratelegacy.go index 04bf4731e0..7172b57f54 100644 --- a/common/scheduledevents2/migratelegacy.go +++ b/common/scheduledevents2/migratelegacy.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/mediocregopher/radix/v3" "github.com/sirupsen/logrus" ) diff --git a/common/scheduledevents2/scheduledevents.go b/common/scheduledevents2/scheduledevents.go index a35ba30240..44f72665f2 100644 --- a/common/scheduledevents2/scheduledevents.go +++ b/common/scheduledevents2/scheduledevents.go @@ -20,10 +20,10 @@ import ( "github.com/volatiletech/null" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/volatiletech/sqlboiler/boil" ) diff --git a/common/scheduledevents2/scheduledevents_test.go b/common/scheduledevents2/scheduledevents_test.go index df5099955b..a0389c2261 100644 --- a/common/scheduledevents2/scheduledevents_test.go +++ b/common/scheduledevents2/scheduledevents_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" ) var SchemaInit = false diff --git a/common/templates/context.go b/common/templates/context.go index 7f9a29efea..d277088ac2 100644 --- a/common/templates/context.go +++ b/common/templates/context.go @@ -14,13 +14,13 @@ import ( "unicode/utf8" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/prefix" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/lib/template" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/prefix" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/template" "github.com/sirupsen/logrus" "github.com/vmihailenco/msgpack" ) diff --git a/common/templates/context_funcs.go b/common/templates/context_funcs.go index e06e9386ca..b2e49250f2 100644 --- a/common/templates/context_funcs.go +++ b/common/templates/context_funcs.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var ErrTooManyCalls = errors.New("too many calls to this function") diff --git a/common/templates/general.go b/common/templates/general.go index 6a77283a35..185da7bd7d 100644 --- a/common/templates/general.go +++ b/common/templates/general.go @@ -12,9 +12,9 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) // dictionary creates a map[string]interface{} from the given parameters by diff --git a/common/templates/structs.go b/common/templates/structs.go index b051a176aa..9609024512 100644 --- a/common/templates/structs.go +++ b/common/templates/structs.go @@ -3,8 +3,8 @@ package templates import ( "errors" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) // CtxChannel is almost a 1:1 copy of dstate.ChannelState, its needed because we cant axpose all those state methods diff --git a/common/util.go b/common/util.go index 3e2cd2c47c..58c6fb0e69 100644 --- a/common/util.go +++ b/common/util.go @@ -12,9 +12,9 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/lib/pq" "github.com/mediocregopher/radix/v3" "github.com/sirupsen/logrus" diff --git a/customcommands/bot.go b/customcommands/bot.go index 3fd1a0b705..1ad0d1045e 100644 --- a/customcommands/bot.go +++ b/customcommands/bot.go @@ -13,28 +13,28 @@ import ( "time" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/lib/template" - "github.com/botlabs-gg/yagpdb/premium" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/lib/template" + "github.com/botlabs-gg/yagpdb/v2/premium" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/keylock" - "github.com/botlabs-gg/yagpdb/common/multiratelimit" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - schEventsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/customcommands/models" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/keylock" + "github.com/botlabs-gg/yagpdb/v2/common/multiratelimit" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + schEventsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" "github.com/sirupsen/logrus" "github.com/vmihailenco/msgpack" "github.com/volatiletech/null" diff --git a/customcommands/bot_test.go b/customcommands/bot_test.go index 203c1d6629..03e2ef52e0 100644 --- a/customcommands/bot_test.go +++ b/customcommands/bot_test.go @@ -3,9 +3,9 @@ package customcommands import ( "testing" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/customcommands/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func TestCheckMatch(t *testing.T) { diff --git a/customcommands/customcommands.go b/customcommands/customcommands.go index ab1016bc1c..8eca867c67 100644 --- a/customcommands/customcommands.go +++ b/customcommands/customcommands.go @@ -11,13 +11,13 @@ import ( "unicode/utf8" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/customcommands/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/karlseguin/ccache" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/null" diff --git a/customcommands/interval.go b/customcommands/interval.go index 33443ec610..bf02b1a2ac 100644 --- a/customcommands/interval.go +++ b/customcommands/interval.go @@ -5,10 +5,10 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - schEventsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + schEventsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/customcommands/models" "github.com/volatiletech/null" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/customcommands/interval_test.go b/customcommands/interval_test.go index 61f9ba92bf..195b17b3cf 100644 --- a/customcommands/interval_test.go +++ b/customcommands/interval_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/customcommands/models" "github.com/volatiletech/null" ) diff --git a/customcommands/migration.go b/customcommands/migration.go index ae61aec661..4d6fb84328 100644 --- a/customcommands/migration.go +++ b/customcommands/migration.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/sqlboiler/boil" ) diff --git a/customcommands/tmplextensions.go b/customcommands/tmplextensions.go index 7ca6011614..09b4c6e744 100644 --- a/customcommands/tmplextensions.go +++ b/customcommands/tmplextensions.go @@ -7,17 +7,17 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - scheduledmodels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/customcommands/models" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/premium" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + scheduledmodels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/premium" "github.com/vmihailenco/msgpack" "github.com/volatiletech/null" "github.com/volatiletech/sqlboiler/boil" diff --git a/customcommands/web.go b/customcommands/web.go index a1cc87e1e2..daeb515779 100644 --- a/customcommands/web.go +++ b/customcommands/web.go @@ -11,14 +11,14 @@ import ( "unicode/utf8" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" - yagtemplate "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/customcommands/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + yagtemplate "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/null" "github.com/volatiletech/sqlboiler/boil" diff --git a/discordlogger/discordlogger.go b/discordlogger/discordlogger.go index 1212267cdb..cdf51eb803 100644 --- a/discordlogger/discordlogger.go +++ b/discordlogger/discordlogger.go @@ -4,11 +4,11 @@ import ( "fmt" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/bot/models" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" ) var ( diff --git a/feeds/plugin.go b/feeds/plugin.go index fbed0c5f4b..0e09fef53e 100644 --- a/feeds/plugin.go +++ b/feeds/plugin.go @@ -4,7 +4,7 @@ import ( "strings" "sync" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/go.mod b/go.mod index 53c26475ed..d0c9df4f8e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/botlabs-gg/yagpdb +module github.com/botlabs-gg/yagpdb/v2 go 1.17 @@ -7,7 +7,7 @@ require ( github.com/AYLIEN/aylien_textapi_go v0.6.0 github.com/NYTimes/gziphandler v1.1.1 github.com/PuerkitoBio/goquery v1.5.0 - github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 + github.com/buger/jsonparser v1.0.0 github.com/bwmarrin/snowflake v0.3.0 github.com/cenkalti/backoff v2.1.1+incompatible github.com/dghubble/oauth1 v0.6.0 @@ -67,11 +67,11 @@ require ( github.com/volatiletech/sqlboiler/v4 v4.5.0 github.com/volatiletech/strmangle v0.0.1 goji.io v2.0.2+incompatible - golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 golang.org/x/image v0.0.0-20190902063713-cb417be4ba39 - golang.org/x/net v0.0.0-20210614182718-04defd469f4e + golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 - golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect + golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect golang.org/x/time v0.0.0-20191024005414-555d28b269f0 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/api v0.40.0 @@ -86,7 +86,10 @@ require ( gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f ) -require cloud.google.com/go v0.74.0 // indirect +require ( + cloud.google.com/go v0.74.0 // indirect + golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect +) require ( github.com/AlekSi/pointer v1.1.0 @@ -161,7 +164,8 @@ require ( go.opencensus.io v0.22.5 // indirect go.uber.org/atomic v1.4.0 // indirect go.uber.org/multierr v1.1.0 // indirect - golang.org/x/text v0.3.6 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/tools v0.1.10 google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d // indirect google.golang.org/grpc v1.34.0 // indirect diff --git a/go.sum b/go.sum index d42f4541d0..4099d6afdc 100644 --- a/go.sum +++ b/go.sum @@ -101,8 +101,9 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= -github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23 h1:D21IyuvjDCshj1/qq+pCNd3VZOAEI9jy6Bi131YlXgI= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= +github.com/buger/jsonparser v1.0.0 h1:etJTGF5ESxjI0Ic2UaLQs2LQQpa8G9ykQScukbh4L8A= +github.com/buger/jsonparser v1.0.0/go.mod h1:tgcrVJ81GPSF0mz+0nu1Xaz0fazGPrmmJfJtxjbHhUQ= github.com/bwmarrin/snowflake v0.3.0 h1:xm67bEhkKh6ij1790JB83OujPR5CzNe8QuQqAgISZN0= github.com/bwmarrin/snowflake v0.3.0/go.mod h1:NdZxfVWX+oR6y2K0o6qAYv6gIOP9rjG0/E9WsDpxqwE= github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY= @@ -751,6 +752,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -786,6 +788,8 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -830,6 +834,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -904,6 +910,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf h1:2ucpDCmfkl8Bd/FsLtiD653Wf96cW37s+iGx93zsu4k= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -915,6 +923,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -975,6 +985,8 @@ golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/lib/cardsagainstdiscord/cad.go b/lib/cardsagainstdiscord/cad.go index fb03069cc6..ec22ea2c43 100644 --- a/lib/cardsagainstdiscord/cad.go +++ b/lib/cardsagainstdiscord/cad.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/pkg/errors" ) diff --git a/lib/cardsagainstdiscord/cmd/cardsagainstdiscord/main.go b/lib/cardsagainstdiscord/cmd/cardsagainstdiscord/main.go index 8c3c41390e..d09541c52d 100644 --- a/lib/cardsagainstdiscord/cmd/cardsagainstdiscord/main.go +++ b/lib/cardsagainstdiscord/cmd/cardsagainstdiscord/main.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/botlabs-gg/yagpdb/lib/cardsagainstdiscord" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate/inmemorytracker" + "github.com/botlabs-gg/yagpdb/v2/lib/cardsagainstdiscord" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate/inmemorytracker" ) var cahManager *cardsagainstdiscord.GameManager diff --git a/lib/cardsagainstdiscord/game.go b/lib/cardsagainstdiscord/game.go index 246290f07f..6549130eeb 100644 --- a/lib/cardsagainstdiscord/game.go +++ b/lib/cardsagainstdiscord/game.go @@ -11,7 +11,7 @@ import ( "time" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type GameState int diff --git a/lib/cardsagainstdiscord/manager.go b/lib/cardsagainstdiscord/manager.go index c6de2e2633..d250c58983 100644 --- a/lib/cardsagainstdiscord/manager.go +++ b/lib/cardsagainstdiscord/manager.go @@ -3,7 +3,7 @@ package cardsagainstdiscord import ( "sync" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type GameManager struct { diff --git a/lib/dca/cmd/dca/main.go b/lib/dca/cmd/dca/main.go index c40fe61c39..265f9ea7d8 100644 --- a/lib/dca/cmd/dca/main.go +++ b/lib/dca/cmd/dca/main.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/botlabs-gg/yagpdb/lib/dca" + "github.com/botlabs-gg/yagpdb/v2/lib/dca" ) // All global variables used within the program diff --git a/lib/dca/encode.go b/lib/dca/encode.go index bec92b2054..0c8e4e4c36 100644 --- a/lib/dca/encode.go +++ b/lib/dca/encode.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/ogg" + "github.com/botlabs-gg/yagpdb/v2/lib/ogg" ) // AudioApplication is an application profile for opus encoding diff --git a/lib/dcmd/arg.go b/lib/dcmd/arg.go index 56549db799..0dba1c33ce 100644 --- a/lib/dcmd/arg.go +++ b/lib/dcmd/arg.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) // ArgDef represents a argument definition, either a switch or plain arg diff --git a/lib/dcmd/arg_test.go b/lib/dcmd/arg_test.go index 09e32c8145..031aa0e768 100644 --- a/lib/dcmd/arg_test.go +++ b/lib/dcmd/arg_test.go @@ -3,7 +3,7 @@ package dcmd import ( "testing" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/stretchr/testify/assert" ) diff --git a/lib/dcmd/container.go b/lib/dcmd/container.go index f799f8ea53..88e597c7fb 100644 --- a/lib/dcmd/container.go +++ b/lib/dcmd/container.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) type MiddleWareFunc func(next RunFunc) RunFunc diff --git a/lib/dcmd/data.go b/lib/dcmd/data.go index b131af6ffc..10b0a783d3 100644 --- a/lib/dcmd/data.go +++ b/lib/dcmd/data.go @@ -4,8 +4,8 @@ import ( "context" "reflect" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/pkg/errors" ) diff --git a/lib/dcmd/examples/advancedhelp/advancedhelp.go b/lib/dcmd/examples/advancedhelp/advancedhelp.go index 3b6afda823..b873a148e0 100644 --- a/lib/dcmd/examples/advancedhelp/advancedhelp.go +++ b/lib/dcmd/examples/advancedhelp/advancedhelp.go @@ -8,8 +8,8 @@ import ( "log" "os" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func main() { diff --git a/lib/dcmd/examples/middleware/middleware.go b/lib/dcmd/examples/middleware/middleware.go index 78361630bf..bbc653d04a 100644 --- a/lib/dcmd/examples/middleware/middleware.go +++ b/lib/dcmd/examples/middleware/middleware.go @@ -10,8 +10,8 @@ import ( "os" "sync" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func main() { diff --git a/lib/dcmd/examples/simple/simple.go b/lib/dcmd/examples/simple/simple.go index ae486e7998..166dfb4220 100644 --- a/lib/dcmd/examples/simple/simple.go +++ b/lib/dcmd/examples/simple/simple.go @@ -9,8 +9,8 @@ import ( "log" "os" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func main() { diff --git a/lib/dcmd/examples/timeofday/timeofday.go b/lib/dcmd/examples/timeofday/timeofday.go index fe67252072..24d5d2b285 100644 --- a/lib/dcmd/examples/timeofday/timeofday.go +++ b/lib/dcmd/examples/timeofday/timeofday.go @@ -9,8 +9,8 @@ import ( "os" "time" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func main() { diff --git a/lib/dcmd/help.go b/lib/dcmd/help.go index f1397f6cc5..b55452f244 100644 --- a/lib/dcmd/help.go +++ b/lib/dcmd/help.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) // HelpFormatter is a interface for help formatters, for an example see StdHelpFormatter diff --git a/lib/dcmd/parse.go b/lib/dcmd/parse.go index 50550433a3..de4643a297 100644 --- a/lib/dcmd/parse.go +++ b/lib/dcmd/parse.go @@ -3,7 +3,7 @@ package dcmd import ( "strings" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var ( diff --git a/lib/dcmd/response.go b/lib/dcmd/response.go index d98f0f7117..2481121500 100644 --- a/lib/dcmd/response.go +++ b/lib/dcmd/response.go @@ -6,7 +6,7 @@ import ( "unicode" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type Response interface { diff --git a/lib/dcmd/system.go b/lib/dcmd/system.go index 13c281b691..47f739fea7 100644 --- a/lib/dcmd/system.go +++ b/lib/dcmd/system.go @@ -6,8 +6,8 @@ import ( "runtime/debug" "strings" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/pkg/errors" ) diff --git a/lib/dcmd/system_test.go b/lib/dcmd/system_test.go index de96781cba..74cfdf536d 100644 --- a/lib/dcmd/system_test.go +++ b/lib/dcmd/system_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/stretchr/testify/assert" ) diff --git a/lib/discordgo/events.go b/lib/discordgo/events.go index 7e313ba6f7..431bd914b2 100644 --- a/lib/discordgo/events.go +++ b/lib/discordgo/events.go @@ -1,7 +1,7 @@ package discordgo import ( - "github.com/botlabs-gg/yagpdb/lib/gojay" + "github.com/botlabs-gg/yagpdb/v2/lib/gojay" "github.com/pkg/errors" ) diff --git a/lib/discordgo/gateway.go b/lib/discordgo/gateway.go index 3de8b0b738..c5900bdfbf 100644 --- a/lib/discordgo/gateway.go +++ b/lib/discordgo/gateway.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/lib/gojay" + "github.com/botlabs-gg/yagpdb/v2/lib/gojay" "github.com/gobwas/ws" "github.com/gobwas/ws/wsutil" ) diff --git a/lib/discordgo/oauth2_test.go b/lib/discordgo/oauth2_test.go index 58707b302c..650c0fab85 100644 --- a/lib/discordgo/oauth2_test.go +++ b/lib/discordgo/oauth2_test.go @@ -4,7 +4,7 @@ import ( "log" "os" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func ExampleApplication() { diff --git a/lib/discordgo/structs.go b/lib/discordgo/structs.go index 3cfc0269f0..186cf5778c 100644 --- a/lib/discordgo/structs.go +++ b/lib/discordgo/structs.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/gojay" + "github.com/botlabs-gg/yagpdb/v2/lib/gojay" "github.com/pkg/errors" "github.com/volatiletech/null" ) diff --git a/lib/discordgo/types.go b/lib/discordgo/types.go index 443edf42db..5a2e3d4af3 100644 --- a/lib/discordgo/types.go +++ b/lib/discordgo/types.go @@ -19,7 +19,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/gojay" + "github.com/botlabs-gg/yagpdb/v2/lib/gojay" ) // Timestamp stores a timestamp, as sent by the Discord API. diff --git a/lib/discordgo/user.go b/lib/discordgo/user.go index b251e9f5cd..37627251ed 100644 --- a/lib/discordgo/user.go +++ b/lib/discordgo/user.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/botlabs-gg/yagpdb/lib/gojay" + "github.com/botlabs-gg/yagpdb/v2/lib/gojay" ) // A User stores all data for an individual Discord user. diff --git a/lib/discordgo/voice.go b/lib/discordgo/voice.go index fabc935190..c297a00ad5 100644 --- a/lib/discordgo/voice.go +++ b/lib/discordgo/voice.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/gojay" + "github.com/botlabs-gg/yagpdb/v2/lib/gojay" "github.com/gorilla/websocket" "golang.org/x/crypto/nacl/secretbox" ) diff --git a/lib/dshardorchestrator/cmd/dso-cli/main.go b/lib/dshardorchestrator/cmd/dso-cli/main.go index 3e02c0dd88..6ed4525b61 100644 --- a/lib/dshardorchestrator/cmd/dso-cli/main.go +++ b/lib/dshardorchestrator/cmd/dso-cli/main.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator/rest" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator/rest" "github.com/jedib0t/go-pretty/table" "github.com/mitchellh/cli" ) diff --git a/lib/dshardorchestrator/cmd/dso-sample-bot/main.go b/lib/dshardorchestrator/cmd/dso-sample-bot/main.go index 04f9a29b45..a50f4ff8a6 100644 --- a/lib/dshardorchestrator/cmd/dso-sample-bot/main.go +++ b/lib/dshardorchestrator/cmd/dso-sample-bot/main.go @@ -5,8 +5,8 @@ import ( "log" "os" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/node" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/node" ) var Node *node.Conn diff --git a/lib/dshardorchestrator/cmd/dso-sample-bot/node-implementation.go b/lib/dshardorchestrator/cmd/dso-sample-bot/node-implementation.go index 515df3cd1e..0ed280c4da 100644 --- a/lib/dshardorchestrator/cmd/dso-sample-bot/node-implementation.go +++ b/lib/dshardorchestrator/cmd/dso-sample-bot/node-implementation.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/node" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/node" ) type Bot struct { diff --git a/lib/dshardorchestrator/cmd/dso-sample-orchestrator/main.go b/lib/dshardorchestrator/cmd/dso-sample-orchestrator/main.go index 8ad00465ee..69aee28557 100644 --- a/lib/dshardorchestrator/cmd/dso-sample-orchestrator/main.go +++ b/lib/dshardorchestrator/cmd/dso-sample-orchestrator/main.go @@ -5,10 +5,10 @@ import ( "os" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator/rest" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator/rest" ) func main() { diff --git a/lib/dshardorchestrator/node/interface.go b/lib/dshardorchestrator/node/interface.go index f14e85099f..67fe56eb11 100644 --- a/lib/dshardorchestrator/node/interface.go +++ b/lib/dshardorchestrator/node/interface.go @@ -1,7 +1,7 @@ package node import ( - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" ) type SessionInfo struct { diff --git a/lib/dshardorchestrator/node/node.go b/lib/dshardorchestrator/node/node.go index 235848f5dc..5a1a590a20 100644 --- a/lib/dshardorchestrator/node/node.go +++ b/lib/dshardorchestrator/node/node.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" ) var ( diff --git a/lib/dshardorchestrator/orchestrator/monitor.go b/lib/dshardorchestrator/orchestrator/monitor.go index 90cf8a8422..2cd3c12a8c 100644 --- a/lib/dshardorchestrator/orchestrator/monitor.go +++ b/lib/dshardorchestrator/orchestrator/monitor.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" ) type monitor struct { diff --git a/lib/dshardorchestrator/orchestrator/nodeconn.go b/lib/dshardorchestrator/orchestrator/nodeconn.go index cc894414bc..114e877438 100644 --- a/lib/dshardorchestrator/orchestrator/nodeconn.go +++ b/lib/dshardorchestrator/orchestrator/nodeconn.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" ) // NodeConn represents a connection from a master server to a slave diff --git a/lib/dshardorchestrator/orchestrator/orchestrator.go b/lib/dshardorchestrator/orchestrator/orchestrator.go index 8bd2c7c1cb..542851135e 100644 --- a/lib/dshardorchestrator/orchestrator/orchestrator.go +++ b/lib/dshardorchestrator/orchestrator/orchestrator.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" "github.com/pkg/errors" ) diff --git a/lib/dshardorchestrator/orchestrator/rest/handlers.go b/lib/dshardorchestrator/orchestrator/rest/handlers.go index 9a630d31df..a320b0690a 100644 --- a/lib/dshardorchestrator/orchestrator/rest/handlers.go +++ b/lib/dshardorchestrator/orchestrator/rest/handlers.go @@ -5,7 +5,7 @@ import ( "net/http" "strconv" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator" "github.com/gin-gonic/gin" "github.com/pkg/errors" ) diff --git a/lib/dshardorchestrator/orchestrator/rest/rest.go b/lib/dshardorchestrator/orchestrator/rest/rest.go index 966dab0f83..fc57670e60 100644 --- a/lib/dshardorchestrator/orchestrator/rest/rest.go +++ b/lib/dshardorchestrator/orchestrator/rest/rest.go @@ -1,7 +1,7 @@ package rest import ( - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator" "github.com/gin-gonic/gin" ) diff --git a/lib/dshardorchestrator/orchestrator/standards.go b/lib/dshardorchestrator/orchestrator/standards.go index 7a477504cd..d8a0fdc505 100644 --- a/lib/dshardorchestrator/orchestrator/standards.go +++ b/lib/dshardorchestrator/orchestrator/standards.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) // StdShardCountProvider is a standard implementation of RecommendedShardCountProvider diff --git a/lib/dshardorchestrator/tests/basic_test.go b/lib/dshardorchestrator/tests/basic_test.go index 29af95ac73..b80a6de1d5 100644 --- a/lib/dshardorchestrator/tests/basic_test.go +++ b/lib/dshardorchestrator/tests/basic_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/node" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/orchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/node" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/orchestrator" ) var testServerAddr = "127.0.0.1:7447" diff --git a/lib/dshardorchestrator/tests/fullmigration_test.go b/lib/dshardorchestrator/tests/fullmigration_test.go index 1dcf1f5e21..8caa2af4b0 100644 --- a/lib/dshardorchestrator/tests/fullmigration_test.go +++ b/lib/dshardorchestrator/tests/fullmigration_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/node" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/node" ) type MockLauncher struct { diff --git a/lib/dshardorchestrator/tests/mocknode.go b/lib/dshardorchestrator/tests/mocknode.go index 4ae8d47b31..1a778532c6 100644 --- a/lib/dshardorchestrator/tests/mocknode.go +++ b/lib/dshardorchestrator/tests/mocknode.go @@ -4,8 +4,8 @@ import ( "strconv" "sync/atomic" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator/node" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator/node" ) type MockBot struct { diff --git a/lib/dstate/example/main.go b/lib/dstate/example/main.go index c276e17180..fc7f497c4d 100644 --- a/lib/dstate/example/main.go +++ b/lib/dstate/example/main.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate/inmemorytracker" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate/inmemorytracker" ) var Token string diff --git a/lib/dstate/helpers.go b/lib/dstate/helpers.go index f96ce50c69..116d812576 100644 --- a/lib/dstate/helpers.go +++ b/lib/dstate/helpers.go @@ -3,7 +3,7 @@ package dstate import ( "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func GuildSetFromGuild(guild *discordgo.Guild) *GuildSet { diff --git a/lib/dstate/inmemorytracker/accessors.go b/lib/dstate/inmemorytracker/accessors.go index de28cf5f6f..0176454d25 100644 --- a/lib/dstate/inmemorytracker/accessors.go +++ b/lib/dstate/inmemorytracker/accessors.go @@ -1,8 +1,8 @@ package inmemorytracker import ( - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var _ dstate.StateTracker = (*InMemoryTracker)(nil) diff --git a/lib/dstate/inmemorytracker/gc.go b/lib/dstate/inmemorytracker/gc.go index 47f164eda9..8595fe5492 100644 --- a/lib/dstate/inmemorytracker/gc.go +++ b/lib/dstate/inmemorytracker/gc.go @@ -4,7 +4,7 @@ import ( "container/list" "time" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) func (shard *ShardTracker) runGcLoop(interval time.Duration) { diff --git a/lib/dstate/inmemorytracker/gc_test.go b/lib/dstate/inmemorytracker/gc_test.go index 1a316c727d..ab78fbfda6 100644 --- a/lib/dstate/inmemorytracker/gc_test.go +++ b/lib/dstate/inmemorytracker/gc_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) func createTestMessage(id int64, ts time.Time) *discordgo.Message { diff --git a/lib/dstate/inmemorytracker/inmemorytracker_test.go b/lib/dstate/inmemorytracker/inmemorytracker_test.go index f5237ce4ec..4d6dc76099 100644 --- a/lib/dstate/inmemorytracker/inmemorytracker_test.go +++ b/lib/dstate/inmemorytracker/inmemorytracker_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var testSession = &discordgo.Session{ShardID: 0, ShardCount: 1} diff --git a/lib/dstate/inmemorytracker/tracker.go b/lib/dstate/inmemorytracker/tracker.go index 7a6f3deac7..03b3174cc1 100644 --- a/lib/dstate/inmemorytracker/tracker.go +++ b/lib/dstate/inmemorytracker/tracker.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) type TrackerConfig struct { diff --git a/lib/dstate/interface.go b/lib/dstate/interface.go index cbc80cd2f3..5e74898cf1 100644 --- a/lib/dstate/interface.go +++ b/lib/dstate/interface.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) // The state system for yags diff --git a/lib/dstate/permissions.go b/lib/dstate/permissions.go index b7c280b0fa..15d5075049 100644 --- a/lib/dstate/permissions.go +++ b/lib/dstate/permissions.go @@ -1,6 +1,6 @@ package dstate -import "github.com/botlabs-gg/yagpdb/lib/discordgo" +import "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" const AllPermissions int64 = discordgo.PermissionAll diff --git a/lib/dstate/permissions_test.go b/lib/dstate/permissions_test.go index bc8118c5e1..6df454e418 100644 --- a/lib/dstate/permissions_test.go +++ b/lib/dstate/permissions_test.go @@ -3,7 +3,7 @@ package dstate import ( "testing" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func TestGuildPermissions(t *testing.T) { diff --git a/lib/jdshardmanager/discordhandlers.go b/lib/jdshardmanager/discordhandlers.go index 147d2b9176..72d780d04e 100644 --- a/lib/jdshardmanager/discordhandlers.go +++ b/lib/jdshardmanager/discordhandlers.go @@ -1,7 +1,7 @@ package dshardmanager import ( - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func (m *Manager) OnDiscordConnected(s *discordgo.Session, evt *discordgo.Connect) { diff --git a/lib/jdshardmanager/dshardmanager.go b/lib/jdshardmanager/dshardmanager.go index 2f0fee146b..163229f2c8 100644 --- a/lib/jdshardmanager/dshardmanager.go +++ b/lib/jdshardmanager/dshardmanager.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/pkg/errors" ) diff --git a/lib/jdshardmanager/example/main.go b/lib/jdshardmanager/example/main.go index fc13e24dca..c7cc2b1bf8 100644 --- a/lib/jdshardmanager/example/main.go +++ b/lib/jdshardmanager/example/main.go @@ -8,7 +8,7 @@ import ( "os" "strings" - dshardmanager "github.com/botlabs-gg/yagpdb/lib/jdshardmanager" + dshardmanager "github.com/botlabs-gg/yagpdb/v2/lib/jdshardmanager" ) var ( diff --git a/lib/template/examplefiles_test.go b/lib/template/examplefiles_test.go index 0a3b04872b..a34a3e0929 100644 --- a/lib/template/examplefiles_test.go +++ b/lib/template/examplefiles_test.go @@ -5,12 +5,13 @@ package template_test import ( - "github.com/botlabs-gg/yagpdb/lib/template" "io" "io/ioutil" "log" "os" "path/filepath" + + "github.com/botlabs-gg/yagpdb/v2/lib/template" ) // templateFile defines the contents of a template to be stored in a file, for testing. diff --git a/lib/template/examplefunc_test.go b/lib/template/examplefunc_test.go index 5cbe58966e..ebe2bdac2e 100644 --- a/lib/template/examplefunc_test.go +++ b/lib/template/examplefunc_test.go @@ -5,10 +5,11 @@ package template_test import ( - "github.com/botlabs-gg/yagpdb/lib/template" "log" "os" "strings" + + "github.com/botlabs-gg/yagpdb/v2/lib/template" ) // This example demonstrates a custom function to process template text. diff --git a/lib/template/exec.go b/lib/template/exec.go index 28bcdcb3fb..3e986b84d9 100644 --- a/lib/template/exec.go +++ b/lib/template/exec.go @@ -14,7 +14,7 @@ import ( "sort" "strings" - "github.com/botlabs-gg/yagpdb/lib/template/parse" + "github.com/botlabs-gg/yagpdb/v2/lib/template/parse" ) // maxExecDepth specifies the maximum stack depth of templates within diff --git a/lib/template/multi_test.go b/lib/template/multi_test.go index 30c89950ea..79ff53e98f 100644 --- a/lib/template/multi_test.go +++ b/lib/template/multi_test.go @@ -11,7 +11,7 @@ import ( "fmt" "testing" - "github.com/botlabs-gg/yagpdb/lib/template/parse" + "github.com/botlabs-gg/yagpdb/v2/lib/template/parse" ) const ( diff --git a/lib/template/template.go b/lib/template/template.go index 91e9ad9f7c..ee3d367b29 100644 --- a/lib/template/template.go +++ b/lib/template/template.go @@ -8,7 +8,7 @@ import ( "reflect" "sync" - "github.com/botlabs-gg/yagpdb/lib/template/parse" + "github.com/botlabs-gg/yagpdb/v2/lib/template/parse" ) // common holds the information shared by related templates. diff --git a/lib/when/rules/br/br.go b/lib/when/rules/br/br.go index 53444792fd..f893baaafe 100644 --- a/lib/when/rules/br/br.go +++ b/lib/when/rules/br/br.go @@ -1,6 +1,6 @@ package br -import "github.com/botlabs-gg/yagpdb/lib/when/rules" +import "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" var All = []rules.Rule{ Weekday(rules.Override), diff --git a/lib/when/rules/br/br_test.go b/lib/when/rules/br/br_test.go index de633db7c2..dacd59253a 100644 --- a/lib/when/rules/br/br_test.go +++ b/lib/when/rules/br/br_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" "github.com/stretchr/testify/require" ) diff --git a/lib/when/rules/br/casual_date.go b/lib/when/rules/br/casual_date.go index 83178eb0e9..e315e6ef54 100644 --- a/lib/when/rules/br/casual_date.go +++ b/lib/when/rules/br/casual_date.go @@ -6,7 +6,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) func CasualDate(s rules.Strategy) rules.Rule { diff --git a/lib/when/rules/br/casual_test.go b/lib/when/rules/br/casual_test.go index d3c4b950f8..73eaab7a45 100644 --- a/lib/when/rules/br/casual_test.go +++ b/lib/when/rules/br/casual_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" ) func TestCasualDate(t *testing.T) { diff --git a/lib/when/rules/br/casual_time.go b/lib/when/rules/br/casual_time.go index 79f5fa95a4..a4d4647df3 100644 --- a/lib/when/rules/br/casual_time.go +++ b/lib/when/rules/br/casual_time.go @@ -6,7 +6,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) func CasualTime(s rules.Strategy) rules.Rule { diff --git a/lib/when/rules/br/deadline.go b/lib/when/rules/br/deadline.go index 686f31cd28..5887f0fd53 100644 --- a/lib/when/rules/br/deadline.go +++ b/lib/when/rules/br/deadline.go @@ -7,7 +7,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/br/deadline_test.go b/lib/when/rules/br/deadline_test.go index ce5add96e6..2093aeffb9 100644 --- a/lib/when/rules/br/deadline_test.go +++ b/lib/when/rules/br/deadline_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" ) func TestDeadline(t *testing.T) { diff --git a/lib/when/rules/br/exact_month_date.go b/lib/when/rules/br/exact_month_date.go index bfe27cc187..61ec7dba0b 100644 --- a/lib/when/rules/br/exact_month_date.go +++ b/lib/when/rules/br/exact_month_date.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) func ExactMonthDate(s rules.Strategy) rules.Rule { diff --git a/lib/when/rules/br/exact_month_date_test.go b/lib/when/rules/br/exact_month_date_test.go index 9507565d34..f00b47ace7 100644 --- a/lib/when/rules/br/exact_month_date_test.go +++ b/lib/when/rules/br/exact_month_date_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" ) func TestExactMonthDate(t *testing.T) { diff --git a/lib/when/rules/br/hour.go b/lib/when/rules/br/hour.go index 4a8e2be557..2d607ea548 100644 --- a/lib/when/rules/br/hour.go +++ b/lib/when/rules/br/hour.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) /* diff --git a/lib/when/rules/br/hour_minute.go b/lib/when/rules/br/hour_minute.go index fbc11ce605..86127ad059 100644 --- a/lib/when/rules/br/hour_minute.go +++ b/lib/when/rules/br/hour_minute.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/br/hour_minute_test.go b/lib/when/rules/br/hour_minute_test.go index 0706a9decd..9015338306 100644 --- a/lib/when/rules/br/hour_minute_test.go +++ b/lib/when/rules/br/hour_minute_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" ) func TestHourMinute(t *testing.T) { diff --git a/lib/when/rules/br/hour_test.go b/lib/when/rules/br/hour_test.go index 633e0c6c2a..ce702f3f36 100644 --- a/lib/when/rules/br/hour_test.go +++ b/lib/when/rules/br/hour_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" ) func TestHour(t *testing.T) { diff --git a/lib/when/rules/br/past_time.go b/lib/when/rules/br/past_time.go index 6564e4ca43..4652adc4f5 100644 --- a/lib/when/rules/br/past_time.go +++ b/lib/when/rules/br/past_time.go @@ -7,7 +7,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/br/past_time_test.go b/lib/when/rules/br/past_time_test.go index 611b126096..a679598e89 100644 --- a/lib/when/rules/br/past_time_test.go +++ b/lib/when/rules/br/past_time_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" ) func TestPastTime(t *testing.T) { diff --git a/lib/when/rules/br/weekday.go b/lib/when/rules/br/weekday.go index f395c93cd9..f7e4df2434 100644 --- a/lib/when/rules/br/weekday.go +++ b/lib/when/rules/br/weekday.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) func Weekday(s rules.Strategy) rules.Rule { diff --git a/lib/when/rules/br/weekday_test.go b/lib/when/rules/br/weekday_test.go index 5e056770c6..4a9690efba 100644 --- a/lib/when/rules/br/weekday_test.go +++ b/lib/when/rules/br/weekday_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" ) func TestWeekday(t *testing.T) { diff --git a/lib/when/rules/common/common.go b/lib/when/rules/common/common.go index b81ed0ab13..ac0a8e1e19 100644 --- a/lib/when/rules/common/common.go +++ b/lib/when/rules/common/common.go @@ -1,6 +1,6 @@ package common -import "github.com/botlabs-gg/yagpdb/lib/when/rules" +import "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" var All = []rules.Rule{ SlashDMY(rules.Override), diff --git a/lib/when/rules/common/common_test.go b/lib/when/rules/common/common_test.go index ffcd11c7c4..669673ba93 100644 --- a/lib/when/rules/common/common_test.go +++ b/lib/when/rules/common/common_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules/common" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/common" "github.com/stretchr/testify/require" ) diff --git a/lib/when/rules/common/slash_dmy.go b/lib/when/rules/common/slash_dmy.go index 21f46c7e0c..8f80e39560 100644 --- a/lib/when/rules/common/slash_dmy.go +++ b/lib/when/rules/common/slash_dmy.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) /* diff --git a/lib/when/rules/common/slash_dmy_test.go b/lib/when/rules/common/slash_dmy_test.go index 393f817c8c..8d1d52d7ca 100644 --- a/lib/when/rules/common/slash_dmy_test.go +++ b/lib/when/rules/common/slash_dmy_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/common" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/common" ) func TestSlashDMY(t *testing.T) { diff --git a/lib/when/rules/en/casual_date.go b/lib/when/rules/en/casual_date.go index 77bbc91beb..9ef722c671 100644 --- a/lib/when/rules/en/casual_date.go +++ b/lib/when/rules/en/casual_date.go @@ -6,7 +6,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) func CasualDate(s rules.Strategy) rules.Rule { diff --git a/lib/when/rules/en/casual_test.go b/lib/when/rules/en/casual_test.go index b4b04892cf..f0fd579635 100644 --- a/lib/when/rules/en/casual_test.go +++ b/lib/when/rules/en/casual_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" ) func TestCasualDate(t *testing.T) { diff --git a/lib/when/rules/en/casual_time.go b/lib/when/rules/en/casual_time.go index dddb7cd2a2..30fa274e5e 100644 --- a/lib/when/rules/en/casual_time.go +++ b/lib/when/rules/en/casual_time.go @@ -6,7 +6,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) func CasualTime(s rules.Strategy) rules.Rule { diff --git a/lib/when/rules/en/deadline.go b/lib/when/rules/en/deadline.go index 0951094fe3..e9b23c6f54 100644 --- a/lib/when/rules/en/deadline.go +++ b/lib/when/rules/en/deadline.go @@ -7,7 +7,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/en/deadline_test.go b/lib/when/rules/en/deadline_test.go index c567af77a3..97b5e978fd 100644 --- a/lib/when/rules/en/deadline_test.go +++ b/lib/when/rules/en/deadline_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" ) func TestDeadline(t *testing.T) { diff --git a/lib/when/rules/en/en.go b/lib/when/rules/en/en.go index 52939e281d..8295edfa68 100644 --- a/lib/when/rules/en/en.go +++ b/lib/when/rules/en/en.go @@ -1,6 +1,6 @@ package en -import "github.com/botlabs-gg/yagpdb/lib/when/rules" +import "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" var All = []rules.Rule{ Weekday(rules.Override), diff --git a/lib/when/rules/en/en_test.go b/lib/when/rules/en/en_test.go index 3a86411db4..60f1d80d76 100644 --- a/lib/when/rules/en/en_test.go +++ b/lib/when/rules/en/en_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" "github.com/stretchr/testify/require" ) diff --git a/lib/when/rules/en/exact_month_date.go b/lib/when/rules/en/exact_month_date.go index 7d1d53bd68..8714851e5b 100644 --- a/lib/when/rules/en/exact_month_date.go +++ b/lib/when/rules/en/exact_month_date.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) // <[]string{"third of march", "third", "", "march", "", ""}> diff --git a/lib/when/rules/en/exact_month_date_test.go b/lib/when/rules/en/exact_month_date_test.go index 883b4d882b..4610e2cfe8 100644 --- a/lib/when/rules/en/exact_month_date_test.go +++ b/lib/when/rules/en/exact_month_date_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" ) func TestExactMonthDate(t *testing.T) { diff --git a/lib/when/rules/en/hour.go b/lib/when/rules/en/hour.go index 13cd317b8b..f23261aed3 100644 --- a/lib/when/rules/en/hour.go +++ b/lib/when/rules/en/hour.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) /* diff --git a/lib/when/rules/en/hour_minute.go b/lib/when/rules/en/hour_minute.go index 85591f4d06..46c2f932bb 100644 --- a/lib/when/rules/en/hour_minute.go +++ b/lib/when/rules/en/hour_minute.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/en/hour_minute_test.go b/lib/when/rules/en/hour_minute_test.go index 38747bdf4c..1695c6cd97 100644 --- a/lib/when/rules/en/hour_minute_test.go +++ b/lib/when/rules/en/hour_minute_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" ) func TestHourMinute(t *testing.T) { diff --git a/lib/when/rules/en/hour_test.go b/lib/when/rules/en/hour_test.go index 18d77784bb..28104ebf9c 100644 --- a/lib/when/rules/en/hour_test.go +++ b/lib/when/rules/en/hour_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" ) func TestHour(t *testing.T) { diff --git a/lib/when/rules/en/past_time.go b/lib/when/rules/en/past_time.go index 377eb3038e..8e6c268f89 100644 --- a/lib/when/rules/en/past_time.go +++ b/lib/when/rules/en/past_time.go @@ -7,7 +7,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/en/past_time_test.go b/lib/when/rules/en/past_time_test.go index c8951d3ef3..be45408584 100644 --- a/lib/when/rules/en/past_time_test.go +++ b/lib/when/rules/en/past_time_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" ) func TestPastTime(t *testing.T) { diff --git a/lib/when/rules/en/weekday.go b/lib/when/rules/en/weekday.go index e06ff49339..4f140f8963 100644 --- a/lib/when/rules/en/weekday.go +++ b/lib/when/rules/en/weekday.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) func Weekday(s rules.Strategy) rules.Rule { diff --git a/lib/when/rules/en/weekday_test.go b/lib/when/rules/en/weekday_test.go index 5da3adbdda..440df2eefe 100644 --- a/lib/when/rules/en/weekday_test.go +++ b/lib/when/rules/en/weekday_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" ) func TestWeekday(t *testing.T) { diff --git a/lib/when/rules/ru/casual_date.go b/lib/when/rules/ru/casual_date.go index 0d0776fe4b..7ce4d078d6 100644 --- a/lib/when/rules/ru/casual_date.go +++ b/lib/when/rules/ru/casual_date.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) // https://play.golang.org/p/QrFtjmjUoJ diff --git a/lib/when/rules/ru/casual_test.go b/lib/when/rules/ru/casual_test.go index 07f4220b12..ff28769054 100644 --- a/lib/when/rules/ru/casual_test.go +++ b/lib/when/rules/ru/casual_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/ru" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/ru" ) func TestCasualDate(t *testing.T) { diff --git a/lib/when/rules/ru/casual_time.go b/lib/when/rules/ru/casual_time.go index 7a126f7893..497c5c5bc5 100644 --- a/lib/when/rules/ru/casual_time.go +++ b/lib/when/rules/ru/casual_time.go @@ -6,7 +6,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) // https://play.golang.org/p/IUbYhm7Nu- diff --git a/lib/when/rules/ru/deadline.go b/lib/when/rules/ru/deadline.go index 4cb2dad676..21e80a583e 100644 --- a/lib/when/rules/ru/deadline.go +++ b/lib/when/rules/ru/deadline.go @@ -7,7 +7,7 @@ import ( "time" "github.com/AlekSi/pointer" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/ru/deadline_test.go b/lib/when/rules/ru/deadline_test.go index 5bd5e500be..7dec19ca5c 100644 --- a/lib/when/rules/ru/deadline_test.go +++ b/lib/when/rules/ru/deadline_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/ru" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/ru" ) func TestDeadline(t *testing.T) { diff --git a/lib/when/rules/ru/hour.go b/lib/when/rules/ru/hour.go index fa136e2a68..91a8664a85 100644 --- a/lib/when/rules/ru/hour.go +++ b/lib/when/rules/ru/hour.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/ru/hour_minute.go b/lib/when/rules/ru/hour_minute.go index ad9c300edf..a314c3c7c4 100644 --- a/lib/when/rules/ru/hour_minute.go +++ b/lib/when/rules/ru/hour_minute.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" "github.com/pkg/errors" ) diff --git a/lib/when/rules/ru/hour_minute_test.go b/lib/when/rules/ru/hour_minute_test.go index 5db7529168..4524fea690 100644 --- a/lib/when/rules/ru/hour_minute_test.go +++ b/lib/when/rules/ru/hour_minute_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/ru" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/ru" ) func TestHourMinute(t *testing.T) { diff --git a/lib/when/rules/ru/hour_test.go b/lib/when/rules/ru/hour_test.go index d056cb5767..1810c5508a 100644 --- a/lib/when/rules/ru/hour_test.go +++ b/lib/when/rules/ru/hour_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/ru" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/ru" ) func TestHour(t *testing.T) { diff --git a/lib/when/rules/ru/ru.go b/lib/when/rules/ru/ru.go index 69f08918d1..483e5e7ad3 100644 --- a/lib/when/rules/ru/ru.go +++ b/lib/when/rules/ru/ru.go @@ -1,6 +1,6 @@ package ru -import "github.com/botlabs-gg/yagpdb/lib/when/rules" +import "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" var All = []rules.Rule{ Weekday(rules.Override), diff --git a/lib/when/rules/ru/ru_test.go b/lib/when/rules/ru/ru_test.go index 8cfdd2d29e..1027efcb55 100644 --- a/lib/when/rules/ru/ru_test.go +++ b/lib/when/rules/ru/ru_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules/ru" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/ru" "github.com/stretchr/testify/require" ) diff --git a/lib/when/rules/ru/weekday.go b/lib/when/rules/ru/weekday.go index 3a2b30317c..45451c685b 100644 --- a/lib/when/rules/ru/weekday.go +++ b/lib/when/rules/ru/weekday.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) // https://play.golang.org/p/aRWlil_64M diff --git a/lib/when/rules/ru/weekday_test.go b/lib/when/rules/ru/weekday_test.go index 0c9fa19951..05608c5c23 100644 --- a/lib/when/rules/ru/weekday_test.go +++ b/lib/when/rules/ru/weekday_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/ru" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/ru" ) func TestWeekday(t *testing.T) { diff --git a/lib/when/when.go b/lib/when/when.go index f84517a072..e18b4082ed 100644 --- a/lib/when/when.go +++ b/lib/when/when.go @@ -4,11 +4,11 @@ import ( "sort" "time" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/lib/when/rules/br" - "github.com/botlabs-gg/yagpdb/lib/when/rules/common" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" - "github.com/botlabs-gg/yagpdb/lib/when/rules/ru" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/br" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/common" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/ru" "github.com/pkg/errors" ) diff --git a/logs/logs.go b/logs/logs.go index 849e5f1617..9a3b5249d2 100644 --- a/logs/logs.go +++ b/logs/logs.go @@ -10,11 +10,11 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/logs/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/logs/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" diff --git a/logs/plugin_bot.go b/logs/plugin_bot.go index 9ee8063381..9010e70bfc 100644 --- a/logs/plugin_bot.go +++ b/logs/plugin_bot.go @@ -8,17 +8,17 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/common/config" - - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/logs/models" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/common/config" + + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/logs/models" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" ) diff --git a/logs/template_extensions.go b/logs/template_extensions.go index c96f231d23..cf863358f5 100644 --- a/logs/template_extensions.go +++ b/logs/template_extensions.go @@ -2,9 +2,10 @@ package logs import ( "context" - "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common/templates" "time" + + "emperror.dev/errors" + "github.com/botlabs-gg/yagpdb/v2/common/templates" ) func init() { diff --git a/logs/web.go b/logs/web.go index 9cc0ef1b04..957f60fccf 100644 --- a/logs/web.go +++ b/logs/web.go @@ -10,13 +10,13 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/logs/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/logs/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" "goji.io" diff --git a/moderation/commands.go b/moderation/commands.go index 910d09f075..5223a00527 100644 --- a/moderation/commands.go +++ b/moderation/commands.go @@ -9,15 +9,15 @@ import ( "unicode/utf8" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/jinzhu/gorm" ) diff --git a/moderation/models.go b/moderation/models.go index c65be60adf..48dc3f72a8 100644 --- a/moderation/models.go +++ b/moderation/models.go @@ -6,10 +6,10 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/configstore" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/configstore" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" "github.com/lib/pq" ) diff --git a/moderation/moderation.go b/moderation/moderation.go index a80e0e6ca0..d2b6a21134 100644 --- a/moderation/moderation.go +++ b/moderation/moderation.go @@ -2,10 +2,10 @@ package moderation import ( "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/configstore" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/configstore" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "golang.org/x/net/context" ) diff --git a/moderation/modlog.go b/moderation/modlog.go index 61ec413bd3..e7b5d9eb6c 100644 --- a/moderation/modlog.go +++ b/moderation/modlog.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type ModlogAction struct { diff --git a/moderation/plugin_bot.go b/moderation/plugin_bot.go index 71f3c96bf8..1bd1a4e3e7 100644 --- a/moderation/plugin_bot.go +++ b/moderation/plugin_bot.go @@ -7,17 +7,17 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - seventsmodels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dshardorchestrator" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + seventsmodels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dshardorchestrator" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/jinzhu/gorm" "github.com/mediocregopher/radix/v3" ) diff --git a/moderation/plugin_web.go b/moderation/plugin_web.go index 426a9a1556..914ed987dd 100644 --- a/moderation/plugin_web.go +++ b/moderation/plugin_web.go @@ -6,10 +6,10 @@ import ( "html/template" "net/http" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web" "goji.io" "goji.io/pat" ) diff --git a/moderation/punishments.go b/moderation/punishments.go index 1fe7b2dd2d..0dcb8bade1 100644 --- a/moderation/punishments.go +++ b/moderation/punishments.go @@ -7,14 +7,14 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - seventsmodels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/logs" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + seventsmodels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/logs" "github.com/jinzhu/gorm" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/moderation/topwarnings.go b/moderation/topwarnings.go index e46e36a3b3..6df4d0e20a 100644 --- a/moderation/topwarnings.go +++ b/moderation/topwarnings.go @@ -4,10 +4,10 @@ import ( "database/sql" "fmt" - //"github.com/botlabs-gg/yagpdb/lib/discordgo" - //"github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" + // "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + // "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" ) type WarnRankEntry struct { diff --git a/notifications/notifications.go b/notifications/notifications.go index ae8603fffd..097427849f 100644 --- a/notifications/notifications.go +++ b/notifications/notifications.go @@ -1,12 +1,13 @@ package notifications import ( - "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/configstore" - "golang.org/x/net/context" "strconv" "strings" + + "emperror.dev/errors" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/configstore" + "golang.org/x/net/context" ) const ( diff --git a/notifications/plugin_bot.go b/notifications/plugin_bot.go index 3950fe9d8b..74989e27d3 100644 --- a/notifications/plugin_bot.go +++ b/notifications/plugin_bot.go @@ -6,13 +6,13 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var _ bot.BotInitHandler = (*Plugin)(nil) diff --git a/notifications/plugin_web.go b/notifications/plugin_web.go index dba3958eef..44a747e304 100644 --- a/notifications/plugin_web.go +++ b/notifications/plugin_web.go @@ -6,11 +6,11 @@ import ( "html/template" "net/http" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/configstore" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/configstore" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web" "goji.io/pat" ) diff --git a/premium/codepremiumsource.go b/premium/codepremiumsource.go index ee8ba0e616..e128cf8565 100644 --- a/premium/codepremiumsource.go +++ b/premium/codepremiumsource.go @@ -11,12 +11,12 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/premium/models" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/premium/models" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" "github.com/lib/pq" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" diff --git a/premium/monitor.go b/premium/monitor.go index 39e540ba38..81a871a693 100644 --- a/premium/monitor.go +++ b/premium/monitor.go @@ -7,9 +7,9 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" - "github.com/botlabs-gg/yagpdb/premium/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/premium/models" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/sqlboiler/v4/queries/qm" ) diff --git a/premium/patreonpremiumsource/patreonpremiumsource.go b/premium/patreonpremiumsource/patreonpremiumsource.go index 99fd60b9a7..644fce92d7 100644 --- a/premium/patreonpremiumsource/patreonpremiumsource.go +++ b/premium/patreonpremiumsource/patreonpremiumsource.go @@ -6,11 +6,11 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/patreon" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/premium/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/patreon" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/premium/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/v4/queries/qm" ) diff --git a/premium/plugin_bot.go b/premium/plugin_bot.go index 5acb19423d..84fba18c3d 100644 --- a/premium/plugin_bot.go +++ b/premium/plugin_bot.go @@ -3,8 +3,8 @@ package premium import ( "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" ) var _ bot.BotInitHandler = (*Plugin)(nil) diff --git a/premium/plugin_web.go b/premium/plugin_web.go index 6dc8162065..a17bbc7ac8 100644 --- a/premium/plugin_web.go +++ b/premium/plugin_web.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/premium/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/premium/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/didip/tollbooth" "github.com/didip/tollbooth/limiter" "github.com/volatiletech/sqlboiler/v4/queries/qm" diff --git a/premium/premium.go b/premium/premium.go index aab822f5ec..7b5488bde2 100644 --- a/premium/premium.go +++ b/premium/premium.go @@ -4,12 +4,12 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - schEventsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/common/templates" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + schEventsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/common/templates" "github.com/mediocregopher/radix/v3" ) diff --git a/premium/slotpremiumsource.go b/premium/slotpremiumsource.go index 99cf56c404..25600ff1a6 100644 --- a/premium/slotpremiumsource.go +++ b/premium/slotpremiumsource.go @@ -7,10 +7,10 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - "github.com/botlabs-gg/yagpdb/premium/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/premium/models" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" diff --git a/reddit/bot.go b/reddit/bot.go index 6e789ac616..9c727db6f2 100644 --- a/reddit/bot.go +++ b/reddit/bot.go @@ -6,11 +6,11 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/reddit/models" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/reddit/models" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var _ bot.RemoveGuildHandler = (*Plugin)(nil) diff --git a/reddit/migrate_to_psql.go b/reddit/migrate_to_psql.go index bea659b8bc..76ee41938e 100644 --- a/reddit/migrate_to_psql.go +++ b/reddit/migrate_to_psql.go @@ -8,8 +8,8 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/reddit/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/reddit/models" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/sqlboiler/boil" ) diff --git a/reddit/plugin_web.go b/reddit/plugin_web.go index f02d226c01..d2078c0b8e 100644 --- a/reddit/plugin_web.go +++ b/reddit/plugin_web.go @@ -10,12 +10,12 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/reddit/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/reddit/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" "goji.io" diff --git a/reddit/postfetcher.go b/reddit/postfetcher.go index 1b8d7cfe71..784ac0a447 100644 --- a/reddit/postfetcher.go +++ b/reddit/postfetcher.go @@ -6,8 +6,8 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - greddit "github.com/botlabs-gg/yagpdb/lib/go-reddit" + "github.com/botlabs-gg/yagpdb/v2/common" + greddit "github.com/botlabs-gg/yagpdb/v2/lib/go-reddit" "github.com/mediocregopher/radix/v3" "github.com/sirupsen/logrus" ) diff --git a/reddit/reddit.go b/reddit/reddit.go index a748a498f3..1fe92143b3 100644 --- a/reddit/reddit.go +++ b/reddit/reddit.go @@ -8,12 +8,12 @@ import ( "strings" "sync" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/go-reddit" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/reddit/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/go-reddit" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/reddit/models" ) const ( diff --git a/reddit/redditbot.go b/reddit/redditbot.go index a4d5e526a7..914ad93698 100644 --- a/reddit/redditbot.go +++ b/reddit/redditbot.go @@ -10,14 +10,14 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/feeds" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/go-reddit" - "github.com/botlabs-gg/yagpdb/reddit/models" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/feeds" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/go-reddit" + "github.com/botlabs-gg/yagpdb/v2/reddit/models" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/reminders/plugin_bot.go b/reminders/plugin_bot.go index 25078a8023..0359296639 100644 --- a/reminders/plugin_bot.go +++ b/reminders/plugin_bot.go @@ -7,13 +7,13 @@ import ( "time" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - seventsmodels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + seventsmodels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/jinzhu/gorm" ) diff --git a/reminders/reminders.go b/reminders/reminders.go index 17659db2e5..eef7ef4498 100644 --- a/reminders/reminders.go +++ b/reminders/reminders.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/jinzhu/gorm" "github.com/sirupsen/logrus" ) diff --git a/reputation/plugin_bot.go b/reputation/plugin_bot.go index e3f10ebda9..45754bbada 100644 --- a/reputation/plugin_bot.go +++ b/reputation/plugin_bot.go @@ -6,18 +6,18 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/lib/dstate" - - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/reputation/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/reputation/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/reputation/plugin_web.go b/reputation/plugin_web.go index bd29571b29..e4b3ee16b9 100644 --- a/reputation/plugin_web.go +++ b/reputation/plugin_web.go @@ -8,12 +8,12 @@ import ( "net/http" "strconv" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/reputation/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/reputation/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" "goji.io" diff --git a/reputation/reputation.go b/reputation/reputation.go index 7bc6461ce5..038baab094 100644 --- a/reputation/reputation.go +++ b/reputation/reputation.go @@ -10,13 +10,13 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/reputation/models" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/reputation/models" "github.com/mediocregopher/radix/v3" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/rolecommands/bot.go b/rolecommands/bot.go index 20f03d3e36..07bf37c9a0 100644 --- a/rolecommands/bot.go +++ b/rolecommands/bot.go @@ -4,17 +4,17 @@ import ( "context" "database/sql" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - schEvtsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/rolecommands/models" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + schEvtsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/rolecommands/models" "github.com/sirupsen/logrus" "github.com/volatiletech/sqlboiler/v4/queries/qm" ) diff --git a/rolecommands/commonrole.go b/rolecommands/commonrole.go index ae25ad051a..1a3f66b8ed 100644 --- a/rolecommands/commonrole.go +++ b/rolecommands/commonrole.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - schEvtsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/rolecommands/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + schEvtsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/rolecommands/models" "github.com/tidwall/buntdb" v3_qm "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/rolecommands/menu.go b/rolecommands/menu.go index 88e8abdf5a..904fdfe204 100644 --- a/rolecommands/menu.go +++ b/rolecommands/menu.go @@ -11,16 +11,16 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/rolecommands/models" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/rolecommands/models" "github.com/volatiletech/null/v8" "github.com/volatiletech/sqlboiler/v4/boil" "github.com/volatiletech/sqlboiler/v4/queries/qm" diff --git a/rolecommands/recent_rolemenus.go b/rolecommands/recent_rolemenus.go index 8a8c1bf7d8..9c1ce8a60c 100644 --- a/rolecommands/recent_rolemenus.go +++ b/rolecommands/recent_rolemenus.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/bot" + "github.com/botlabs-gg/yagpdb/v2/bot" ) type RecentTrackedMenu struct { diff --git a/rolecommands/rolecommands.go b/rolecommands/rolecommands.go index cedc5ad3c5..b1c4a7ece1 100644 --- a/rolecommands/rolecommands.go +++ b/rolecommands/rolecommands.go @@ -9,13 +9,13 @@ import ( "sort" "strconv" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/rolecommands/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/rolecommands/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/tidwall/buntdb" "github.com/volatiletech/sqlboiler/v4/queries/qm" ) diff --git a/rolecommands/web.go b/rolecommands/web.go index b345c7688e..2abd18b0fb 100644 --- a/rolecommands/web.go +++ b/rolecommands/web.go @@ -10,13 +10,13 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/pubsub" - schEvtsModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/rolecommands/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + schEvtsModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/rolecommands/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/null/v8" v3_qm "github.com/volatiletech/sqlboiler/queries/qm" "github.com/volatiletech/sqlboiler/v4/boil" diff --git a/rsvp/plugin_bot.go b/rsvp/plugin_bot.go index 0f4324f140..37ef3cf169 100644 --- a/rsvp/plugin_bot.go +++ b/rsvp/plugin_bot.go @@ -10,17 +10,17 @@ import ( "time" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - eventModels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/rsvp/models" - "github.com/botlabs-gg/yagpdb/timezonecompanion" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + eventModels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/rsvp/models" + "github.com/botlabs-gg/yagpdb/v2/timezonecompanion" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/rsvp/rsvp.go b/rsvp/rsvp.go index 000eb50515..871f39983e 100644 --- a/rsvp/rsvp.go +++ b/rsvp/rsvp.go @@ -5,12 +5,12 @@ package rsvp import ( "sync" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - wcommon "github.com/botlabs-gg/yagpdb/lib/when/rules/common" - "github.com/botlabs-gg/yagpdb/lib/when/rules/en" - "github.com/botlabs-gg/yagpdb/timezonecompanion/trules" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + wcommon "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/common" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules/en" + "github.com/botlabs-gg/yagpdb/v2/timezonecompanion/trules" ) var ( diff --git a/rsvp/setup.go b/rsvp/setup.go index bb56948e97..85ecb4d684 100644 --- a/rsvp/setup.go +++ b/rsvp/setup.go @@ -10,14 +10,14 @@ import ( "time" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/rsvp/models" - "github.com/botlabs-gg/yagpdb/timezonecompanion" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/rsvp/models" + "github.com/botlabs-gg/yagpdb/v2/timezonecompanion" "github.com/volatiletech/sqlboiler/boil" ) diff --git a/safebrowsing/client.go b/safebrowsing/client.go index 650250ed5a..d5c77debb3 100644 --- a/safebrowsing/client.go +++ b/safebrowsing/client.go @@ -1,13 +1,14 @@ package safebrowsing import ( - "emperror.dev/errors" "encoding/json" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" - "github.com/google/safebrowsing" "io/ioutil" "net/http" "strings" + + "emperror.dev/errors" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" + "github.com/google/safebrowsing" ) // CheckString checks a string against google safebrowsing for threats diff --git a/safebrowsing/safebrowsing.go b/safebrowsing/safebrowsing.go index f54bf8550f..d249fdd8e6 100644 --- a/safebrowsing/safebrowsing.go +++ b/safebrowsing/safebrowsing.go @@ -1,11 +1,12 @@ package safebrowsing import ( - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" - "goji.io/pat" "net/http" "sync" + + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" + "goji.io/pat" ) var _ backgroundworkers.BackgroundWorkerPlugin = (*Plugin)(nil) diff --git a/safebrowsing/server.go b/safebrowsing/server.go index b2981d4852..6ca3dd6c0e 100644 --- a/safebrowsing/server.go +++ b/safebrowsing/server.go @@ -3,12 +3,13 @@ package safebrowsing import ( "encoding/json" "errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/google/safebrowsing" - "github.com/sirupsen/logrus" "io/ioutil" "net/http" + + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/google/safebrowsing" + "github.com/sirupsen/logrus" ) var SafeBrowser *safebrowsing.SafeBrowser diff --git a/serverstats/bgworker.go b/serverstats/bgworker.go index 0be17d623a..b9a445d070 100644 --- a/serverstats/bgworker.go +++ b/serverstats/bgworker.go @@ -6,11 +6,11 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/serverstats/messagestatscollector" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/serverstats/messagestatscollector" "github.com/mediocregopher/radix/v3" ) diff --git a/serverstats/bgworker_test.go b/serverstats/bgworker_test.go index 8d4ffdc695..e7c74d5494 100644 --- a/serverstats/bgworker_test.go +++ b/serverstats/bgworker_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/botlabs-gg/yagpdb/common/testutils" + "github.com/botlabs-gg/yagpdb/v2/common/testutils" ) func TestCompressStats(t *testing.T) { diff --git a/serverstats/memberstatsupdater.go b/serverstats/memberstatsupdater.go index 70f26aa98a..32f61998ea 100644 --- a/serverstats/memberstatsupdater.go +++ b/serverstats/memberstatsupdater.go @@ -6,8 +6,8 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/mediocregopher/radix/v3" ) diff --git a/serverstats/messagestatscollector/messagestatscollector.go b/serverstats/messagestatscollector/messagestatscollector.go index 65f63216ab..4356052746 100644 --- a/serverstats/messagestatscollector/messagestatscollector.go +++ b/serverstats/messagestatscollector/messagestatscollector.go @@ -4,8 +4,8 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" "github.com/sirupsen/logrus" ) diff --git a/serverstats/migration.go b/serverstats/migration.go index 2942fc940a..95e0cc7d9e 100644 --- a/serverstats/migration.go +++ b/serverstats/migration.go @@ -1,10 +1,11 @@ package serverstats import ( - "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/premium" "time" + + "emperror.dev/errors" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/premium" ) func StartMigrationToV2Format() error { diff --git a/serverstats/migration_test.go b/serverstats/migration_test.go index 6f92658114..385aa0a770 100644 --- a/serverstats/migration_test.go +++ b/serverstats/migration_test.go @@ -2,9 +2,10 @@ package serverstats import ( "context" - "github.com/botlabs-gg/yagpdb/common/testutils" "testing" "time" + + "github.com/botlabs-gg/yagpdb/v2/common/testutils" ) func TestMigrationToV2FormatMsgs(t *testing.T) { diff --git a/serverstats/plugin_bot.go b/serverstats/plugin_bot.go index 2a3e2f8b9c..80c69025ed 100644 --- a/serverstats/plugin_bot.go +++ b/serverstats/plugin_bot.go @@ -7,14 +7,14 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/serverstats/messagestatscollector" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/serverstats/messagestatscollector" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/mediocregopher/radix/v3" ) diff --git a/serverstats/plugin_web.go b/serverstats/plugin_web.go index 3e1f7ae4a6..ee4a6ebf4e 100644 --- a/serverstats/plugin_web.go +++ b/serverstats/plugin_web.go @@ -11,13 +11,13 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/serverstats/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/serverstats/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/karlseguin/rcache" "github.com/volatiletech/null" "github.com/volatiletech/sqlboiler/boil" diff --git a/serverstats/serverstats.go b/serverstats/serverstats.go index 64ac6bc93d..4f87be09aa 100644 --- a/serverstats/serverstats.go +++ b/serverstats/serverstats.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/serverstats/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/serverstats/models" ) var confDeprecated = config.RegisterOption("yagpdb.serverstats.deprecated", "Wether to mark server stats as disabled or not, this will disable recording of new stats", false) diff --git a/serverstats/serverstats_test.go b/serverstats/serverstats_test.go index 13398e5960..e2c020de45 100644 --- a/serverstats/serverstats_test.go +++ b/serverstats/serverstats_test.go @@ -3,11 +3,12 @@ package serverstats import ( "database/sql" "fmt" - "github.com/botlabs-gg/yagpdb/common" "os" "testing" - "github.com/botlabs-gg/yagpdb/common/testutils" + "github.com/botlabs-gg/yagpdb/v2/common" + + "github.com/botlabs-gg/yagpdb/v2/common/testutils" ) var db *sql.DB diff --git a/serverstats/stats.go b/serverstats/stats.go index fd43a66246..74f22306b0 100644 --- a/serverstats/stats.go +++ b/serverstats/stats.go @@ -7,9 +7,9 @@ import ( "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/serverstats/messagestatscollector" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/serverstats/messagestatscollector" "github.com/mediocregopher/radix/v3" ) diff --git a/serverstats/stats_test.go b/serverstats/stats_test.go index fc24f8eb96..5b5cd733ba 100644 --- a/serverstats/stats_test.go +++ b/serverstats/stats_test.go @@ -1,9 +1,10 @@ package serverstats import ( - "github.com/botlabs-gg/yagpdb/common/testutils" "testing" "time" + + "github.com/botlabs-gg/yagpdb/v2/common/testutils" ) func TestDailyStatsMessages(t *testing.T) { diff --git a/soundboard/bot.go b/soundboard/bot.go index d860bb6d6b..6aa7c84c68 100644 --- a/soundboard/bot.go +++ b/soundboard/bot.go @@ -4,11 +4,11 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/soundboard/models" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/soundboard/models" ) func (p *Plugin) AddCommands() { diff --git a/soundboard/player.go b/soundboard/player.go index f183a44d26..79fdb3246a 100644 --- a/soundboard/player.go +++ b/soundboard/player.go @@ -6,10 +6,10 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dca" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dca" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type PlayRequest struct { diff --git a/soundboard/soundboard.go b/soundboard/soundboard.go index f598796abd..1012aed8a7 100644 --- a/soundboard/soundboard.go +++ b/soundboard/soundboard.go @@ -4,12 +4,13 @@ package soundboard import ( "fmt" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/soundboard/models" + "os" + + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/soundboard/models" "github.com/volatiletech/sqlboiler/queries/qm" "golang.org/x/net/context" - "os" ) type Plugin struct{} diff --git a/soundboard/transcoder.go b/soundboard/transcoder.go index 6b6173f752..cc100581df 100644 --- a/soundboard/transcoder.go +++ b/soundboard/transcoder.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/backgroundworkers" - "github.com/botlabs-gg/yagpdb/lib/dca" - "github.com/botlabs-gg/yagpdb/soundboard/models" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers" + "github.com/botlabs-gg/yagpdb/v2/lib/dca" + "github.com/botlabs-gg/yagpdb/v2/soundboard/models" "goji.io/pat" ) diff --git a/soundboard/web.go b/soundboard/web.go index b06bb33aa5..495172df16 100644 --- a/soundboard/web.go +++ b/soundboard/web.go @@ -12,10 +12,10 @@ import ( "strings" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/soundboard/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/soundboard/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" "goji.io" diff --git a/stdcommands/advice/advice.go b/stdcommands/advice/advice.go index 9a51c4a8fd..b4053e059c 100644 --- a/stdcommands/advice/advice.go +++ b/stdcommands/advice/advice.go @@ -6,8 +6,8 @@ import ( "net/http" "net/url" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/allocstat/measure_allocs.go b/stdcommands/allocstat/measure_allocs.go index 22dcc0d52c..36ad47b573 100644 --- a/stdcommands/allocstat/measure_allocs.go +++ b/stdcommands/allocstat/measure_allocs.go @@ -5,10 +5,10 @@ import ( "runtime" "time" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/banserver/banserver.go b/stdcommands/banserver/banserver.go index 2ccf863c87..3f41782703 100644 --- a/stdcommands/banserver/banserver.go +++ b/stdcommands/banserver/banserver.go @@ -1,10 +1,10 @@ package banserver import ( - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" "github.com/mediocregopher/radix/v3" ) diff --git a/stdcommands/calc/calc.go b/stdcommands/calc/calc.go index 88f59cc5f7..abbada4c3b 100644 --- a/stdcommands/calc/calc.go +++ b/stdcommands/calc/calc.go @@ -5,8 +5,8 @@ import ( "strings" "sync" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" "github.com/ei14/calc/compute" ) diff --git a/stdcommands/catfact/catfact.go b/stdcommands/catfact/catfact.go index 1a782e2709..30d9d68100 100644 --- a/stdcommands/catfact/catfact.go +++ b/stdcommands/catfact/catfact.go @@ -3,8 +3,8 @@ package catfact import ( "math/rand" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/ccreqs/ccreqs.go b/stdcommands/ccreqs/ccreqs.go index f7326dd552..687e05d941 100644 --- a/stdcommands/ccreqs/ccreqs.go +++ b/stdcommands/ccreqs/ccreqs.go @@ -3,10 +3,10 @@ package ccreqs import ( "fmt" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/createinvite/createinvite.go b/stdcommands/createinvite/createinvite.go index 562c662db1..87dad19e6c 100644 --- a/stdcommands/createinvite/createinvite.go +++ b/stdcommands/createinvite/createinvite.go @@ -1,12 +1,12 @@ package createinvite import ( - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/currentshard/currentshard.go b/stdcommands/currentshard/currentshard.go index b156d5575b..6737e6ba72 100644 --- a/stdcommands/currentshard/currentshard.go +++ b/stdcommands/currentshard/currentshard.go @@ -3,11 +3,11 @@ package currentshard import ( "fmt" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/currenttime/currenttime.go b/stdcommands/currenttime/currenttime.go index c05888a644..a6a5e32a42 100644 --- a/stdcommands/currenttime/currenttime.go +++ b/stdcommands/currenttime/currenttime.go @@ -4,9 +4,9 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/timezonecompanion" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/timezonecompanion" "github.com/tkuchiki/go-timezone" ) diff --git a/stdcommands/customembed/customembed.go b/stdcommands/customembed/customembed.go index 61a1e6c98e..5a83fb4e01 100644 --- a/stdcommands/customembed/customembed.go +++ b/stdcommands/customembed/customembed.go @@ -3,9 +3,9 @@ package customembed import ( "encoding/json" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/dadjoke/dadjoke.go b/stdcommands/dadjoke/dadjoke.go index 38c5f41181..b15b7a361e 100644 --- a/stdcommands/dadjoke/dadjoke.go +++ b/stdcommands/dadjoke/dadjoke.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) type Joke struct { diff --git a/stdcommands/dcallvoice/dcallvoice.go b/stdcommands/dcallvoice/dcallvoice.go index 4ba00de7c8..045a4de773 100644 --- a/stdcommands/dcallvoice/dcallvoice.go +++ b/stdcommands/dcallvoice/dcallvoice.go @@ -3,12 +3,12 @@ package dcallvoice import ( "fmt" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/define/define.go b/stdcommands/define/define.go index d48349a20d..475263a005 100644 --- a/stdcommands/define/define.go +++ b/stdcommands/define/define.go @@ -6,11 +6,11 @@ import ( "net/url" "regexp" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/dpatrie/urbandictionary" ) diff --git a/stdcommands/dogfact/dogfact.go b/stdcommands/dogfact/dogfact.go index 0f28c80d7a..dede7d0d54 100644 --- a/stdcommands/dogfact/dogfact.go +++ b/stdcommands/dogfact/dogfact.go @@ -3,8 +3,8 @@ package dogfact import ( "math/rand" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/findserver/findserver.go b/stdcommands/findserver/findserver.go index 2b7544c12e..9aa02a07ca 100644 --- a/stdcommands/findserver/findserver.go +++ b/stdcommands/findserver/findserver.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/botlabs-gg/yagpdb/bot/models" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot/models" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/stdcommands/globalrl/globalrl.go b/stdcommands/globalrl/globalrl.go index d1182e4377..294ac9f172 100644 --- a/stdcommands/globalrl/globalrl.go +++ b/stdcommands/globalrl/globalrl.go @@ -1,11 +1,11 @@ package globalrl import ( - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/guildunavailable/guildunavilable.go b/stdcommands/guildunavailable/guildunavilable.go index 690f47f4f2..f734b4ba32 100644 --- a/stdcommands/guildunavailable/guildunavilable.go +++ b/stdcommands/guildunavailable/guildunavilable.go @@ -3,9 +3,9 @@ package guildunavailable import ( "fmt" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/howlongtobeat/howlongtobeat.go b/stdcommands/howlongtobeat/howlongtobeat.go index ad6ad15bff..f79fe2fc93 100644 --- a/stdcommands/howlongtobeat/howlongtobeat.go +++ b/stdcommands/howlongtobeat/howlongtobeat.go @@ -6,10 +6,10 @@ import ( "sort" "strings" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type hltb struct { diff --git a/stdcommands/howlongtobeat/queryfunctions.go b/stdcommands/howlongtobeat/queryfunctions.go index dc23ed7b67..84d5985b83 100644 --- a/stdcommands/howlongtobeat/queryfunctions.go +++ b/stdcommands/howlongtobeat/queryfunctions.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/PuerkitoBio/goquery" - "github.com/botlabs-gg/yagpdb/commands" + "github.com/botlabs-gg/yagpdb/v2/commands" ) func getGameData(searchTitle string) (string, error) { diff --git a/stdcommands/info/info.go b/stdcommands/info/info.go index 65a2e5ca6a..5ccdb1e910 100644 --- a/stdcommands/info/info.go +++ b/stdcommands/info/info.go @@ -3,9 +3,9 @@ package info import ( "fmt" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/invite/invite.go b/stdcommands/invite/invite.go index ee8a6d70b3..2adb557807 100644 --- a/stdcommands/invite/invite.go +++ b/stdcommands/invite/invite.go @@ -1,9 +1,9 @@ package invite import ( - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/leaveserver/leaveserver.go b/stdcommands/leaveserver/leaveserver.go index f7181b9f5c..abed472bb8 100644 --- a/stdcommands/leaveserver/leaveserver.go +++ b/stdcommands/leaveserver/leaveserver.go @@ -1,10 +1,10 @@ package leaveserver import ( - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/listflags/listflags.go b/stdcommands/listflags/listflags.go index 590e4a268c..b520eaf761 100644 --- a/stdcommands/listflags/listflags.go +++ b/stdcommands/listflags/listflags.go @@ -3,10 +3,10 @@ package listflags import ( "strings" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/listroles/listroles.go b/stdcommands/listroles/listroles.go index d5ae0609a1..b769d6bca7 100644 --- a/stdcommands/listroles/listroles.go +++ b/stdcommands/listroles/listroles.go @@ -3,9 +3,9 @@ package listroles import ( "fmt" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/memstats/memstats.go b/stdcommands/memstats/memstats.go index 470a5c1fa3..80378076a7 100644 --- a/stdcommands/memstats/memstats.go +++ b/stdcommands/memstats/memstats.go @@ -5,11 +5,11 @@ import ( "encoding/json" "runtime" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/ping/ping.go b/stdcommands/ping/ping.go index 1a09ef8d7c..f135d3545e 100644 --- a/stdcommands/ping/ping.go +++ b/stdcommands/ping/ping.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/poll/poll.go b/stdcommands/poll/poll.go index 746f8f2f53..6a3dd03d3e 100644 --- a/stdcommands/poll/poll.go +++ b/stdcommands/poll/poll.go @@ -2,10 +2,10 @@ package poll import ( "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var ( diff --git a/stdcommands/roll/roll.go b/stdcommands/roll/roll.go index 8a0bafcf1a..79b1f2c897 100644 --- a/stdcommands/roll/roll.go +++ b/stdcommands/roll/roll.go @@ -5,9 +5,9 @@ import ( "math/rand" "strings" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/dice" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/dice" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/setstatus/setstatus.go b/stdcommands/setstatus/setstatus.go index 08c8a5cd98..e689150170 100644 --- a/stdcommands/setstatus/setstatus.go +++ b/stdcommands/setstatus/setstatus.go @@ -1,10 +1,10 @@ package setstatus import ( - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/simpleembed/simpleembed.go b/stdcommands/simpleembed/simpleembed.go index 7c6c5d2663..412f3a5df1 100644 --- a/stdcommands/simpleembed/simpleembed.go +++ b/stdcommands/simpleembed/simpleembed.go @@ -4,12 +4,12 @@ import ( "strconv" "strings" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "golang.org/x/image/colornames" ) diff --git a/stdcommands/sleep/sleep.go b/stdcommands/sleep/sleep.go index b503993329..ef50ecbaf5 100644 --- a/stdcommands/sleep/sleep.go +++ b/stdcommands/sleep/sleep.go @@ -3,9 +3,9 @@ package sleep import ( "time" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/statedbg/statedbg.go b/stdcommands/statedbg/statedbg.go index 0a274f3382..45edd0de49 100644 --- a/stdcommands/statedbg/statedbg.go +++ b/stdcommands/statedbg/statedbg.go @@ -5,12 +5,12 @@ import ( "encoding/json" "fmt" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) func Commands() *dcmd.Container { diff --git a/stdcommands/stateinfo/stateinfo.go b/stdcommands/stateinfo/stateinfo.go index 2819e766d8..60d6edf186 100644 --- a/stdcommands/stateinfo/stateinfo.go +++ b/stdcommands/stateinfo/stateinfo.go @@ -3,10 +3,10 @@ package stateinfo import ( "fmt" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/stdcommands.go b/stdcommands/stdcommands.go index 1b5705d025..6008573bbb 100644 --- a/stdcommands/stdcommands.go +++ b/stdcommands/stdcommands.go @@ -1,56 +1,56 @@ package stdcommands import ( - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/stdcommands/advice" - "github.com/botlabs-gg/yagpdb/stdcommands/allocstat" - "github.com/botlabs-gg/yagpdb/stdcommands/banserver" - "github.com/botlabs-gg/yagpdb/stdcommands/calc" - "github.com/botlabs-gg/yagpdb/stdcommands/catfact" - "github.com/botlabs-gg/yagpdb/stdcommands/ccreqs" - "github.com/botlabs-gg/yagpdb/stdcommands/createinvite" - "github.com/botlabs-gg/yagpdb/stdcommands/currentshard" - "github.com/botlabs-gg/yagpdb/stdcommands/currenttime" - "github.com/botlabs-gg/yagpdb/stdcommands/customembed" - "github.com/botlabs-gg/yagpdb/stdcommands/dadjoke" - "github.com/botlabs-gg/yagpdb/stdcommands/dcallvoice" - "github.com/botlabs-gg/yagpdb/stdcommands/define" - "github.com/botlabs-gg/yagpdb/stdcommands/dogfact" - "github.com/botlabs-gg/yagpdb/stdcommands/findserver" - "github.com/botlabs-gg/yagpdb/stdcommands/globalrl" - "github.com/botlabs-gg/yagpdb/stdcommands/guildunavailable" - "github.com/botlabs-gg/yagpdb/stdcommands/howlongtobeat" - "github.com/botlabs-gg/yagpdb/stdcommands/info" - "github.com/botlabs-gg/yagpdb/stdcommands/invite" - "github.com/botlabs-gg/yagpdb/stdcommands/leaveserver" - "github.com/botlabs-gg/yagpdb/stdcommands/listflags" - "github.com/botlabs-gg/yagpdb/stdcommands/listroles" - "github.com/botlabs-gg/yagpdb/stdcommands/memstats" - "github.com/botlabs-gg/yagpdb/stdcommands/ping" - "github.com/botlabs-gg/yagpdb/stdcommands/poll" - "github.com/botlabs-gg/yagpdb/stdcommands/roll" - "github.com/botlabs-gg/yagpdb/stdcommands/setstatus" - "github.com/botlabs-gg/yagpdb/stdcommands/simpleembed" - "github.com/botlabs-gg/yagpdb/stdcommands/sleep" - "github.com/botlabs-gg/yagpdb/stdcommands/statedbg" - "github.com/botlabs-gg/yagpdb/stdcommands/stateinfo" - "github.com/botlabs-gg/yagpdb/stdcommands/throw" - "github.com/botlabs-gg/yagpdb/stdcommands/toggledbg" - "github.com/botlabs-gg/yagpdb/stdcommands/topcommands" - "github.com/botlabs-gg/yagpdb/stdcommands/topevents" - "github.com/botlabs-gg/yagpdb/stdcommands/topgames" - "github.com/botlabs-gg/yagpdb/stdcommands/topic" - "github.com/botlabs-gg/yagpdb/stdcommands/topservers" - "github.com/botlabs-gg/yagpdb/stdcommands/unbanserver" - "github.com/botlabs-gg/yagpdb/stdcommands/undelete" - "github.com/botlabs-gg/yagpdb/stdcommands/viewperms" - "github.com/botlabs-gg/yagpdb/stdcommands/weather" - "github.com/botlabs-gg/yagpdb/stdcommands/wouldyourather" - "github.com/botlabs-gg/yagpdb/stdcommands/xkcd" - "github.com/botlabs-gg/yagpdb/stdcommands/yagstatus" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/advice" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/allocstat" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/banserver" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/calc" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/catfact" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/ccreqs" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/createinvite" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/currentshard" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/currenttime" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/customembed" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/dadjoke" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/dcallvoice" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/define" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/dogfact" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/findserver" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/globalrl" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/guildunavailable" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/howlongtobeat" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/info" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/invite" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/leaveserver" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/listflags" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/listroles" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/memstats" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/ping" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/poll" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/roll" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/setstatus" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/simpleembed" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/sleep" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/statedbg" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/stateinfo" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/throw" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/toggledbg" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/topcommands" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/topevents" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/topgames" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/topic" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/topservers" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/unbanserver" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/undelete" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/viewperms" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/weather" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/wouldyourather" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/xkcd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/yagstatus" ) var ( diff --git a/stdcommands/throw/throw.go b/stdcommands/throw/throw.go index 3445782675..3c0807d315 100644 --- a/stdcommands/throw/throw.go +++ b/stdcommands/throw/throw.go @@ -4,9 +4,9 @@ import ( "fmt" "math/rand" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/toggledbg/toggledbg.go b/stdcommands/toggledbg/toggledbg.go index ff6da4faf7..89a3418d29 100644 --- a/stdcommands/toggledbg/toggledbg.go +++ b/stdcommands/toggledbg/toggledbg.go @@ -1,12 +1,12 @@ package toggledbg import ( - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/sirupsen/logrus" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/topcommands/topcommands.go b/stdcommands/topcommands/topcommands.go index 1ad91a7e02..1e78c4d43c 100644 --- a/stdcommands/topcommands/topcommands.go +++ b/stdcommands/topcommands/topcommands.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/topevents/topevents.go b/stdcommands/topevents/topevents.go index 4129c6f1a4..1794835b7d 100644 --- a/stdcommands/topevents/topevents.go +++ b/stdcommands/topevents/topevents.go @@ -4,10 +4,10 @@ import ( "fmt" "sort" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/topgames/topgames.go b/stdcommands/topgames/topgames.go index 48dd6c4b1b..8b6e6adc82 100644 --- a/stdcommands/topgames/topgames.go +++ b/stdcommands/topgames/topgames.go @@ -4,10 +4,10 @@ import ( "fmt" "sort" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/topic/topic.go b/stdcommands/topic/topic.go index dcd71afc8f..94a77b6c47 100644 --- a/stdcommands/topic/topic.go +++ b/stdcommands/topic/topic.go @@ -3,8 +3,8 @@ package topic import ( "math/rand" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/topservers/topservers.go b/stdcommands/topservers/topservers.go index 524c14c7bf..07927fb4ed 100644 --- a/stdcommands/topservers/topservers.go +++ b/stdcommands/topservers/topservers.go @@ -3,10 +3,10 @@ package topservers import ( "fmt" - "github.com/botlabs-gg/yagpdb/bot/models" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/bot/models" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/stdcommands/unbanserver/unbanserver.go b/stdcommands/unbanserver/unbanserver.go index 75b07aa17d..dfb3897bec 100644 --- a/stdcommands/unbanserver/unbanserver.go +++ b/stdcommands/unbanserver/unbanserver.go @@ -1,10 +1,10 @@ package unbanserver import ( - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/stdcommands/util" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/stdcommands/util" "github.com/mediocregopher/radix/v3" ) diff --git a/stdcommands/undelete/undelete.go b/stdcommands/undelete/undelete.go index 3049216d92..26da4a7561 100644 --- a/stdcommands/undelete/undelete.go +++ b/stdcommands/undelete/undelete.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/util/debugcmd.go b/stdcommands/util/debugcmd.go index baf0786aab..296cb35e99 100644 --- a/stdcommands/util/debugcmd.go +++ b/stdcommands/util/debugcmd.go @@ -1,10 +1,10 @@ package util import ( - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" ) func isExecedByCC(data *dcmd.Data) bool { diff --git a/stdcommands/viewperms/viewperms.go b/stdcommands/viewperms/viewperms.go index 22a10621ac..1a3c186dd4 100644 --- a/stdcommands/viewperms/viewperms.go +++ b/stdcommands/viewperms/viewperms.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/weather/weather.go b/stdcommands/weather/weather.go index 921e58b5c2..a6686b436f 100644 --- a/stdcommands/weather/weather.go +++ b/stdcommands/weather/weather.go @@ -8,8 +8,8 @@ import ( "strings" "unicode" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" "github.com/lunixbochs/vtclean" ) diff --git a/stdcommands/wouldyourather/wouldyourather.go b/stdcommands/wouldyourather/wouldyourather.go index de487c76e0..ae4b1d8ccd 100644 --- a/stdcommands/wouldyourather/wouldyourather.go +++ b/stdcommands/wouldyourather/wouldyourather.go @@ -7,10 +7,10 @@ import ( "emperror.dev/errors" "github.com/PuerkitoBio/goquery" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) var Command = &commands.YAGCommand{ diff --git a/stdcommands/xkcd/xkcd.go b/stdcommands/xkcd/xkcd.go index dc7db92dc3..10d6950652 100644 --- a/stdcommands/xkcd/xkcd.go +++ b/stdcommands/xkcd/xkcd.go @@ -7,9 +7,9 @@ import ( "math/rand" "net/http" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type Xkcd struct { diff --git a/stdcommands/yagstatus/yagstatus.go b/stdcommands/yagstatus/yagstatus.go index 51cf80cadd..34ff49ed60 100644 --- a/stdcommands/yagstatus/yagstatus.go +++ b/stdcommands/yagstatus/yagstatus.go @@ -5,11 +5,11 @@ import ( "runtime" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/shirou/gopsutil/load" "github.com/shirou/gopsutil/mem" ) diff --git a/streaming/bot.go b/streaming/bot.go index 1700703904..1277743fc4 100644 --- a/streaming/bot.go +++ b/streaming/bot.go @@ -9,15 +9,15 @@ import ( "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/mediocregopher/radix/v3" ) diff --git a/streaming/streaming.go b/streaming/streaming.go index c7767f8840..214662a0eb 100644 --- a/streaming/streaming.go +++ b/streaming/streaming.go @@ -5,9 +5,9 @@ import ( "strconv" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) type Plugin struct{} diff --git a/streaming/web.go b/streaming/web.go index 996f7697d4..134e3d6291 100644 --- a/streaming/web.go +++ b/streaming/web.go @@ -8,12 +8,12 @@ import ( "html/template" "net/http" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/featureflags" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/featureflags" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web" "goji.io" "goji.io/pat" ) diff --git a/tickets/tickets.go b/tickets/tickets.go index f443a5e57d..f4af2bc624 100644 --- a/tickets/tickets.go +++ b/tickets/tickets.go @@ -5,9 +5,9 @@ package tickets import ( "fmt" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/tickets/models" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/tickets/models" ) type Plugin struct{} diff --git a/tickets/tickets_bot.go b/tickets/tickets_bot.go index 21ab0c75bd..220db718e3 100644 --- a/tickets/tickets_bot.go +++ b/tickets/tickets_bot.go @@ -7,13 +7,13 @@ import ( "unicode/utf8" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/tickets/models" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/tickets/models" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/tickets/tickets_commands.go b/tickets/tickets_commands.go index 94dd5f71f4..0d20d16d44 100644 --- a/tickets/tickets_commands.go +++ b/tickets/tickets_commands.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/tickets/models" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/tickets/models" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/tickets/tickets_test.go b/tickets/tickets_test.go index 048ca9b350..43d7a133ee 100644 --- a/tickets/tickets_test.go +++ b/tickets/tickets_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func TestInheritPermissionsFromCategory(t *testing.T) { diff --git a/tickets/tickets_web.go b/tickets/tickets_web.go index f1a84eeae1..37ca26125b 100644 --- a/tickets/tickets_web.go +++ b/tickets/tickets_web.go @@ -7,11 +7,11 @@ import ( "html/template" "net/http" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/tickets/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/tickets/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/boil" "goji.io/pat" ) diff --git a/tickets/tmplextensions.go b/tickets/tmplextensions.go index e2d690ea1b..0a18db871c 100644 --- a/tickets/tmplextensions.go +++ b/tickets/tmplextensions.go @@ -7,11 +7,11 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/tickets/models" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/tickets/models" "github.com/volatiletech/null" ) diff --git a/timezonecompanion/plugin_bot.go b/timezonecompanion/plugin_bot.go index c7d29ffaf5..4d2ea6f0f2 100644 --- a/timezonecompanion/plugin_bot.go +++ b/timezonecompanion/plugin_bot.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/bot/paginatedmessages" - "github.com/botlabs-gg/yagpdb/commands" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/dcmd" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/timezonecompanion/models" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/bot/paginatedmessages" + "github.com/botlabs-gg/yagpdb/v2/commands" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/dcmd" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/timezonecompanion/models" "github.com/volatiletech/sqlboiler/boil" ) diff --git a/timezonecompanion/timezonecompanion.go b/timezonecompanion/timezonecompanion.go index 5d93ce1708..97d8d6be92 100644 --- a/timezonecompanion/timezonecompanion.go +++ b/timezonecompanion/timezonecompanion.go @@ -4,10 +4,10 @@ package timezonecompanion //go:generate go run generate/generatemappings.go import ( - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/when" - "github.com/botlabs-gg/yagpdb/lib/when/rules" - "github.com/botlabs-gg/yagpdb/timezonecompanion/trules" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/when" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/timezonecompanion/trules" ) type Plugin struct { diff --git a/timezonecompanion/trules/hour.go b/timezonecompanion/trules/hour.go index dfc943a5b5..fe52675fd9 100644 --- a/timezonecompanion/trules/hour.go +++ b/timezonecompanion/trules/hour.go @@ -7,7 +7,7 @@ import ( "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) /* diff --git a/timezonecompanion/trules/hourminute.go b/timezonecompanion/trules/hourminute.go index 6e860d7739..9b3640ef40 100644 --- a/timezonecompanion/trules/hourminute.go +++ b/timezonecompanion/trules/hourminute.go @@ -6,7 +6,7 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/lib/when/rules" + "github.com/botlabs-gg/yagpdb/v2/lib/when/rules" ) /* diff --git a/twitter/bot.go b/twitter/bot.go index 1f1a846a21..ed5cf212f9 100644 --- a/twitter/bot.go +++ b/twitter/bot.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/twitter/models" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/twitter/models" ) func (p *Plugin) Status() (string, string) { diff --git a/twitter/feed.go b/twitter/feed.go index 094a5891b2..2fc71dd5ea 100644 --- a/twitter/feed.go +++ b/twitter/feed.go @@ -7,13 +7,13 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/feeds" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/go-twitter/twitter" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/twitter/models" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/feeds" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/go-twitter/twitter" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/twitter/models" "github.com/prometheus/client_golang/prometheus" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" diff --git a/twitter/twitter.go b/twitter/twitter.go index 21f77f7151..218ef4af3d 100644 --- a/twitter/twitter.go +++ b/twitter/twitter.go @@ -3,13 +3,14 @@ package twitter //go:generate sqlboiler --no-hooks psql import ( - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/lib/go-twitter/twitter" - "github.com/botlabs-gg/yagpdb/twitter/models" - "github.com/dghubble/oauth1" "sync" + + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/lib/go-twitter/twitter" + "github.com/botlabs-gg/yagpdb/v2/twitter/models" + "github.com/dghubble/oauth1" ) var ( diff --git a/twitter/web.go b/twitter/web.go index 289abfabe4..b1b33e91f8 100644 --- a/twitter/web.go +++ b/twitter/web.go @@ -8,12 +8,12 @@ import ( "net/http" "strconv" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/lib/go-twitter/twitter" - "github.com/botlabs-gg/yagpdb/premium" - "github.com/botlabs-gg/yagpdb/twitter/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/lib/go-twitter/twitter" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/twitter/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" "goji.io" diff --git a/verification/verification.go b/verification/verification.go index 9ec61e960e..1dcf262622 100644 --- a/verification/verification.go +++ b/verification/verification.go @@ -3,8 +3,8 @@ package verification //go:generate sqlboiler --no-hooks psql import ( - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" ) var confGoogleReCAPTCHASiteKey = config.RegisterOption("yagpdb.google.recaptcha_site_key", "Google reCAPTCHA site key", "") diff --git a/verification/verification_bot.go b/verification/verification_bot.go index f01b0aa8c7..782472bd3a 100644 --- a/verification/verification_bot.go +++ b/verification/verification_bot.go @@ -11,18 +11,18 @@ import ( "unicode/utf8" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - seventsmodels "github.com/botlabs-gg/yagpdb/common/scheduledevents2/models" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/moderation" - "github.com/botlabs-gg/yagpdb/verification/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + seventsmodels "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2/models" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/moderation" + "github.com/botlabs-gg/yagpdb/v2/verification/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/volatiletech/sqlboiler/boil" "github.com/volatiletech/sqlboiler/queries/qm" ) diff --git a/verification/verification_web.go b/verification/verification_web.go index 6c457c2cee..0d495b6ae2 100644 --- a/verification/verification_web.go +++ b/verification/verification_web.go @@ -12,12 +12,12 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/scheduledevents2" - "github.com/botlabs-gg/yagpdb/verification/models" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/scheduledevents2" + "github.com/botlabs-gg/yagpdb/v2/verification/models" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/microcosm-cc/bluemonday" "github.com/russross/blackfriday" "github.com/sirupsen/logrus" diff --git a/web/discordblog/discordblog.go b/web/discordblog/discordblog.go index c7817f84cd..42da42913c 100644 --- a/web/discordblog/discordblog.go +++ b/web/discordblog/discordblog.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/shurcooL/github_flavored_markdown" "github.com/sirupsen/logrus" ) diff --git a/web/discorddata/bot.go b/web/discorddata/bot.go index f88dcbc667..cdcec69b21 100644 --- a/web/discorddata/bot.go +++ b/web/discorddata/bot.go @@ -1,9 +1,9 @@ package discorddata import ( - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/bot/eventsystem" - "github.com/botlabs-gg/yagpdb/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/bot/eventsystem" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" ) type EvictData struct { diff --git a/web/discorddata/discord_data.go b/web/discorddata/discord_data.go index 5b7ef7b3e6..18d3c756c3 100644 --- a/web/discorddata/discord_data.go +++ b/web/discorddata/discord_data.go @@ -6,10 +6,10 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/karlseguin/ccache" "golang.org/x/oauth2" ) diff --git a/web/handlers_auth.go b/web/handlers_auth.go index 43ee5934c8..a089fbbd59 100644 --- a/web/handlers_auth.go +++ b/web/handlers_auth.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web/discorddata" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web/discorddata" "github.com/mediocregopher/radix/v3" "golang.org/x/oauth2" ) diff --git a/web/handlers_general.go b/web/handlers_general.go index 86989e7967..9a33310f92 100644 --- a/web/handlers_general.go +++ b/web/handlers_general.go @@ -15,15 +15,15 @@ import ( "sync/atomic" "time" - "github.com/botlabs-gg/yagpdb/bot/botrest" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/common/models" - "github.com/botlabs-gg/yagpdb/common/patreon" - "github.com/botlabs-gg/yagpdb/common/pubsub" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/web/discordblog" + "github.com/botlabs-gg/yagpdb/v2/bot/botrest" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/common/models" + "github.com/botlabs-gg/yagpdb/v2/common/patreon" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/web/discordblog" "github.com/mediocregopher/radix/v3" "github.com/patrickmn/go-cache" "goji.io/pat" diff --git a/web/middleware.go b/web/middleware.go index 8655decee1..f4bc1451e7 100644 --- a/web/middleware.go +++ b/web/middleware.go @@ -13,12 +13,12 @@ import ( "time" "emperror.dev/errors" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" - "github.com/botlabs-gg/yagpdb/web/discorddata" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/web/discorddata" "github.com/gorilla/schema" "github.com/miolini/datacounter" "github.com/prometheus/client_golang/prometheus" diff --git a/web/plugin.go b/web/plugin.go index 01e5a96ce6..9e4d7a7668 100644 --- a/web/plugin.go +++ b/web/plugin.go @@ -4,7 +4,7 @@ import ( "html/template" "net/http" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" ) // Plugin represents a web plugin diff --git a/web/template.go b/web/template.go index 4a66e10a90..566be4e7b7 100644 --- a/web/template.go +++ b/web/template.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) func prettyTime(t time.Time) string { diff --git a/web/util.go b/web/util.go index cd27442626..7955d7a66d 100644 --- a/web/util.go +++ b/web/util.go @@ -10,11 +10,11 @@ import ( "net/url" "strings" - "github.com/botlabs-gg/yagpdb/bot" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/sirupsen/logrus" "goji.io/pattern" ) diff --git a/web/validation.go b/web/validation.go index ef7fbb0158..6b64bfb77a 100644 --- a/web/validation.go +++ b/web/validation.go @@ -35,10 +35,10 @@ import ( "unicode" "unicode/utf8" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" "github.com/lib/pq" ) diff --git a/web/validation_test.go b/web/validation_test.go index a9a4f3eb1c..deb2f5a3eb 100644 --- a/web/validation_test.go +++ b/web/validation_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/botlabs-gg/yagpdb/lib/dstate" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" ) type StringTestStruct struct { diff --git a/web/web.go b/web/web.go index 906af9a1e2..e6230de704 100644 --- a/web/web.go +++ b/web/web.go @@ -11,13 +11,13 @@ import ( "time" "github.com/NYTimes/gziphandler" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/patreon" - yagtmpl "github.com/botlabs-gg/yagpdb/common/templates" - "github.com/botlabs-gg/yagpdb/frontend" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web/discordblog" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/patreon" + yagtmpl "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/frontend" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web/discordblog" "github.com/natefinch/lumberjack" "goji.io" "goji.io/pat" diff --git a/web/web_test.go b/web/web_test.go index bc374c39e8..707a45a04d 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/models" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) func createUserGuild(connected bool, owner bool, manageServer bool) *common.GuildWithConnected { diff --git a/youtube/bot.go b/youtube/bot.go index 00dab1c63d..50333eca29 100644 --- a/youtube/bot.go +++ b/youtube/bot.go @@ -3,7 +3,7 @@ package youtube import ( "fmt" - "github.com/botlabs-gg/yagpdb/common" + "github.com/botlabs-gg/yagpdb/v2/common" "github.com/mediocregopher/radix/v3" ) diff --git a/youtube/feed.go b/youtube/feed.go index dfe0d813e8..e537411a16 100644 --- a/youtube/feed.go +++ b/youtube/feed.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/analytics" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/feeds" - "github.com/botlabs-gg/yagpdb/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/feeds" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" "github.com/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "golang.org/x/oauth2/google" diff --git a/youtube/web.go b/youtube/web.go index 68ebebfc4c..4ef92b5b51 100644 --- a/youtube/web.go +++ b/youtube/web.go @@ -15,10 +15,10 @@ import ( "strconv" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/cplogs" - "github.com/botlabs-gg/yagpdb/lib/discordgo" - "github.com/botlabs-gg/yagpdb/web" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/cplogs" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/web" "github.com/jinzhu/gorm" "github.com/mediocregopher/radix/v3" "goji.io" diff --git a/youtube/youtube.go b/youtube/youtube.go index 57aae05a23..2eba5b5a6b 100644 --- a/youtube/youtube.go +++ b/youtube/youtube.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/botlabs-gg/yagpdb/common" - "github.com/botlabs-gg/yagpdb/common/config" - "github.com/botlabs-gg/yagpdb/common/mqueue" - "github.com/botlabs-gg/yagpdb/premium" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/config" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/premium" "google.golang.org/api/youtube/v3" )