Iota 4

admin/plugin_admin.go

@@ -1,7 +1,7 @@
 package admin
 
 import (
-	"github.com/botlabs-gg/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common"
 )
 
 var logger = common.GetPluginLogger(&Plugin{})

admin/web.go

@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"emperror.dev/errors"
-	"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"
+	"github.com/RhykerWells/yagpdb/v2/bot/botrest"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/config"
+	"github.com/RhykerWells/yagpdb/v2/common/internalapi"
+	"github.com/RhykerWells/yagpdb/v2/lib/dshardorchestrator/orchestrator/rest"
+	"github.com/RhykerWells/yagpdb/v2/web"
 	"goji.io"
 	"goji.io/pat"
 )

analytics/analytics.go

@@ -3,8 +3,8 @@ package analytics
 import (
 	"sync"
 
-	"github.com/botlabs-gg/yagpdb/v2/common"
-	"github.com/botlabs-gg/yagpdb/v2/common/config"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/config"
 	"github.com/mediocregopher/radix/v3"
 )
 

analytics/backgroundworker.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"emperror.dev/errors"
-	"github.com/botlabs-gg/yagpdb/v2/common"
-	"github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/backgroundworkers"
 	"github.com/mediocregopher/radix/v3"
 )
 

antiphishing/antiphishing.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/botlabs-gg/yagpdb/v2/common"
-	"github.com/botlabs-gg/yagpdb/v2/lib/confusables"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/lib/confusables"
 	"github.com/mediocregopher/radix/v3"
 	"github.com/sirupsen/logrus"
 )

antiphishing/backgroundworkers.go

@@ -4,7 +4,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/botlabs-gg/yagpdb/v2/common/backgroundworkers"
+	"github.com/RhykerWells/yagpdb/v2/common/backgroundworkers"
 )
 
 var _ backgroundworkers.BackgroundWorkerPlugin = (*Plugin)(nil)

automod/automod.go

@@ -8,12 +8,12 @@ import (
 	"unicode"
 
 	"emperror.dev/errors"
-	"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/RhykerWells/yagpdb/v2/automod/models"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/featureflags"
+	"github.com/RhykerWells/yagpdb/v2/premium"
+	"github.com/aarondl/sqlboiler/v4/queries/qm"
 	"github.com/karlseguin/ccache"
-	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 )
 
 //go:generate sqlboiler --no-hooks psql

automod/automod_bot.go

