From 0a937a65d07ea9da3e596520e68e14a2279c413e Mon Sep 17 00:00:00 2001 From: Knut Ahlers Date: Wed, 2 Nov 2022 22:38:14 +0100 Subject: [PATCH] prepare release v3.0.0 Signed-off-by: Knut Ahlers --- .github/workflows/test-and-build.yml | 2 + History.md | 7 ++- action_script.go | 4 +- actions.go | 2 +- actorDocs.go | 2 +- auth.go | 4 +- automessage.go | 2 +- botEditor.go | 2 +- botUserState.go | 2 +- chatcommands.go | 2 +- config.go | 2 +- configEditor.go | 4 +- configEditor_automessage.go | 2 +- configEditor_general.go | 2 +- configEditor_global.go | 2 +- configEditor_rules.go | 2 +- events.go | 2 +- functions.go | 2 +- functions_irc.go | 2 +- functions_twitch.go | 2 +- go.mod | 2 +- internal/actors/announce/actor.go | 4 +- internal/actors/ban/actor.go | 4 +- internal/actors/counter/actor.go | 4 +- internal/actors/counter/database.go | 2 +- internal/actors/counter/database_test.go | 2 +- internal/actors/delay/actor.go | 2 +- internal/actors/delete/actor.go | 4 +- internal/actors/filesay/actor.go | 2 +- internal/actors/modchannel/actor.go | 4 +- internal/actors/nuke/actor.go | 4 +- internal/actors/punish/actor.go | 6 +-- internal/actors/punish/database.go | 2 +- internal/actors/punish/database_test.go | 2 +- internal/actors/quotedb/actor.go | 4 +- internal/actors/quotedb/database.go | 2 +- internal/actors/quotedb/database_test.go | 2 +- internal/actors/quotedb/http.go | 2 +- internal/actors/raw/actor.go | 2 +- internal/actors/respond/actor.go | 2 +- internal/actors/timeout/actor.go | 4 +- internal/actors/variables/actor.go | 4 +- internal/actors/variables/database.go | 2 +- internal/actors/variables/database_test.go | 2 +- internal/actors/whisper/actor.go | 4 +- internal/apimodules/customevent/actor.go | 2 +- .../apimodules/customevent/customevent.go | 4 +- internal/apimodules/customevent/database.go | 4 +- .../apimodules/customevent/memoryCache.go | 2 +- internal/apimodules/msgformat/msgformat.go | 2 +- internal/apimodules/overlays/database.go | 4 +- internal/apimodules/overlays/database_test.go | 4 +- internal/apimodules/overlays/overlays.go | 4 +- internal/service/access/access.go | 4 +- internal/service/timer/timer.go | 4 +- internal/service/timer/timer_test.go | 2 +- internal/template/api/api.go | 2 +- internal/template/numeric/numeric.go | 2 +- internal/template/random/random.go | 2 +- internal/template/slice/slice.go | 2 +- internal/v2migrator/core.go | 10 ++-- internal/v2migrator/modOverlays.go | 4 +- internal/v2migrator/modQuoteDB.go | 4 +- internal/v2migrator/store.go | 6 +-- irc.go | 4 +- main.go | 10 ++-- msgformatter.go | 2 +- plugins.go | 2 +- plugins/interface.go | 4 +- plugins/rule.go | 2 +- plugins/rule_test.go | 2 +- plugins_core.go | 52 +++++++++---------- scopes.go | 2 +- status.go | 2 +- swagger.go | 2 +- twitchWatcher.go | 4 +- 76 files changed, 144 insertions(+), 137 deletions(-) diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml index fa1dda8..731fd2a 100644 --- a/.github/workflows/test-and-build.yml +++ b/.github/workflows/test-and-build.yml @@ -5,6 +5,8 @@ on: push: branches-ignore: - stable + tags: + - 'v*' permissions: contents: write diff --git a/History.md b/History.md index 1cb53fe..3f8036c 100644 --- a/History.md +++ b/History.md @@ -1,4 +1,4 @@ -# 3.0.0 / Unreleased +# 3.0.0 / 2022-11-02 **⚠ Breaking Changes:** - Backend storage format has been switched from JSON-file to database. Migrations must be run before use of `v3.x` version. See [README](https://github.com/Luzifer/twitch-bot#upgrade-from-v2x-to-v3x) for instructions. @@ -7,17 +7,22 @@ **Changelog:** * New Features + * [core] Add config validation command * [core] Add rule-subscription feature + * [core] Add `outbound_raid` event + * [customevent] Add scheduled custom events * [templating] Add `jsonAPI` template function * Improvements * [core] Move storage to database (#30, #32) ⚠ * [core] Allow to pass ID to channel modification + * [core] Extend API and replace deprecated chat commands (#34) * [editor] Add all template functions to highlighter * [overlays] Add `hide` option to debug overlay * [templating] Add sprig functions, replace some built-ins ⚠ * Bugfixes + * [core] Fix: Allow 5s for rule updates # 2.7.1 / 2022-09-06 diff --git a/action_script.go b/action_script.go index 3cb5478..85022aa 100644 --- a/action_script.go +++ b/action_script.go @@ -10,8 +10,8 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func init() { diff --git a/actions.go b/actions.go index be0226b..ec10175 100644 --- a/actions.go +++ b/actions.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/actorDocs.go b/actorDocs.go index b251e37..e9b3e59 100644 --- a/actorDocs.go +++ b/actorDocs.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) //go:embed actorDocs.tpl diff --git a/auth.go b/auth.go index 193b142..7f88eb1 100644 --- a/auth.go +++ b/auth.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var instanceState = uuid.Must(uuid.NewV4()).String() diff --git a/automessage.go b/automessage.go index afa2a83..2b9b229 100644 --- a/automessage.go +++ b/automessage.go @@ -13,7 +13,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var cronParser = cron.NewParser(cron.SecondOptional | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor) diff --git a/botEditor.go b/botEditor.go index c7e8d97..801c486 100644 --- a/botEditor.go +++ b/botEditor.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" ) func getAuthorizationFromRequest(r *http.Request) (string, *twitch.Client, error) { diff --git a/botUserState.go b/botUserState.go index 1e49429..fcf8126 100644 --- a/botUserState.go +++ b/botUserState.go @@ -6,7 +6,7 @@ import ( "github.com/go-irc/irc" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" ) type ( diff --git a/chatcommands.go b/chatcommands.go index 8ab9d16..c57acad 100644 --- a/chatcommands.go +++ b/chatcommands.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/config.go b/config.go index 9040888..9f0b6cc 100644 --- a/config.go +++ b/config.go @@ -15,7 +15,7 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const expectedMinConfigVersion = 2 diff --git a/configEditor.go b/configEditor.go index 3cd9955..3c6ee83 100644 --- a/configEditor.go +++ b/configEditor.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/websocket" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const websocketPingInterval = 30 * time.Second diff --git a/configEditor_automessage.go b/configEditor_automessage.go index a012214..9847974 100644 --- a/configEditor_automessage.go +++ b/configEditor_automessage.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func registerEditorAutoMessageRoutes() { diff --git a/configEditor_general.go b/configEditor_general.go index 43504cf..d2f003a 100644 --- a/configEditor_general.go +++ b/configEditor_general.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) type ( diff --git a/configEditor_global.go b/configEditor_global.go index e32b44b..75353f1 100644 --- a/configEditor_global.go +++ b/configEditor_global.go @@ -8,7 +8,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func registerEditorGlobalMethods() { diff --git a/configEditor_rules.go b/configEditor_rules.go index 3e9a0dd..b6c00a4 100644 --- a/configEditor_rules.go +++ b/configEditor_rules.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func registerEditorRulesRoutes() { diff --git a/events.go b/events.go index 2e2bd6d..d7e77a8 100644 --- a/events.go +++ b/events.go @@ -5,7 +5,7 @@ import ( log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func ptrStr(s string) *string { return &s } diff --git a/functions.go b/functions.go index c5a1c0a..b6b4b1e 100644 --- a/functions.go +++ b/functions.go @@ -13,7 +13,7 @@ import ( "github.com/Luzifer/go_helpers/v2/str" korvike "github.com/Luzifer/korvike/functions" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/functions_irc.go b/functions_irc.go index a45210d..432a7e4 100644 --- a/functions_irc.go +++ b/functions_irc.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func init() { diff --git a/functions_twitch.go b/functions_twitch.go index ead35bd..5cc56b2 100644 --- a/functions_twitch.go +++ b/functions_twitch.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func init() { diff --git a/go.mod b/go.mod index 6f5c00b..467f011 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/Luzifer/twitch-bot/v2 +module github.com/Luzifer/twitch-bot/v3 go 1.19 diff --git a/internal/actors/announce/actor.go b/internal/actors/announce/actor.go index 4bc27d0..58ffef0 100644 --- a/internal/actors/announce/actor.go +++ b/internal/actors/announce/actor.go @@ -6,8 +6,8 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/internal/actors/ban/actor.go b/internal/actors/ban/actor.go index 5c44c1a..375f388 100644 --- a/internal/actors/ban/actor.go +++ b/internal/actors/ban/actor.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "ban" diff --git a/internal/actors/counter/actor.go b/internal/actors/counter/actor.go index 3348d5e..fcba46c 100644 --- a/internal/actors/counter/actor.go +++ b/internal/actors/counter/actor.go @@ -10,8 +10,8 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/internal/actors/counter/database.go b/internal/actors/counter/database.go index a295de0..51923b6 100644 --- a/internal/actors/counter/database.go +++ b/internal/actors/counter/database.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) type ( diff --git a/internal/actors/counter/database_test.go b/internal/actors/counter/database_test.go index 5671192..6c2cac2 100644 --- a/internal/actors/counter/database_test.go +++ b/internal/actors/counter/database_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) func TestCounterStoreLoop(t *testing.T) { diff --git a/internal/actors/delay/actor.go b/internal/actors/delay/actor.go index 7b9218d..29b538c 100644 --- a/internal/actors/delay/actor.go +++ b/internal/actors/delay/actor.go @@ -6,7 +6,7 @@ import ( "github.com/go-irc/irc" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "delay" diff --git a/internal/actors/delete/actor.go b/internal/actors/delete/actor.go index 147faf0..3d179de 100644 --- a/internal/actors/delete/actor.go +++ b/internal/actors/delete/actor.go @@ -4,8 +4,8 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "delete" diff --git a/internal/actors/filesay/actor.go b/internal/actors/filesay/actor.go index 7b140ca..2d5fb32 100644 --- a/internal/actors/filesay/actor.go +++ b/internal/actors/filesay/actor.go @@ -10,7 +10,7 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const ( diff --git a/internal/actors/modchannel/actor.go b/internal/actors/modchannel/actor.go index 5d75e30..95502aa 100644 --- a/internal/actors/modchannel/actor.go +++ b/internal/actors/modchannel/actor.go @@ -7,8 +7,8 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "modchannel" diff --git a/internal/actors/nuke/actor.go b/internal/actors/nuke/actor.go index c49f76c..c451e4d 100644 --- a/internal/actors/nuke/actor.go +++ b/internal/actors/nuke/actor.go @@ -11,8 +11,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const ( diff --git a/internal/actors/punish/actor.go b/internal/actors/punish/actor.go index a073c90..5e30573 100644 --- a/internal/actors/punish/actor.go +++ b/internal/actors/punish/actor.go @@ -8,9 +8,9 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const ( diff --git a/internal/actors/punish/database.go b/internal/actors/punish/database.go index efeca8c..eff807f 100644 --- a/internal/actors/punish/database.go +++ b/internal/actors/punish/database.go @@ -8,7 +8,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) type ( diff --git a/internal/actors/punish/database_test.go b/internal/actors/punish/database_test.go index 2dd5649..8c3247f 100644 --- a/internal/actors/punish/database_test.go +++ b/internal/actors/punish/database_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) func TestPunishmentRoundtrip(t *testing.T) { diff --git a/internal/actors/quotedb/actor.go b/internal/actors/quotedb/actor.go index 5ea65fe..1919b30 100644 --- a/internal/actors/quotedb/actor.go +++ b/internal/actors/quotedb/actor.go @@ -6,8 +6,8 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const ( diff --git a/internal/actors/quotedb/database.go b/internal/actors/quotedb/database.go index a66a8dc..cb96079 100644 --- a/internal/actors/quotedb/database.go +++ b/internal/actors/quotedb/database.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "gorm.io/gorm" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) type ( diff --git a/internal/actors/quotedb/database_test.go b/internal/actors/quotedb/database_test.go index 33ff45c..6b50d58 100644 --- a/internal/actors/quotedb/database_test.go +++ b/internal/actors/quotedb/database_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) func TestQuotesRoundtrip(t *testing.T) { diff --git a/internal/actors/quotedb/http.go b/internal/actors/quotedb/http.go index 484936a..0640c51 100644 --- a/internal/actors/quotedb/http.go +++ b/internal/actors/quotedb/http.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/internal/actors/raw/actor.go b/internal/actors/raw/actor.go index 234c6d4..ec342e1 100644 --- a/internal/actors/raw/actor.go +++ b/internal/actors/raw/actor.go @@ -4,7 +4,7 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "raw" diff --git a/internal/actors/respond/actor.go b/internal/actors/respond/actor.go index d23c3af..c394782 100644 --- a/internal/actors/respond/actor.go +++ b/internal/actors/respond/actor.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "respond" diff --git a/internal/actors/timeout/actor.go b/internal/actors/timeout/actor.go index 94e93d7..4eb98bb 100644 --- a/internal/actors/timeout/actor.go +++ b/internal/actors/timeout/actor.go @@ -8,8 +8,8 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "timeout" diff --git a/internal/actors/variables/actor.go b/internal/actors/variables/actor.go index 16dcc18..9a1ccb9 100644 --- a/internal/actors/variables/actor.go +++ b/internal/actors/variables/actor.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/internal/actors/variables/database.go b/internal/actors/variables/database.go index 9ecc020..015baba 100644 --- a/internal/actors/variables/database.go +++ b/internal/actors/variables/database.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) type ( diff --git a/internal/actors/variables/database_test.go b/internal/actors/variables/database_test.go index 1e27d65..092356e 100644 --- a/internal/actors/variables/database_test.go +++ b/internal/actors/variables/database_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) func TestVariableRoundtrip(t *testing.T) { diff --git a/internal/actors/whisper/actor.go b/internal/actors/whisper/actor.go index 1042f82..5834df0 100644 --- a/internal/actors/whisper/actor.go +++ b/internal/actors/whisper/actor.go @@ -4,8 +4,8 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "whisper" diff --git a/internal/apimodules/customevent/actor.go b/internal/apimodules/customevent/actor.go index 041dc63..ba59cf3 100644 --- a/internal/apimodules/customevent/actor.go +++ b/internal/apimodules/customevent/actor.go @@ -7,7 +7,7 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) type actor struct{} diff --git a/internal/apimodules/customevent/customevent.go b/internal/apimodules/customevent/customevent.go index cbc4107..cfba728 100644 --- a/internal/apimodules/customevent/customevent.go +++ b/internal/apimodules/customevent/customevent.go @@ -10,8 +10,8 @@ import ( "github.com/gorilla/mux" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const actorName = "customevent" diff --git a/internal/apimodules/customevent/database.go b/internal/apimodules/customevent/database.go index 1279298..a7f8cf2 100644 --- a/internal/apimodules/customevent/database.go +++ b/internal/apimodules/customevent/database.go @@ -8,8 +8,8 @@ import ( "github.com/gofrs/uuid/v3" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const cleanupTimeout = 15 * time.Minute diff --git a/internal/apimodules/customevent/memoryCache.go b/internal/apimodules/customevent/memoryCache.go index 5a722d0..c059d4e 100644 --- a/internal/apimodules/customevent/memoryCache.go +++ b/internal/apimodules/customevent/memoryCache.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) const memoryCacheRefreshInterval = 5 * time.Minute diff --git a/internal/apimodules/msgformat/msgformat.go b/internal/apimodules/msgformat/msgformat.go index 42b17b6..a4c4f33 100644 --- a/internal/apimodules/msgformat/msgformat.go +++ b/internal/apimodules/msgformat/msgformat.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var formatMessage plugins.MsgFormatter diff --git a/internal/apimodules/overlays/database.go b/internal/apimodules/overlays/database.go index bdea4d6..d893e52 100644 --- a/internal/apimodules/overlays/database.go +++ b/internal/apimodules/overlays/database.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) type ( diff --git a/internal/apimodules/overlays/database_test.go b/internal/apimodules/overlays/database_test.go index 94170e4..84521dd 100644 --- a/internal/apimodules/overlays/database_test.go +++ b/internal/apimodules/overlays/database_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func TestEventDatabaseRoundtrip(t *testing.T) { diff --git a/internal/apimodules/overlays/overlays.go b/internal/apimodules/overlays/overlays.go index 2d0454f..745ebe9 100644 --- a/internal/apimodules/overlays/overlays.go +++ b/internal/apimodules/overlays/overlays.go @@ -17,8 +17,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const ( diff --git a/internal/service/access/access.go b/internal/service/access/access.go index 3b39381..2ba9a40 100644 --- a/internal/service/access/access.go +++ b/internal/service/access/access.go @@ -8,8 +8,8 @@ import ( "gorm.io/gorm/clause" "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" ) const ( diff --git a/internal/service/timer/timer.go b/internal/service/timer/timer.go index 67326ef..0730e9e 100644 --- a/internal/service/timer/timer.go +++ b/internal/service/timer/timer.go @@ -10,8 +10,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) type ( diff --git a/internal/service/timer/timer_test.go b/internal/service/timer/timer_test.go index 5b1bd0f..9491753 100644 --- a/internal/service/timer/timer_test.go +++ b/internal/service/timer/timer_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) func TestTimerRoundtrip(t *testing.T) { diff --git a/internal/template/api/api.go b/internal/template/api/api.go index ab8b849..87dc96b 100644 --- a/internal/template/api/api.go +++ b/internal/template/api/api.go @@ -1,6 +1,6 @@ package api -import "github.com/Luzifer/twitch-bot/v2/plugins" +import "github.com/Luzifer/twitch-bot/v3/plugins" func Register(args plugins.RegistrationArguments) error { args.RegisterTemplateFunction("jsonAPI", plugins.GenericTemplateFunctionGetter(jsonAPI)) diff --git a/internal/template/numeric/numeric.go b/internal/template/numeric/numeric.go index f299584..b82865e 100644 --- a/internal/template/numeric/numeric.go +++ b/internal/template/numeric/numeric.go @@ -3,7 +3,7 @@ package numeric import ( "math" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func Register(args plugins.RegistrationArguments) error { diff --git a/internal/template/random/random.go b/internal/template/random/random.go index 4a657f8..f27969b 100644 --- a/internal/template/random/random.go +++ b/internal/template/random/random.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func Register(args plugins.RegistrationArguments) error { diff --git a/internal/template/slice/slice.go b/internal/template/slice/slice.go index 73c840e..010f71e 100644 --- a/internal/template/slice/slice.go +++ b/internal/template/slice/slice.go @@ -2,7 +2,7 @@ package slice import ( "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func Register(args plugins.RegistrationArguments) error { diff --git a/internal/v2migrator/core.go b/internal/v2migrator/core.go index e23662b..e34d28b 100644 --- a/internal/v2migrator/core.go +++ b/internal/v2migrator/core.go @@ -3,11 +3,11 @@ package v2migrator import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/internal/actors/counter" - "github.com/Luzifer/twitch-bot/v2/internal/actors/variables" - "github.com/Luzifer/twitch-bot/v2/internal/service/access" - "github.com/Luzifer/twitch-bot/v2/internal/service/timer" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/internal/actors/counter" + "github.com/Luzifer/twitch-bot/v3/internal/actors/variables" + "github.com/Luzifer/twitch-bot/v3/internal/service/access" + "github.com/Luzifer/twitch-bot/v3/internal/service/timer" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) func (s storageFile) migrateCoreKV(db database.Connector) (err error) { diff --git a/internal/v2migrator/modOverlays.go b/internal/v2migrator/modOverlays.go index 854958a..016f13d 100644 --- a/internal/v2migrator/modOverlays.go +++ b/internal/v2migrator/modOverlays.go @@ -3,8 +3,8 @@ package v2migrator import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/internal/apimodules/overlays" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/internal/apimodules/overlays" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) type ( diff --git a/internal/v2migrator/modQuoteDB.go b/internal/v2migrator/modQuoteDB.go index 3843736..7377a60 100644 --- a/internal/v2migrator/modQuoteDB.go +++ b/internal/v2migrator/modQuoteDB.go @@ -3,8 +3,8 @@ package v2migrator import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/internal/actors/quotedb" - "github.com/Luzifer/twitch-bot/v2/pkg/database" + "github.com/Luzifer/twitch-bot/v3/internal/actors/quotedb" + "github.com/Luzifer/twitch-bot/v3/pkg/database" ) type ( diff --git a/internal/v2migrator/store.go b/internal/v2migrator/store.go index 53847ed..a4ece6c 100644 --- a/internal/v2migrator/store.go +++ b/internal/v2migrator/store.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/internal/v2migrator/crypt" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/internal/v2migrator/crypt" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/plugins" ) type ( diff --git a/irc.go b/irc.go index c888e72..bbb1b8f 100644 --- a/irc.go +++ b/irc.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/main.go b/main.go index 1ac1b24..e036e8d 100644 --- a/main.go +++ b/main.go @@ -25,11 +25,11 @@ import ( "github.com/Luzifer/go_helpers/v2/str" "github.com/Luzifer/rconfig/v2" - "github.com/Luzifer/twitch-bot/v2/internal/service/access" - "github.com/Luzifer/twitch-bot/v2/internal/service/timer" - "github.com/Luzifer/twitch-bot/v2/internal/v2migrator" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/internal/service/access" + "github.com/Luzifer/twitch-bot/v3/internal/service/timer" + "github.com/Luzifer/twitch-bot/v3/internal/v2migrator" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" ) const ( diff --git a/msgformatter.go b/msgformatter.go index b9739d4..99eb6d3 100644 --- a/msgformatter.go +++ b/msgformatter.go @@ -10,7 +10,7 @@ import ( "github.com/go-irc/irc" "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/plugins.go b/plugins.go index ad677fd..1d7d28e 100644 --- a/plugins.go +++ b/plugins.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) func loadPlugins(pluginDir string) error { diff --git a/plugins/interface.go b/plugins/interface.go index 63930f4..4e1859b 100644 --- a/plugins/interface.go +++ b/plugins/interface.go @@ -6,8 +6,8 @@ import ( "github.com/robfig/cron/v3" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" ) type ( diff --git a/plugins/rule.go b/plugins/rule.go index 963ae1e..64c443b 100644 --- a/plugins/rule.go +++ b/plugins/rule.go @@ -18,7 +18,7 @@ import ( "gopkg.in/yaml.v2" "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" ) const remoteRuleFetchTimeout = 5 * time.Second diff --git a/plugins/rule_test.go b/plugins/rule_test.go index d7b02fe..84fd838 100644 --- a/plugins/rule_test.go +++ b/plugins/rule_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-irc/irc" "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" ) var ( diff --git a/plugins_core.go b/plugins_core.go index 3e37719..eb55177 100644 --- a/plugins_core.go +++ b/plugins_core.go @@ -10,32 +10,32 @@ import ( "github.com/Luzifer/go_helpers/v2/backoff" "github.com/Luzifer/go_helpers/v2/str" - "github.com/Luzifer/twitch-bot/v2/internal/actors/announce" - "github.com/Luzifer/twitch-bot/v2/internal/actors/ban" - "github.com/Luzifer/twitch-bot/v2/internal/actors/counter" - "github.com/Luzifer/twitch-bot/v2/internal/actors/delay" - deleteactor "github.com/Luzifer/twitch-bot/v2/internal/actors/delete" - "github.com/Luzifer/twitch-bot/v2/internal/actors/filesay" - "github.com/Luzifer/twitch-bot/v2/internal/actors/modchannel" - "github.com/Luzifer/twitch-bot/v2/internal/actors/nuke" - "github.com/Luzifer/twitch-bot/v2/internal/actors/punish" - "github.com/Luzifer/twitch-bot/v2/internal/actors/quotedb" - "github.com/Luzifer/twitch-bot/v2/internal/actors/raw" - "github.com/Luzifer/twitch-bot/v2/internal/actors/respond" - "github.com/Luzifer/twitch-bot/v2/internal/actors/timeout" - "github.com/Luzifer/twitch-bot/v2/internal/actors/variables" - "github.com/Luzifer/twitch-bot/v2/internal/actors/whisper" - "github.com/Luzifer/twitch-bot/v2/internal/apimodules/customevent" - "github.com/Luzifer/twitch-bot/v2/internal/apimodules/msgformat" - "github.com/Luzifer/twitch-bot/v2/internal/apimodules/overlays" - "github.com/Luzifer/twitch-bot/v2/internal/service/access" - "github.com/Luzifer/twitch-bot/v2/internal/template/api" - "github.com/Luzifer/twitch-bot/v2/internal/template/numeric" - "github.com/Luzifer/twitch-bot/v2/internal/template/random" - "github.com/Luzifer/twitch-bot/v2/internal/template/slice" - "github.com/Luzifer/twitch-bot/v2/pkg/database" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/internal/actors/announce" + "github.com/Luzifer/twitch-bot/v3/internal/actors/ban" + "github.com/Luzifer/twitch-bot/v3/internal/actors/counter" + "github.com/Luzifer/twitch-bot/v3/internal/actors/delay" + deleteactor "github.com/Luzifer/twitch-bot/v3/internal/actors/delete" + "github.com/Luzifer/twitch-bot/v3/internal/actors/filesay" + "github.com/Luzifer/twitch-bot/v3/internal/actors/modchannel" + "github.com/Luzifer/twitch-bot/v3/internal/actors/nuke" + "github.com/Luzifer/twitch-bot/v3/internal/actors/punish" + "github.com/Luzifer/twitch-bot/v3/internal/actors/quotedb" + "github.com/Luzifer/twitch-bot/v3/internal/actors/raw" + "github.com/Luzifer/twitch-bot/v3/internal/actors/respond" + "github.com/Luzifer/twitch-bot/v3/internal/actors/timeout" + "github.com/Luzifer/twitch-bot/v3/internal/actors/variables" + "github.com/Luzifer/twitch-bot/v3/internal/actors/whisper" + "github.com/Luzifer/twitch-bot/v3/internal/apimodules/customevent" + "github.com/Luzifer/twitch-bot/v3/internal/apimodules/msgformat" + "github.com/Luzifer/twitch-bot/v3/internal/apimodules/overlays" + "github.com/Luzifer/twitch-bot/v3/internal/service/access" + "github.com/Luzifer/twitch-bot/v3/internal/template/api" + "github.com/Luzifer/twitch-bot/v3/internal/template/numeric" + "github.com/Luzifer/twitch-bot/v3/internal/template/random" + "github.com/Luzifer/twitch-bot/v3/internal/template/slice" + "github.com/Luzifer/twitch-bot/v3/pkg/database" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const ircHandleWaitRetries = 10 diff --git a/scopes.go b/scopes.go index e039e69..1b4543b 100644 --- a/scopes.go +++ b/scopes.go @@ -1,6 +1,6 @@ package main -import "github.com/Luzifer/twitch-bot/v2/pkg/twitch" +import "github.com/Luzifer/twitch-bot/v3/pkg/twitch" var ( channelDefaultScopes = []string{ diff --git a/status.go b/status.go index ab8dd7d..af8e859 100644 --- a/status.go +++ b/status.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) const statusIRCMessageReceivedTimeout = 5 * time.Minute diff --git a/swagger.go b/swagger.go index cbee506..286c4e7 100644 --- a/swagger.go +++ b/swagger.go @@ -12,7 +12,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/wzshiming/openapi/spec" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/plugins" ) var ( diff --git a/twitchWatcher.go b/twitchWatcher.go index 07b2034..500fd70 100644 --- a/twitchWatcher.go +++ b/twitchWatcher.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" log "github.com/sirupsen/logrus" - "github.com/Luzifer/twitch-bot/v2/pkg/twitch" - "github.com/Luzifer/twitch-bot/v2/plugins" + "github.com/Luzifer/twitch-bot/v3/pkg/twitch" + "github.com/Luzifer/twitch-bot/v3/plugins" ) type (