@@ -10,19 +10,19 @@ import (
 	"sort"
 	"time"
 
-	"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/v8"
-	"github.com/volatiletech/sqlboiler/v4/boil"
-	"github.com/volatiletech/sqlboiler/v4/queries/qm"
+	"github.com/RhykerWells/yagpdb/v2/analytics"
+	"github.com/RhykerWells/yagpdb/v2/automod/models"
+	"github.com/RhykerWells/yagpdb/v2/bot"
+	"github.com/RhykerWells/yagpdb/v2/bot/eventsystem"
+	"github.com/RhykerWells/yagpdb/v2/commands"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/scheduledevents2"
+	schEventsModels "github.com/RhykerWells/yagpdb/v2/common/scheduledevents2/models"
+	"github.com/RhykerWells/yagpdb/v2/lib/discordgo"
+	"github.com/RhykerWells/yagpdb/v2/lib/dstate"
+	"github.com/aarondl/null/v8"
+	"github.com/aarondl/sqlboiler/v4/boil"
+	"github.com/aarondl/sqlboiler/v4/queries/qm"
 )
 
 func (p *Plugin) BotInit() {

automod/automod_web.go

@@ -12,19 +12,19 @@ import (
 	"strconv"
 	"strings"
 
-	"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/discordgo"
-	"github.com/botlabs-gg/yagpdb/v2/lib/dstate"
-	"github.com/botlabs-gg/yagpdb/v2/moderation"
-	"github.com/botlabs-gg/yagpdb/v2/web"
+	"github.com/RhykerWells/yagpdb/v2/automod/models"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/cplogs"
+	"github.com/RhykerWells/yagpdb/v2/common/featureflags"
+	"github.com/RhykerWells/yagpdb/v2/common/pubsub"
+	"github.com/RhykerWells/yagpdb/v2/lib/discordgo"
+	"github.com/RhykerWells/yagpdb/v2/lib/dstate"
+	"github.com/RhykerWells/yagpdb/v2/moderation"
+	"github.com/RhykerWells/yagpdb/v2/web"
+	"github.com/aarondl/sqlboiler/v4/boil"
+	"github.com/aarondl/sqlboiler/v4/queries/qm"
 	"github.com/fatih/structs"
 	"github.com/gorilla/schema"
-	"github.com/volatiletech/sqlboiler/v4/boil"
-	"github.com/volatiletech/sqlboiler/v4/queries/qm"
 	"goji.io"
 	"goji.io/pat"
 )

automod/cachedruleset.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 
 	"emperror.dev/errors"
-	"github.com/botlabs-gg/yagpdb/v2/automod/models"
+	"github.com/RhykerWells/yagpdb/v2/automod/models"
 )
 
 type ParsedRuleset struct {

automod/commands.go

@@ -6,16 +6,15 @@ import (
 	"strings"
 	"time"
 
-	"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/v4/boil"
-	"github.com/volatiletech/sqlboiler/v4/queries/qm"
+	"github.com/RhykerWells/yagpdb/v2/automod/models"
+	"github.com/RhykerWells/yagpdb/v2/bot/paginatedmessages"
+	"github.com/RhykerWells/yagpdb/v2/commands"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/featureflags"
+	"github.com/RhykerWells/yagpdb/v2/lib/dcmd"
+	"github.com/RhykerWells/yagpdb/v2/lib/discordgo"
+	"github.com/aarondl/sqlboiler/v4/boil"
+	"github.com/aarondl/sqlboiler/v4/queries/qm"
 )
 
 func (p *Plugin) AddCommands() {
@@ -376,7 +375,7 @@ func (p *Plugin) AddCommands() {
 	container.AddCommand(cmdListVLC, cmdListVLC.GetTrigger())
 	container.AddCommand(cmdDelV, cmdDelV.GetTrigger())
 	container.AddCommand(cmdClearV, cmdClearV.GetTrigger())
-	commands.RegisterSlashCommandsContainer(container, false, func(gs *dstate.GuildSet) ([]int64, error) {
-		return nil, nil
-	})
+	//commands.RegisterSlashCommandsContainer(container, false, func(gs *dstate.GuildSet) ([]int64, error) {
+	//	return nil, nil
+	//})
 }

automod/conditions.go

@@ -3,9 +3,9 @@ package automod
 import (
 	"time"
 
-	"github.com/botlabs-gg/yagpdb/v2/bot"
-	"github.com/botlabs-gg/yagpdb/v2/common"
-	"github.com/botlabs-gg/yagpdb/v2/lib/discordgo"
+	"github.com/RhykerWells/yagpdb/v2/bot"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/lib/discordgo"
 )
 
 type Condition interface {

automod/effects.go

@@ -6,18 +6,18 @@ import (
 	"sync"
 	"time"
 
-	"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/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/volatiletech/null/v8"
-	"github.com/volatiletech/sqlboiler/v4/boil"
-	"github.com/volatiletech/sqlboiler/v4/queries/qm"
+	"github.com/RhykerWells/yagpdb/v2/automod/models"
+	"github.com/RhykerWells/yagpdb/v2/bot"
+	"github.com/RhykerWells/yagpdb/v2/common"
+	"github.com/RhykerWells/yagpdb/v2/common/scheduledevents2"
+	schEventsModels "github.com/RhykerWells/yagpdb/v2/common/scheduledevents2/models"
+	"github.com/RhykerWells/yagpdb/v2/common/templates"
+	"github.com/RhykerWells/yagpdb/v2/lib/discordgo"
+	"github.com/RhykerWells/yagpdb/v2/lib/dstate"
+	"github.com/RhykerWells/yagpdb/v2/moderation"
+	"github.com/aarondl/null/v8"
+	"github.com/aarondl/sqlboiler/v4/boil"
+	"github.com/aarondl/sqlboiler/v4/queries/qm"
 )
 
 type Effect interface {
@@ -413,76 +413,6 @@ func (mute *MuteUserEffect) MergeDuplicates(data []interface{}) interface{} {
 
 ///////////////////////////////////////////////////////
 
-type TimeoutUserEffect struct{}
-
-type TimeoutUserEffectData struct {
-	Duration     int    `valid:",0,40320,trimspace"`
-	CustomReason string `valid:",0,150,trimspace"`
-}
-
-func (timeout *TimeoutUserEffect) Kind() RulePartType {
-	return RulePartEffect
-}
-
-func (timeout *TimeoutUserEffect) DataType() interface{} {
-	return &TimeoutUserEffectData{}
-}
-
-func (timeout *TimeoutUserEffect) UserSettings() []*SettingDef {
-	return []*SettingDef{
-		{
-			Name:    "Duration (minutes)",
-			Key:     "Duration",
-			Min:     int(moderation.MinTimeOutDuration.Minutes()),
-			Max:     int(moderation.MaxTimeOutDuration.Minutes()),
-			Kind:    SettingTypeInt,
-			Default: int(moderation.DefaultTimeoutDuration.Minutes()),
-		},
-		{
-			Name: "Custom message (empty for default)",
-			Key:  "CustomReason",
-			Min:  0,
-			Max:  150,
-			Kind: SettingTypeString,
-		},
-	}
-}
-
-func (timeout *TimeoutUserEffect) Name() (name string) {
-	return "Timeout user"
-}
-
-func (timeout *TimeoutUserEffect) Description() (description string) {
-	return "Timeout the user"
-}
-
-func (timeout *TimeoutUserEffect) Apply(ctxData *TriggeredRuleData, settings interface{}) error {
-	// if a user is timed out, do not apply the effect again.
-	member := ctxData.MS.Member
-	if member.CommunicationDisabledUntil != nil && member.CommunicationDisabledUntil.After(time.Now()) {
-		return nil
-	}
-
-	settingsCast := settings.(*TimeoutUserEffectData)
-
-	reason := "Automoderator:\n"
-	if settingsCast.CustomReason != "" {
-		reason += settingsCast.CustomReason
-	} else {
-		reason += ctxData.ConstructReason(true)
-	}
-
-	duration := time.Duration(settingsCast.Duration) * time.Minute
-	err := moderation.TimeoutUser(nil, ctxData.GS.ID, ctxData.CS, ctxData.Message, common.BotUser, reason, &ctxData.MS.User, duration, false)
-	return err
-}
-
-func (timeout *TimeoutUserEffect) MergeDuplicates(data []interface{}) interface{} {
-	return data[0]
-}
-
-///////////////////////////////////////////////////////
-
 type WarnUserEffect struct{}
 
 type WarnUserEffectData struct {