diff --git a/.circleci/config.yml b/.circleci/config.yml index 3625054532..09d36d6daa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: # basic units of work in a run build: # runs not using Workflows must have a `build` job as entry point docker: # run the steps with Docker # CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/ - - image: cimg/go:1.25.0 # + - image: cimg/go:1.25.4 # # directory where steps are run. Path must conform to the Go Workspace requirements working_directory: ~/app diff --git a/.gitignore b/.gitignore index c93de57dca..c301797fd4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ cmd/yagpdb/static/index.html cmd/yagpdb/cert cmd/yagpdb/access_log cmd/yagpdb/access.log +cmd/yagpdb/*.log cmd/yagpdb/static/report.html cmd/yagpdb/yagpdb cmd/yagpdb/templates/plugins/*.html diff --git a/automod/assets/automod.html b/automod/assets/automod.html index 1fac951c5e..0991083b77 100644 --- a/automod/assets/automod.html +++ b/automod/assets/automod.html @@ -338,7 +338,7 @@

List: - {{textChannelOptions .ActiveGuild.Channels .BulkRole.NotificationChannel true "None"}} + {{textOnlyChannelOptions .ActiveGuild.Channels .BulkRole.NotificationChannel true "None"}} diff --git a/cmd/yagpdb/main.go b/cmd/yagpdb/main.go index 5e6e570906..6e6d8cd14a 100644 --- a/cmd/yagpdb/main.go +++ b/cmd/yagpdb/main.go @@ -9,6 +9,8 @@ import ( "github.com/botlabs-gg/yagpdb/v2/common/run" "github.com/botlabs-gg/yagpdb/v2/lib/confusables" "github.com/botlabs-gg/yagpdb/v2/trivia" + "github.com/botlabs-gg/yagpdb/v2/twitch" + "github.com/botlabs-gg/yagpdb/v2/voiceroles" "github.com/botlabs-gg/yagpdb/v2/web/discorddata" // Core yagpdb packages @@ -100,6 +102,8 @@ func main() { rss.RegisterPlugin() bulkrole.RegisterPlugin() personalizer.RegisterPlugin() + twitch.RegisterPlugin() + voiceroles.RegisterPlugin() // Register confusables replacer confusables.Init() diff --git a/commands/tmplexec.go b/commands/tmplexec.go index 4d2c785de6..3efd955b5d 100644 --- a/commands/tmplexec.go +++ b/commands/tmplexec.go @@ -122,62 +122,11 @@ func execCmd(tmplCtx *templates.Context, dryRun bool, m *discordgo.MessageCreate fakeMsg := *m.Message fakeMsg.Mentions = make([]*discordgo.User, 0) - cmdLine := cmd + " " - - for _, arg := range args { - if arg == nil { - return "", errors.New("Nil arg passed") - } - - switch t := arg.(type) { - case string: - if strings.HasPrefix(t, "-") { - // Don't put quotes around switches - cmdLine += t - } else if strings.HasPrefix(t, "\\-") { - // Escaped - - cmdLine += "\"" + t[1:] + "\"" - } else { - cmdLine += "\"" + t + "\"" - } - case int: - cmdLine += strconv.FormatInt(int64(t), 10) - case int32: - cmdLine += strconv.FormatInt(int64(t), 10) - case int64: - cmdLine += strconv.FormatInt(t, 10) - case uint: - cmdLine += strconv.FormatUint(uint64(t), 10) - case uint8: - cmdLine += strconv.FormatUint(uint64(t), 10) - case uint16: - cmdLine += strconv.FormatUint(uint64(t), 10) - case uint32: - cmdLine += strconv.FormatUint(uint64(t), 10) - case uint64: - cmdLine += strconv.FormatUint(t, 10) - case float32: - cmdLine += strconv.FormatFloat(float64(t), 'E', -1, 32) - case float64: - cmdLine += strconv.FormatFloat(t, 'E', -1, 64) - case *discordgo.User: - cmdLine += "<@" + strconv.FormatInt(t.ID, 10) + ">" - fakeMsg.Mentions = append(fakeMsg.Mentions, t) - case discordgo.User: - cmdLine += "<@" + strconv.FormatInt(t.ID, 10) + ">" - fakeMsg.Mentions = append(fakeMsg.Mentions, &t) - case []string: - for i, str := range t { - if i != 0 { - cmdLine += " " - } - cmdLine += str - } - default: - return "", errors.New("Unknown type in exec, only strings, numbers, users and string slices are supported") - } - cmdLine += " " + cmdLine, mentions, err := buildExecCmdLine(cmd, args...) + if err != nil { + return "", err } + fakeMsg.Mentions = append(fakeMsg.Mentions, mentions...) logger.Infof("Custom template is executing a command: %s for guild %v", cmdLine, tmplCtx.Msg.GuildID) @@ -240,7 +189,7 @@ func execCmd(tmplCtx *templates.Context, dryRun bool, m *discordgo.MessageCreate } if cd > 0 { - return "", errors.NewPlain("this command is on guild scope cooldown") + return "", errors.NewPlain("This command is on cooldown, try again in " + strconv.Itoa(cd) + "seconds") } resp, err := runFunc(data) @@ -265,3 +214,69 @@ func execCmd(tmplCtx *templates.Context, dryRun bool, m *discordgo.MessageCreate return "", nil } + +func buildExecCmdLine(cmd string, args ...any) (string, []*discordgo.User, error) { + cmdLine := cmd + " " + var mentions []*discordgo.User + + for _, arg := range args { + if arg == nil { + return "", nil, errors.New("Nil arg passed") + } + + switch t := arg.(type) { + case string: + if strings.HasPrefix(t, "-") { + // Don't put quotes around switches + cmdLine += t + } else if strings.HasPrefix(t, "\\-") { + // Escaped - + cmdLine += "\"" + t[1:] + "\"" + } else { + cmdLine += "\"" + t + "\"" + } + case int: + cmdLine += strconv.FormatInt(int64(t), 10) + case int32: + cmdLine += strconv.FormatInt(int64(t), 10) + case int64: + cmdLine += strconv.FormatInt(t, 10) + case uint: + cmdLine += strconv.FormatUint(uint64(t), 10) + case uint8: + cmdLine += strconv.FormatUint(uint64(t), 10) + case uint16: + cmdLine += strconv.FormatUint(uint64(t), 10) + case uint32: + cmdLine += strconv.FormatUint(uint64(t), 10) + case uint64: + cmdLine += strconv.FormatUint(t, 10) + case float32: + cmdLine += strconv.FormatFloat(float64(t), 'E', -1, 32) + case float64: + cmdLine += strconv.FormatFloat(t, 'E', -1, 64) + case *discordgo.User: + cmdLine += "<@" + strconv.FormatInt(t.ID, 10) + ">" + mentions = append(mentions, t) + case discordgo.User: + cmdLine += "<@" + strconv.FormatInt(t.ID, 10) + ">" + mentions = append(mentions, &t) + case []string: + for i, str := range t { + if i != 0 { + cmdLine += " " + } + cmdLine += str + } + default: + return "", nil, errors.New("Unknown type in exec, only strings, numbers, users and string slices are supported") + } + cmdLine += " " + + if len(cmdLine) > templates.MaxStringLength { + return "", nil, templates.ErrStringTooLong + } + } + + return cmdLine, mentions, nil +} diff --git a/commands/yagcommmand.go b/commands/yagcommmand.go index 715d46ab85..9221e789b0 100644 --- a/commands/yagcommmand.go +++ b/commands/yagcommmand.go @@ -3,6 +3,7 @@ package commands import ( "context" "fmt" + "strconv" "strings" "sync" "sync/atomic" @@ -496,7 +497,7 @@ func (yc *YAGCommand) checkCanExecuteCommand(data *dcmd.Data) (canExecute bool, if cdLeft > 0 { resp = &CanExecuteError{ Type: ReasonCooldown, - Message: "Command is on cooldown", + Message: "Command is on cooldown, try again in " + strconv.Itoa(cdLeft) + " seconds", } return false, resp, settings, nil } diff --git a/common/mqueue/discordprocessor.go b/common/mqueue/discordprocessor.go index f6764fc114..bcf9d608da 100644 --- a/common/mqueue/discordprocessor.go +++ b/common/mqueue/discordprocessor.go @@ -1,7 +1,6 @@ package mqueue import ( - "encoding/json" "time" "emperror.dev/errors" @@ -74,25 +73,19 @@ var disableOnError = []int{ discordgo.ErrCodeUnknownChannel, discordgo.ErrCodeMissingAccess, discordgo.ErrCodeMissingPermissions, + discordgo.ErrCodeCannotSendMessagesInVoiceChannel, + discordgo.ErrCodeUnknownWebhook, 30007, // max number of webhooks 220001, // webhook points to a forum channel } func maybeDisableFeed(source PluginWithSourceDisabler, elem *QueuedElement, err *discordgo.RESTError) { - // source.HandleMQueueError(elem, errors.Cause(err)) + l := logger.WithError(err).WithField("source", elem.Source).WithField("sourceid", elem.SourceItemID).WithField("guild_id", elem.GuildID) if err.Message == nil || !common.ContainsIntSlice(disableOnError, err.Message.Code) { - // don't disable - l := logger.WithError(err).WithField("source", elem.Source).WithField("sourceid", elem.SourceItemID) - if elem.MessageEmbed != nil { - serializedEmbed, _ := json.Marshal(elem.MessageEmbed) - l = l.WithField("embed", serializedEmbed) - } - l.Error("error sending mqueue message") return } - - logger.WithError(err).Warnf("disabling feed item %s from %s", elem.SourceItemID, elem.Source) + l.Warn("disabling feed item") source.DisableFeed(elem, err) } diff --git a/common/run/gen-docs.go b/common/run/gen-docs.go index 94c38aceef..157037d126 100644 --- a/common/run/gen-docs.go +++ b/common/run/gen-docs.go @@ -40,7 +40,11 @@ func GenCommandsDocs() { nameStr += entry.Cmd.Trigger.Names[0] // then aliases - aliases := strings.Join(entry.Cmd.Trigger.Names[1:], "/") + var as bytes.Buffer + for _, alias := range entry.Cmd.Trigger.Names[1:] { + as.WriteString("- " + alias + "\n") + } + aliases := as.String() // arguments and switches args := stdHelpFmt.ArgDefs(entry.Cmd, mockCmdData) @@ -59,29 +63,26 @@ func GenCommandsDocs() { } } + anchor := strings.ReplaceAll(nameStr, " ", "-") out.WriteString("### " + nameStr + "\n\n") if aliases != "" { - out.WriteString("**Aliases:** " + aliases + "\n\n") + out.WriteString("#### Aliases{#" + anchor + "-aliases}\n\n" + aliases + "\n") } out.WriteString(desc) - out.WriteString("\n\n") + out.WriteString("\n") - out.WriteString("**Usage:**\n") - out.WriteString("```\n" + args + "\n```\n") + out.WriteString("#### Usage{#" + anchor + "-usage}\n\n") + out.WriteString("```txt\n" + args + "\n```\n") if switches != "" { - out.WriteString("```\n" + switches + "\n```\n") + out.WriteString("\n```txt\n" + switches + "\n```\n") } - out.WriteString("\n") } - } os.Stdout.Write(out.Bytes()) - - return } func GenConfigDocs() { @@ -127,7 +128,7 @@ func GenConfigDocs() { out.WriteString("\n") properKey := strings.ToUpper(v.Name) - properKey = strings.Replace(properKey, ".", "_", -1) + properKey = strings.ReplaceAll(properKey, ".", "_") out.WriteString(properKey + "\n\n") } diff --git a/common/run/run.go b/common/run/run.go index 233864378b..a55f390a30 100644 --- a/common/run/run.go +++ b/common/run/run.go @@ -93,7 +93,7 @@ func Init() { AddSyslogHooks() } - if !flagRunBot && !flagRunWeb && flagRunFeeds == "" && !flagRunEverything && !flagDryRun && !flagRunBWC && !flagGenConfigDocs { + if !flagRunBot && !flagRunWeb && flagRunFeeds == "" && !flagRunEverything && !flagDryRun && !flagRunBWC && !flagGenConfigDocs && !FlagGenCmdDocs { log.Error("Didnt specify what to run, see -h for more info") os.Exit(1) } diff --git a/common/templates/components.go b/common/templates/components.go index 3cfaabbf8c..7c8805e72c 100644 --- a/common/templates/components.go +++ b/common/templates/components.go @@ -16,18 +16,18 @@ import ( "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" ) -func CreateComponent(expectedType discordgo.ComponentType, values ...interface{}) (discordgo.MessageComponent, error) { +func CreateComponent(expectedType discordgo.ComponentType, values ...any) (discordgo.MessageComponent, error) { if len(values) < 1 && expectedType != discordgo.ActionsRowComponent { return discordgo.ActionsRow{}, errors.New("no values passed to component builder") } - var m map[string]interface{} + var m map[string]any switch t := values[0].(type) { case SDict: m = t case *SDict: m = *t - case map[string]interface{}: + case map[string]any: m = t default: dict, err := StringKeyDictionary(values...) @@ -102,6 +102,10 @@ func CreateComponent(expectedType discordgo.ComponentType, values ...interface{} comp := discordgo.Container{} err = json.Unmarshal(encoded, &comp) component = comp + case discordgo.LabelComponent: + comp := discordgo.Label{} + err = json.Unmarshal(encoded, &comp) + component = comp } if err != nil { @@ -111,14 +115,63 @@ func CreateComponent(expectedType discordgo.ComponentType, values ...interface{} return component, nil } -func CreateButton(values ...interface{}) (*discordgo.Button, error) { - var messageSdict map[string]interface{} +func CreateLabel(values ...any) (*discordgo.Label, error) { + var messageSdict map[string]any + switch t := values[0].(type) { + case SDict: + messageSdict = t + case *SDict: + messageSdict = *t + case map[string]any: + messageSdict = t + case *discordgo.Label: + return t, nil + default: + dict, err := StringKeyDictionary(values...) + if err != nil { + return nil, err + } + messageSdict = dict + } + + convertedLabel := make(map[string]any) + for k, v := range messageSdict { + switch strings.ToLower(k) { + case "custom_id": + c, err := validateCustomID(ToString(v), nil) + if err != nil { + return nil, err + } + convertedLabel[k] = c + case "label": + convertedLabel[k] = v + case "description": + convertedLabel[k] = v + case "component": + if c, ok := v.(discordgo.InteractiveComponent); ok && c.IsAllowedInLabel() { + convertedLabel[k] = c + } else { + return nil, errors.New("unsupported component in label") + } + } + } + + l, err := CreateComponent(discordgo.LabelComponent, convertedLabel) + if err != nil { + return nil, err + } + label := l.(discordgo.Label) + return &label, nil +} + +func CreateButton(values ...any) (*discordgo.Button, error) { + var messageSdict map[string]any switch t := values[0].(type) { case SDict: messageSdict = t case *SDict: messageSdict = *t - case map[string]interface{}: + case map[string]any: messageSdict = t case *discordgo.Button: return t, nil @@ -130,7 +183,7 @@ func CreateButton(values ...interface{}) (*discordgo.Button, error) { messageSdict = dict } - convertedButton := make(map[string]interface{}) + convertedButton := make(map[string]any) for k, v := range messageSdict { switch strings.ToLower(k) { case "style": @@ -188,14 +241,14 @@ func CreateButton(values ...interface{}) (*discordgo.Button, error) { return &button, err } -func CreateSelectMenu(values ...interface{}) (*discordgo.SelectMenu, error) { - var messageSdict map[string]interface{} +func CreateSelectMenu(values ...any) (*discordgo.SelectMenu, error) { + var messageSdict map[string]any switch t := values[0].(type) { case SDict: messageSdict = t case *SDict: messageSdict = *t - case map[string]interface{}: + case map[string]any: messageSdict = t case *discordgo.SelectMenu: return t, nil @@ -209,7 +262,7 @@ func CreateSelectMenu(values ...interface{}) (*discordgo.SelectMenu, error) { menuType := discordgo.SelectMenuComponent - convertedMenu := make(map[string]interface{}) + convertedMenu := make(map[string]any) for k, v := range messageSdict { switch strings.ToLower(k) { case "type": @@ -263,15 +316,15 @@ func CreateSelectMenu(values ...interface{}) (*discordgo.SelectMenu, error) { return &menu, err } -func createThumbnail(values ...interface{}) (discordgo.Thumbnail, error) { +func createThumbnail(values ...any) (discordgo.Thumbnail, error) { thumb := discordgo.Thumbnail{} - var messageSdict map[string]interface{} + var messageSdict map[string]any switch t := values[0].(type) { case SDict: messageSdict = t case *SDict: messageSdict = *t - case map[string]interface{}: + case map[string]any: messageSdict = t case *discordgo.Thumbnail: return *t, nil @@ -285,7 +338,7 @@ func createThumbnail(values ...interface{}) (discordgo.Thumbnail, error) { messageSdict = dict } - convertedThumbnail := make(map[string]interface{}) + convertedThumbnail := make(map[string]any) for k, v := range messageSdict { switch strings.ToLower(k) { case "media": @@ -302,14 +355,14 @@ func createThumbnail(values ...interface{}) (discordgo.Thumbnail, error) { return thumb, err } -func CreateSection(values ...interface{}) (*discordgo.Section, error) { - var messageSdict map[string]interface{} +func CreateSection(values ...any) (*discordgo.Section, error) { + var messageSdict map[string]any switch t := values[0].(type) { case SDict: messageSdict = t case *SDict: messageSdict = *t - case map[string]interface{}: + case map[string]any: messageSdict = t case *discordgo.Section: return t, nil @@ -321,7 +374,7 @@ func CreateSection(values ...interface{}) (*discordgo.Section, error) { messageSdict = dict } - convertedSection := make(map[string]interface{}) + convertedSection := make(map[string]any) for k, v := range messageSdict { switch strings.ToLower(k) { case "text": @@ -368,9 +421,9 @@ func CreateSection(values ...interface{}) (*discordgo.Section, error) { return §ion, err } -func CreateTextDisplay(value interface{}) (*discordgo.TextDisplay, error) { +func CreateTextDisplay(value any) (*discordgo.TextDisplay, error) { var display discordgo.TextDisplay - d, err := CreateComponent(discordgo.TextDisplayComponent, map[string]interface{}{ + d, err := CreateComponent(discordgo.TextDisplayComponent, map[string]any{ "content": ToString(value), }) if err == nil { @@ -379,20 +432,59 @@ func CreateTextDisplay(value interface{}) (*discordgo.TextDisplay, error) { return &display, err } -func createUnfurledMedia(value interface{}) discordgo.UnfurledMediaItem { +func CreateTextInput(values ...any) (*discordgo.TextInput, error) { + var messageSdict map[string]any + switch t := values[0].(type) { + case SDict: + messageSdict = t + case *SDict: + messageSdict = *t + case map[string]any: + messageSdict = t + default: + dict, err := StringKeyDictionary(values...) + if err != nil { + return nil, err + } + messageSdict = dict + } + var textInput discordgo.TextInput + convertedTextInput := make(map[string]any) + for k, v := range messageSdict { + switch strings.ToLower(k) { + case "custom_id": + c, err := validateCustomID(TemplateCustomIDPrefix+ToString(v), nil) + if err != nil { + return nil, err + } + convertedTextInput[k] = c + default: + convertedTextInput[k] = v + } + } + + t, err := CreateComponent(discordgo.TextInputComponent, convertedTextInput) + if err == nil { + textInput = t.(discordgo.TextInput) + } + + return &textInput, err +} + +func createUnfurledMedia(value any) discordgo.UnfurledMediaItem { return discordgo.UnfurledMediaItem{ URL: ToString(value), } } -func createGalleryItem(values ...interface{}) (item discordgo.MediaGalleryItem, err error) { - var messageSdict map[string]interface{} +func createGalleryItem(values ...any) (item discordgo.MediaGalleryItem, err error) { + var messageSdict map[string]any switch t := values[0].(type) { case SDict: messageSdict = t case *SDict: messageSdict = *t - case map[string]interface{}: + case map[string]any: messageSdict = t case discordgo.MediaGalleryItem: item = t @@ -423,7 +515,7 @@ func createGalleryItem(values ...interface{}) (item discordgo.MediaGalleryItem, return } -func CreateGallery(values interface{}) (*discordgo.MediaGallery, error) { +func CreateGallery(values any) (*discordgo.MediaGallery, error) { convertedGallery := &discordgo.MediaGallery{} val, _ := indirect(reflect.ValueOf(values)) if val.Kind() == reflect.Slice { @@ -447,14 +539,14 @@ func CreateGallery(values interface{}) (*discordgo.MediaGallery, error) { return convertedGallery, nil } -func CreateFile(msgFiles *[]*discordgo.File, values ...interface{}) (*discordgo.ComponentFile, error) { - var messageSdict map[string]interface{} +func CreateFile(msgFiles *[]*discordgo.File, values ...any) (*discordgo.ComponentFile, error) { + var messageSdict map[string]any switch t := values[0].(type) { case SDict: messageSdict = t case *SDict: messageSdict = *t - case map[string]interface{}: + case map[string]any: messageSdict = t case *discordgo.ComponentFile: return t, nil @@ -470,7 +562,7 @@ func CreateFile(msgFiles *[]*discordgo.File, values ...interface{}) (*discordgo. ContentType: "text/plain", Name: "attachment_" + time.Now().Format("2006-01-02_15-04-05") + ".txt", } - convertedFile := make(map[string]interface{}) + convertedFile := make(map[string]any) for k, v := range messageSdict { switch strings.ToLower(k) { case "content": @@ -501,7 +593,7 @@ func CreateFile(msgFiles *[]*discordgo.File, values ...interface{}) (*discordgo. return &cFile, err } -func CreateSeparator(large interface{}) *discordgo.Separator { +func CreateSeparator(large any) *discordgo.Separator { spacing := discordgo.SeparatorSpacingSmall if large != nil && large != false { spacing = discordgo.SeparatorSpacingLarge @@ -511,7 +603,7 @@ func CreateSeparator(large interface{}) *discordgo.Separator { } } -func CreateComponentArray(msgFiles *[]*discordgo.File, values ...interface{}) ([]discordgo.TopLevelComponent, error) { +func CreateComponentArray(msgFiles *[]*discordgo.File, values ...any) ([]discordgo.TopLevelComponent, error) { if len(values) < 1 { return nil, nil } @@ -733,14 +825,14 @@ func CreateComponentArray(msgFiles *[]*discordgo.File, values ...interface{}) ([ return components, nil } -func CreateContainer(msgFiles *[]*discordgo.File, values ...interface{}) (*discordgo.Container, error) { - var messageSdict map[string]interface{} +func CreateContainer(msgFiles *[]*discordgo.File, values ...any) (*discordgo.Container, error) { + var messageSdict map[string]any switch t := values[0].(type) { case SDict: messageSdict = t case *SDict: messageSdict = *t - case map[string]interface{}: + case map[string]any: messageSdict = t case *discordgo.Container: return t, nil @@ -778,7 +870,7 @@ func CreateContainer(msgFiles *[]*discordgo.File, values ...interface{}) (*disco func distributeComponentsIntoActionsRows(components reflect.Value) (returnComponents []discordgo.TopLevelComponent, err error) { if components.Len() < 1 { - return + return make([]discordgo.TopLevelComponent, 0), nil } const maxRows = 5 // Discord limitation @@ -855,22 +947,15 @@ func validateCustomID(id string, used map[string]bool) (string, error) { id = fmt.Sprint(len(used)) } - if !strings.HasPrefix(id, "templates-") { - id = fmt.Sprint("templates-", id) + if !strings.HasPrefix(id, TemplateCustomIDPrefix) { + id = fmt.Sprint(TemplateCustomIDPrefix, id) } const maxCIDLength = 100 // discord limitation if len(id) > maxCIDLength { - return "", errors.New("custom id too long (max 90 chars)") // maxCIDLength - len("templates-") + return "", fmt.Errorf("custom id too long (max %d chars)", maxCIDLength-len(TemplateCustomIDPrefix)) } - if used == nil { - return id, nil - } - - if _, ok := used[id]; ok { - return "", errors.New("duplicate custom ids used") - } return id, nil } diff --git a/common/templates/context.go b/common/templates/context.go index f6ccfaf27b..571c51526e 100644 --- a/common/templates/context.go +++ b/common/templates/context.go @@ -26,13 +26,17 @@ import ( "github.com/botlabs-gg/yagpdb/v2/web/discorddata" "github.com/sirupsen/logrus" "github.com/vmihailenco/msgpack" + "golang.org/x/text/cases" + "golang.org/x/text/language" ) var ( - StandardFuncMap = map[string]interface{}{ + titleCaser = cases.Title(language.Und) + + StandardFuncMap = map[string]any{ // conversion functions "str": ToString, - "toString": ToString, // don't ask why we have 2 of these + "toString": ToString, // don't ask why we have 2 of these, update: the answer is always "deprecated but not removed" "toInt": tmplToInt, "toInt64": ToInt64, "toFloat": ToFloat64, @@ -47,7 +51,7 @@ var ( "lower": strings.ToLower, "slice": slice, "split": strings.Split, - "title": strings.Title, + "title": titleCaser.String, "trimSpace": strings.TrimSpace, "upper": strings.ToUpper, "urlescape": url.PathEscape, @@ -89,20 +93,30 @@ var ( "bitwiseLeftShift": tmplBitwiseLeftShift, "bitwiseRightShift": tmplBitwiseRightShift, - // misc - "humanizeThousands": tmplHumanizeThousands, - "dict": Dictionary, - "sdict": StringKeyDictionary, - "structToSdict": StructToSdict, - "componentBuilder": CreateComponentBuilder, + // message component builders + "componentBuilder": CreateComponentBuilder, + "modalBuilder": CreateModalBuilder, + "cbutton": CreateButton, + "cmenu": CreateSelectMenu, + "cmodal": CreateModal, + "clabel": CreateLabel, + "ctextInput": CreateTextInput, + "ctextDisplay": CreateTextDisplay, + + // message builders "cembed": CreateEmbed, - "cbutton": CreateButton, - "cmenu": CreateSelectMenu, - "cmodal": CreateModal, - "cslice": CreateSlice, "complexMessage": CreateMessageSend, "complexMessageEdit": CreateMessageEdit, - "kindOf": KindOf, + + // misc + "humanizeThousands": tmplHumanizeThousands, + "dict": Dictionary, + "sdict": StringKeyDictionary, + "structToSdict": StructToSdict, + + "cslice": CreateSlice, + + "kindOf": KindOf, "adjective": common.RandomAdjective, "in": in, @@ -663,8 +677,6 @@ func baseContextFuncs(c *Context) { c.addContextFunc("deleteResponse", c.tmplDelResponse) c.addContextFunc("deleteTrigger", c.tmplDelTrigger) - c.addContextFunc("editComponentMessage", c.tmplEditComponentsMessage(true)) - c.addContextFunc("editComponentMessageNoEscape", c.tmplEditComponentsMessage(false)) c.addContextFunc("editMessage", c.tmplEditMessage(true)) c.addContextFunc("editMessageNoEscape", c.tmplEditMessage(false)) c.addContextFunc("getMessage", c.tmplGetMessage) @@ -675,11 +687,15 @@ func baseContextFuncs(c *Context) { // Message send functions c.addContextFunc("sendDM", c.tmplSendDM) + + //TODO: Remove these component functions c.addContextFunc("sendComponentMessageRetID", c.tmplSendComponentsMessage(true, true)) c.addContextFunc("sendComponentMessage", c.tmplSendComponentsMessage(true, false)) c.addContextFunc("sendComponentMessageNoEscape", c.tmplSendComponentsMessage(false, false)) c.addContextFunc("sendComponentMessageNoEscapeRetID", c.tmplSendComponentsMessage(false, true)) - c.addContextFunc("sendComponentMessageRetID", c.tmplSendComponentsMessage(true, true)) + c.addContextFunc("editComponentMessage", c.tmplEditComponentsMessage(true)) + c.addContextFunc("editComponentMessageNoEscape", c.tmplEditComponentsMessage(false)) + c.addContextFunc("sendMessage", c.tmplSendMessage(true, false)) c.addContextFunc("sendMessageNoEscape", c.tmplSendMessage(false, false)) c.addContextFunc("sendMessageNoEscapeRetID", c.tmplSendMessage(false, true)) @@ -1015,7 +1031,7 @@ func (d Dict) MarshalJSON() ([]byte, error) { return json.Marshal(md) } -type SDict map[string]interface{} +type SDict map[string]any func (d SDict) Set(key string, value interface{}) (string, error) { d[key] = value @@ -1140,12 +1156,95 @@ func (s Slice) StringSlice(flag ...bool) interface{} { return StringSlice } +type ModalBuilder struct { + Title string + CustomID string + Components []discordgo.TopLevelComponent +} + +func (s *ModalBuilder) Set(key string, value any) (*ModalBuilder, error) { + switch key { + case "title": + s.Title = ToString(value) + case "custom_id": + cID, err := validateCustomID(ToString(value), nil) + if err != nil { + return nil, err + } + s.CustomID = cID + case "components": + val, _ := indirect(reflect.ValueOf(value)) + s.Components = make([]discordgo.TopLevelComponent, 0) + if val.Kind() == reflect.Slice { + for i := 0; i < val.Len(); i++ { + _, err := s.addComponent(val.Index(i).Interface()) + if err != nil { + return nil, err + } + } + } else { + return nil, errors.New("components must be a slice of Labels or TextFields") + } + default: + return nil, errors.New("invalid key, accepted keys are: title, custom_id, components") + } + return s, nil +} + +func (s *ModalBuilder) addComponent(comp any) (*ModalBuilder, error) { + if len(s.Components) == 5 { + return nil, errors.New("modal builder can only have maximum 5 top level components") + } + + if comp, ok := comp.(discordgo.TopLevelComponent); ok { + if !comp.IsModalSupported() { + return nil, errors.New("invalid top level component passed to modal builder") + } + s.Components = append(s.Components, comp) + } else { + return nil, errors.New("invalid top level component passed to modal builder") + } + + return s, nil +} + +func (s *ModalBuilder) AddComponents(comps ...any) (*ModalBuilder, error) { + for _, comp := range comps { + val, _ := indirect(reflect.ValueOf(comp)) + if val.Kind() == reflect.Slice { + for i := 0; i < val.Len(); i++ { + _, err := s.addComponent(val.Index(i).Interface()) + if err != nil { + return nil, err + } + } + } else { + _, err := s.addComponent(comp) + if err != nil { + return nil, err + } + } + } + return s, nil +} + +func (s *ModalBuilder) toModal() (*discordgo.InteractionResponse, error) { + return &discordgo.InteractionResponse{ + Type: discordgo.InteractionResponseModal, + Data: &discordgo.InteractionResponseData{ + Title: s.Title, + CustomID: s.CustomID, + Components: s.Components, + }, + }, nil +} + type ComponentBuilder struct { Components []string - Values []interface{} + Values []any } -func (s *ComponentBuilder) Add(key string, value interface{}) (interface{}, error) { +func (s *ComponentBuilder) Add(key string, value any) (interface{}, error) { if len(s.Components)+1 > MaxSliceLength { return nil, errors.New("resulting slice exceeds slice size limit") } diff --git a/common/templates/context_funcs.go b/common/templates/context_funcs.go index 0c6dc1ba5c..8800c2067f 100644 --- a/common/templates/context_funcs.go +++ b/common/templates/context_funcs.go @@ -22,9 +22,10 @@ import ( ) var ( - ErrTooManyCalls = errors.New("too many calls to this function") - ErrTooManyAPICalls = errors.New("too many potential Discord API calls") - ErrRegexCacheLimit = errors.New("too many unique regular expressions (regex)") + ErrTooManyCalls = errors.New("too many calls to this function") + ErrTooManyAPICalls = errors.New("too many potential Discord API calls") + ErrFuncRemovedTemporarily = errors.New("this function is removed temporarily") + ErrRegexCacheLimit = errors.New("too many unique regular expressions (regex)") ) func (c *Context) tmplSendDM(s ...interface{}) string { @@ -327,17 +328,17 @@ func (c *Context) checkSafeDictNoRecursion(d Dict, n int) bool { return true } -func (c *Context) tmplSendMessage(filterSpecialMentions bool, returnID bool) func(channel interface{}, msg interface{}) interface{} { +func (c *Context) tmplSendMessage(filterSpecialMentions bool, returnID bool) func(channel any, msg any) (any, error) { - return func(channel interface{}, msg interface{}) interface{} { + return func(channel any, msg any) (any, error) { if c.IncreaseCheckGenericAPICall() { - return "" + return "", nil } sendType := sendMessageGuildChannel cid := c.ChannelArg(channel) if cid == 0 { - return "" + return "", nil } if cid != c.ChannelArgNoDM(channel) { @@ -363,10 +364,9 @@ func (c *Context) tmplSendMessage(filterSpecialMentions bool, returnID bool) fun msgSend.Reference.ChannelID = cid } case *ComponentBuilder: - msgSend, _ = typedMsg.ToComplexMessage() - if msgSend.Reference != nil { - msgSend.Reference.GuildID = c.GS.ID - msgSend.Reference.ChannelID = cid + msgSend, err = typedMsg.ToComplexMessage() + if err != nil { + return "", err } default: msgSend.Content = ToString(msg) @@ -389,7 +389,11 @@ func (c *Context) tmplSendMessage(filterSpecialMentions bool, returnID bool) fun msgSend.AllowedMentions = discordgo.AllowedMentions{Parse: parseMentions, RepliedUser: repliedUser} } - if msgSend.Reference != nil { + if msgSend.Reference != nil && msgSend.Reference.MessageID != 0 { + msgSend.Reference.GuildID = c.GS.ID + if msgSend.Reference.ChannelID == 0 { + msgSend.Reference.ChannelID = cid + } if msgSend.Reference.Type == discordgo.MessageReferenceTypeForward { if originChannel := c.ChannelArgNoDM(msgSend.Reference.ChannelID); originChannel != 0 { hasPerms, _ := bot.BotHasPermissionGS(c.GS, originChannel, discordgo.PermissionViewChannel|discordgo.PermissionReadMessageHistory) @@ -403,12 +407,15 @@ func (c *Context) tmplSendMessage(filterSpecialMentions bool, returnID bool) fun } m, err = common.BotSession.ChannelMessageSendComplex(cid, msgSend) + if err != nil { + return "", err + } - if err == nil && returnID { - return m.ID + if returnID { + return m.ID, nil } - return "" + return "", nil } } @@ -592,7 +599,7 @@ func (c *Context) tmplEditComponentsMessage(filterSpecialMentions bool) func(cha func (c *Context) tmplPinMessage(unpin bool) func(channel, msgID interface{}) (string, error) { return func(channel, msgID interface{}) (string, error) { - if c.IncreaseCheckCallCounter("message_pins", 5) { + if c.IncreaseCheckCallCounter("message_pins", 2) { return "", ErrTooManyCalls } @@ -1697,7 +1704,7 @@ func (c *Context) tmplGetChannelOrThread(channel interface{}) (*CtxChannel, erro func (c *Context) tmplGetChannelPins(pinCount bool) func(channel interface{}) (interface{}, error) { return func(channel interface{}) (interface{}, error) { - if c.IncreaseCheckCallCounterPremium("channel_pins", 2, 4) { + if c.IncreaseCheckCallCounterPremium("channel_pins", 1, 2) { return 0, ErrTooManyCalls } @@ -1706,21 +1713,28 @@ func (c *Context) tmplGetChannelPins(pinCount bool) func(channel interface{}) (i return 0, errors.New("unknown channel") } - msg, err := common.BotSession.ChannelMessagesPinned(cID) - if err != nil { - return 0, err + hasMore := true + var before *time.Time + msgs := make([]discordgo.Message, 0) + for hasMore { + pinned, err := common.BotSession.ChannelMessagesPinned(cID, 50, before) + if err != nil { + return 0, err + } + hasMore = pinned.HasMore + if hasMore && len(pinned.Items) > 0 { + before = &pinned.Items[len(pinned.Items)-1].PinnedAt + } + for _, item := range pinned.Items { + msgs = append(msgs, *item.Message) + } } if pinCount { - return len(msg), nil - } - - pinnedMessages := make([]discordgo.Message, 0, len(msg)) - for _, m := range msg { - pinnedMessages = append(pinnedMessages, *m) + return len(msgs), nil } - return pinnedMessages, nil + return msgs, nil } } diff --git a/common/templates/context_interactions.go b/common/templates/context_interactions.go index 3ccbbd6b61..3493b89bdd 100644 --- a/common/templates/context_interactions.go +++ b/common/templates/context_interactions.go @@ -12,6 +12,8 @@ import ( var ErrTooManyInteractionResponses = errors.New("cannot respond to an interaction > 1 time; consider using a followup") +const TemplateCustomIDPrefix = "templates-" + func interactionContextFuncs(c *Context) { c.addContextFunc("deleteInteractionResponse", c.tmplDeleteInteractionResponse) c.addContextFunc("editResponse", c.tmplEditInteractionResponse(true)) @@ -27,7 +29,26 @@ func interactionContextFuncs(c *Context) { c.addContextFunc("updateMessageNoEscape", c.tmplUpdateMessage(false)) } -func CreateModal(values ...interface{}) (*discordgo.InteractionResponse, error) { +func CreateModalBuilder(customID string, title string, components ...any) (*ModalBuilder, error) { + cid, err := validateCustomID(customID, nil) + if err != nil { + return nil, err + } + modal := &ModalBuilder{ + Title: title, + CustomID: cid, + } + for _, component := range components { + _, err := modal.addComponent(component) + if err != nil { + return nil, err + } + } + + return modal, nil +} + +func CreateModal(values ...any) (*discordgo.InteractionResponse, error) { if len(values) < 1 { return &discordgo.InteractionResponse{}, errors.New("no values passed to component builder") } @@ -38,7 +59,11 @@ func CreateModal(values ...interface{}) (*discordgo.InteractionResponse, error) m = t case *SDict: m = *t - case map[string]interface{}: + case ModalBuilder: + return t.toModal() + case *ModalBuilder: + return t.toModal() + case map[string]any: m = t default: dict, err := StringKeyDictionary(values...) @@ -48,14 +73,29 @@ func CreateModal(values ...interface{}) (*discordgo.InteractionResponse, error) m = dict } - modal := &discordgo.InteractionResponseData{CustomID: "templates-0"} // default cID if not set + modalBuilder := &ModalBuilder{ + CustomID: TemplateCustomIDPrefix + "-0", + } + _, hasComponentsKey := m["components"] + _, hasFieldsKey := m["fields"] + if hasComponentsKey && hasFieldsKey { + return nil, errors.New("cannot have both 'components' and 'fields' in a cmodal") + } for key, val := range m { switch key { case "title": - modal.Title = ToString(val) + modalBuilder.Title = ToString(val) case "custom_id": - modal.CustomID = "templates-" + ToString(val) + cid, err := validateCustomID(ToString(val), nil) + if err != nil { + return nil, err + } + modalBuilder.CustomID = cid + case "components": + modalBuilder.Set("components", val) + + //TODO: Deprecate this key in future versions case "fields": if val == nil { continue @@ -79,7 +119,7 @@ func CreateModal(values ...interface{}) (*discordgo.InteractionResponse, error) return nil, err } usedCustomIDs[field.CustomID] = true - modal.Components = append(modal.Components, discordgo.ActionsRow{Components: []discordgo.InteractiveComponent{field}}) + modalBuilder.Components = append(modalBuilder.Components, discordgo.ActionsRow{Components: []discordgo.InteractiveComponent{field}}) } } else { f, err := CreateComponent(discordgo.TextInputComponent, val) @@ -94,7 +134,7 @@ func CreateModal(values ...interface{}) (*discordgo.InteractionResponse, error) if err != nil { return nil, err } - modal.Components = append(modal.Components, discordgo.ActionsRow{Components: []discordgo.InteractiveComponent{field}}) + modalBuilder.Components = append(modalBuilder.Components, discordgo.ActionsRow{Components: []discordgo.InteractiveComponent{field}}) } default: return nil, errors.New(`invalid key "` + key + `" passed to send message builder`) @@ -102,10 +142,7 @@ func CreateModal(values ...interface{}) (*discordgo.InteractionResponse, error) } - return &discordgo.InteractionResponse{ - Type: discordgo.InteractionResponseModal, - Data: modal, - }, nil + return modalBuilder.toModal() } func (c *Context) tmplDeleteInteractionResponse(interactionToken, msgID interface{}, delaySeconds ...interface{}) (interface{}, error) { @@ -276,11 +313,15 @@ func (c *Context) tmplSendModal(modal interface{}) (interface{}, error) { var typedModal *discordgo.InteractionResponse var err error switch m := modal.(type) { + case ModalBuilder: + typedModal, err = m.toModal() + case *ModalBuilder: + typedModal, err = m.toModal() case *discordgo.InteractionResponse: typedModal = m case discordgo.InteractionResponse: typedModal = &m - case SDict, *SDict, map[string]interface{}: + case SDict, *SDict, map[string]any: typedModal, err = CreateModal(m) default: return "", errors.New("invalid modal passed to sendModal") diff --git a/common/templates/general.go b/common/templates/general.go index 3a5a798a79..c038f827ee 100644 --- a/common/templates/general.go +++ b/common/templates/general.go @@ -381,7 +381,7 @@ func CreateMessageSend(values ...interface{}) (*discordgo.MessageSend, error) { v, _ := indirect(reflect.ValueOf(val)) if v.Kind() == reflect.Slice { buttons := []*discordgo.Button{} - const maxButtons = 25 // Discord limitation + const maxButtons = 40 // Discord limitation for i := 0; i < v.Len() && i < maxButtons; i++ { button, err := CreateButton(v.Index(i).Interface()) if err != nil { @@ -535,6 +535,7 @@ func CreateMessageEdit(values ...interface{}) (*discordgo.MessageEdit, error) { v, _ := indirect(reflect.ValueOf(val)) if v.Kind() == reflect.Slice { const maxEmbeds = 10 // Discord limitation + msg.Embeds = make([]*discordgo.MessageEmbed, 0, maxEmbeds) for i := 0; i < v.Len() && i < maxEmbeds; i++ { embed, err := CreateEmbed(v.Index(i).Interface()) if err != nil { @@ -767,39 +768,39 @@ func in(l interface{}, v interface{}) bool { lv, _ := indirect(reflect.ValueOf(l)) vv := reflect.ValueOf(v) - if !reflect.ValueOf(vv).IsZero() { - switch lv.Kind() { - case reflect.Array, reflect.Slice: - for i := 0; i < lv.Len(); i++ { - lvv := lv.Index(i) - lvv, isNil := indirect(lvv) - if isNil { - continue + if reflect.ValueOf(vv).IsZero() { + return false + } + + switch lv.Kind() { + case reflect.String: + if vv.Type() == lv.Type() && strings.Contains(lv.String(), vv.String()) { + return true + } + case reflect.Array, reflect.Slice: + for i := range lv.Len() { + lvv := lv.Index(i) + lvv, isNil := indirect(lvv) + if isNil { + continue + } + switch { + case lvv.Kind() == reflect.String: + if vv.Type() == lvv.Type() && vv.String() == lvv.String() { + return true } - switch lvv.Kind() { - case reflect.String: - if vv.Type() == lvv.Type() && vv.String() == lvv.String() { - return true - } - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - switch vv.Kind() { - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - if vv.Int() == lvv.Int() { - return true - } - } - case reflect.Float32, reflect.Float64: - switch vv.Kind() { - case reflect.Float32, reflect.Float64: - if vv.Float() == lvv.Float() { - return true - } - } + case lvv.CanInt() && vv.CanInt(): + if vv.Int() == lvv.Int() { + return true + } + case lvv.CanUint() && vv.CanUint(): + if vv.Uint() == lvv.Uint() { + return true + } + case lvv.CanFloat() && vv.CanFloat(): + if vv.Float() == lvv.Float() { + return true } - } - case reflect.String: - if vv.Type() == lv.Type() && strings.Contains(lv.String(), vv.String()) { - return true } } } @@ -1335,7 +1336,7 @@ func sequence(start, stop int) ([]int, error) { } if stop-start > MaxSliceLength { - return nil, fmt.Errorf("Sequence max length is %d", MaxSliceLength) + return nil, fmt.Errorf("sequence max length is %d", MaxSliceLength) } out := make([]int, stop-start) @@ -1376,7 +1377,11 @@ func shuffle(seq interface{}) (interface{}, error) { return shuffled.Interface(), nil } -func tmplToInt(from interface{}) int { +func tmplToInt(from any, base ...int) int { + b := 10 + if len(base) > 0 { + b = base[0] + } t := reflect.ValueOf(from) switch { case t.CanInt(): @@ -1386,14 +1391,18 @@ func tmplToInt(from interface{}) int { case t.CanUint(): return int(t.Uint()) case t.Kind() == reflect.String: - parsed, _ := strconv.ParseInt(t.String(), 10, 64) + parsed, _ := strconv.ParseInt(t.String(), b, 64) return int(parsed) default: return 0 } } -func ToInt64(from interface{}) int64 { +func ToInt64(from any, base ...int) int64 { + b := 10 + if len(base) > 0 { + b = base[0] + } t := reflect.ValueOf(from) switch { case t.CanInt(): @@ -1403,7 +1412,7 @@ func ToInt64(from interface{}) int64 { case t.CanUint(): return int64(t.Uint()) case t.Kind() == reflect.String: - parsed, _ := strconv.ParseInt(t.String(), 10, 64) + parsed, _ := strconv.ParseInt(t.String(), b, 64) return parsed default: return 0 diff --git a/customcommands/assets/customcommands-database.html b/customcommands/assets/customcommands-database.html index d64ee60b0f..93d0506506 100644 --- a/customcommands/assets/customcommands-database.html +++ b/customcommands/assets/customcommands-database.html @@ -30,7 +30,7 @@

Database Usage - {{.DatabaseUsagePercent}}% Full

{{.TotalDatabaseUsage}} Entries used of total {{.TotalDatabaseCapacity}}

{{sub .TotalDatabaseCapacity .TotalDatabaseUsage}} available

Total calculated by member count multiplied by 50{{if .IsGuildPremium}}0{{end}} ({{.ActiveGuild.MemberCount}}*50{{if .IsGuildPremium}}0{{end}}).{{if not .IsGuildPremium}} Get 10 times the - database space with premium!{{end}} + database space with premium!{{end}}

diff --git a/customcommands/assets/customcommands-editcmd.html b/customcommands/assets/customcommands-editcmd.html index 483f67e563..fb44c42a71 100644 --- a/customcommands/assets/customcommands-editcmd.html +++ b/customcommands/assets/customcommands-editcmd.html @@ -14,6 +14,9 @@

Editing Custom Command #{{.CC.LocalID}}

text-decoration: line-through; color: #d2322d !important; } + #cc-responses { + flex-wrap: unset !important; + } @@ -65,16 +68,16 @@

{{if eq (call .GetCCIntervalType .CC) 1}}hour(s){{else}}minute(s){{end}}{{end}}

-
+ +
- +
-

+ No trigger: can only be triggered manually by other custom commands -

-

- Command Trigger: Works the same way as normal commands by using the - command - prefix or bot mention followed by the trigger.
-

-

+ + + Works the same way as normal commands by using the + command prefix or bot mention followed by the trigger. + + Any message that starts with the trigger will run the command. -

-

+ + Any message that contains the trigger will run the command. -

-

+ + Any message that matches the provided regex will trigger the command. -

-

+ + Any message that is equal to the trigger will run the command. -

-

+ + The command will trigger on the specified reaction events. -

-

+ + The command will run at a hourly interval, for example every 5 hours. -

-

+ + The command will run at a minute interval, for example every 10 minutes. -

-

+ + The command will run when a component (a button or a select menu) whose - custom ID matches the given regex is used. BETA FEATURE. -

-

- The command will run when a modal whose custom ID matches the given regex is submitted. BETA FEATURE. -

-

- The command will run on a crontab interval, for example 45 23 * * 6 (23:45 every Saturday). -

+ custom ID matches the given regex is used. + + + The command will run when a modal whose custom ID matches the given regex is submitted. + + + The command will run on a crontab interval, for example + 45 23 * * 6 (23:45 every Saturday). + + + The command will run when a role is assigned to or removed from a member, + has a cooldown of 5 minutes per user-role combination, reduced to 1 minute for premium servers +
@@ -219,7 +227,7 @@

-

Deferring a response becomes the original interaction response. Use editResponse to edit a deferred response.

+ Deferring a response becomes the original interaction response. Use editResponse to edit a deferred response. @@ -253,6 +261,41 @@

+

formaction="/manage/{{$guild}}/customcommands/commands/{{.CC.LocalID}}/delete">Delete -
+
-

Tip: Alt + Shift + S also saves the custom command

@@ -501,9 +556,9 @@

Copy Import Link

-

To share custom command #{{.CC.LocalID}}, and allow users to + To share custom command #{{.CC.LocalID}}, and allow users to import it, copy the link below. -

+
@@ -531,7 +586,7 @@

Copy Import Link

-

Total Imports: {{.CC.ImportCount}}

+ Total Imports: {{.CC.ImportCount}}
@@ -550,30 +605,30 @@

Custom Command Information

-

Available template data is {{template "template_helper_user"}} (and much + Available template data is {{template "template_helper_user"}} (and much more) -

-

Execute bot commands using + + Execute bot commands using {{`{{exec "command" "arg1" "arg2"}}`}}, Example: {{"{{exec \"role\" \"yagpdb\"}}"}} will be the same as the user typing - (mention or prefix) role yagpdb

-

Arguments are available in a string array: .CmdArgs
+ (mention or prefix) role yagpdb + Arguments are available in a string array: .CmdArgs
Access single arguments by index using {{"{{index .CmdArgs 0}}"}}
Get the number of arguments using {{"{{len .CmdArgs}}"}}
Loop over them with
{{"{{range .CmdArgs}}{{.}}"}} <- that dot will be replaced by the current argument we're looping over{{"{{end}}"}}
"end" - marks the end of the for loop.

+ marks the end of the for loop. -

+ See the templating and custom command docs for more info and join the support server if you have further questions. Custom commands - for yagpdb are rather complicated for the time being.

-

+ for yagpdb are rather complicated for the time being. + YAGPDB will pick one message at random from all configured responses. -

+
@@ -617,7 +672,7 @@

Custom Command Information

}); var intervalTriggerEls = ['#interval-cc-run-now', '#cc-time-trigger-details', '#cc-interval-trigger-details']; - var textTriggerEls = ['#cc-text-trigger-details', '#cc-extra-settings', '#cc-text-trigger-case-sensitivity-toggle']; + var textTriggerEls = ['#cc-text-trigger-details', '#cc-role-settings', '#cc-channel-settings', '#cc-text-trigger-case-sensitivity-toggle']; var messageTriggerEls = [...textTriggerEls, '#cc-message-trigger-label', '#cc-message-trigger-details']; var interactionTriggerEls = [...textTriggerEls, '#cc-customid-trigger-label', '#cc-interaction-trigger-details']; @@ -627,13 +682,14 @@

Custom Command Information

component: [...interactionTriggerEls, '#trigger-desc-component'], interval_hours: [...intervalTriggerEls, '#trigger-desc-interval_hours'], interval_minutes: [...intervalTriggerEls, '#trigger-desc-interval_minutes'], - reaction: ['#cc-reaction-trigger-details', '#cc-extra-settings', '#trigger-desc-reaction'], + reaction: ['#cc-reaction-trigger-details', '#cc-role-settings', '#cc-channel-settings', '#trigger-desc-reaction'], cmd: [...messageTriggerEls, '#command-trigger-prepended-prefix', '#trigger-desc-cmd'], prefix: [...messageTriggerEls, '#trigger-desc-prefix'], contains: [...messageTriggerEls, '#trigger-desc-contains'], regex: [...messageTriggerEls, '#trigger-desc-regex'], exact: [...messageTriggerEls, '#trigger-desc-exact'], cron: ['#cc-text-trigger-details', '#cc-cron-trigger-label', '#cc-time-trigger-details', '#trigger-desc-cron'], + role_trigger: ['#cc-role-trigger-details', '#cc-role-settings','#trigger-desc-role_trigger'], none: ['#trigger-desc-none'], }; @@ -670,7 +726,7 @@

Custom Command Information

// issue warnings for common configurations that are indicative of user // error (but are not hard errors, since can be intended) function refreshWarnings() { - const allChecks = [checkNoEmptyRequiredRoles, checkNoEmptyRequiredChannels, checkMissingIntervalTriggerChannel]; + const allChecks = [checkNoEmptyRequiredRoles, checkNoEmptyRequiredChannels, checkMissingTriggerChannel]; const triggerType = $('#trigger-type-dropdown').val(); for (const c of allChecks) { @@ -690,7 +746,7 @@

Custom Command Information

// 'require roles' mode with no required roles var checkNoEmptyRequiredRoles = { - applicableTriggerTypes: ['modal', 'component', 'reaction', 'cmd', 'prefix', 'contains', 'regex', 'exact'], + applicableTriggerTypes: ['modal', 'component', 'reaction', 'cmd', 'prefix', 'contains', 'regex', 'exact', 'role_trigger'], warningId: 'require-no-roles-warning', run() { const isRequireMode = $('#require-role-mode').prop('checked'); @@ -713,7 +769,7 @@

Custom Command Information

$('#command-roles').change(() => checkNoEmptyRequiredRoles.run()); var checkNoEmptyRequiredChannels = { - applicableTriggerTypes: ['modal', 'component', 'reaction', 'cmd', 'prefix', 'contains', 'regex', 'exact'], + applicableTriggerTypes: ['modal', 'component', 'reaction', 'cmd', 'prefix', 'contains', 'regex', 'exact', 'role_trigger'], warningId: 'require-no-channels-warning', run() { const isRequireMode = $('#require-channel-mode').prop('checked'); @@ -735,14 +791,19 @@

Custom Command Information

$('#ignore-channel-mode').change(() => checkNoEmptyRequiredChannels.run()); $('#command-channels').change(() => checkNoEmptyRequiredChannels.run()); - var checkMissingIntervalTriggerChannel = { - applicableTriggerTypes: ['interval_hours', 'interval_minutes', 'cron'], - warningId: 'time-trigger-no-channel-warning', + var checkMissingTriggerChannel = { + applicableTriggerTypes: ['interval_hours', 'interval_minutes', 'cron', 'role_trigger'], + warningId: 'trigger-no-channel-warning', run() { - const selectedChannel = $('#time-trigger-channel').val(); + const triggerType = $('#trigger-type-dropdown').val(); + let id = 'time-trigger-channel'; + if (triggerType == 'role_trigger') { + id = 'role-trigger-channel'; + } + const selectedChannel = $(`#${id}`).val(); if (!selectedChannel) { addWarningIfNotExists(this.warningId, - "Selecting no channel for an interval command effectively disables your command, meaning it will never run." + "Selecting no channel for this command type effectively disables your command, meaning it will never run." + " If your command does not need to run in a specific channel, select a arbitrary one from the list instead.", ); } else { @@ -754,7 +815,8 @@

Custom Command Information

}, }; - $('#time-trigger-channel').change(() => checkMissingIntervalTriggerChannel.run()); + $('#time-trigger-channel').change(() => checkMissingTriggerChannel.run()); + $('#role-trigger-channel').change(() => checkMissingTriggerChannel.run()); function updateTriggerLength() { const triggerLength = $('#trigger-length'); diff --git a/customcommands/assets/customcommands-public.html b/customcommands/assets/customcommands-public.html index af58ec7d7e..5c4c85dad8 100644 --- a/customcommands/assets/customcommands-public.html +++ b/customcommands/assets/customcommands-public.html @@ -39,59 +39,65 @@

{{ if eq .CC.TriggerType 10}} -

- No trigger: can only be triggered manually by other custom + + Can only be triggered manually by other custom commands -

+ {{else if eq .CC.TriggerType 0}} -

- Command Trigger: Works the same way as normal commands by using the + + Works the same way as normal commands by using the command prefix or bot mention followed by the trigger.
-

+ {{else if eq .CC.TriggerType 1}} -

+ Any message that starts with the trigger will run the command. -

+ {{else if eq .CC.TriggerType 2}} -

+ Any message that contains the trigger will run the command. -

+ {{else if eq .CC.TriggerType 3}} -

+ Any message that matches the provided regex will trigger the command. -

+ {{else if eq .CC.TriggerType 4}} -

+ Any message that is equal to the trigger will run the command. -

+ {{else if eq .CC.TriggerType 5}} {{if eq (call .GetCCIntervalType .CC) 1}} -

+ The command will run at a hourly interval, for example every 5 hours. -

+ {{else}} -

+ The command will run at a minute interval, for example every 10 minutes. -

+ {{end}} {{else if eq .CC.TriggerType 6}} -

+ The command will trigger on the specified reaction events. -

+ {{else if eq .CC.TriggerType 7}} -

- The command will run when a component (a button or a select menu) whose - custom ID matches the given regex is used. BETA FEATURE. -

+ + The command will run when a component (a button or a select menu) whose + custom ID matches the given regex is used. + {{else if eq .CC.TriggerType 8}} -

- The command will run when a modal whose custom ID matches the given regex is submitted. BETA FEATURE. -

+ + The command will run when a modal whose custom ID matches the given regex is submitted. + {{else if eq .CC.TriggerType 9}} -

- The command will run on a crontab interval, for example 45 23 * * 6 (23:45 every Saturday). -

+ + The command will run on a crontab interval, for example 45 23 * * 6 (23:45 + every Saturday). + + {{else if eq .CC.TriggerType 11}} + + The command will run when a role is assigned to or removed from a member, + has a cooldown of 5 minutes per user-role combination, reduced to 1 minute for premium servers + {{end}}
@@ -99,6 +105,7 @@

+
{{if eq .CC.TriggerType 0 1 2 3 4 7 8 9}}
@@ -177,7 +184,7 @@

-

Deferring a response becomes the original interaction response. Use editResponse to edit a deferred response.

+

Deferring a response becomes the original interaction response. Use editResponse to edit a deferred response.

{{end}} @@ -226,7 +233,7 @@

{{end}}
-
+

+ +
+
+ + +
+
+ + +
+
+
+
+ {{end}}
@@ -266,30 +302,11 @@

-

An optional name that can be used to identify the command.

-

-
-
- - {{if .User}} - - - {{else}} -
- Log in to import this CC into your server. + An optional name that can be used to identify the command.
- {{end}}
-
+
@@ -320,6 +337,26 @@

+
+
+ + {{if .User}} + + + {{else}} + + {{end}} +
+
@@ -334,16 +371,16 @@

WARNING: IMPORTING A CUSTOM COMMAND

-

You are about to import a CC created by another user, which is not vetted by + You are about to import a CC created by another user, which is not vetted by YAGPDB or its staff. -

-

CCs may exploit YAGPDB's functionality for malicious purposes. Ensure you + + CCs may exploit YAGPDB's functionality for malicious purposes. Ensure you fully understand the custom command code before deploying it on your server. -

-

YAGPDB is not responsible for any potential damage caused by importing the CC. -

-

Import to ? -

+ + YAGPDB is not responsible for any potential damage caused by importing the CC. + + Import to ? +
diff --git a/customcommands/assets/customcommands.html b/customcommands/assets/customcommands.html index 2c7c38aa31..666a3137d5 100644 --- a/customcommands/assets/customcommands.html +++ b/customcommands/assets/customcommands.html @@ -65,73 +65,84 @@

Custom commands

- {{if not .CurrentCommandGroup}}

Create a new group to put allowed/denied roles/channels on - multiple commands at the same time, as well as keeping things organized.

{{else}} + {{if not .CurrentCommandGroup}} +

Create a new group to put allowed/denied roles/channels on multiple commands at the same time, as well as keeping things organized.

+ {{else}}
-
-
+
-
- -
-
-
- -
-
- -
-
-
-
-
- -
-
-
- + {{textOnlyChannelOptions .ActiveGuild.Channels .CurrentCommandGroup.RedirectErrorsChannel true "None"}}

{{checkbox "IsEnabled" "IsEnabled" "Enables or Disables the Group" (not .CurrentCommandGroup.Disabled) }}
-
- +
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
{{end}} +

You have created {{.CCCount}} custom commands against the total limit of {{.CCLimit}} {{.AdditionalMessage}}

-
+
diff --git a/customcommands/bot.go b/customcommands/bot.go index 7be3d55e9f..175a8da95e 100644 --- a/customcommands/bot.go +++ b/customcommands/bot.go @@ -25,13 +25,11 @@ import ( "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/keylock" "github.com/botlabs-gg/yagpdb/v2/common/multiratelimit" prfx "github.com/botlabs-gg/yagpdb/v2/common/prefix" "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" @@ -39,8 +37,6 @@ import ( "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/v8" "github.com/volatiletech/sqlboiler/v4/queries/qm" ) @@ -72,43 +68,13 @@ func (p *Plugin) BotInit() { eventsystem.AddHandlerAsyncLastLegacy(p, bot.ConcurrentEventHandler(HandleMessageUpdate), eventsystem.EventMessageUpdate) eventsystem.AddHandlerAsyncLastLegacy(p, bot.ConcurrentEventHandler(handleMessageReactions), eventsystem.EventMessageReactionAdd, eventsystem.EventMessageReactionRemove) eventsystem.AddHandlerAsyncLastLegacy(p, bot.ConcurrentEventHandler(handleInteractionCreate), eventsystem.EventInteractionCreate) + eventsystem.AddHandlerAsyncLastLegacy(p, bot.ConcurrentEventHandler(handleGuildAuditLogEntryCreate), eventsystem.EventGuildAuditLogEntryCreate) pubsub.AddHandler("custom_commands_run_now", handleCustomCommandsRunNow, models.CustomCommand{}) scheduledevents2.RegisterHandler("cc_next_run", NextRunScheduledEvent{}, handleNextRunScheduledEVent) scheduledevents2.RegisterHandler("cc_delayed_run", DelayedRunCCData{}, handleDelayedRunCC) } -func handleCustomCommandsRunNow(event *pubsub.Event) { - dataCast := event.Data.(*models.CustomCommand) - f := logger.WithFields(logrus.Fields{ - "guild_id": dataCast.GuildID, - "cmd_id": dataCast.LocalID, - }) - - gs := bot.State.GetGuild(dataCast.GuildID) - if gs == nil { - f.Error("failed fetching active guild from state") - return - } - - cs := gs.GetChannel(dataCast.ContextChannel) - if cs == nil { - f.Error("failed finding channel to run cc in") - return - } - - metricsExecutedCommands.With(prometheus.Labels{"trigger": "timed"}).Inc() - - tmplCtx := templates.NewContext(gs, cs, nil) - ExecuteCustomCommand(dataCast, tmplCtx) - - dataCast.LastRun = null.TimeFrom(time.Now()) - err := UpdateCommandNextRunTime(dataCast, true, true) - if err != nil { - f.WithError(err).Error("failed updating custom command next run time") - } -} - type DelayedRunCCData struct { ChannelID int64 `json:"channel_id"` CmdID int64 `json:"cmd_id"` @@ -231,7 +197,7 @@ var cmdDiagnoseCCTriggers = &commands.YAGCommand{ {Name: "input", Type: dcmd.String}, }, RequireDiscordPerms: []int64{discordgo.PermissionManageGuild}, - SlashCommandEnabled: false, + SlashCommandEnabled: true, DefaultEnabled: true, RunFunc: func(data *dcmd.Data) (interface{}, error) { cmds, err := BotCachedGetCommandsWithMessageTriggers(data.GuildData.GS.ID, data.Context()) @@ -308,7 +274,7 @@ var cmdDiagnoseCCTriggers = &commands.YAGCommand{ } return &discordgo.MessageSend{ Content: out.String(), - File: &discordgo.File{Name: "output.md", Reader: strings.NewReader(fileOut.String())}, + File: &discordgo.File{Name: "output.txt", Reader: strings.NewReader(fileOut.String())}, }, nil }, } @@ -524,136 +490,6 @@ func StringCommands(ccs []*models.CustomCommand, gMap map[int64]string) string { return out } -func handleDelayedRunCC(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) { - dataCast := data.(*DelayedRunCCData) - cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, dataCast.CmdID), qm.Load("Group")).OneG(context.Background()) - if err != nil { - return false, errors.WrapIf(err, "find_command") - } - - if cmd.R.Group != nil && cmd.R.Group.Disabled { - return false, errors.New("custom command group is disabled") - } - - if cmd.Disabled { - return false, errors.New("custom command is disabled") - } - - if !DelayedCCRunLimit.AllowN(DelayedRunLimitKey{GuildID: evt.GuildID, ChannelID: dataCast.ChannelID}, time.Now(), 1) { - logger.WithField("guild", cmd.GuildID).Warn("went above delayed cc run ratelimit") - return false, nil - } - - gs := bot.State.GetGuild(evt.GuildID) - if gs == nil { - // in case the bot left in the meantime - if onGuild, err := common.BotIsOnGuild(evt.GuildID); !onGuild && err == nil { - return false, nil - } else if err != nil { - logger.WithError(err).Error("failed checking if bot is on guild") - } - - return true, nil - } - - cs := gs.GetChannelOrThread(dataCast.ChannelID) - if cs == nil { - // don't reschedule if channel is deleted, make sure its actually not there, and not just a discord downtime - if !gs.Available { - return true, nil - } - - return false, nil - } - - // attempt to get up to date member information - if dataCast.Member != nil { - updatedMS, _ := bot.GetMember(gs.ID, dataCast.Member.User.ID) - if updatedMS != nil { - dataCast.Member = updatedMS - } - } - - tmplCtx := templates.NewContext(gs, cs, dataCast.Member) - if dataCast.Message != nil { - tmplCtx.Msg = dataCast.Message - tmplCtx.Data["Message"] = dataCast.Message - } - - tmplCtx.ExecutedFrom = dataCast.ExecutedFrom - - // decode userdata - if len(dataCast.UserData) > 0 { - var i interface{} - err := msgpack.Unmarshal(dataCast.UserData, &i) - if err != nil { - return false, err - } - - tmplCtx.Data["ExecData"] = i - } - - metricsExecutedCommands.With(prometheus.Labels{"trigger": "timed"}).Inc() - - err = ExecuteCustomCommand(cmd, tmplCtx) - return false, err -} - -func handleNextRunScheduledEVent(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) { - cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, (data.(*NextRunScheduledEvent)).CmdID), qm.Load("Group")).OneG(context.Background()) - if err != nil { - return false, errors.WrapIf(err, "find_command") - } - - if cmd.R.Group != nil && cmd.R.Group.Disabled { - return false, errors.New("custom command group is disabled") - } - - if cmd.Disabled { - return false, errors.New("custom command is disabled") - } - - if time.Until(cmd.NextRun.Time) > time.Second*5 { - return false, nil // old scheduled event that wasn't removed, /shrug - - } - - gs := bot.State.GetGuild(evt.GuildID) - if gs == nil { - if onGuild, err := common.BotIsOnGuild(evt.GuildID); !onGuild && err == nil { - return false, nil - } else if err != nil { - logger.WithError(err).Error("failed checking if bot is on guild") - } - - return true, nil - } - - cs := gs.GetChannel(cmd.ContextChannel) - if cs == nil { - // don't reschedule if channel is deleted, make sure its actually not there, and not just a discord downtime - if !gs.Available { - return true, nil - } - - return false, nil - } - - metricsExecutedCommands.With(prometheus.Labels{"trigger": "timed"}).Inc() - - tmplCtx := templates.NewContext(gs, cs, nil) - ExecuteCustomCommand(cmd, tmplCtx) - - // schedule next runs - cmd.LastRun = cmd.NextRun - err = UpdateCommandNextRunTime(cmd, true, false) - if err != nil { - logger.WithError(err).Error("failed updating custom command next run time") - } - - return false, nil -} - func shouldIgnoreChannel(msg *discordgo.Message, gs *dstate.GuildSet, cState *dstate.ChannelState) bool { if msg.GuildID == 0 { return true @@ -701,11 +537,21 @@ func (p *Plugin) OnRemovedPremiumGuild(GuildID int64) error { return errors.WrapIf(err, "Failed disabling long custom commands on premium removal") } - commands, err := models.CustomCommands(qm.Where("guild_id = ? AND disabled = false", GuildID), qm.OrderBy("local_id ASC"), qm.Offset(MaxCommands)).AllG(context.Background()) + commands, err := models.CustomCommands(qm.Where("guild_id = ? AND disabled = false AND trigger_type = ?", GuildID, CommandTriggerRole), qm.OrderBy("local_id ASC "), qm.Offset(MaxRoleTriggerCommands)).AllG(context.Background()) if err != nil { - return errors.WrapIf(err, "failed getting custom commands") + return errors.WrapIf(err, "failed fetching role trigger custom commands on premium removal") + } + if len(commands) > 0 { + _, err = commands.UpdateAllG(context.Background(), models.M{"disabled": true}) + if err != nil { + return errors.WrapIf(err, "failed disabling role trigger custom commands on premium removal") + } } + commands, err = models.CustomCommands(qm.Where("guild_id = ? AND disabled = false", GuildID), qm.OrderBy("local_id ASC"), qm.Offset(MaxCommands)).AllG(context.Background()) + if err != nil { + return errors.WrapIf(err, "failed getting custom commands") + } if len(commands) > 0 { _, err = commands.UpdateAllG(context.Background(), models.M{"disabled": true}) if err != nil { @@ -725,520 +571,12 @@ var metricsExecutedCommands = promauto.NewCounterVec(prometheus.CounterOpts{ Help: "Number custom commands triggered", }, []string{"trigger"}) -func handleMessageReactions(evt *eventsystem.EventData) { - var reaction *discordgo.MessageReaction - var added bool - - switch e := evt.EvtInterface.(type) { - case *discordgo.MessageReactionAdd: - added = true - reaction = e.MessageReaction - case *discordgo.MessageReactionRemove: - reaction = e.MessageReaction - } - - if reaction.GuildID == 0 || reaction.UserID == common.BotUser.ID { - // ignore dm reactions and reactions from the bot - return - } - - if !evt.HasFeatureFlag(featureFlagHasCommands) { - return - } - - cState := evt.CSOrThread() - if cState == nil { - return - } - // if the execution channel is a thread, check for send message in thread perms on the parent channel. - permToCheck := discordgo.PermissionSendMessages - cID := cState.ID - if cState.Type.IsThread() { - permToCheck = discordgo.PermissionSendMessagesInThreads - cID = cState.ParentID - } - - if hasPerms, _ := bot.BotHasPermissionGS(evt.GS, cID, permToCheck); !hasPerms { - // don't run in channel or thread we don't have perms in - return - } - - ms, triggeredCmds, err := findReactionTriggerCustomCommands(evt.Context(), cState, reaction.UserID, reaction, added) - if err != nil { - if common.IsDiscordErr(err, discordgo.ErrCodeUnknownMember) { - // example scenario: removing reactions of a user that's not on the server - // (reactions aren't cleared automatically when a user leaves) - return - } - - logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding reaction ccs") - return - } - - if len(triggeredCmds) < 1 { - return - } - - metricsExecutedCommands.With(prometheus.Labels{"trigger": "reaction"}).Inc() - - rMessage, err := common.BotSession.ChannelMessage(cState.ID, reaction.MessageID) - if err != nil { - logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding reaction ccs") - return - } - rMessage.GuildID = cState.GuildID - - for _, matched := range triggeredCmds { - err = ExecuteCustomCommandFromReaction(matched.CC, evt.GS, ms, cState, reaction, added, rMessage) - if err != nil { - logger.WithField("guild", cState.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") - } - } -} - -func ExecuteCustomCommandFromReaction(cc *models.CustomCommand, gs *dstate.GuildSet, ms *dstate.MemberState, cs *dstate.ChannelState, reaction *discordgo.MessageReaction, added bool, message *discordgo.Message) error { - tmplCtx := templates.NewContext(gs, cs, ms) - - // to make sure the message is in the proper context of the user reacting we set the mssage context to a fake message - fakeMsg := *message - fakeMsg.Member = ms.DgoMember() - fakeMsg.Author = fakeMsg.Member.User - tmplCtx.Msg = &fakeMsg - - tmplCtx.Data["Reaction"] = reaction - tmplCtx.Data["ReactionMessage"] = message - tmplCtx.Data["Message"] = message - tmplCtx.Data["ReactionAdded"] = added - - return ExecuteCustomCommand(cc, tmplCtx) -} - -func handleInteractionCreate(evt *eventsystem.EventData) { - i := evt.EvtInterface.(*discordgo.InteractionCreate).Interaction - interaction := templates.CustomCommandInteraction{Interaction: &i, RespondedTo: false} - - if interaction.GuildID == 0 { - // ignore dm interactions - return - } - - evt.GS = bot.State.GetGuild(interaction.GuildID) - if evt.GS == nil { - logrus.WithField("guild_id", interaction.GuildID).Error("Couldn't get Guild from state for interaction create") - return - } - - evt.GuildFeatureFlags, _ = featureflags.RetryGetGuildFlags(evt.GS.ID) - if !evt.HasFeatureFlag(featureFlagHasCommands) { - return - } - - cState := evt.GS.GetChannelOrThread(interaction.ChannelID) - if cState == nil { - return - } - - // Ephemeral messages always have guild_id = 0 even if created in a guild channel; see - // https://github.com/discord/discord-api-docs/issues/4557. But exec/execAdmin rely - // on the guild ID of the message to fill guild data, so patch it here. - if interaction.Message == nil || interaction.Member == nil { - return - } - interaction.Message.GuildID = evt.GS.ID - interaction.Member.GuildID = evt.GS.ID - - switch interaction.Type { - case discordgo.InteractionMessageComponent: - cMessage, err := common.BotSession.ChannelMessage(cState.ID, interaction.Message.ID) - if err == nil { - cMessage.GuildID = cState.GuildID - interaction.Message = cMessage - } - - cID := interaction.MessageComponentData().CustomID - - // continue only if this component was created by a cc - cID, ok := strings.CutPrefix(cID, "templates-") - if !ok { - return - } - - triggeredCmds, err := findComponentOrModalTriggerCustomCommands(evt.Context(), cState, interaction.Member, cID, false) - if err != nil { - logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding component ccs") - return - } - - if len(triggeredCmds) < 1 { - return - } - - deferResponseToCCs(&interaction, triggeredCmds) - for _, matched := range triggeredCmds { - err = ExecuteCustomCommandFromComponent(matched.CC, evt.GS, cState, matched.Args, matched.Stripped, &interaction) - if err != nil { - logger.WithField("guild", cState.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") - } - } - case discordgo.InteractionModalSubmit: - cID := interaction.ModalSubmitData().CustomID - - // continue only if this modal was created by a cc - cID, ok := strings.CutPrefix(cID, "templates-") - if !ok { - return - } - - triggeredCmds, err := findComponentOrModalTriggerCustomCommands(evt.Context(), cState, interaction.Member, cID, true) - if err != nil { - logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding component ccs") - return - } - - if len(triggeredCmds) < 1 { - return - } - - deferResponseToCCs(&interaction, triggeredCmds) - for _, matched := range triggeredCmds { - err = ExecuteCustomCommandFromModal(matched.CC, evt.GS, cState, matched.Args, matched.Stripped, &interaction) - if err != nil { - logger.WithField("guild", cState.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") - } - } - } -} - -func deferResponseToCCs(interaction *templates.CustomCommandInteraction, ccs []*TriggeredCC) { - def := &discordgo.InteractionResponse{ - Data: &discordgo.InteractionResponseData{}, - } - - for _, c := range ccs { - switch c.CC.InteractionDeferMode { - case InteractionDeferModeNone: - continue - case InteractionDeferModeMessage: - def.Type = discordgo.InteractionResponseDeferredChannelMessageWithSource - case InteractionDeferModeEphemeral: - def.Type = discordgo.InteractionResponseDeferredChannelMessageWithSource - def.Data.Flags = def.Data.Flags | discordgo.MessageFlagsEphemeral - case InteractionDeferModeUpdate: - def.Type = discordgo.InteractionResponseDeferredMessageUpdate - } - - break - } - - if def.Type != 0 { - err := common.BotSession.CreateInteractionResponse(interaction.ID, interaction.Token, def) - if err != nil { - logger.WithField("guild", interaction.GuildID).WithError(err).Error("Error deferring response") - } - interaction.RespondedTo = true - interaction.Deferred = true - } -} - -func HandleMessageUpdate(evt *eventsystem.EventData) { - mu := evt.MessageUpdate() - cs := evt.CSOrThread() - - if isPremium, _ := premium.IsGuildPremium(mu.GuildID); !isPremium { - return - } - - if !evt.HasFeatureFlag(featureFlagHasCommands) { - return - } - - if shouldIgnoreChannel(mu.Message, evt.GS, cs) { - return - } - - member := dstate.MemberStateFromMember(mu.Member) - member.GuildID = evt.GS.ID - var matchedCustomCommands []*TriggeredCC - var err error - common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands", logrus.Fields{"guild": evt.GS.ID}, func() { - matchedCustomCommands, err = findMessageTriggerCustomCommands(evt.Context(), cs, member, evt, mu.Message) - }) - if err != nil { - logger.WithError(err).Error("Error matching custom commands") - return - } - - if len(matchedCustomCommands) == 0 { - return - } - - metricsExecutedCommands.With(prometheus.Labels{"trigger": "message"}).Inc() - for _, matched := range matchedCustomCommands { - if !matched.CC.TriggerOnEdit { - continue - } - err = ExecuteCustomCommandFromMessage(evt.GS, matched.CC, member, cs, matched.Args, matched.Stripped, mu.Message, true) - if err != nil { - logger.WithField("guild", mu.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") - } - } -} - -func HandleMessageCreate(evt *eventsystem.EventData) { - mc := evt.MessageCreate() - cs := evt.CSOrThread() - - if !evt.HasFeatureFlag(featureFlagHasCommands) { - return - } - - if shouldIgnoreChannel(mc.Message, evt.GS, cs) { - return - } - - member := dstate.MemberStateFromMember(mc.Member) - member.GuildID = evt.GS.ID - - var matchedCustomCommands []*TriggeredCC - var err error - common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands", logrus.Fields{"guild": evt.GS.ID}, func() { - matchedCustomCommands, err = findMessageTriggerCustomCommands(evt.Context(), cs, member, evt, mc.Message) - }) - if err != nil { - logger.WithError(err).Error("Error matching custom commands") - return - } - - if len(matchedCustomCommands) == 0 { - return - } - - metricsExecutedCommands.With(prometheus.Labels{"trigger": "message"}).Inc() - - for _, matched := range matchedCustomCommands { - err = ExecuteCustomCommandFromMessage(evt.GS, matched.CC, member, cs, matched.Args, matched.Stripped, mc.Message, false) - if err != nil { - logger.WithField("guild", mc.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") - } - } -} - type TriggeredCC struct { CC *models.CustomCommand Stripped string Args []string } -func findMessageTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelState, ms *dstate.MemberState, evt *eventsystem.EventData, msg *discordgo.Message) (matches []*TriggeredCC, err error) { - cmds, err := BotCachedGetCommandsWithMessageTriggers(cs.GuildID, ctx) - if err != nil { - return nil, errors.WrapIf(err, "BotCachedGetCommandsWithMessageTriggers") - } - - prefix, err := commands.GetCommandPrefixBotEvt(evt) - if err != nil { - return nil, errors.WrapIf(err, "GetCommandPrefix") - } - - var matched []*TriggeredCC - for _, cmd := range cmds { - if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || !CmdRunsForUser(cmd, ms) || cmd.R.Group != nil && cmd.R.Group.Disabled { - continue - } - content := msg.Content - if cmd.TriggerType == int(CommandTriggerContains) || cmd.TriggerType == int(CommandTriggerRegex) { - //for contains and regex match, we need to look at the content of the forwarded message too. - content = strings.Join(msg.GetMessageContents(), " ") - } - if didMatch, stripped, args := CheckMatch(prefix, cmd, content); didMatch { - matched = append(matched, &TriggeredCC{ - CC: cmd, - Args: args, - Stripped: stripped, - }) - } - } - - sort.Slice(matched, func(i, j int) bool { - return hasHigherPriority(matched[i].CC, matched[j].CC) - }) - - limit := CCActionExecLimit(msg.GuildID) - if len(matched) > limit { - matched = matched[:limit] - } - - return matched, nil -} - -func findReactionTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelState, userID int64, reaction *discordgo.MessageReaction, add bool) (ms *dstate.MemberState, matches []*TriggeredCC, err error) { - cmds, err := BotCachedGetCommandsWithMessageTriggers(cs.GuildID, ctx) - if err != nil { - return nil, nil, errors.WrapIf(err, "BotCachedGetCommandsWithReactionTriggers") - } - - var matched []*TriggeredCC - for _, cmd := range cmds { - if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || cmd.R.Group != nil && cmd.R.Group.Disabled { - continue - } - - if didMatch := CheckMatchReaction(cmd, reaction, add); didMatch { - - matched = append(matched, &TriggeredCC{ - CC: cmd, - }) - } - } - - if len(matched) < 1 { - // no matches - return nil, matched, nil - } - - ms, err = bot.GetMember(cs.GuildID, userID) - if err != nil { - return nil, nil, errors.WithStackIf(err) - } - - if ms.User.Bot { - return nil, nil, nil - } - - // filter by roles - filtered := make([]*TriggeredCC, 0, len(matched)) - for _, v := range matched { - if !CmdRunsForUser(v.CC, ms) { - continue - } - - filtered = append(filtered, v) - } - - sort.Slice(filtered, func(i, j int) bool { - return hasHigherPriority(filtered[i].CC, filtered[j].CC) - }) - - limit := CCActionExecLimit(cs.GuildID) - if len(filtered) > limit { - filtered = filtered[:limit] - } - - return ms, filtered, nil -} - -func findComponentOrModalTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelState, member *discordgo.Member, cID string, modal bool) (matches []*TriggeredCC, err error) { - cmds, err := BotCachedGetCommandsWithMessageTriggers(cs.GuildID, ctx) - if err != nil { - return nil, errors.WrapIf(err, "BotCachedGetCommandsWithComponentTriggers") - } - - var matched []*TriggeredCC - for _, cmd := range cmds { - if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || cmd.R.Group != nil && cmd.R.Group.Disabled { - continue - } - - if modal { - if didMatch, stripped, args := CheckMatchModal(cmd, cID); didMatch { - - matched = append(matched, &TriggeredCC{ - CC: cmd, - Stripped: stripped, - Args: args, - }) - } - } else { - if didMatch, stripped, args := CheckMatchComponent(cmd, cID); didMatch { - - matched = append(matched, &TriggeredCC{ - CC: cmd, - Stripped: stripped, - Args: args, - }) - } - } - } - - if len(matched) < 1 { - // no matches - return matched, nil - } - - ms, err := bot.GetMember(cs.GuildID, member.User.ID) - if err != nil { - return nil, errors.WithStackIf(err) - } - - if ms.User.Bot { - return nil, nil - } - - // filter by roles - filtered := make([]*TriggeredCC, 0, len(matched)) - for _, v := range matched { - if !CmdRunsForUser(v.CC, ms) { - continue - } - - filtered = append(filtered, v) - } - - sort.Slice(filtered, func(i, j int) bool { - return hasHigherPriority(filtered[i].CC, filtered[j].CC) - }) - - limit := CCActionExecLimit(cs.GuildID) - if len(filtered) > limit { - filtered = filtered[:limit] - } - - return filtered, nil -} - -// hasHigherPriority reports whether custom command a should be executed in preference to custom -// command b. Regex custom commands always have lowest priority, with ties broken by ID (smaller ID -// has priority.) -func hasHigherPriority(a *models.CustomCommand, b *models.CustomCommand) bool { - aIsRegex := a.TriggerType == int(CommandTriggerRegex) - bIsRegex := b.TriggerType == int(CommandTriggerRegex) - - switch { - case !aIsRegex && bIsRegex: - return true - case aIsRegex && !bIsRegex: - return false - default: - return a.LocalID < b.LocalID - } -} - -func ExecuteCustomCommandFromMessage(gs *dstate.GuildSet, cmd *models.CustomCommand, member *dstate.MemberState, cs *dstate.ChannelState, cmdArgs []string, stripped string, m *discordgo.Message, isEdit bool) error { - tmplCtx := templates.NewContext(gs, cs, member) - tmplCtx.Msg = m - - // preapre message specific data - args := dcmd.SplitArgs(m.Content) - argsStr := make([]string, len(args)) - for k, v := range args { - argsStr[k] = v.Str - } - - tmplCtx.Data["Args"] = argsStr - tmplCtx.Data["StrippedMsg"] = stripped - tmplCtx.Data["Cmd"] = cmdArgs[0] - if len(cmdArgs) > 1 { - tmplCtx.Data["CmdArgs"] = cmdArgs[1:] - } else { - tmplCtx.Data["CmdArgs"] = []string{} - } - tmplCtx.Data["IsMessageEdit"] = isEdit - tmplCtx.Data["Message"] = m - - return ExecuteCustomCommand(cmd, tmplCtx) -} - -// func ExecuteCustomCommand(cmd *models.CustomCommand, cmdArgs []string, stripped string, s *discordgo.Session, m *discordgo.MessageCreate) (resp string, tmplCtx *templates.Context, err error) { func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context) error { defer func() { if err := recover(); err != nil { @@ -1277,6 +615,8 @@ func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context) errChannel := tmplCtx.CurrentFrame.CS.ID if cmd.RedirectErrorsChannel != 0 { errChannel = cmd.RedirectErrorsChannel + } else if cmd.R.Group != nil && cmd.R.Group.RedirectErrorsChannel != 0 { + errChannel = cmd.R.Group.RedirectErrorsChannel } if cmd.ShowErrors { @@ -1312,6 +652,8 @@ func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context) errChannel := tmplCtx.CurrentFrame.CS.ID if cmd.RedirectErrorsChannel != 0 { errChannel = cmd.RedirectErrorsChannel + } else if cmd.R.Group != nil && cmd.R.Group.RedirectErrorsChannel != 0 { + errChannel = cmd.R.Group.RedirectErrorsChannel } if cmd.ShowErrors { @@ -1330,90 +672,6 @@ func ExecuteCustomCommand(cmd *models.CustomCommand, tmplCtx *templates.Context) return nil } -func ExecuteCustomCommandFromComponent(cc *models.CustomCommand, gs *dstate.GuildSet, cs *dstate.ChannelState, cmdArgs []string, stripped string, interaction *templates.CustomCommandInteraction) error { - ms := dstate.MemberStateFromMember(interaction.Member) - tmplCtx := templates.NewContext(gs, cs, ms) - tmplCtx.CurrentFrame.Interaction = interaction - - tmplCtx.Data["Interaction"] = interaction - tmplCtx.Data["InteractionData"] = interaction.MessageComponentData() - cid := strings.TrimPrefix(interaction.MessageComponentData().CustomID, "templates-") - tmplCtx.Data["CustomID"] = cid - tmplCtx.Data["Cmd"] = cmdArgs[0] - if len(cmdArgs) > 1 { - tmplCtx.Data["CmdArgs"] = cmdArgs[1:] - } else { - tmplCtx.Data["CmdArgs"] = []string{} - } - tmplCtx.Data["StrippedID"] = stripped - tmplCtx.Data["StrippedMsg"] = stripped - - switch interaction.MessageComponentData().ComponentType { - case discordgo.ButtonComponent: - tmplCtx.Data["IsButton"] = true - case discordgo.SelectMenuComponent, discordgo.UserSelectMenuComponent, discordgo.RoleSelectMenuComponent, discordgo.MentionableSelectMenuComponent, discordgo.ChannelSelectMenuComponent: - tmplCtx.Data["IsMenu"] = true - switch interaction.MessageComponentData().ComponentType { - case discordgo.SelectMenuComponent: - tmplCtx.Data["MenuType"] = "string" - case discordgo.UserSelectMenuComponent: - tmplCtx.Data["MenuType"] = "user" - case discordgo.RoleSelectMenuComponent: - tmplCtx.Data["MenuType"] = "role" - case discordgo.MentionableSelectMenuComponent: - tmplCtx.Data["MenuType"] = "mentionable" - case discordgo.ChannelSelectMenuComponent: - tmplCtx.Data["MenuType"] = "channel" - } - tmplCtx.Data["Values"] = interaction.MessageComponentData().Values - } - - msg := interaction.Message - msg.Member = ms.DgoMember() - msg.Author = msg.Member.User - tmplCtx.Msg = msg - - tmplCtx.Data["Message"] = msg - - return ExecuteCustomCommand(cc, tmplCtx) -} - -func ExecuteCustomCommandFromModal(cc *models.CustomCommand, gs *dstate.GuildSet, cs *dstate.ChannelState, cmdArgs []string, stripped string, interaction *templates.CustomCommandInteraction) error { - ms := dstate.MemberStateFromMember(interaction.Member) - tmplCtx := templates.NewContext(gs, cs, ms) - tmplCtx.CurrentFrame.Interaction = interaction - - tmplCtx.Data["Interaction"] = interaction - tmplCtx.Data["InteractionData"] = interaction.ModalSubmitData() - cid := strings.TrimPrefix(interaction.ModalSubmitData().CustomID, "templates-") - tmplCtx.Data["CustomID"] = cid - tmplCtx.Data["Cmd"] = cmdArgs[0] - if len(cmdArgs) > 1 { - tmplCtx.Data["CmdArgs"] = cmdArgs[1:] - } else { - tmplCtx.Data["CmdArgs"] = []string{} - } - tmplCtx.Data["StrippedID"] = stripped - tmplCtx.Data["StrippedMsg"] = stripped - tmplCtx.Data["IsModal"] = true - cmdValues := []string{} - for i := 0; i < len(interaction.ModalSubmitData().Components); i++ { - row := interaction.ModalSubmitData().Components[i].(*discordgo.ActionsRow) - field := row.Components[0].(*discordgo.TextInput) - cmdValues = append(cmdValues, field.Value) - } - tmplCtx.Data["Values"] = cmdValues - - msg := interaction.Message - msg.Member = ms.DgoMember() - msg.Author = msg.Member.User - tmplCtx.Msg = msg - - tmplCtx.Data["Message"] = msg - - return ExecuteCustomCommand(cc, tmplCtx) -} - func formatCustomCommandRunErr(src string, err error) string { // check if we can retrieve the original ExecError cause := errors.Cause(err) @@ -1559,6 +817,8 @@ func onExecPanic(cmd *models.CustomCommand, err error, tmplCtx *templates.Contex errChannel := tmplCtx.CurrentFrame.CS.ID if cmd.RedirectErrorsChannel != 0 { errChannel = cmd.RedirectErrorsChannel + } else if cmd.R.Group != nil && cmd.R.Group.RedirectErrorsChannel != 0 { + errChannel = cmd.R.Group.RedirectErrorsChannel } if cmd.ShowErrors { @@ -1587,140 +847,6 @@ func updatePostCommandRan(cmd *models.CustomCommand, runErr error) { } } -// CheckMatch returns true if the given cmd matches, as well as the arguments -// following the command trigger (arg 0 being the message up to, and including, -// the trigger). -func CheckMatch(globalPrefix string, cmd *models.CustomCommand, msg string) (match bool, stripped string, args []string) { - trigger := cmd.TextTrigger - - cmdMatch := "(?m)" - if !cmd.TextTriggerCaseSensitive { - cmdMatch += "(?i)" - } - - switch CommandTriggerType(cmd.TriggerType) { - case CommandTriggerCommand: - // Regex is: - // \A(<@!?bot_id> ?|server_cmd_prefix)trigger(\z|[[:space:]]) - cmdMatch += `\A(<@!?` + discordgo.StrID(common.BotUser.ID) + "> ?|" + regexp.QuoteMeta(globalPrefix) + ")" + regexp.QuoteMeta(trigger) + `(\z|[[:space:]])` - case CommandTriggerStartsWith: - cmdMatch += `\A` + regexp.QuoteMeta(trigger) - case CommandTriggerContains: - cmdMatch += regexp.QuoteMeta(trigger) - case CommandTriggerRegex: - cmdMatch += trigger - case CommandTriggerExact: - cmdMatch += `\A` + regexp.QuoteMeta(trigger) + `\z` - default: - return false, "", nil - } - - return matchRegexSplitArgs(cmdMatch, msg) -} - -func CheckMatchReaction(cmd *models.CustomCommand, reaction *discordgo.MessageReaction, add bool) (match bool) { - if cmd.TriggerType != int(CommandTriggerReaction) { - return false - } - - switch cmd.ReactionTriggerMode { - case ReactionModeBoth: - return true - case ReactionModeAddOnly: - return add - case ReactionModeRemoveOnly: - return !add - } - - return false -} - -func CheckMatchComponent(cmd *models.CustomCommand, cID string) (match bool, stripped string, args []string) { - - if cmd.TriggerType != int(CommandTriggerComponent) { - return false, "", nil - } - - cmdMatch := "(?m)" - if !cmd.TextTriggerCaseSensitive { - cmdMatch += "(?i)" - } - cmdMatch += cmd.TextTrigger - - match, stripped, args = matchRegexSplitArgs(cmdMatch, cID) - return -} - -func CheckMatchModal(cmd *models.CustomCommand, cID string) (match bool, stripped string, args []string) { - - if cmd.TriggerType != int(CommandTriggerModal) { - return false, "", nil - } - - cmdMatch := "(?m)" - if !cmd.TextTriggerCaseSensitive { - cmdMatch += "(?i)" - } - cmdMatch += cmd.TextTrigger - - match, stripped, args = matchRegexSplitArgs(cmdMatch, cID) - return -} - -func matchRegexSplitArgs(pattern, msg string) (match bool, stripped string, args []string) { - item, err := RegexCache.Fetch(pattern, time.Minute*10, func() (interface{}, error) { - re, err := regexp.Compile(pattern) - if err != nil { - return nil, err - } - - return re, nil - }) - - if err != nil { - return false, "", nil - } - - re := item.Value().(*regexp.Regexp) - - idx := re.FindStringIndex(msg) - if idx == nil { - return false, "", nil - } - - argsRaw := dcmd.SplitArgs(msg[idx[1]:]) - args = make([]string, len(argsRaw)+1) - args[0] = strings.TrimSpace(msg[:idx[1]]) - for i, v := range argsRaw { - args[i+1] = v.Str - } - - stripped = msg[idx[1]:] - match = true - return -} - -var cachedCommandsMessage = common.CacheSet.RegisterSlot("custom_commands_message_trigger", nil, int64(0)) - -func BotCachedGetCommandsWithMessageTriggers(guildID int64, ctx context.Context) ([]*models.CustomCommand, error) { - v, err := cachedCommandsMessage.GetCustomFetch(guildID, func(key interface{}) (interface{}, error) { - var cmds []*models.CustomCommand - var err error - - common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands from db", logrus.Fields{"guild": guildID}, func() { - cmds, err = models.CustomCommands(qm.Where("guild_id = ? AND trigger_type IN (0,1,2,3,4,6,7,8,9)", guildID), qm.OrderBy("local_id desc"), qm.Load("Group")).AllG(ctx) - }) - - return cmds, err - }) - - if err != nil { - return nil, err - } - - return v.([]*models.CustomCommand), nil -} - var cmdFixCommands = &commands.YAGCommand{ CmdCategory: commands.CategoryTool, Name: "fixscheduledccs", diff --git a/customcommands/customcommands.go b/customcommands/customcommands.go index 7bdba8eda6..95a9b531c0 100644 --- a/customcommands/customcommands.go +++ b/customcommands/customcommands.go @@ -76,6 +76,7 @@ const ( CommandTriggerComponent CommandTriggerType = 7 CommandTriggerModal CommandTriggerType = 8 CommandTriggerCron CommandTriggerType = 9 + CommandTriggerRole CommandTriggerType = 11 ) var ( @@ -91,6 +92,7 @@ var ( CommandTriggerComponent, CommandTriggerModal, CommandTriggerCron, + CommandTriggerRole, } triggerStrings = map[CommandTriggerType]string{ @@ -105,6 +107,7 @@ var ( CommandTriggerComponent: "Component", CommandTriggerModal: "Modal", CommandTriggerCron: "Crontab", + CommandTriggerRole: "Role", } ) @@ -121,6 +124,12 @@ const ( InteractionDeferModeUpdate ) +const ( + RoleTriggerModeBoth = iota + RoleTriggerModeAdd + RoleTriggerModeRemove +) + func (t CommandTriggerType) String() string { return triggerStrings[t] } @@ -138,6 +147,8 @@ type CustomCommand struct { PublicID string `json:"public_id" schema:"public_id"` ContextChannel int64 `schema:"context_channel" valid:"channel,true"` + TimeContextChannel int64 `schema:"time_context_channel" valid:"channel,true"` + RoleContextChannel int64 `schema:"role_context_channel" valid:"channel,true"` RedirectErrorsChannel int64 `schema:"redirect_errors_channel" valid:"channel,true"` TimeTriggerInterval int `schema:"time_trigger_interval"` @@ -147,6 +158,8 @@ type CustomCommand struct { ReactionTriggerMode int `schema:"reaction_trigger_mode"` InteractionDeferMode int `schema:"interaction_defer_mode"` + RoleTriggerMode int `schema:"role_trigger_mode"` + // If set, then the following channels are required, otherwise they are ignored RequireChannels bool `json:"require_channels" schema:"require_channels"` Channels []int64 `json:"channels" schema:"channels"` @@ -223,7 +236,15 @@ func (cc *CustomCommand) Validate(tmpl web.TemplateData, guild_id int64) (ok boo } } + if cc.TriggerTypeForm == "role_trigger" { + if cc.RoleTriggerMode < 0 || cc.RoleTriggerMode > 2 { + tmpl.AddAlerts(web.ErrorAlert("Invalid role trigger mode")) + return false + } + } + return true + } func (cc *CustomCommand) ToDBModel() *models.CustomCommand { @@ -248,6 +269,8 @@ func (cc *CustomCommand) ToDBModel() *models.CustomCommand { ReactionTriggerMode: int16(cc.ReactionTriggerMode), InteractionDeferMode: int16(cc.InteractionDeferMode), + RoleTriggerMode: int16(cc.RoleTriggerMode), + Responses: cc.Responses, ShowErrors: cc.ShowErrors, @@ -353,28 +376,15 @@ func (c CustomCommandSlice) Swap(i, j int) { c[j] = temp } -func filterEmptyResponses(s string, ss ...string) []string { - result := make([]string, 0, len(ss)+1) - if s != "" { - result = append(result, s) - } - - for _, s := range ss { - if s != "" { - result = append(result, s) - } - } - - return result -} - const ( - MaxCommands = 100 - MaxCommandsPremium = 250 - MaxCCResponsesLength = 10000 - MaxCCResponsesLengthPremium = 20000 - MaxUserMessages = 20 - MaxGroups = 50 + MaxCommands = 100 + MaxCommandsPremium = 250 + MaxRoleTriggerCommands = 1 + MaxRoleTriggerCommandsPremium = 5 + MaxCCResponsesLength = 10000 + MaxCCResponsesLengthPremium = 20000 + MaxUserMessages = 20 + MaxGroups = 50 ) func MaxCommandsForContext(ctx context.Context) int { @@ -385,6 +395,14 @@ func MaxCommandsForContext(ctx context.Context) int { return MaxCommands } +func MaxRoleTriggerCommandsForContext(ctx context.Context) int { + if premium.ContextPremium(ctx) { + return MaxRoleTriggerCommandsPremium + } + + return MaxRoleTriggerCommands +} + var _ featureflags.PluginWithFeatureFlags = (*Plugin)(nil) const ( diff --git a/customcommands/handle_component.go b/customcommands/handle_component.go new file mode 100644 index 0000000000..94bec75a29 --- /dev/null +++ b/customcommands/handle_component.go @@ -0,0 +1,381 @@ +package customcommands + +import ( + "context" + "sort" + "strings" + "time" + + "emperror.dev/errors" + "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/templates" + "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/sirupsen/logrus" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +func handleInteractionCreate(evt *eventsystem.EventData) { + i := evt.EvtInterface.(*discordgo.InteractionCreate).Interaction + interaction := templates.CustomCommandInteraction{Interaction: &i, RespondedTo: false} + + if interaction.GuildID == 0 { + // ignore dm interactions + return + } + + evt.GS = bot.State.GetGuild(interaction.GuildID) + if evt.GS == nil { + logrus.WithField("guild_id", interaction.GuildID).Error("Couldn't get Guild from state for interaction create") + return + } + + evt.GuildFeatureFlags, _ = featureflags.RetryGetGuildFlags(evt.GS.ID) + if !evt.HasFeatureFlag(featureFlagHasCommands) { + return + } + + cState := evt.GS.GetChannelOrThread(interaction.ChannelID) + if cState == nil { + return + } + + // Ephemeral messages always have guild_id = 0 even if created in a guild channel; see + // https://github.com/discord/discord-api-docs/issues/4557. But exec/execAdmin rely + // on the guild ID of the message to fill guild data, so patch it here. + if interaction.Message == nil || interaction.Member == nil { + return + } + interaction.Message.GuildID = evt.GS.ID + interaction.Member.GuildID = evt.GS.ID + + switch interaction.Type { + case discordgo.InteractionMessageComponent: + cMessage, err := common.BotSession.ChannelMessage(cState.ID, interaction.Message.ID) + if err == nil { + cMessage.GuildID = cState.GuildID + interaction.Message = cMessage + } + + cID := interaction.MessageComponentData().CustomID + + // continue only if this component was created by a cc + cID, ok := strings.CutPrefix(cID, templates.TemplateCustomIDPrefix) + if !ok { + return + } + + triggeredCmds, err := findComponentOrModalTriggerCustomCommands(evt.Context(), cState, interaction.Member, cID, false) + if err != nil { + logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding component ccs") + return + } + + if len(triggeredCmds) < 1 { + return + } + + deferResponseToCCs(&interaction, triggeredCmds) + for _, matched := range triggeredCmds { + err = ExecuteCustomCommandFromComponent(matched.CC, evt.GS, cState, matched.Args, matched.Stripped, &interaction) + if err != nil { + logger.WithField("guild", cState.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") + } + } + case discordgo.InteractionModalSubmit: + cID := interaction.ModalSubmitData().CustomID + + // continue only if this modal was created by a cc + cID, ok := strings.CutPrefix(cID, templates.TemplateCustomIDPrefix) + if !ok { + return + } + + triggeredCmds, err := findComponentOrModalTriggerCustomCommands(evt.Context(), cState, interaction.Member, cID, true) + if err != nil { + logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding component ccs") + return + } + + if len(triggeredCmds) < 1 { + return + } + + deferResponseToCCs(&interaction, triggeredCmds) + for _, matched := range triggeredCmds { + err = ExecuteCustomCommandFromModal(matched.CC, evt.GS, cState, matched.Args, matched.Stripped, &interaction) + if err != nil { + logger.WithField("guild", cState.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") + } + } + } +} + +func deferResponseToCCs(interaction *templates.CustomCommandInteraction, ccs []*TriggeredCC) { + def := &discordgo.InteractionResponse{ + Data: &discordgo.InteractionResponseData{}, + } + + for _, c := range ccs { + switch c.CC.InteractionDeferMode { + case InteractionDeferModeNone: + continue + case InteractionDeferModeMessage: + def.Type = discordgo.InteractionResponseDeferredChannelMessageWithSource + case InteractionDeferModeEphemeral: + def.Type = discordgo.InteractionResponseDeferredChannelMessageWithSource + def.Data.Flags = def.Data.Flags | discordgo.MessageFlagsEphemeral + case InteractionDeferModeUpdate: + def.Type = discordgo.InteractionResponseDeferredMessageUpdate + } + + break + } + + if def.Type != 0 { + err := common.BotSession.CreateInteractionResponse(interaction.ID, interaction.Token, def) + if err != nil { + logger.WithField("guild", interaction.GuildID).WithError(err).Error("Error deferring response") + } + interaction.RespondedTo = true + interaction.Deferred = true + } +} + +var cachedCommandsComponentTrigger = common.CacheSet.RegisterSlot("custom_commands_component_trigger", nil, int64(0)) + +func BotCachedGetCommandsWithComponentTrigger(guildID int64, ctx context.Context) ([]*models.CustomCommand, error) { + v, err := cachedCommandsComponentTrigger.GetCustomFetch(guildID, func(key interface{}) (interface{}, error) { + var cmds []*models.CustomCommand + var err error + common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands from db", logrus.Fields{"guild": guildID}, func() { + cmds, err = models.CustomCommands(qm.Where("guild_id = ? AND trigger_type IN (7,8)", guildID), qm.OrderBy("local_id desc"), qm.Load("Group")).AllG(ctx) + }) + return cmds, err + }) + if err != nil { + return nil, err + } + return v.([]*models.CustomCommand), nil +} + +func findComponentOrModalTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelState, member *discordgo.Member, cID string, modal bool) (matches []*TriggeredCC, err error) { + cmds, err := BotCachedGetCommandsWithComponentTrigger(cs.GuildID, ctx) + if err != nil { + return nil, errors.WrapIf(err, "BotCachedGetCommandsWithComponentTriggers") + } + + var matched []*TriggeredCC + for _, cmd := range cmds { + if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || cmd.R.Group != nil && cmd.R.Group.Disabled { + continue + } + + if modal { + if didMatch, stripped, args := CheckMatchModal(cmd, cID); didMatch { + + matched = append(matched, &TriggeredCC{ + CC: cmd, + Stripped: stripped, + Args: args, + }) + } + } else { + if didMatch, stripped, args := CheckMatchComponent(cmd, cID); didMatch { + + matched = append(matched, &TriggeredCC{ + CC: cmd, + Stripped: stripped, + Args: args, + }) + } + } + } + + if len(matched) < 1 { + // no matches + return matched, nil + } + + ms, err := bot.GetMember(cs.GuildID, member.User.ID) + if err != nil { + return nil, errors.WithStackIf(err) + } + + if ms.User.Bot { + return nil, nil + } + + // filter by roles + filtered := make([]*TriggeredCC, 0, len(matched)) + for _, v := range matched { + if !CmdRunsForUser(v.CC, ms) { + continue + } + + filtered = append(filtered, v) + } + + sort.Slice(filtered, func(i, j int) bool { + return hasHigherPriority(filtered[i].CC, filtered[j].CC) + }) + + limit := CCActionExecLimit(cs.GuildID) + if len(filtered) > limit { + filtered = filtered[:limit] + } + + return filtered, nil +} + +func ExecuteCustomCommandFromComponent(cc *models.CustomCommand, gs *dstate.GuildSet, cs *dstate.ChannelState, cmdArgs []string, stripped string, interaction *templates.CustomCommandInteraction) error { + ms := dstate.MemberStateFromMember(interaction.Member) + tmplCtx := templates.NewContext(gs, cs, ms) + tmplCtx.CurrentFrame.Interaction = interaction + + tmplCtx.Data["Interaction"] = interaction + tmplCtx.Data["InteractionData"] = interaction.MessageComponentData() + cid := strings.TrimPrefix(interaction.MessageComponentData().CustomID, templates.TemplateCustomIDPrefix) + tmplCtx.Data["CustomID"] = cid + tmplCtx.Data["Cmd"] = cmdArgs[0] + if len(cmdArgs) > 1 { + tmplCtx.Data["CmdArgs"] = cmdArgs[1:] + } else { + tmplCtx.Data["CmdArgs"] = []string{} + } + tmplCtx.Data["StrippedID"] = stripped + tmplCtx.Data["StrippedMsg"] = stripped + + switch interaction.MessageComponentData().ComponentType { + case discordgo.ButtonComponent: + tmplCtx.Data["IsButton"] = true + case discordgo.SelectMenuComponent, discordgo.UserSelectMenuComponent, discordgo.RoleSelectMenuComponent, discordgo.MentionableSelectMenuComponent, discordgo.ChannelSelectMenuComponent: + tmplCtx.Data["IsMenu"] = true + switch interaction.MessageComponentData().ComponentType { + case discordgo.SelectMenuComponent: + tmplCtx.Data["MenuType"] = "string" + case discordgo.UserSelectMenuComponent: + tmplCtx.Data["MenuType"] = "user" + case discordgo.RoleSelectMenuComponent: + tmplCtx.Data["MenuType"] = "role" + case discordgo.MentionableSelectMenuComponent: + tmplCtx.Data["MenuType"] = "mentionable" + case discordgo.ChannelSelectMenuComponent: + tmplCtx.Data["MenuType"] = "channel" + } + tmplCtx.Data["Values"] = interaction.MessageComponentData().Values + } + + msg := interaction.Message + msg.Member = ms.DgoMember() + msg.Author = msg.Member.User + tmplCtx.Msg = msg + + tmplCtx.Data["Message"] = msg + + return ExecuteCustomCommand(cc, tmplCtx) +} + +func CheckMatchComponent(cmd *models.CustomCommand, cID string) (match bool, stripped string, args []string) { + + if cmd.TriggerType != int(CommandTriggerComponent) { + return false, "", nil + } + + cmdMatch := "(?m)" + if !cmd.TextTriggerCaseSensitive { + cmdMatch += "(?i)" + } + cmdMatch += cmd.TextTrigger + + match, stripped, args = matchRegexSplitArgs(cmdMatch, cID) + return +} + +func ExecuteCustomCommandFromModal(cc *models.CustomCommand, gs *dstate.GuildSet, cs *dstate.ChannelState, cmdArgs []string, stripped string, interaction *templates.CustomCommandInteraction) error { + ms := dstate.MemberStateFromMember(interaction.Member) + tmplCtx := templates.NewContext(gs, cs, ms) + tmplCtx.CurrentFrame.Interaction = interaction + + tmplCtx.Data["Interaction"] = interaction + tmplCtx.Data["InteractionData"] = interaction.ModalSubmitData() + modalCustomID := strings.TrimPrefix(interaction.ModalSubmitData().CustomID, templates.TemplateCustomIDPrefix) + tmplCtx.Data["CustomID"] = modalCustomID + tmplCtx.Data["Cmd"] = cmdArgs[0] + if len(cmdArgs) > 1 { + tmplCtx.Data["CmdArgs"] = cmdArgs[1:] + } else { + tmplCtx.Data["CmdArgs"] = []string{} + } + tmplCtx.Data["StrippedID"] = stripped + tmplCtx.Data["StrippedMsg"] = stripped + tmplCtx.Data["IsModal"] = true + cmdValues := []any{} + + modalValues := templates.SDict{} + for i := 0; i < len(interaction.ModalSubmitData().Components); i++ { + switch comp := interaction.ModalSubmitData().Components[i].(type) { + case *discordgo.ActionsRow: + for j := 0; j < len(comp.Components); j++ { + field, ok := comp.Components[j].(*discordgo.TextInput) + if ok { + cmdValues = append(cmdValues, field.Value) + } + cID, _ := strings.CutPrefix(field.CustomID, templates.TemplateCustomIDPrefix) + modalValues.Set(cID, templates.SDict{ + "type": field.Type(), + "value": field.Value, + "custom_id": cID, + }) + } + case *discordgo.Label: + if t, ok := comp.Component.(*discordgo.TextInput); ok { + cID, _ := strings.CutPrefix(t.CustomID, templates.TemplateCustomIDPrefix) + cmdValues = append(cmdValues, t.Value) + modalValues.Set(cID, templates.SDict{ + "type": t.Type(), + "value": t.Value, + "custom_id": cID, + }) + } else if sm, ok := comp.Component.(*discordgo.SelectMenu); ok { + cID, _ := strings.CutPrefix(sm.CustomID, templates.TemplateCustomIDPrefix) + cmdValues = append(cmdValues, sm.Values) + modalValues.Set(cID, templates.SDict{ + "type": sm.Type(), + "value": sm.Values, + "custom_id": cID, + }) + } + } + } + tmplCtx.Data["Values"] = cmdValues + tmplCtx.Data["ModalValues"] = modalValues + msg := interaction.Message + msg.Member = ms.DgoMember() + msg.Author = msg.Member.User + tmplCtx.Msg = msg + + tmplCtx.Data["Message"] = msg + + return ExecuteCustomCommand(cc, tmplCtx) +} + +func CheckMatchModal(cmd *models.CustomCommand, cID string) (match bool, stripped string, args []string) { + + if cmd.TriggerType != int(CommandTriggerModal) { + return false, "", nil + } + + cmdMatch := "(?m)" + if !cmd.TextTriggerCaseSensitive { + cmdMatch += "(?i)" + } + cmdMatch += cmd.TextTrigger + + match, stripped, args = matchRegexSplitArgs(cmdMatch, cID) + return +} diff --git a/customcommands/handle_reaction.go b/customcommands/handle_reaction.go new file mode 100644 index 0000000000..20fc2cae77 --- /dev/null +++ b/customcommands/handle_reaction.go @@ -0,0 +1,200 @@ +package customcommands + +import ( + "context" + "sort" + "time" + + "emperror.dev/errors" + "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/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/lib/dstate" + "github.com/prometheus/client_golang/prometheus" + "github.com/sirupsen/logrus" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +func handleMessageReactions(evt *eventsystem.EventData) { + var reaction *discordgo.MessageReaction + var added bool + + switch e := evt.EvtInterface.(type) { + case *discordgo.MessageReactionAdd: + added = true + reaction = e.MessageReaction + case *discordgo.MessageReactionRemove: + reaction = e.MessageReaction + } + + if reaction.GuildID == 0 || reaction.UserID == common.BotUser.ID { + // ignore dm reactions and reactions from the bot + return + } + + if !evt.HasFeatureFlag(featureFlagHasCommands) { + return + } + + cState := evt.CSOrThread() + if cState == nil { + return + } + // if the execution channel is a thread, check for send message in thread perms on the parent channel. + permToCheck := discordgo.PermissionSendMessages + cID := cState.ID + if cState.Type.IsThread() { + permToCheck = discordgo.PermissionSendMessagesInThreads + cID = cState.ParentID + } + + if hasPerms, _ := bot.BotHasPermissionGS(evt.GS, cID, permToCheck); !hasPerms { + // don't run in channel or thread we don't have perms in + return + } + + ms, triggeredCmds, err := findReactionTriggerCustomCommands(evt.Context(), cState, reaction.UserID, reaction, added) + if err != nil { + if common.IsDiscordErr(err, discordgo.ErrCodeUnknownMember) { + // example scenario: removing reactions of a user that's not on the server + // (reactions aren't cleared automatically when a user leaves) + return + } + + logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding reaction ccs") + return + } + + if len(triggeredCmds) < 1 { + return + } + + metricsExecutedCommands.With(prometheus.Labels{"trigger": "reaction"}).Inc() + + rMessage, err := common.BotSession.ChannelMessage(cState.ID, reaction.MessageID) + if err != nil { + logger.WithField("guild", evt.GS.ID).WithError(err).Error("failed finding reaction ccs") + return + } + rMessage.GuildID = cState.GuildID + + for _, matched := range triggeredCmds { + err = ExecuteCustomCommandFromReaction(matched.CC, evt.GS, ms, cState, reaction, added, rMessage) + if err != nil { + logger.WithField("guild", cState.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") + } + } +} + +var cachedCommandsReactionTrigger = common.CacheSet.RegisterSlot("custom_commands_reaction_trigger", nil, int64(0)) + +func BotCachedGetCommandsWithReactionTrigger(guildID int64, ctx context.Context) ([]*models.CustomCommand, error) { + v, err := cachedCommandsReactionTrigger.GetCustomFetch(guildID, func(key interface{}) (interface{}, error) { + var cmds []*models.CustomCommand + var err error + + common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands from db", logrus.Fields{"guild": guildID}, func() { + cmds, err = models.CustomCommands(qm.Where("guild_id = ? AND trigger_type = 6", guildID), qm.OrderBy("local_id desc"), qm.Load("Group")).AllG(ctx) + }) + + return cmds, err + }) + + if err != nil { + return nil, err + } + + return v.([]*models.CustomCommand), nil +} + +func findReactionTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelState, userID int64, reaction *discordgo.MessageReaction, add bool) (ms *dstate.MemberState, matches []*TriggeredCC, err error) { + cmds, err := BotCachedGetCommandsWithReactionTrigger(cs.GuildID, ctx) + if err != nil { + return nil, nil, errors.WrapIf(err, "BotCachedGetCommandsWithReactionTriggers") + } + + var matched []*TriggeredCC + for _, cmd := range cmds { + if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || cmd.R.Group != nil && cmd.R.Group.Disabled { + continue + } + + if didMatch := CheckMatchReaction(cmd, reaction, add); didMatch { + matched = append(matched, &TriggeredCC{ + CC: cmd, + }) + } + } + + if len(matched) < 1 { + // no matches + return nil, matched, nil + } + + ms, err = bot.GetMember(cs.GuildID, userID) + if err != nil { + return nil, nil, errors.WithStackIf(err) + } + + if ms.User.Bot { + return nil, nil, nil + } + + // filter by roles + filtered := make([]*TriggeredCC, 0, len(matched)) + for _, v := range matched { + if !CmdRunsForUser(v.CC, ms) { + continue + } + + filtered = append(filtered, v) + } + + sort.Slice(filtered, func(i, j int) bool { + return hasHigherPriority(filtered[i].CC, filtered[j].CC) + }) + + limit := CCActionExecLimit(cs.GuildID) + if len(filtered) > limit { + filtered = filtered[:limit] + } + + return ms, filtered, nil +} + +func ExecuteCustomCommandFromReaction(cc *models.CustomCommand, gs *dstate.GuildSet, ms *dstate.MemberState, cs *dstate.ChannelState, reaction *discordgo.MessageReaction, added bool, message *discordgo.Message) error { + tmplCtx := templates.NewContext(gs, cs, ms) + + // to make sure the message is in the proper context of the user reacting we set the mssage context to a fake message + fakeMsg := *message + fakeMsg.Member = ms.DgoMember() + fakeMsg.Author = fakeMsg.Member.User + tmplCtx.Msg = &fakeMsg + + tmplCtx.Data["Reaction"] = reaction + tmplCtx.Data["ReactionMessage"] = message + tmplCtx.Data["Message"] = message + tmplCtx.Data["ReactionAdded"] = added + + return ExecuteCustomCommand(cc, tmplCtx) +} + +func CheckMatchReaction(cmd *models.CustomCommand, reaction *discordgo.MessageReaction, add bool) (match bool) { + if cmd.TriggerType != int(CommandTriggerReaction) { + return false + } + + switch cmd.ReactionTriggerMode { + case ReactionModeBoth: + return true + case ReactionModeAddOnly: + return add + case ReactionModeRemoveOnly: + return !add + } + + return false +} diff --git a/customcommands/handle_role.go b/customcommands/handle_role.go new file mode 100644 index 0000000000..89d3e4b971 --- /dev/null +++ b/customcommands/handle_role.go @@ -0,0 +1,274 @@ +package customcommands + +import ( + "context" + "fmt" + "slices" + "strconv" + "time" + + "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/customcommands/models" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/mediocregopher/radix/v3" + "github.com/prometheus/client_golang/prometheus" + "github.com/sirupsen/logrus" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +const ( + roleTriggerCooldownSecondsPremium = 60 + roleTriggerCooldownSeconds = 300 +) + +func keyRoleTriggerCooldown(guildID, userID, roleID int64) string { + return fmt.Sprintf("custom_command_role_trigger_cd:%d:%d:%d", guildID, userID, roleID) +} + +func checkRoleTriggerCooldown(guildID, userID, roleID int64) (bool, error) { + var exists int + err := common.RedisPool.Do(radix.Cmd(&exists, "EXISTS", keyRoleTriggerCooldown(guildID, userID, roleID))) + if err != nil { + return false, err + } + return exists == 0, nil +} + +func setRoleTriggerCooldown(guildID, userID, roleID int64, duration int) error { + return common.RedisPool.Do(radix.FlatCmd(nil, "SETEX", keyRoleTriggerCooldown(guildID, userID, roleID), duration, "1")) +} + +var cachedCommandsRoleTrigger = common.CacheSet.RegisterSlot("custom_commands_role_trigger", nil, int64(0)) + +func BotCachedGetCommandsWithRoleTrigger(guildID int64, ctx context.Context) ([]*models.CustomCommand, error) { + v, err := cachedCommandsRoleTrigger.GetCustomFetch(guildID, func(key interface{}) (interface{}, error) { + var cmds []*models.CustomCommand + var err error + + common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands from db", logrus.Fields{"guild": guildID}, func() { + cmds, err = models.CustomCommands(qm.Where("guild_id = ? AND trigger_type = 11", guildID), qm.OrderBy("local_id desc"), qm.Load("Group")).AllG(ctx) + }) + + return cmds, err + }) + + if err != nil { + return nil, err + } + + return v.([]*models.CustomCommand), nil +} + +func CmdRunsForRole(cc *models.CustomCommand, role *discordgo.Role) bool { + if cc.GroupID.Valid { + // check group restrictions + if slices.Contains(cc.R.Group.IgnoreRoles, role.ID) { + return false + } + + if len(cc.R.Group.WhitelistRoles) > 0 && !slices.Contains(cc.R.Group.WhitelistRoles, role.ID) { + return false + } + } + + // check command specific restrictions + if len(cc.Roles) == 0 { + // Fast path + return !cc.RolesWhitelistMode + } + + if slices.Contains(cc.Roles, role.ID) { + return cc.RolesWhitelistMode + } + + return !cc.RolesWhitelistMode +} + +func findRoleTriggerCommands(ctx context.Context, guildID int64) (matches []*TriggeredCC, err error) { + allCmds, err := BotCachedGetCommandsWithRoleTrigger(guildID, ctx) + if err != nil { + return nil, err + } + + matches = make([]*TriggeredCC, 0, len(allCmds)) + + for _, cmd := range allCmds { + if cmd.Disabled || cmd.R.Group != nil && cmd.R.Group.Disabled || cmd.ContextChannel == 0 { + continue + } + + matches = append(matches, &TriggeredCC{ + CC: cmd, + }) + } + + return +} + +func handleGuildAuditLogEntryCreate(evt *eventsystem.EventData) { + data := evt.GuildAuditLogEntryCreate() + + if data.ActionType == nil || *data.ActionType != discordgo.AuditLogActionMemberRoleUpdate { + return + } + + if !evt.HasFeatureFlag(featureFlagHasCommands) { + return + } + + commands, err := findRoleTriggerCommands(evt.Context(), data.GuildID) + if err != nil { + logger.WithField("guild", data.GuildID).WithError(err).Warn("failed fetching role trigger commands") + return + } + + if len(commands) == 0 { + return + } + + var roleChanges []struct { + roleID int64 + added bool + } + + for _, change := range data.Changes { + if change.Key == nil { + continue + } + + if *change.Key != discordgo.AuditLogChangeKeyRoleAdd && *change.Key != discordgo.AuditLogChangeKeyRoleRemove { + continue + } + + isRoleAdded := *change.Key == discordgo.AuditLogChangeKeyRoleAdd + var roles []map[string]any + if change.NewValue != nil { + if roleArray, ok := change.NewValue.([]any); ok { + for _, r := range roleArray { + if roleMap, ok := r.(map[string]any); ok { + roles = append(roles, roleMap) + } + } + } + } + for _, roleMap := range roles { + if roleIDStr, ok := roleMap["id"].(string); ok { + if roleID, err := strconv.ParseInt(roleIDStr, 10, 64); err == nil { + roleChanges = append(roleChanges, struct { + roleID int64 + added bool + }{roleID: roleID, added: isRoleAdded}) + } + } + } + } + + if len(roleChanges) == 0 { + return + } + + targetUserID := data.TargetID + modUserID := data.UserID + + targetMember, err := bot.GetMember(data.GuildID, targetUserID) + if err != nil { + logger.WithField("guild", data.GuildID).WithField("TargetUserID", targetUserID).WithError(err).Warn("failed getting target member for role trigger") + return + } + + if targetMember.User.Bot { + return + } + + modMember, err := bot.GetMember(data.GuildID, modUserID) + if err != nil { + logger.WithField("guild", data.GuildID).WithField("ModUserID", modUserID).WithError(err).Warn("failed getting mod member for role trigger") + return + } + + for _, roleChange := range roleChanges { + // Check cooldown + canTrigger, err := checkRoleTriggerCooldown(data.GuildID, targetUserID, roleChange.roleID) + if err != nil { + logger.WithField("guild", data.GuildID).WithField("TargetUserID", targetUserID).WithField("RoleID", roleChange.roleID).WithError(err).Warn("failed checking role trigger cooldown") + continue + } + + if !canTrigger { + continue // On cooldown + } + + if len(commands) == 0 { + continue + } + + // Get the role object + gs := evt.GS + if gs == nil { + continue + } + + role := gs.GetRole(roleChange.roleID) + if role == nil { + continue + } + + // Execute matched commands + metricsExecutedCommands.With(prometheus.Labels{"trigger": "role"}).Inc() + filteredCommands := make([]*TriggeredCC, 0, len(commands)) + for _, cmd := range commands { + cmdMode := int(cmd.CC.RoleTriggerMode) + if cmdMode == RoleTriggerModeAdd && !roleChange.added { + continue + } + + if cmdMode == RoleTriggerModeRemove && roleChange.added { + continue + } + + if !CmdRunsForRole(cmd.CC, role) { + continue + } + + filteredCommands = append(filteredCommands, cmd) + } + + if len(filteredCommands) == 0 { + continue + } + + cooldown := roleTriggerCooldownSeconds + if premiumEnabled, _ := premium.IsGuildPremium(data.GuildID); premiumEnabled { + cooldown = roleTriggerCooldownSecondsPremium + } + + if err := setRoleTriggerCooldown(data.GuildID, targetUserID, roleChange.roleID, cooldown); err != nil { + logger.WithField("guild", data.GuildID).WithField("TargetUserID", targetUserID).WithField("RoleID", roleChange.roleID).WithError(err).Warn("failed setting role trigger cooldown") + continue + } + + for _, cmd := range filteredCommands { + cs := gs.GetChannel(cmd.CC.ContextChannel) + if cs == nil { + continue + } + // Create template context with role trigger specific variables + tmplCtx := templates.NewContext(gs, cs, nil) + tmplCtx.GS = gs + tmplCtx.Data["TargetMember"] = &targetMember // member who got the role + tmplCtx.Data["TargetUser"] = &targetMember.User // user who got the role // Member who assigned the role + tmplCtx.Data["Role"] = role // Role that was assigned/removed + tmplCtx.Data["Author"] = &modMember.User // User object who assigned the role + tmplCtx.Data["RoleAdded"] = roleChange.added + err = ExecuteCustomCommand(cmd.CC, tmplCtx) + if err != nil { + logger.WithField("guild", data.GuildID).WithField("cc_id", cmd.CC.LocalID).WithError(err).Error("Error executing role trigger custom command") + } + } + + } +} diff --git a/customcommands/handle_text.go b/customcommands/handle_text.go new file mode 100644 index 0000000000..a7246aaf36 --- /dev/null +++ b/customcommands/handle_text.go @@ -0,0 +1,275 @@ +package customcommands + +import ( + "context" + "regexp" + "sort" + "strings" + "time" + + "emperror.dev/errors" + "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/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/prometheus/client_golang/prometheus" + "github.com/sirupsen/logrus" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +// hasHigherPriority reports whether custom command a should be executed in preference to custom +// command b. Regex custom commands always have lowest priority, with ties broken by ID (smaller ID +// has priority.) +func hasHigherPriority(a *models.CustomCommand, b *models.CustomCommand) bool { + aIsRegex := a.TriggerType == int(CommandTriggerRegex) + bIsRegex := b.TriggerType == int(CommandTriggerRegex) + + switch { + case !aIsRegex && bIsRegex: + return true + case aIsRegex && !bIsRegex: + return false + default: + return a.LocalID < b.LocalID + } +} + +func findMessageTriggerCustomCommands(ctx context.Context, cs *dstate.ChannelState, ms *dstate.MemberState, evt *eventsystem.EventData, msg *discordgo.Message) (matches []*TriggeredCC, err error) { + cmds, err := BotCachedGetCommandsWithMessageTriggers(cs.GuildID, ctx) + if err != nil { + return nil, errors.WrapIf(err, "BotCachedGetCommandsWithMessageTriggers") + } + + prefix, err := commands.GetCommandPrefixBotEvt(evt) + if err != nil { + return nil, errors.WrapIf(err, "GetCommandPrefix") + } + + var matched []*TriggeredCC + for _, cmd := range cmds { + if cmd.Disabled || !CmdRunsInChannel(cmd, common.ChannelOrThreadParentID(cs)) || !CmdRunsForUser(cmd, ms) || cmd.R.Group != nil && cmd.R.Group.Disabled { + continue + } + content := msg.Content + if cmd.TriggerType == int(CommandTriggerContains) || cmd.TriggerType == int(CommandTriggerRegex) { + //for contains and regex match, we need to look at the content of the forwarded message too. + content = strings.Join(msg.GetMessageContents(), " ") + } + if didMatch, stripped, args := CheckMatch(prefix, cmd, content); didMatch { + matched = append(matched, &TriggeredCC{ + CC: cmd, + Args: args, + Stripped: stripped, + }) + } + } + + sort.Slice(matched, func(i, j int) bool { + return hasHigherPriority(matched[i].CC, matched[j].CC) + }) + + limit := CCActionExecLimit(msg.GuildID) + if len(matched) > limit { + matched = matched[:limit] + } + + return matched, nil +} + +func HandleMessageUpdate(evt *eventsystem.EventData) { + mu := evt.MessageUpdate() + cs := evt.CSOrThread() + + if isPremium, _ := premium.IsGuildPremium(mu.GuildID); !isPremium { + return + } + + if !evt.HasFeatureFlag(featureFlagHasCommands) { + return + } + + if shouldIgnoreChannel(mu.Message, evt.GS, cs) { + return + } + + member := dstate.MemberStateFromMember(mu.Member) + member.GuildID = evt.GS.ID + var matchedCustomCommands []*TriggeredCC + var err error + common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands", logrus.Fields{"guild": evt.GS.ID}, func() { + matchedCustomCommands, err = findMessageTriggerCustomCommands(evt.Context(), cs, member, evt, mu.Message) + }) + if err != nil { + logger.WithError(err).Error("Error matching custom commands") + return + } + + if len(matchedCustomCommands) == 0 { + return + } + + metricsExecutedCommands.With(prometheus.Labels{"trigger": "message"}).Inc() + for _, matched := range matchedCustomCommands { + if !matched.CC.TriggerOnEdit { + continue + } + err = ExecuteCustomCommandFromMessage(evt.GS, matched.CC, member, cs, matched.Args, matched.Stripped, mu.Message, true) + if err != nil { + logger.WithField("guild", mu.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") + } + } +} + +func HandleMessageCreate(evt *eventsystem.EventData) { + mc := evt.MessageCreate() + cs := evt.CSOrThread() + + if !evt.HasFeatureFlag(featureFlagHasCommands) { + return + } + + if shouldIgnoreChannel(mc.Message, evt.GS, cs) { + return + } + + member := dstate.MemberStateFromMember(mc.Member) + member.GuildID = evt.GS.ID + + var matchedCustomCommands []*TriggeredCC + var err error + common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands", logrus.Fields{"guild": evt.GS.ID}, func() { + matchedCustomCommands, err = findMessageTriggerCustomCommands(evt.Context(), cs, member, evt, mc.Message) + }) + if err != nil { + logger.WithError(err).Error("Error matching custom commands") + return + } + + if len(matchedCustomCommands) == 0 { + return + } + + metricsExecutedCommands.With(prometheus.Labels{"trigger": "message"}).Inc() + + for _, matched := range matchedCustomCommands { + err = ExecuteCustomCommandFromMessage(evt.GS, matched.CC, member, cs, matched.Args, matched.Stripped, mc.Message, false) + if err != nil { + logger.WithField("guild", mc.GuildID).WithField("cc_id", matched.CC.LocalID).WithError(err).Error("Error executing custom command") + } + } +} + +// CheckMatch returns true if the given cmd matches, as well as the arguments +// following the command trigger (arg 0 being the message up to, and including, +// the trigger). +func CheckMatch(globalPrefix string, cmd *models.CustomCommand, msg string) (match bool, stripped string, args []string) { + trigger := cmd.TextTrigger + + cmdMatch := "(?m)" + if !cmd.TextTriggerCaseSensitive { + cmdMatch += "(?i)" + } + + switch CommandTriggerType(cmd.TriggerType) { + case CommandTriggerCommand: + // Regex is: + // \A(<@!?bot_id> ?|server_cmd_prefix)trigger(\z|[[:space:]]) + cmdMatch += `\A(<@!?` + discordgo.StrID(common.BotUser.ID) + "> ?|" + regexp.QuoteMeta(globalPrefix) + ")" + regexp.QuoteMeta(trigger) + `(\z|[[:space:]])` + case CommandTriggerStartsWith: + cmdMatch += `\A` + regexp.QuoteMeta(trigger) + case CommandTriggerContains: + cmdMatch += regexp.QuoteMeta(trigger) + case CommandTriggerRegex: + cmdMatch += trigger + case CommandTriggerExact: + cmdMatch += `\A` + regexp.QuoteMeta(trigger) + `\z` + default: + return false, "", nil + } + + return matchRegexSplitArgs(cmdMatch, msg) +} + +func ExecuteCustomCommandFromMessage(gs *dstate.GuildSet, cmd *models.CustomCommand, member *dstate.MemberState, cs *dstate.ChannelState, cmdArgs []string, stripped string, m *discordgo.Message, isEdit bool) error { + tmplCtx := templates.NewContext(gs, cs, member) + tmplCtx.Msg = m + + // prepare message specific data + args := dcmd.SplitArgs(m.Content) + argsStr := make([]string, len(args)) + for k, v := range args { + argsStr[k] = v.Str + } + + tmplCtx.Data["Args"] = argsStr + tmplCtx.Data["StrippedMsg"] = stripped + tmplCtx.Data["Cmd"] = cmdArgs[0] + if len(cmdArgs) > 1 { + tmplCtx.Data["CmdArgs"] = cmdArgs[1:] + } else { + tmplCtx.Data["CmdArgs"] = []string{} + } + tmplCtx.Data["IsMessageEdit"] = isEdit + tmplCtx.Data["Message"] = m + + return ExecuteCustomCommand(cmd, tmplCtx) +} + +func matchRegexSplitArgs(pattern, msg string) (match bool, stripped string, args []string) { + item, err := RegexCache.Fetch(pattern, time.Minute*10, func() (interface{}, error) { + re, err := regexp.Compile(pattern) + if err != nil { + return nil, err + } + + return re, nil + }) + + if err != nil { + return false, "", nil + } + + re := item.Value().(*regexp.Regexp) + + idx := re.FindStringIndex(msg) + if idx == nil { + return false, "", nil + } + + argsRaw := dcmd.SplitArgs(msg[idx[1]:]) + args = make([]string, len(argsRaw)+1) + args[0] = strings.TrimSpace(msg[:idx[1]]) + for i, v := range argsRaw { + args[i+1] = v.Str + } + + stripped = msg[idx[1]:] + match = true + return +} + +var cachedCommandsMessageTrigger = common.CacheSet.RegisterSlot("custom_commands_message_trigger", nil, int64(0)) + +func BotCachedGetCommandsWithMessageTriggers(guildID int64, ctx context.Context) ([]*models.CustomCommand, error) { + v, err := cachedCommandsMessageTrigger.GetCustomFetch(guildID, func(key interface{}) (interface{}, error) { + var cmds []*models.CustomCommand + var err error + + common.LogLongCallTime(time.Second, true, "Took longer than a second to fetch custom commands from db", logrus.Fields{"guild": guildID}, func() { + cmds, err = models.CustomCommands(qm.Where("guild_id = ? AND trigger_type IN (0,1,2,3,4) and disabled = false", guildID), qm.OrderBy("local_id desc"), qm.Load("Group")).AllG(ctx) + }) + + return cmds, err + }) + + if err != nil { + return nil, err + } + + return v.([]*models.CustomCommand), nil +} diff --git a/customcommands/handle_timed.go b/customcommands/handle_timed.go new file mode 100644 index 0000000000..63a8c0b31e --- /dev/null +++ b/customcommands/handle_timed.go @@ -0,0 +1,180 @@ +package customcommands + +import ( + "context" + "time" + + "emperror.dev/errors" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + 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/prometheus/client_golang/prometheus" + "github.com/sirupsen/logrus" + "github.com/vmihailenco/msgpack" + "github.com/volatiletech/null/v8" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +func handleCustomCommandsRunNow(event *pubsub.Event) { + dataCast := event.Data.(*models.CustomCommand) + f := logger.WithFields(logrus.Fields{ + "guild_id": dataCast.GuildID, + "cmd_id": dataCast.LocalID, + }) + + gs := bot.State.GetGuild(dataCast.GuildID) + if gs == nil { + f.Error("failed fetching active guild from state") + return + } + + cs := gs.GetChannel(dataCast.ContextChannel) + if cs == nil { + f.Error("failed finding channel to run cc in") + return + } + + metricsExecutedCommands.With(prometheus.Labels{"trigger": "timed"}).Inc() + + tmplCtx := templates.NewContext(gs, cs, nil) + ExecuteCustomCommand(dataCast, tmplCtx) + + dataCast.LastRun = null.TimeFrom(time.Now()) + err := UpdateCommandNextRunTime(dataCast, true, true) + if err != nil { + f.WithError(err).Error("failed updating custom command next run time") + } +} + +func handleDelayedRunCC(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) { + dataCast := data.(*DelayedRunCCData) + cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, dataCast.CmdID), qm.Load("Group")).OneG(context.Background()) + if err != nil { + return false, errors.WrapIf(err, "find_command") + } + + if cmd.R.Group != nil && cmd.R.Group.Disabled { + return false, errors.New("custom command group is disabled") + } + + if cmd.Disabled { + return false, errors.New("custom command is disabled") + } + + if !DelayedCCRunLimit.AllowN(DelayedRunLimitKey{GuildID: evt.GuildID, ChannelID: dataCast.ChannelID}, time.Now(), 1) { + logger.WithField("guild", cmd.GuildID).Warn("went above delayed cc run ratelimit") + return false, nil + } + + gs := bot.State.GetGuild(evt.GuildID) + if gs == nil { + // in case the bot left in the meantime + if onGuild, err := common.BotIsOnGuild(evt.GuildID); !onGuild && err == nil { + return false, nil + } else if err != nil { + logger.WithError(err).Error("failed checking if bot is on guild") + } + + return true, nil + } + + cs := gs.GetChannelOrThread(dataCast.ChannelID) + if cs == nil { + // don't reschedule if channel is deleted, make sure its actually not there, and not just a discord downtime + if !gs.Available { + return true, nil + } + + return false, nil + } + + // attempt to get up to date member information + if dataCast.Member != nil { + updatedMS, _ := bot.GetMember(gs.ID, dataCast.Member.User.ID) + if updatedMS != nil { + dataCast.Member = updatedMS + } + } + + tmplCtx := templates.NewContext(gs, cs, dataCast.Member) + if dataCast.Message != nil { + tmplCtx.Msg = dataCast.Message + tmplCtx.Data["Message"] = dataCast.Message + } + + tmplCtx.ExecutedFrom = dataCast.ExecutedFrom + + // decode userdata + if len(dataCast.UserData) > 0 { + var i interface{} + err := msgpack.Unmarshal(dataCast.UserData, &i) + if err != nil { + return false, err + } + + tmplCtx.Data["ExecData"] = i + } + + metricsExecutedCommands.With(prometheus.Labels{"trigger": "timed"}).Inc() + + err = ExecuteCustomCommand(cmd, tmplCtx) + return false, err +} + +func handleNextRunScheduledEVent(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) { + cmd, err := models.CustomCommands(qm.Where("guild_id = ? AND local_id = ?", evt.GuildID, (data.(*NextRunScheduledEvent)).CmdID), qm.Load("Group")).OneG(context.Background()) + if err != nil { + return false, errors.WrapIf(err, "find_command") + } + + if cmd.R.Group != nil && cmd.R.Group.Disabled { + return false, errors.New("custom command group is disabled") + } + + if cmd.Disabled { + return false, errors.New("custom command is disabled") + } + + if time.Until(cmd.NextRun.Time) > time.Second*5 { + return false, nil // old scheduled event that wasn't removed, /shrug + + } + + gs := bot.State.GetGuild(evt.GuildID) + if gs == nil { + if onGuild, err := common.BotIsOnGuild(evt.GuildID); !onGuild && err == nil { + return false, nil + } else if err != nil { + logger.WithError(err).Error("failed checking if bot is on guild") + } + + return true, nil + } + + cs := gs.GetChannel(cmd.ContextChannel) + if cs == nil { + // don't reschedule if channel is deleted, make sure its actually not there, and not just a discord downtime + if !gs.Available { + return true, nil + } + + return false, nil + } + + metricsExecutedCommands.With(prometheus.Labels{"trigger": "timed"}).Inc() + + tmplCtx := templates.NewContext(gs, cs, nil) + ExecuteCustomCommand(cmd, tmplCtx) + + // schedule next runs + cmd.LastRun = cmd.NextRun + err = UpdateCommandNextRunTime(cmd, true, false) + if err != nil { + logger.WithError(err).Error("failed updating custom command next run time") + } + + return false, nil +} diff --git a/customcommands/interval.go b/customcommands/interval.go index c1c3839942..0494f0b0d1 100644 --- a/customcommands/interval.go +++ b/customcommands/interval.go @@ -66,7 +66,7 @@ func CalcNextRunTime(cc *models.CustomCommand, now time.Time) time.Time { specSchedule := cronSchedule.(*cron.SpecSchedule) const hoursInADay = 24 const daysInAWeek = 7 - const starIsConfiguredBitset = 1<<63 // top bit set == "*" + const starIsConfiguredBitset = 1 << 63 // top bit set == "*" var newHoursScheduledBitset uint64 var newDaysScheduledBitset uint64 for hourOfDay := range hoursInADay { @@ -98,8 +98,8 @@ func CalcNextRunTime(cc *models.CustomCommand, now time.Time) time.Time { } } - const allHoursBitset = (1<= MaxCommandsForContext(ctx) { + if int(currentCount) >= MaxCommandsForContext(ctx) { return templateData.AddAlerts(web.ErrorAlert(fmt.Sprintf("Max %d custom commands allowed (or %d for premium servers)", MaxCommands, MaxCommandsPremium))), nil } @@ -490,7 +492,7 @@ func handleNewCommand(w http.ResponseWriter, r *http.Request) (web.TemplateData, go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyImportedCommand, &cplogs.Param{Type: cplogs.ParamTypeInt, Value: dbModel.LocalID})) } - pubsub.EvictCacheSet(cachedCommandsMessage, activeGuild.ID) + EvictCustomCommandCache(activeGuild.ID) return templateData, nil } @@ -546,8 +548,20 @@ func handleUpdateCommand(w http.ResponseWriter, r *http.Request) (web.TemplateDa dbModel.GuildID = activeGuild.ID dbModel.LocalID = cmdEdit.ID dbModel.TriggerType = int(triggerTypeFromForm(cmdEdit.TriggerTypeForm)) + + // Check limits for role triggers (1 free, 5 premium) + if dbModel.TriggerType == int(CommandTriggerRole) { + dbModel.ContextChannel = cmdEdit.RoleContextChannel + ok, err := checkRoleTriggerLimit(ctx, activeGuild.ID, cmdEdit.ID, templateData) + if err != nil || !ok { + return templateData, err + } + + } + // check low interval limits if dbModel.TriggerType == int(CommandTriggerInterval) || dbModel.TriggerType == int(CommandTriggerCron) { + dbModel.ContextChannel = cmdEdit.TimeContextChannel switch CommandTriggerType(dbModel.TriggerType) { case CommandTriggerInterval: if dbModel.TimeTriggerInterval <= 10 { @@ -638,7 +652,7 @@ func handleUpdateCommand(w http.ResponseWriter, r *http.Request) (web.TemplateDa go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyDisabledSharingCommand, &cplogs.Param{Type: cplogs.ParamTypeInt, Value: dbModel.LocalID})) } - pubsub.EvictCacheSet(cachedCommandsMessage, activeGuild.ID) + EvictCustomCommandCache(activeGuild.ID) return templateData, err } @@ -670,7 +684,7 @@ func handleDeleteCommand(w http.ResponseWriter, r *http.Request) (web.TemplateDa err = DelNextRunEvent(cmd.GuildID, cmd.LocalID) featureflags.MarkGuildDirty(activeGuild.ID) - pubsub.EvictCacheSet(cachedCommandsMessage, activeGuild.ID) + EvictCustomCommandCache(activeGuild.ID) return templateData, err } @@ -758,6 +772,29 @@ func checkIntervalLimits(ctx context.Context, guildID int64, cmdID int64, templa return false, nil } +func checkRoleTriggerLimit(ctx context.Context, guildID int64, cmdID int64, templateData web.TemplateData) (ok bool, err error) { + isPremium := premium.ContextPremium(ctx) + limit := MaxRoleTriggerCommandsForContext(ctx) + // Check if we're at the limit (excluding the current command being updated) + count, err := models.CustomCommands( + qm.Where("guild_id = ? AND trigger_type = ? AND local_id != ?", guildID, int(CommandTriggerRole), cmdID), + ).CountG(ctx) + if err != nil { + return false, err + } + + if int(count) >= limit { + msg := fmt.Sprintf("Max %d role trigger commands allowed", limit) + if !isPremium { + msg = fmt.Sprintf("%s (Premium servers allow up to %d)", msg, MaxRoleTriggerCommandsPremium) + } + templateData.AddAlerts(web.ErrorAlert(msg)) + return false, nil + } + + return true, nil +} + func handleNewGroup(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { ctx := r.Context() activeGuild, templateData := web.GetBaseCPContextData(ctx) @@ -787,7 +824,7 @@ func handleNewGroup(w http.ResponseWriter, r *http.Request) (web.TemplateData, e templateData["CurrentGroupID"] = dbModel.ID - pubsub.EvictCacheSet(cachedCommandsMessage, activeGuild.ID) + EvictCustomCommandCache(activeGuild.ID) return templateData, nil } @@ -802,7 +839,6 @@ func handleUpdateGroup(w http.ResponseWriter, r *http.Request) (web.TemplateData if err != nil { return templateData, err } - logrus.Infof("groupForm.IsEnabled %#v", groupForm.IsEnabled) model.WhitelistChannels = groupForm.WhitelistChannels model.IgnoreChannels = groupForm.BlacklistChannels @@ -810,13 +846,14 @@ func handleUpdateGroup(w http.ResponseWriter, r *http.Request) (web.TemplateData model.IgnoreRoles = groupForm.BlacklistRoles model.Name = groupForm.Name model.Disabled = !groupForm.IsEnabled + model.RedirectErrorsChannel = groupForm.RedirectErrorsChannel _, err = model.UpdateG(ctx, boil.Infer()) if err == nil { go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyUpdatedGroup, &cplogs.Param{Type: cplogs.ParamTypeString, Value: model.Name})) } - pubsub.EvictCacheSet(cachedCommandsMessage, activeGuild.ID) + EvictCustomCommandCache(activeGuild.ID) return templateData, err } @@ -838,7 +875,7 @@ func handleDeleteGroup(w http.ResponseWriter, r *http.Request) (web.TemplateData go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyRemovedGroup, &cplogs.Param{Type: cplogs.ParamTypeInt, Value: id})) } - pubsub.EvictCacheSet(cachedCommandsMessage, activeGuild.ID) + EvictCustomCommandCache(activeGuild.ID) return templateData, err } @@ -866,6 +903,8 @@ func triggerTypeFromForm(str string) CommandTriggerType { return CommandTriggerModal case "cron": return CommandTriggerCron + case "role_trigger": + return CommandTriggerRole default: return CommandTriggerCommand @@ -975,3 +1014,10 @@ func UpdateImportCount(cmd *models.CustomCommand) { logger.WithError(err).WithField("guild", cmd.GuildID).Error("failed running post command imported query") } } + +func EvictCustomCommandCache(guildID int64) { + pubsub.EvictCacheSet(cachedCommandsMessageTrigger, guildID) + pubsub.EvictCacheSet(cachedCommandsComponentTrigger, guildID) + pubsub.EvictCacheSet(cachedCommandsReactionTrigger, guildID) + pubsub.EvictCacheSet(cachedCommandsRoleTrigger, guildID) +} diff --git a/frontend/static/js/yagFuncs.js b/frontend/static/js/yagFuncs.js index 7af10a6314..cf55cb6d01 100644 --- a/frontend/static/js/yagFuncs.js +++ b/frontend/static/js/yagFuncs.js @@ -137,7 +137,11 @@ var yagFuncs = { cembed: true, cbutton: true, cmenu: true, - cmodal: true, + ctextInput: true, + ctextDisplay: true, + clabel: true, + componentBuilder: true, + modalBuilder: true, cslice: true, complexMessage: true, complexMessageEdit: true, diff --git a/frontend/templates/cp_nav.html b/frontend/templates/cp_nav.html index 14835239d5..1e27f39c45 100644 --- a/frontend/templates/cp_nav.html +++ b/frontend/templates/cp_nav.html @@ -137,7 +137,7 @@
{{else}}
- Login using discord + Login with Discord
{{end}} diff --git a/frontend/templates/index.html b/frontend/templates/index.html index 216d96a1e8..91aada8de5 100644 --- a/frontend/templates/index.html +++ b/frontend/templates/index.html @@ -66,13 +66,17 @@ Premium + {{if .User}}
Control Panel
- {{if .User}}
Logout
+ {{else}} +
+ Login with Discord +
{{end}}
diff --git a/go.mod b/go.mod index abbcc4203f..97e44bb45e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/botlabs-gg/yagpdb/v2 -go 1.25.0 +go 1.25.4 require ( emperror.dev/errors v0.8.1 @@ -60,12 +60,12 @@ require ( github.com/volatiletech/sqlboiler/v4 v4.14.2 github.com/volatiletech/strmangle v0.0.6 goji.io v2.0.2+incompatible - golang.org/x/crypto v0.36.0 + golang.org/x/crypto v0.45.0 golang.org/x/image v0.18.0 - golang.org/x/net v0.38.0 + golang.org/x/net v0.47.0 golang.org/x/oauth2 v0.27.0 - golang.org/x/sys v0.31.0 // indirect - golang.org/x/text v0.23.0 + golang.org/x/sys v0.38.0 // indirect + golang.org/x/text v0.31.0 golang.org/x/time v0.3.0 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/api v0.131.0 @@ -79,6 +79,7 @@ require ( github.com/jarcoal/httpmock v1.0.4 github.com/justinian/dice v1.0.2 github.com/n0madic/twitter-scraper v0.0.0-20230711213008-94503a2bc36c + github.com/nicklaw5/helix/v2 v2.32.0 github.com/robfig/cron/v3 v3.0.1 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c ) @@ -93,6 +94,7 @@ require ( github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/goccy/go-json v0.10.2 // indirect + github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/s2a-go v0.1.4 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect diff --git a/go.sum b/go.sum index 5eb4979cb5..139a711234 100644 --- a/go.sum +++ b/go.sum @@ -259,6 +259,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= @@ -556,6 +558,8 @@ github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4 github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= +github.com/nicklaw5/helix/v2 v2.32.0 h1:ZRPt+wRUMQqpny6yZKVY9rUGNwv+ZmIh75fSiopMXuY= +github.com/nicklaw5/helix/v2 v2.32.0/go.mod h1:KaXa2mb2kBzsDana9RbXevTgnfU95DMoSORWo2hqlWA= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -828,8 +832,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= -golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= -golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= 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= @@ -928,8 +932,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= 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= @@ -970,8 +974,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= -golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1065,16 +1069,16 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo= -golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= -golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= +golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= +golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1089,8 +1093,8 @@ golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= 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= diff --git a/lib/dcmd/help.go b/lib/dcmd/help.go index b55452f244..0c2595d2bc 100644 --- a/lib/dcmd/help.go +++ b/lib/dcmd/help.go @@ -261,6 +261,10 @@ func (s *StdHelpFormatter) Switches(cmd Cmd) (str string) { for _, sw := range switches { str += "[-" + strings.ToLower(sw.Name) + " " + s.ArgDef(sw) + "]\n" } + // Trim the last newline + if len(str) > 0 && strings.HasSuffix(str, "\n") { + str = str[:len(str)-1] + } return } @@ -284,6 +288,10 @@ func (s *StdHelpFormatter) ArgDefs(cmd *RegisteredCommand, data *Data) (str stri } else { str = cmd.FormatNames(false, "/") + " " + s.ArgDefLine(defs, req) } + // Trim the last newline + if len(str) > 0 && strings.HasSuffix(str, "\n") { + str = str[:len(str)-1] + } return } diff --git a/lib/discordgo/components.go b/lib/discordgo/components.go index bbe3ac8f1f..33f144cb6d 100644 --- a/lib/discordgo/components.go +++ b/lib/discordgo/components.go @@ -4,6 +4,8 @@ import ( "encoding/json" "errors" "fmt" + + "github.com/sirupsen/logrus" ) // ComponentType is type of component. @@ -25,7 +27,9 @@ const ( MediaGalleryComponent ComponentType = 12 FileComponent ComponentType = 13 SeparatorComponent ComponentType = 14 + ActivityContentComponent ComponentType = 16 ContainerComponent ComponentType = 17 + LabelComponent ComponentType = 18 ) // MessageComponent is a base interface for all message components. @@ -72,8 +76,11 @@ func (umc *unmarshalableMessageComponent) UnmarshalJSON(src []byte) error { umc.MessageComponent = &Separator{} case ContainerComponent: umc.MessageComponent = &Container{} + case LabelComponent: + umc.MessageComponent = &Label{} default: - return fmt.Errorf("unknown component type: %d", v.Type) + logrus.Warnf("unknown component type: %d", v.Type) + umc.MessageComponent = &UnknownComponent{} } return json.Unmarshal(src, umc.MessageComponent) } @@ -88,16 +95,44 @@ func MessageComponentFromJSON(b []byte) (MessageComponent, error) { return u.MessageComponent, nil } +type UnknownComponent struct { + TopLevelComponent +} + // TopLevelComponent is an interface for message components which can be used on the top level of a message. type TopLevelComponent interface { MessageComponent IsTopLevel() bool + IsModalSupported() bool } // InteractiveComponent is an interface for message components which can be interacted with. type InteractiveComponent interface { MessageComponent IsInteractive() bool + IsAllowedInLabel() bool +} + +func (r UnknownComponent) MarshalJSON() ([]byte, error) { + type unknownComponent UnknownComponent + return json.Marshal(struct { + unknownComponent + Type ComponentType `json:"type"` + }{ + Type: r.Type(), + }) +} + +func (r *UnknownComponent) UnmarshalJSON(data []byte) error { + var v struct { + UnknownComponent UnknownComponent `json:"components"` + } + err := json.Unmarshal(data, &v) + if err != nil { + return err + } + *r = v.UnknownComponent + return err } // ActionsRow is a container for interactive components within one row. @@ -150,6 +185,11 @@ func (ActionsRow) IsTopLevel() bool { return true } +// IsModalSupported is a method to assert the component as modal supported. +func (ActionsRow) IsModalSupported() bool { + return false +} + // ButtonStyle is style of button. type ButtonStyle uint @@ -213,6 +253,10 @@ func (Button) IsInteractive() bool { return true } +func (Button) IsAllowedInLabel() bool { + return false +} + // IsAccessory is a method to assert the component as an accessory. func (Button) IsAccessory() bool { return true @@ -275,6 +319,9 @@ type SelectMenu struct { // NOTE: Number of entries should be in the range defined by MinValues and MaxValues. DefaultValues []SelectMenuDefaultValue `json:"default_values,omitempty"` + // Values is a list of values selected by the user, only filled when the select menu is submitted. + Values []string `json:"values,omitempty"` + Options []SelectMenuOption `json:"options,omitempty"` Disabled bool `json:"disabled"` Required bool `json:"required"` @@ -291,6 +338,10 @@ func (s SelectMenu) Type() ComponentType { return SelectMenuComponent } +func (SelectMenu) IsAllowedInLabel() bool { + return true +} + // MarshalJSON is a method for marshaling SelectMenu to a JSON object. func (s SelectMenu) MarshalJSON() ([]byte, error) { type selectMenu SelectMenu @@ -312,7 +363,7 @@ func (SelectMenu) IsInteractive() bool { // TextInput represents text input component. type TextInput struct { CustomID string `json:"custom_id"` - Label string `json:"label"` + Label string `json:"label,omitempty"` Style TextInputStyle `json:"style"` Placeholder string `json:"placeholder,omitempty"` Value string `json:"value,omitempty"` @@ -326,6 +377,10 @@ func (TextInput) Type() ComponentType { return TextInputComponent } +func (TextInput) IsAllowedInLabel() bool { + return true +} + // MarshalJSON is a method for marshaling TextInput to a JSON object. func (m TextInput) MarshalJSON() ([]byte, error) { type inputText TextInput @@ -389,7 +444,7 @@ func (s Section) MarshalJSON() ([]byte, error) { func (s *Section) UnmarshalJSON(data []byte) error { var v struct { RawComponents []unmarshalableMessageComponent `json:"components"` - RawAccessory unmarshalableMessageComponent `json:"accessory"` + RawAccessory *unmarshalableMessageComponent `json:"accessory"` } err := json.Unmarshal(data, &v) if err != nil { @@ -401,14 +456,17 @@ func (s *Section) UnmarshalJSON(data []byte) error { comp := v.MessageComponent s.Components[i], ok = comp.(SectionComponentPart) if !ok { - return errors.New("non text display passed to section component unmarshaller") + return errors.New("non text display passed to section component") } } + if v.RawAccessory == nil { + return errors.New("missing accessory component in section") + } accessory := v.RawAccessory.MessageComponent s.Accessory, ok = accessory.(AccessoryComponent) if !ok { - return errors.New("non accessory component passed to section component unmarshaller") + return errors.New("non accessory component passed to section component") } return err @@ -424,6 +482,10 @@ func (Section) IsTopLevel() bool { return true } +func (Section) IsModalSupported() bool { + return false +} + func GetTextDisplayContent(component TopLevelComponent) (contents []string) { switch typed := component.(type) { case ActionsRow: @@ -437,10 +499,7 @@ func GetTextDisplayContent(component TopLevelComponent) (contents []string) { } case Container: for _, c := range typed.Components { - comp, ok := c.(TopLevelComponent) - if ok { - contents = append(contents, GetTextDisplayContent(comp)...) - } + contents = append(contents, GetTextDisplayContent(c)...) } case TextDisplay: contents = append(contents, typed.Content) @@ -449,6 +508,62 @@ func GetTextDisplayContent(component TopLevelComponent) (contents []string) { return } +// Label is a top-level layout component. +// Labels wrap modal components with text as a label and optional description. +type Label struct { + // Unique identifier for the component; auto populated through increment if not provided. + ID int `json:"id,omitempty"` + Label string `json:"label"` + Description string `json:"description,omitempty"` + Component InteractiveComponent `json:"component"` +} + +// Type is a method to get the type of a component. + +func (Label) Type() ComponentType { + return LabelComponent +} + +// UnmarshalJSON is a method for unmarshaling Label from JSON + +func (l *Label) UnmarshalJSON(data []byte) error { + type label Label + var v struct { + label + RawComponent unmarshalableMessageComponent `json:"component"` + } + + err := json.Unmarshal(data, &v) + if err != nil { + return err + } + + *l = Label(v.label) + l.Component = v.RawComponent.MessageComponent.(InteractiveComponent) + return nil +} + +// MarshalJSON is a method for marshaling Label to a JSON object. +func (l Label) MarshalJSON() ([]byte, error) { + type label Label + + return json.Marshal(struct { + label + Type ComponentType `json:"type"` + }{ + label: label(l), + Type: l.Type(), + }) +} + +func (Label) IsTopLevel() bool { + return true +} + +func (Label) IsModalSupported() bool { + return true +} + // TextDisplay represents text display component. type TextDisplay struct { ID int `json:"id,omitempty"` @@ -473,6 +588,10 @@ func (TextDisplay) Type() ComponentType { return TextDisplayComponent } +func (TextDisplay) IsModalSupported() bool { + return true +} + // IsTopLevel is a method to assert the component as top level. func (TextDisplay) IsTopLevel() bool { return true @@ -485,7 +604,7 @@ func (TextDisplay) IsSectionComponent() bool { type UnfurledMediaItem struct { URL string `json:"url"` // Supports arbitrary urls and attachment:// references - ProxyURL string `json"proxy_url,omitempty"` // The proxied url of the media item. This field is ignored and provided by the API as part of the response + ProxyURL string `json:"proxy_url,omitempty"` // The proxied url of the media item. This field is ignored and provided by the API as part of the response Height int `json:"height,omitempty"` // The height of the media item. This field is ignored and provided by the API as part of the response Width int `json:"width,omitempty"` // The width of the media item. This field is ignored and provided by the API as part of the response ContentType string `json:"content_type,omitempty"` // The media type of the content. This field is ignored and provided by the API as part of the response @@ -557,6 +676,10 @@ func (MediaGallery) IsTopLevel() bool { return true } +func (MediaGallery) IsModalSupported() bool { + return false +} + // ComponentFile represents file component. type ComponentFile struct { ID int `json:"id,omitempty"` @@ -587,6 +710,10 @@ func (ComponentFile) IsTopLevel() bool { return true } +func (ComponentFile) IsModalSupported() bool { + return false +} + // SeparatorSpacing is the size of padding in a separator type SeparatorSpacing int @@ -625,6 +752,10 @@ func (Separator) IsTopLevel() bool { return true } +func (Separator) IsModalSupported() bool { + return false +} + // Container is a top-level layout component that allows you to join text contextually with an accessory. type Container struct { ID int `json:"id,omitempty"` @@ -677,3 +808,7 @@ func (c Container) Type() ComponentType { func (Container) IsTopLevel() bool { return true } + +func (Container) IsModalSupported() bool { + return false +} diff --git a/lib/discordgo/endpoints.go b/lib/discordgo/endpoints.go index bd50a37ccf..59d816f48a 100644 --- a/lib/discordgo/endpoints.go +++ b/lib/discordgo/endpoints.go @@ -349,10 +349,10 @@ func CreateEndpoints(base string) { EndpointChannelMessages = func(cID int64) string { return EndpointChannels + StrID(cID) + "/messages" } EndpointChannelMessage = func(cID, mID int64) string { return EndpointChannels + StrID(cID) + "/messages/" + StrID(mID) } EndpointChannelMessageAck = func(cID, mID int64) string { return EndpointChannels + StrID(cID) + "/messages/" + StrID(mID) + "/ack" } - EndpointChannelMessagesBulkDelete = func(cID int64) string { return EndpointChannel(cID) + "/messages/bulk-delete" } - EndpointChannelMessagesPins = func(cID int64) string { return EndpointChannel(cID) + "/pins" } - EndpointChannelMessagePin = func(cID, mID int64) string { return EndpointChannel(cID) + "/pins/" + StrID(mID) } - EndpointChannelMessageCrosspost = func(cID, mID int64) string { return EndpointChannel(cID) + "/messages/" + StrID(mID) + "/crosspost" } + EndpointChannelMessagesBulkDelete = func(cID int64) string { return EndpointChannelMessages(cID) + "/bulk-delete" } + EndpointChannelMessagesPins = func(cID int64) string { return EndpointChannelMessages(cID) + "/pins" } + EndpointChannelMessagePin = func(cID, mID int64) string { return EndpointChannelMessagesPins(cID) + "/" + StrID(mID) } + EndpointChannelMessageCrosspost = func(cID, mID int64) string { return EndpointChannelMessage(cID, mID) + "/crosspost" } EndpointChannelMessageThread = func(cID, mID int64) string { return EndpointChannelMessage(cID, mID) + "/threads" } EndpointThreadMembers = func(tID int64) string { return EndpointChannel(tID) + "/thread-members" } EndpointThreadMember = func(tID int64, mID string) string { return EndpointThreadMembers(tID) + "/" + mID } diff --git a/lib/discordgo/event.go b/lib/discordgo/event.go index bec700b0a7..7e1a9ff752 100644 --- a/lib/discordgo/event.go +++ b/lib/discordgo/event.go @@ -119,12 +119,14 @@ func (s *Session) addEventHandlerOnce(eventHandler EventHandler) func() { // to a struct corresponding to the event for which you want to listen. // // eg: -// Session.AddHandler(func(s *discordgo.Session, m *discordgo.MessageCreate) { -// }) +// +// Session.AddHandler(func(s *discordgo.Session, m *discordgo.MessageCreate) { +// }) // // or: -// Session.AddHandler(func(s *discordgo.Session, m *discordgo.PresenceUpdate) { -// }) +// +// Session.AddHandler(func(s *discordgo.Session, m *discordgo.PresenceUpdate) { +// }) // // List of events can be found at this page, with corresponding names in the // library for each event: https://discordapp.com/developers/docs/topics/gateway#event-names diff --git a/lib/discordgo/eventhandlers.go b/lib/discordgo/eventhandlers.go index 50235b8a46..073b4e326a 100644 --- a/lib/discordgo/eventhandlers.go +++ b/lib/discordgo/eventhandlers.go @@ -42,8 +42,20 @@ const ( guildRoleCreateEventType = "GUILD_ROLE_CREATE" guildRoleDeleteEventType = "GUILD_ROLE_DELETE" guildRoleUpdateEventType = "GUILD_ROLE_UPDATE" + guildScheduledEventCreateEventType = "GUILD_SCHEDULED_EVENT_CREATE" + guildScheduledEventDeleteEventType = "GUILD_SCHEDULED_EVENT_DELETE" + guildScheduledEventUpdateEventType = "GUILD_SCHEDULED_EVENT_UPDATE" + guildScheduledEventUserAddEventType = "GUILD_SCHEDULED_EVENT_USER_ADD" + guildScheduledEventUserRemoveEventType = "GUILD_SCHEDULED_EVENT_USER_REMOVE" guildStickersUpdateEventType = "GUILD_STICKERS_UPDATE" guildUpdateEventType = "GUILD_UPDATE" + guildAppliedBoostUpdateEventType = "GUILD_APPLIED_BOOSTS_UPDATE" + guildPowerupEntitlementsCreateEventType = "GUILD_POWERUP_ENTITLEMENTS_CREATE" + guildSoundboardSoundCreateEventType = "GUILD_SOUNDBOARD_SOUND_CREATE" + guildSoundboardSoundDeleteEventType = "GUILD_SOUNDBOARD_SOUND_DELETE" + guildSoundboardSoundsUpdateEventType = "GUILD_SOUNDBOARD_SOUNDS_UPDATE" + guildJoinRequestCreateEventType = "GUILD_JOIN_REQUEST_CREATE" + giftCodeUpdateEventType = "GIFT_CODE_UPDATE" interactionCreateEventType = "INTERACTION_CREATE" inviteCreateEventType = "INVITE_CREATE" inviteDeleteEventType = "INVITE_DELETE" @@ -81,6 +93,8 @@ const ( userSettingsUpdateEventType = "USER_SETTINGS_UPDATE" userUpdateEventType = "USER_UPDATE" voiceChannelStatusUpdateEventType = "VOICE_CHANNEL_STATUS_UPDATE" + voiceChannelStartTimeUpdateEventType = "VOICE_CHANNEL_START_TIME_UPDATE" + voiceChannelEffectSendEventType = "VOICE_CHANNEL_EFFECT_SEND" voiceServerUpdateEventType = "VOICE_SERVER_UPDATE" voiceStateUpdateEventType = "VOICE_STATE_UPDATE" webhooksUpdateEventType = "WEBHOOKS_UPDATE" @@ -591,6 +605,26 @@ func (eh guildIntegrationsUpdateEventHandler) Handle(s *Session, i interface{}) } } +// guildJoinRequestCreateEventHandler is an event handler for GuildJoinRequestCreate events. +type guildJoinRequestCreateEventHandler func(*Session, *GuildJoinRequestCreate) + +// Type returns the event type for GuildJoinRequestCreate events. +func (eh guildJoinRequestCreateEventHandler) Type() string { + return guildJoinRequestCreateEventType +} + +// New returns a new instance of GuildJoinRequestCreate. +func (eh guildJoinRequestCreateEventHandler) New() interface{} { + return &GuildJoinRequestCreate{} +} + +// Handle is the handler for GuildJoinRequestCreate events. +func (eh guildJoinRequestCreateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildJoinRequestCreate); ok { + eh(s, t) + } +} + // guildJoinRequestDeleteEventHandler is an event handler for GuildJoinRequestDelete events. type guildJoinRequestDeleteEventHandler func(*Session, *GuildJoinRequestDelete) @@ -771,6 +805,106 @@ func (eh guildRoleUpdateEventHandler) Handle(s *Session, i interface{}) { } } +// guildScheduledEventCreateEventHandler is an event handler for GuildScheduledEventCreate events. +type guildScheduledEventCreateEventHandler func(*Session, *GuildScheduledEventCreate) + +// Type returns the event type for GuildScheduledEventCreate events. +func (eh guildScheduledEventCreateEventHandler) Type() string { + return guildScheduledEventCreateEventType +} + +// New returns a new instance of GuildScheduledEventCreate. +func (eh guildScheduledEventCreateEventHandler) New() interface{} { + return &GuildScheduledEventCreate{} +} + +// Handle is the handler for GuildScheduledEventCreate events. +func (eh guildScheduledEventCreateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildScheduledEventCreate); ok { + eh(s, t) + } +} + +// guildScheduledEventDeleteEventHandler is an event handler for GuildScheduledEventDelete events. +type guildScheduledEventDeleteEventHandler func(*Session, *GuildScheduledEventDelete) + +// Type returns the event type for GuildScheduledEventDelete events. +func (eh guildScheduledEventDeleteEventHandler) Type() string { + return guildScheduledEventDeleteEventType +} + +// New returns a new instance of GuildScheduledEventDelete. +func (eh guildScheduledEventDeleteEventHandler) New() interface{} { + return &GuildScheduledEventDelete{} +} + +// Handle is the handler for GuildScheduledEventDelete events. +func (eh guildScheduledEventDeleteEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildScheduledEventDelete); ok { + eh(s, t) + } +} + +// guildScheduledEventUpdateEventHandler is an event handler for GuildScheduledEventUpdate events. +type guildScheduledEventUpdateEventHandler func(*Session, *GuildScheduledEventUpdate) + +// Type returns the event type for GuildScheduledEventUpdate events. +func (eh guildScheduledEventUpdateEventHandler) Type() string { + return guildScheduledEventUpdateEventType +} + +// New returns a new instance of GuildScheduledEventUpdate. +func (eh guildScheduledEventUpdateEventHandler) New() interface{} { + return &GuildScheduledEventUpdate{} +} + +// Handle is the handler for GuildScheduledEventUpdate events. +func (eh guildScheduledEventUpdateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildScheduledEventUpdate); ok { + eh(s, t) + } +} + +// guildScheduledEventUserAddEventHandler is an event handler for GuildScheduledEventUserAdd events. +type guildScheduledEventUserAddEventHandler func(*Session, *GuildScheduledEventUserAdd) + +// Type returns the event type for GuildScheduledEventUserAdd events. +func (eh guildScheduledEventUserAddEventHandler) Type() string { + return guildScheduledEventUserAddEventType +} + +// New returns a new instance of GuildScheduledEventUserAdd. +func (eh guildScheduledEventUserAddEventHandler) New() interface{} { + return &GuildScheduledEventUserAdd{} +} + +// Handle is the handler for GuildScheduledEventUserAdd events. +func (eh guildScheduledEventUserAddEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildScheduledEventUserAdd); ok { + eh(s, t) + } +} + +// guildScheduledEventUserRemoveEventHandler is an event handler for GuildScheduledEventUserRemove events. +type guildScheduledEventUserRemoveEventHandler func(*Session, *GuildScheduledEventUserRemove) + +// Type returns the event type for GuildScheduledEventUserRemove events. +func (eh guildScheduledEventUserRemoveEventHandler) Type() string { + return guildScheduledEventUserRemoveEventType +} + +// New returns a new instance of GuildScheduledEventUserRemove. +func (eh guildScheduledEventUserRemoveEventHandler) New() interface{} { + return &GuildScheduledEventUserRemove{} +} + +// Handle is the handler for GuildScheduledEventUserRemove events. +func (eh guildScheduledEventUserRemoveEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildScheduledEventUserRemove); ok { + eh(s, t) + } +} + // guildStickersUpdateEventHandler is an event handler for GuildStickersUpdate events. type guildStickersUpdateEventHandler func(*Session, *GuildStickersUpdate) @@ -811,6 +945,126 @@ func (eh guildUpdateEventHandler) Handle(s *Session, i interface{}) { } } +// guildAppliedBoostUpdateEventHandler is an event handler for GuildAppliedBoostUpdate events. +type guildAppliedBoostUpdateEventHandler func(*Session, *GuildAppliedBoostUpdate) + +// Type returns the event type for GuildAppliedBoostUpdate events. +func (eh guildAppliedBoostUpdateEventHandler) Type() string { + return guildAppliedBoostUpdateEventType +} + +// New returns a new instance of GuildAppliedBoostUpdate. +func (eh guildAppliedBoostUpdateEventHandler) New() interface{} { + return &GuildAppliedBoostUpdate{} +} + +// Handle is the handler for GuildAppliedBoostUpdate events. +func (eh guildAppliedBoostUpdateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildAppliedBoostUpdate); ok { + eh(s, t) + } +} + +// guildPowerupEntitlementsCreateEventHandler is an event handler for GuildPowerupEntitlementsCreate events. +type guildPowerupEntitlementsCreateEventHandler func(*Session, *GuildPowerupEntitlementsCreate) + +// Type returns the event type for GuildPowerupEntitlementsCreate events. +func (eh guildPowerupEntitlementsCreateEventHandler) Type() string { + return guildPowerupEntitlementsCreateEventType +} + +// New returns a new instance of GuildPowerupEntitlementsCreate. +func (eh guildPowerupEntitlementsCreateEventHandler) New() interface{} { + return &GuildPowerupEntitlementsCreate{} +} + +// Handle is the handler for GuildPowerupEntitlementsCreate events. +func (eh guildPowerupEntitlementsCreateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildPowerupEntitlementsCreate); ok { + eh(s, t) + } +} + +// guildSoundboardSoundCreateEventHandler is an event handler for GuildSoundboardSoundCreate events. +type guildSoundboardSoundCreateEventHandler func(*Session, *GuildSoundboardSoundCreate) + +// Type returns the event type for GuildSoundboardSoundCreate events. +func (eh guildSoundboardSoundCreateEventHandler) Type() string { + return guildSoundboardSoundCreateEventType +} + +// New returns a new instance of GuildSoundboardSoundCreate. +func (eh guildSoundboardSoundCreateEventHandler) New() interface{} { + return &GuildSoundboardSoundCreate{} +} + +// Handle is the handler for GuildSoundboardSoundCreate events. +func (eh guildSoundboardSoundCreateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildSoundboardSoundCreate); ok { + eh(s, t) + } +} + +// guildSoundboardSoundDeleteEventHandler is an event handler for GuildSoundboardSoundDelete events. +type guildSoundboardSoundDeleteEventHandler func(*Session, *GuildSoundboardSoundDelete) + +// Type returns the event type for GuildSoundboardSoundDelete events. +func (eh guildSoundboardSoundDeleteEventHandler) Type() string { + return guildSoundboardSoundDeleteEventType +} + +// New returns a new instance of GuildSoundboardSoundDelete. +func (eh guildSoundboardSoundDeleteEventHandler) New() interface{} { + return &GuildSoundboardSoundDelete{} +} + +// Handle is the handler for GuildSoundboardSoundDelete events. +func (eh guildSoundboardSoundDeleteEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildSoundboardSoundDelete); ok { + eh(s, t) + } +} + +// guildSoundboardSoundsUpdateEventHandler is an event handler for GuildSoundboardSoundsUpdate events. +type guildSoundboardSoundsUpdateEventHandler func(*Session, *GuildSoundboardSoundsUpdate) + +// Type returns the event type for GuildSoundboardSoundsUpdate events. +func (eh guildSoundboardSoundsUpdateEventHandler) Type() string { + return guildSoundboardSoundsUpdateEventType +} + +// New returns a new instance of GuildSoundboardSoundsUpdate. +func (eh guildSoundboardSoundsUpdateEventHandler) New() interface{} { + return &GuildSoundboardSoundsUpdate{} +} + +// Handle is the handler for GuildSoundboardSoundsUpdate events. +func (eh guildSoundboardSoundsUpdateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GuildSoundboardSoundsUpdate); ok { + eh(s, t) + } +} + +// giftCodeUpdateEventHandler is an event handler for GiftCodeUpdate events. +type giftCodeUpdateEventHandler func(*Session, *GiftCodeUpdate) + +// Type returns the event type for GiftCodeUpdate events. +func (eh giftCodeUpdateEventHandler) Type() string { + return giftCodeUpdateEventType +} + +// New returns a new instance of GiftCodeUpdate. +func (eh giftCodeUpdateEventHandler) New() interface{} { + return &GiftCodeUpdate{} +} + +// Handle is the handler for GiftCodeUpdate events. +func (eh giftCodeUpdateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*GiftCodeUpdate); ok { + eh(s, t) + } +} + // interactionCreateEventHandler is an event handler for InteractionCreate events. type interactionCreateEventHandler func(*Session, *InteractionCreate) @@ -1526,6 +1780,26 @@ func (eh userUpdateEventHandler) Handle(s *Session, i interface{}) { } } +// voiceChannelEffectSendEventHandler is an event handler for VoiceChannelEffectSend events. +type voiceChannelEffectSendEventHandler func(*Session, *VoiceChannelEffectSend) + +// Type returns the event type for VoiceChannelEffectSend events. +func (eh voiceChannelEffectSendEventHandler) Type() string { + return voiceChannelEffectSendEventType +} + +// New returns a new instance of VoiceChannelEffectSend. +func (eh voiceChannelEffectSendEventHandler) New() interface{} { + return &VoiceChannelEffectSend{} +} + +// Handle is the handler for VoiceChannelEffectSend events. +func (eh voiceChannelEffectSendEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*VoiceChannelEffectSend); ok { + eh(s, t) + } +} + // voiceChannelStatusUpdateEventHandler is an event handler for VoiceChannelStatusUpdate events. type voiceChannelStatusUpdateEventHandler func(*Session, *VoiceChannelStatusUpdate) @@ -1546,6 +1820,26 @@ func (eh voiceChannelStatusUpdateEventHandler) Handle(s *Session, i interface{}) } } +// voiceChannelStartTimeUpdateEventHandler is an event handler for VoiceChannelStartTimeStatusUpdate events. +type voiceChannelStartTimeUpdateEventHandler func(*Session, *VoiceChannelStartTimeStatusUpdate) + +// Type returns the event type for VoiceChannelStartTimeStatusUpdate events. +func (eh voiceChannelStartTimeUpdateEventHandler) Type() string { + return voiceChannelStartTimeUpdateEventType +} + +// New returns a new instance of VoiceChannelStartTimeStatusUpdate. +func (eh voiceChannelStartTimeUpdateEventHandler) New() interface{} { + return &VoiceChannelStartTimeStatusUpdate{} +} + +// Handle is the handler for VoiceChannelStartTimeStatusUpdate events. +func (eh voiceChannelStartTimeUpdateEventHandler) Handle(s *Session, i interface{}) { + if t, ok := i.(*VoiceChannelStartTimeStatusUpdate); ok { + eh(s, t) + } +} + // voiceServerUpdateEventHandler is an event handler for VoiceServerUpdate events. type voiceServerUpdateEventHandler func(*Session, *VoiceServerUpdate) @@ -1662,6 +1956,8 @@ func handlerForInterface(handler interface{}) EventHandler { return guildEmojisUpdateEventHandler(v) case func(*Session, *GuildIntegrationsUpdate): return guildIntegrationsUpdateEventHandler(v) + case func(*Session, *GuildJoinRequestCreate): + return guildJoinRequestCreateEventHandler(v) case func(*Session, *GuildJoinRequestDelete): return guildJoinRequestDeleteEventHandler(v) case func(*Session, *GuildJoinRequestUpdate): @@ -1684,6 +1980,28 @@ func handlerForInterface(handler interface{}) EventHandler { return guildStickersUpdateEventHandler(v) case func(*Session, *GuildUpdate): return guildUpdateEventHandler(v) + case func(*Session, *GuildAppliedBoostUpdate): + return guildAppliedBoostUpdateEventHandler(v) + case func(*Session, *GuildPowerupEntitlementsCreate): + return guildPowerupEntitlementsCreateEventHandler(v) + case func(*Session, *GuildSoundboardSoundCreate): + return guildSoundboardSoundCreateEventHandler(v) + case func(*Session, *GuildSoundboardSoundDelete): + return guildSoundboardSoundDeleteEventHandler(v) + case func(*Session, *GuildSoundboardSoundsUpdate): + return guildSoundboardSoundsUpdateEventHandler(v) + case func(*Session, *GiftCodeUpdate): + return giftCodeUpdateEventHandler(v) + case func(*Session, *GuildScheduledEventCreate): + return guildScheduledEventCreateEventHandler(v) + case func(*Session, *GuildScheduledEventDelete): + return guildScheduledEventDeleteEventHandler(v) + case func(*Session, *GuildScheduledEventUpdate): + return guildScheduledEventUpdateEventHandler(v) + case func(*Session, *GuildScheduledEventUserAdd): + return guildScheduledEventUserAddEventHandler(v) + case func(*Session, *GuildScheduledEventUserRemove): + return guildScheduledEventUserRemoveEventHandler(v) case func(*Session, *InteractionCreate): return interactionCreateEventHandler(v) case func(*Session, *InviteCreate): @@ -1756,8 +2074,12 @@ func handlerForInterface(handler interface{}) EventHandler { return userSettingsUpdateEventHandler(v) case func(*Session, *UserUpdate): return userUpdateEventHandler(v) + case func(*Session, *VoiceChannelEffectSend): + return voiceChannelEffectSendEventHandler(v) case func(*Session, *VoiceChannelStatusUpdate): return voiceChannelStatusUpdateEventHandler(v) + case func(*Session, *VoiceChannelStartTimeStatusUpdate): + return voiceChannelStartTimeUpdateEventHandler(v) case func(*Session, *VoiceServerUpdate): return voiceServerUpdateEventHandler(v) case func(*Session, *VoiceStateUpdate): @@ -1793,6 +2115,7 @@ func init() { registerInterfaceProvider(guildDeleteEventHandler(nil)) registerInterfaceProvider(guildEmojisUpdateEventHandler(nil)) registerInterfaceProvider(guildIntegrationsUpdateEventHandler(nil)) + registerInterfaceProvider(guildJoinRequestCreateEventHandler(nil)) registerInterfaceProvider(guildJoinRequestDeleteEventHandler(nil)) registerInterfaceProvider(guildJoinRequestUpdateEventHandler(nil)) registerInterfaceProvider(guildMemberAddEventHandler(nil)) @@ -1804,6 +2127,17 @@ func init() { registerInterfaceProvider(guildRoleUpdateEventHandler(nil)) registerInterfaceProvider(guildStickersUpdateEventHandler(nil)) registerInterfaceProvider(guildUpdateEventHandler(nil)) + registerInterfaceProvider(guildAppliedBoostUpdateEventHandler(nil)) + registerInterfaceProvider(guildPowerupEntitlementsCreateEventHandler(nil)) + registerInterfaceProvider(guildSoundboardSoundCreateEventHandler(nil)) + registerInterfaceProvider(guildSoundboardSoundDeleteEventHandler(nil)) + registerInterfaceProvider(guildSoundboardSoundsUpdateEventHandler(nil)) + registerInterfaceProvider(giftCodeUpdateEventHandler(nil)) + registerInterfaceProvider(guildScheduledEventCreateEventHandler(nil)) + registerInterfaceProvider(guildScheduledEventDeleteEventHandler(nil)) + registerInterfaceProvider(guildScheduledEventUpdateEventHandler(nil)) + registerInterfaceProvider(guildScheduledEventUserAddEventHandler(nil)) + registerInterfaceProvider(guildScheduledEventUserRemoveEventHandler(nil)) registerInterfaceProvider(interactionCreateEventHandler(nil)) registerInterfaceProvider(inviteCreateEventHandler(nil)) registerInterfaceProvider(inviteDeleteEventHandler(nil)) @@ -1839,7 +2173,9 @@ func init() { registerInterfaceProvider(userNoteUpdateEventHandler(nil)) registerInterfaceProvider(userSettingsUpdateEventHandler(nil)) registerInterfaceProvider(userUpdateEventHandler(nil)) + registerInterfaceProvider(voiceChannelEffectSendEventHandler(nil)) registerInterfaceProvider(voiceChannelStatusUpdateEventHandler(nil)) + registerInterfaceProvider(voiceChannelStartTimeUpdateEventHandler(nil)) registerInterfaceProvider(voiceServerUpdateEventHandler(nil)) registerInterfaceProvider(voiceStateUpdateEventHandler(nil)) registerInterfaceProvider(webhooksUpdateEventHandler(nil)) diff --git a/lib/discordgo/events.go b/lib/discordgo/events.go index 0b3b645091..e95a5e20f3 100644 --- a/lib/discordgo/events.go +++ b/lib/discordgo/events.go @@ -526,6 +526,29 @@ func (e *GuildStickersUpdate) GetGuildID() int64 { return e.GuildID } +// GuildScheduledEventCreate is the data for a GuildScheduledEventCreate event. +type GuildScheduledEventCreate struct{} + +// GuildScheduledEventUpdate is the data for a GuildScheduledEventUpdate event. +type GuildScheduledEventUpdate struct{} + +// GuildScheduledEventDelete is the data for a GuildScheduledEventDelete event. +type GuildScheduledEventDelete struct{} + +// GuildScheduledEventUserAdd is the data for a GuildScheduledEventUserAdd event. +type GuildScheduledEventUserAdd struct { + GuildScheduledEventID int64 `json:"guild_scheduled_event_id,string"` + UserID int64 `json:"user_id,string"` + GuildID int64 `json:"guild_id,string"` +} + +// GuildScheduledEventUserRemove is the data for a GuildScheduledEventUserRemove event. +type GuildScheduledEventUserRemove struct { + GuildScheduledEventID int64 `json:"guild_scheduled_event_id,string"` + UserID int64 `json:"user_id,string"` + GuildID int64 `json:"guild_id,string"` +} + // stage instance was created type StageInstanceCreate struct { } @@ -581,10 +604,19 @@ type GuildAuditLogEntryCreate struct { *AuditLogEntry } +type GuildAppliedBoostUpdate struct{} +type GuildPowerupEntitlementsCreate struct{} +type GuildSoundboardSoundCreate struct{} +type GuildSoundboardSoundDelete struct{} +type GuildSoundboardSoundsUpdate struct{} +type GuildJoinRequestCreate struct{} type GuildJoinRequestUpdate struct{} type GuildJoinRequestDelete struct{} type VoiceChannelStatusUpdate struct{} +type VoiceChannelStartTimeStatusUpdate struct{} +type VoiceChannelEffectSend struct{} type ChannelTopicUpdate struct{} +type GiftCodeUpdate struct{} // Monetization events type EntitlementCreate struct { diff --git a/lib/discordgo/interactions.go b/lib/discordgo/interactions.go index 35fd082c5c..3efb96eeb2 100644 --- a/lib/discordgo/interactions.go +++ b/lib/discordgo/interactions.go @@ -366,10 +366,11 @@ func (d *ModalSubmitInteractionData) UnmarshalJSON(data []byte) error { for i, v := range v.RawComponents { var ok bool comp := v.MessageComponent - d.Components[i], ok = comp.(TopLevelComponent) + c, ok := comp.(TopLevelComponent) if !ok { return errors.New("non top level component passed to modal interaction data unmarshaller") } + d.Components[i] = c } return err } diff --git a/lib/discordgo/message.go b/lib/discordgo/message.go index 83d9e444be..b5f98bf95a 100644 --- a/lib/discordgo/message.go +++ b/lib/discordgo/message.go @@ -17,6 +17,7 @@ import ( "regexp" "strconv" "strings" + "time" "github.com/sirupsen/logrus" ) @@ -319,6 +320,16 @@ type File struct { Reader io.Reader } +type PinnedMessage struct { + Message *Message `json:"message"` + PinnedAt time.Time `json:"pinned_at"` +} + +type PinnedItems struct { + HasMore bool `json:"has_more"` + Items []*PinnedMessage `json:"items"` +} + // MessageSend stores all parameters you can send with ChannelMessageSendComplex. type MessageSend struct { Content string `json:"content,omitempty"` @@ -355,19 +366,22 @@ func (m *MessageEdit) MarshalJSON() ([]byte, error) { type MessageEditAlias MessageEdit temp := struct { *MessageEditAlias - Content *string `json:"content,omitempty"` - Components []TopLevelComponent `json:"components"` - Embeds *[]*MessageEmbed `json:"embeds,omitempty"` - AllowedMentions *AllowedMentions `json:"allowed_mentions,omitempty"` - Flags *MessageFlags `json:"flags,omitempty"` + Content *string `json:"content,omitempty"` + Components *[]TopLevelComponent `json:"components,omitempty"` + Embeds *[]*MessageEmbed `json:"embeds,omitempty"` + AllowedMentions *AllowedMentions `json:"allowed_mentions,omitempty"` + Flags *MessageFlags `json:"flags,omitempty"` }{ MessageEditAlias: (*MessageEditAlias)(m), Content: m.Content, - Components: m.Components, AllowedMentions: &m.AllowedMentions, Flags: &m.Flags, } + if m.Components != nil { + temp.Components = &m.Components + } + if m.Embeds != nil { temp.Embeds = &m.Embeds } diff --git a/lib/discordgo/permission.go b/lib/discordgo/permission.go index a863e33f90..a0b652cc4b 100644 --- a/lib/discordgo/permission.go +++ b/lib/discordgo/permission.go @@ -49,6 +49,9 @@ const ( PermissionUseExternalSounds int64 = 1 << 45 // Allows the usage of custom soundboard sounds from other servers V PermissionSendVoiceMessages int64 = 1 << 46 // Allows sending voice messages T, V, S PermissionSendPolls int64 = 1 << 49 // Allows sending polls T, V, S + PermissionUseExternalApps int64 = 1 << 50 // Allows user-installed apps to send public responses. When disabled, users will still be allowed to use their apps but the responses will be ephemeral. This only applies to apps not also installed to the server. T, V, S + PermissionPinMessages int64 = 1 << 51 // Allows for pinning/unpinning messages in a channel T + PermissionBypassSlowmode int64 = 1 << 52 // Allows bypassing slowmode restrictions T,V,S ) // all bits set except the leftmost to avoid using negative numbers in case discord doesn't handle it @@ -102,6 +105,9 @@ var AllPermissions = []int64{ PermissionManageEvents, PermissionCreateGuildExpressions, PermissionCreateEvents, + PermissionPinMessages, + PermissionBypassSlowmode, + PermissionUseExternalApps, PermissionManageThreads, PermissionUsePublicThreads, diff --git a/lib/discordgo/permission_name.go b/lib/discordgo/permission_name.go index 0a006f2d5a..b8e054637e 100644 --- a/lib/discordgo/permission_name.go +++ b/lib/discordgo/permission_name.go @@ -89,6 +89,12 @@ func PermissionName(p int64) string { return "CreateGuildExpressions" case PermissionCreateEvents: return "CreateEvents" + case PermissionPinMessages: + return "PinMessages" + case PermissionBypassSlowmode: + return "BypassSlowmode" + case PermissionUseExternalApps: + return "UseExternalApps" case PermissionManageThreads: return "ManageThreads" case PermissionUsePublicThreads: diff --git a/lib/discordgo/restapi.go b/lib/discordgo/restapi.go index 3212ef68f4..3189780552 100644 --- a/lib/discordgo/restapi.go +++ b/lib/discordgo/restapi.go @@ -162,8 +162,19 @@ func (s *Session) doRequest(method, urlStr, contentType string, b []byte, header rl := TooManyRequests{} err = json.Unmarshal(response, &rl) if err != nil { - s.log(LogError, "rate limit unmarshal error, %s, %q, url: %s", err, string(response), urlStr) - return + s.log(LogError, "request body rate limit unmarshal error, %s, %q, url: %s", err, string(response), urlStr) + // get ratelimit from headers in case body doesn't have it. + retryAfter := resp.Header.Get("Retry-After") + if retryAfter != "" { + rl.RetryAfter, err = strconv.ParseFloat(retryAfter, 64) + if err != nil { + s.log(LogError, "request header rate limit unmarshal error, %s, %q, url: %s", err, string(response), urlStr) + return nil, true, false, err + } + rl.Global = true + } else { + return nil, true, false, err + } } rl.Bucket = bucket.Key @@ -1907,9 +1918,23 @@ func (s *Session) ChannelMessageUnpin(channelID, messageID int64) (err error) { // ChannelMessagesPinned returns an array of Message structures for pinned messages // within a given channel // channelID : The ID of a Channel. -func (s *Session) ChannelMessagesPinned(channelID int64) (st []*Message, err error) { +func (s *Session) ChannelMessagesPinned(channelID int64, limit int, before *time.Time) (st *PinnedItems, err error) { + + uri := EndpointChannelMessagesPins(channelID) + queryParams := url.Values{} + if before != nil && before.Unix() > 0 { + queryParams.Set("before", before.Format(time.RFC3339)) + } + if limit > 50 { + limit = 50 + } + if limit > 0 { + queryParams.Set("limit", strconv.Itoa(limit)) + } + + uri += "?" + queryParams.Encode() - body, err := s.RequestWithBucketID("GET", EndpointChannelMessagesPins(channelID), nil, nil, EndpointChannelMessagesPins(channelID)) + body, err := s.RequestWithBucketID("GET", uri, nil, nil, EndpointChannelMessagesPins(channelID)) if err != nil { return diff --git a/lib/discordgo/structs.go b/lib/discordgo/structs.go index 78fc99779a..379592f282 100644 --- a/lib/discordgo/structs.go +++ b/lib/discordgo/structs.go @@ -1416,6 +1416,10 @@ type AuditLogEntry struct { GuildID int64 `json:"guild_id,string,omitempty"` } +func (a *AuditLogEntry) GetGuildID() int64 { + return a.GuildID +} + // A UserGuildSettingsChannelOverride stores data for a channel override for a users guild settings. type UserGuildSettingsChannelOverride struct { Muted bool `json:"muted"` diff --git a/lib/discordgo/voice.go b/lib/discordgo/voice.go index c4258115da..588e797795 100644 --- a/lib/discordgo/voice.go +++ b/lib/discordgo/voice.go @@ -10,6 +10,8 @@ package discordgo import ( + "crypto/aes" + "crypto/cipher" "encoding/binary" "encoding/json" "errors" @@ -21,6 +23,7 @@ import ( "github.com/botlabs-gg/yagpdb/v2/lib/gojay" "github.com/gorilla/websocket" + "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/nacl/secretbox" ) @@ -241,8 +244,8 @@ type VoiceSpeakingUpdate struct { // A voiceOP4 stores the data for the voice operation 4 websocket event // which provides us with the NaCl SecretBox encryption key type voiceOP4 struct { - SecretKey [32]byte `json:"secret_key"` - Mode string `json:"mode"` + SecretKey [32]byte `json:"secret_key"` + Mode VoiceMode `json:"mode"` } // A voiceOP2 stores the data for the voice operation 2 websocket event @@ -448,6 +451,7 @@ func (v *VoiceConnection) onEvent(message []byte) { v.log(LogError, "OP4 unmarshall error, %s, %s", err, string(e.RawData)) return } + v.Ready = true return case 5: @@ -515,11 +519,22 @@ func (v *VoiceConnection) wsHeartbeat(wsConn *websocket.Conn, close <-chan struc // ------------------------------------------------------------------------------------------------ type voiceUDPData struct { - Address string `json:"address"` // Public IP of machine running this code - Port uint16 `json:"port"` // UDP Port of machine running this code - Mode string `json:"mode"` // always "xsalsa20_poly1305" + Address string `json:"address"` // Public IP of machine running this code + Port uint16 `json:"port"` // UDP Port of machine running this code + Mode VoiceMode `json:"mode"` // Discord voice mode } +type VoiceMode string + +const ( + VoiceModeXSalsa20Poly1305Lite VoiceMode = "xsalsa20_poly1305_lite" + VoiceModeXSalsa20Poly1305Suffix VoiceMode = "xsalsa20_poly1305_suffix" + VoiceModeXSalsa20Poly1305 VoiceMode = "xsalsa20_poly1305" + VoiceModeAeadAes256GcmRtpsize VoiceMode = "aead_aes256_gcm_rtpsize" + VoiceModeAeadXChaCha20Poly1305Rtpsize VoiceMode = "aead_xchacha20_poly1305_rtpsize" + VoiceModeXSalsa20Poly1305LiteRtpsize VoiceMode = "xsalsa20_poly1305_lite_rtpsize" +) + type voiceUDPD struct { Protocol string `json:"protocol"` // Always "udp" ? Data voiceUDPData `json:"data"` @@ -620,11 +635,34 @@ func (v *VoiceConnection) udpOpen() (err error) { // Grab port from position 72 and 73 port := binary.BigEndian.Uint16(rb[len(rb)-2:]) + // Select the best mode + var selectedMode VoiceMode + preferredModes := []VoiceMode{ + VoiceModeAeadAes256GcmRtpsize, + VoiceModeAeadXChaCha20Poly1305Rtpsize, + VoiceModeXSalsa20Poly1305LiteRtpsize, + } + +loop: + for _, preferred := range preferredModes { + for _, available := range v.op2.Modes { + if VoiceMode(available) == preferred { + selectedMode = preferred + break loop + } + } + } + + if selectedMode == "" { + selectedMode = VoiceModeXSalsa20Poly1305 + } + // Take the data from above and send it back to Discord to finalize // the UDP connection handshake. - data := voiceUDPOp{1, voiceUDPD{"udp", voiceUDPData{ip, port, "xsalsa20_poly1305"}}} + data := voiceUDPOp{1, voiceUDPD{"udp", voiceUDPData{ip, port, selectedMode}}} v.log(LogInformational, "External IP: %s, Port: %d", ip, port) + v.log(LogInformational, "Selected mode: %s (Available: %v)", selectedMode, v.op2.Modes) v.wsMutex.Lock() err = v.wsConn.WriteJSON(data) @@ -697,6 +735,20 @@ func (v *VoiceConnection) udpKeepAlive(udpConn *net.UDPConn, close <-chan struct } } +// buildRtpsizePacket constructs an encrypted voice packet for _rtpsize encryption modes. +// It encrypts the plaintext using the provided AEAD cipher and nonce, then appends the +// nonce counter to the packet as required by Discord's _rtpsize modes. +func buildRtpsizePacket(aead cipher.AEAD, nonce, udpHeader, plaintext []byte, nonceCount uint32) []byte { + ciphertext := aead.Seal(nil, nonce, plaintext, udpHeader) + + sendbuf := make([]byte, len(udpHeader)+len(ciphertext)+4) + copy(sendbuf, udpHeader) + copy(sendbuf[len(udpHeader):], ciphertext) + binary.BigEndian.PutUint32(sendbuf[len(udpHeader)+len(ciphertext):], nonceCount) + + return sendbuf +} + // opusSender will listen on the given channel and send any // pre-encoded opus audio to Discord. Supposedly. func (v *VoiceConnection) opusSender(udpConn *net.UDPConn, close <-chan struct{}, opus <-chan []byte, rate, size int) { @@ -707,9 +759,6 @@ func (v *VoiceConnection) opusSender(udpConn *net.UDPConn, close <-chan struct{} // VoiceConnection is now ready to receive audio packets // TODO: this needs reviewed as I think there must be a better way. - v.Lock() - v.Ready = true - v.Unlock() defer func() { v.Lock() v.Ready = false @@ -722,6 +771,7 @@ func (v *VoiceConnection) opusSender(udpConn *net.UDPConn, close <-chan struct{} var ok bool udpHeader := make([]byte, 12) var nonce [24]byte + var nonceCount uint32 // build the parts that don't change in the udpHeader udpHeader[0] = 0x80 @@ -758,12 +808,84 @@ func (v *VoiceConnection) opusSender(udpConn *net.UDPConn, close <-chan struct{} binary.BigEndian.PutUint16(udpHeader[2:], sequence) binary.BigEndian.PutUint32(udpHeader[4:], timestamp) - // encrypt the opus data - copy(nonce[:], udpHeader) v.RLock() - sendbuf := secretbox.Seal(udpHeader, recvbuf, &nonce, &v.op4.SecretKey) + mode := v.op4.Mode + key := v.op4.SecretKey v.RUnlock() + if mode == "" { + v.log(LogWarning, "opusSender: mode is empty, waiting for OP4") + // Optional: sleep or continue? If we continue we might send garbage or fallback to default. + // But if we fallback to default (legacy) and Discord expects new mode, it fails. + } + + var sendbuf []byte + var err error + + // v.log(LogDebug, "opusSender: sending packet with mode %s, sequence %d", mode, sequence) + + switch mode { + case VoiceModeAeadAes256GcmRtpsize: + block, err := aes.NewCipher(key[:]) + if err != nil { + v.log(LogError, "error creating aes cipher: %v", err) + return + } + + gcm, err := cipher.NewGCM(block) + if err != nil { + v.log(LogError, "error creating gcm: %v", err) + return + } + + nonce := make([]byte, 12) + binary.BigEndian.PutUint32(nonce[:4], nonceCount) + + sendbuf = buildRtpsizePacket(gcm, nonce, udpHeader, recvbuf, nonceCount) + nonceCount++ + + case VoiceModeAeadXChaCha20Poly1305Rtpsize: + aead, err := chacha20poly1305.NewX(key[:]) + if err != nil { + v.log(LogError, "error creating xchacha20poly1305: %v", err) + return + } + + nonce := make([]byte, 24) + binary.BigEndian.PutUint32(nonce[20:], nonceCount) + + sendbuf = buildRtpsizePacket(aead, nonce, udpHeader, recvbuf, nonceCount) + nonceCount++ + + case VoiceModeXSalsa20Poly1305LiteRtpsize: + nonce := make([]byte, 24) + binary.BigEndian.PutUint32(nonce[20:], nonceCount) + + var polyNonce [24]byte + copy(polyNonce[:], nonce) + + ciphertext := secretbox.Seal(nil, recvbuf, &polyNonce, &key) + + sendbuf = make([]byte, len(udpHeader)+len(ciphertext)+4) + copy(sendbuf, udpHeader) + copy(sendbuf[len(udpHeader):], ciphertext) + binary.BigEndian.PutUint32(sendbuf[len(udpHeader)+len(ciphertext):], nonceCount) + + nonceCount++ + + default: + // Fallback to xsalsa20_poly1305 + copy(nonce[:], udpHeader) + v.RLock() + // Note: secretbox.Seal appends to the first argument. + // We pass udpHeader as the first argument, so it appends ciphertext to it. + // But udpHeader is modified in place? No, Seal returns a new slice if capacity is not enough. + // But we should be careful not to modify udpHeader for the next iteration if it was a pointer. + // Here udpHeader is a slice. + sendbuf = secretbox.Seal(udpHeader, recvbuf, &nonce, &key) + v.RUnlock() + } + // block here until we're exactly at the right time :) // Then send rtp audio packet to Discord over UDP select { @@ -772,7 +894,7 @@ func (v *VoiceConnection) opusSender(udpConn *net.UDPConn, close <-chan struct{} case <-ticker.C: // continue } - _, err := udpConn.Write(sendbuf) + _, err = udpConn.Write(sendbuf) if err != nil { v.log(LogError, "udp write error, %s", err) @@ -786,11 +908,7 @@ func (v *VoiceConnection) opusSender(udpConn *net.UDPConn, close <-chan struct{} sequence++ } - if (timestamp + uint32(size)) >= 0xFFFFFFFF { - timestamp = 0 - } else { - timestamp += uint32(size) - } + timestamp += uint32(size) } } @@ -853,9 +971,83 @@ func (v *VoiceConnection) opusReceiver(udpConn *net.UDPConn, close <-chan struct p.Sequence = binary.BigEndian.Uint16(recvbuf[2:4]) p.Timestamp = binary.BigEndian.Uint32(recvbuf[4:8]) p.SSRC = binary.BigEndian.Uint32(recvbuf[8:12]) - // decrypt opus data - copy(nonce[:], recvbuf[0:12]) - p.Opus, _ = secretbox.Open(nil, recvbuf[12:rlen], &nonce, &v.op4.SecretKey) + + v.RLock() + mode := v.op4.Mode + key := v.op4.SecretKey + v.RUnlock() + + var opus []byte + var decErr error + var ok bool + + switch mode { + case VoiceModeAeadAes256GcmRtpsize: + if rlen < 12+4 { + continue + } + block, err := aes.NewCipher(key[:]) + if err != nil { + v.log(LogError, "error creating aes cipher: %v", err) + continue + } + gcm, err := cipher.NewGCM(block) + if err != nil { + v.log(LogError, "error creating gcm: %v", err) + continue + } + + nonce := make([]byte, 12) + nonceCounter := binary.BigEndian.Uint32(recvbuf[rlen-4 : rlen]) + binary.BigEndian.PutUint32(nonce[:4], nonceCounter) + + opus, decErr = gcm.Open(nil, nonce, recvbuf[12:rlen-4], recvbuf[0:12]) + + case VoiceModeAeadXChaCha20Poly1305Rtpsize: + if rlen < 12+4 { + continue + } + aead, err := chacha20poly1305.NewX(key[:]) + if err != nil { + v.log(LogError, "error creating xchacha20poly1305: %v", err) + continue + } + + nonce := make([]byte, 24) + copy(nonce[20:], recvbuf[rlen-4:rlen]) + + opus, decErr = aead.Open(nil, nonce, recvbuf[12:rlen-4], recvbuf[0:12]) + + case VoiceModeXSalsa20Poly1305LiteRtpsize: + if rlen < 12+4 { + continue + } + nonce := make([]byte, 24) + copy(nonce[20:], recvbuf[rlen-4:rlen]) + + var polyNonce [24]byte + copy(polyNonce[:], nonce) + + opus, ok = secretbox.Open(nil, recvbuf[12:rlen-4], &polyNonce, &key) + if !ok { + decErr = fmt.Errorf("decryption failed") + } + + default: + // Legacy + copy(nonce[:], recvbuf[0:12]) + opus, ok = secretbox.Open(nil, recvbuf[12:rlen], &nonce, &v.op4.SecretKey) + if !ok { + decErr = fmt.Errorf("decryption failed") + } + } + + if decErr != nil { + // v.log(LogError, "decryption error: %v", decErr) + continue + } + + p.Opus = opus if len(p.Opus) > 8 && recvbuf[0] == 0x90 { // Extension bit is set, first 8 bytes is the extended header diff --git a/lib/dstate/helpers.go b/lib/dstate/helpers.go index d0ddc16511..de1e2db074 100644 --- a/lib/dstate/helpers.go +++ b/lib/dstate/helpers.go @@ -93,6 +93,7 @@ func MessageStateFromDgo(m *discordgo.Message) *MessageState { MentionRoles: m.MentionRoles, ParsedCreatedAt: parsedC, ParsedEditedAt: parsedE, + Pinned: m.Pinned, RoleSubscriptionData: m.RoleSubscriptionData, } if m.Reference() != nil { diff --git a/lib/dstate/inmemorytracker/tracker.go b/lib/dstate/inmemorytracker/tracker.go index 4daf2e828b..ca17af4b3a 100644 --- a/lib/dstate/inmemorytracker/tracker.go +++ b/lib/dstate/inmemorytracker/tracker.go @@ -291,7 +291,7 @@ func (shard *ShardTracker) handleGuildCreate(gc *discordgo.GuildCreate) { emojis[i] = *gc.Emojis[i] } - stickers := make([]discordgo.Sticker,len(gc.Stickers)) + stickers := make([]discordgo.Sticker, len(gc.Stickers)) for i := range gc.Stickers { stickers[i] = *gc.Stickers[i] } @@ -675,47 +675,10 @@ func (shard *ShardTracker) handleMessageUpdate(m *discordgo.MessageUpdate) { if cl, ok := shard.channelMessages[m.ChannelID]; ok { for e := cl.Back(); e != nil; e = e.Prev() { - // do something with e.Value cast := e.Value.(*dstate.MessageState) if cast.ID == m.ID { - // Update the message - cop := *cast - - if m.Content != "" { - cop.Content = m.Content - } - - if m.Mentions != nil { - cop.Mentions = make([]discordgo.User, len(m.Mentions)) - for i, v := range m.Mentions { - cop.Mentions[i] = *v - } - } - if m.Embeds != nil { - cop.Embeds = make([]discordgo.MessageEmbed, len(m.Embeds)) - for i, v := range m.Embeds { - cop.Embeds[i] = *v - } - } - - if m.Attachments != nil { - cop.Attachments = make([]discordgo.MessageAttachment, len(m.Attachments)) - for i, v := range m.Attachments { - cop.Attachments[i] = *v - } - } - - if m.Author != nil { - cop.Author = *m.Author - } - - if m.MentionRoles != nil { - cop.MentionRoles = m.MentionRoles - } - - e.Value = &cop + e.Value = dstate.MessageStateFromDgo(m.Message) return - // m.parseTimes(msg.Timestamp, msg.EditedTimestamp) } } } diff --git a/lib/dstate/interface.go b/lib/dstate/interface.go index 0d9985e21f..ccc0e25e8f 100644 --- a/lib/dstate/interface.go +++ b/lib/dstate/interface.go @@ -422,6 +422,7 @@ type MessageState struct { ParsedEditedAt time.Time Deleted bool + Pinned bool RoleSubscriptionData *discordgo.RoleSubscriptionData } diff --git a/lib/template/exec.go b/lib/template/exec.go index 71efa8f750..e11c96e8c1 100644 --- a/lib/template/exec.go +++ b/lib/template/exec.go @@ -712,7 +712,9 @@ func (s *state) idealConstant(constant *parse.NumberNode) reflect.Value { switch { case constant.IsComplex: return reflect.ValueOf(constant.Complex128) // incontrovertible. - case constant.IsFloat && !isHexInt(constant.Text) && strings.ContainsAny(constant.Text, ".eEpP"): + case constant.IsFloat && + !isHexInt(constant.Text) && !isRuneInt(constant.Text) && + strings.ContainsAny(constant.Text, ".eEpP"): return reflect.ValueOf(constant.Float64) case constant.IsInt: n := int(constant.Int64) @@ -726,6 +728,10 @@ func (s *state) idealConstant(constant *parse.NumberNode) reflect.Value { return zero } +func isRuneInt(s string) bool { + return len(s) > 0 && s[0] == '\'' +} + func isHexInt(s string) bool { return len(s) > 2 && s[0] == '0' && (s[1] == 'x' || s[1] == 'X') && !strings.ContainsAny(s, "pP") } diff --git a/lib/template/exec_test.go b/lib/template/exec_test.go index b86f10408d..3ac21207cb 100644 --- a/lib/template/exec_test.go +++ b/lib/template/exec_test.go @@ -715,6 +715,12 @@ var execTests = []execTest{ {"bug17c", "{{len .NonEmptyInterfacePtS}}", "2", tVal, true}, {"bug17d", "{{index .NonEmptyInterfacePtS 0}}", "a", tVal, true}, {"bug17e", "{{range .NonEmptyInterfacePtS}}-{{.}}-{{end}}", "-a--b-", tVal, true}, + + // More variadic function corner cases. Some runes would get evaluated + // as constant floats instead of ints. Issue 34483. + {"bug18a", "{{eq . '.'}}", "true", '.', true}, + {"bug18b", "{{eq . 'e'}}", "true", 'e', true}, + {"bug18c", "{{eq . 'P'}}", "true", 'P', true}, } func zeroArgs() string { diff --git a/logs/web.go b/logs/web.go index 7b32e15d8e..a19698120e 100644 --- a/logs/web.go +++ b/logs/web.go @@ -241,7 +241,7 @@ func CheckCanAccessLogs(w http.ResponseWriter, r *http.Request, config *models.G member := web.ContextMember(ctx) if member == nil { goTo := url.QueryEscape(r.RequestURI) - alertLink := fmt.Sprintf(`log in with Discord`, web.BaseURL(), goTo) + alertLink := fmt.Sprintf(`Login with Discord`, web.BaseURL(), goTo) alertMsg := fmt.Sprintf("This server has restricted log access to members only. Please %s to view this log.", alertLink) tmpl.AddAlerts(web.ErrorAlert(alertMsg)) diff --git a/moderation/assets/moderation.html b/moderation/assets/moderation.html index d4a7341011..f6fc16b33c 100644 --- a/moderation/assets/moderation.html +++ b/moderation/assets/moderation.html @@ -124,7 +124,7 @@

Delete ALL server warnings?

@@ -132,7 +132,7 @@

Delete ALL server warnings?

@@ -170,7 +170,7 @@

Delete ALL server warnings?

diff --git a/moderation/commands.go b/moderation/commands.go index 864b342dd8..69d25ba474 100644 --- a/moderation/commands.go +++ b/moderation/commands.go @@ -656,13 +656,14 @@ var ModerationCommands = []*commands.YAGCommand{ }, }, { - CustomEnabled: true, - CmdCategory: commands.CategoryModeration, - Name: "Clean", - Description: "Delete the last number of messages from chat, optionally filtering by user, max age and regex or ignoring pinned messages.", - LongDescription: "Specify a regex with \"-r regex_here\" and max age with \"-ma 1h10m\"\nYou can invert the regex match (i.e. only clear messages that do not match the given regex) by supplying the `-im` flag\nNote: Will only look in the last 1k messages, and none > 2 weeks old.", - Aliases: []string{"clear", "cl"}, - RequiredArgs: 1, + CustomEnabled: true, + CmdCategory: commands.CategoryModeration, + Name: "Clean", + GuildScopeCooldown: 10, + Description: "Delete the last number of messages from chat, optionally filtering by user, max age and regex or ignoring pinned messages.", + LongDescription: "Specify a regex with \"-r regex_here\" and max age with \"-ma 1h10m\"\nYou can invert the regex match (i.e. only clear messages that do not match the given regex) by supplying the `-im` flag\nNote: Will only look in the last 1k messages, and none > 2 weeks old.", + Aliases: []string{"clear", "cl"}, + RequiredArgs: 1, Arguments: []*dcmd.ArgDef{ {Name: "Num", Type: &dcmd.IntArg{Min: 1, Max: 100}}, {Name: "User", Type: dcmd.UserID, Default: 0}, @@ -732,14 +733,10 @@ var ModerationCommands = []*commands.YAGCommand{ } if parsed.Switches["nopin"].Bool() { - pinned, err := common.BotSession.ChannelMessagesPinned(parsed.ChannelID) - if err != nil { - return "Failed fetching pinned messages", err - } - filters = append(filters, NewIgnorePinnedMessagesFilter(pinned)) + filters = append(filters, &IgnorePinnedMessagesFilter{}) } - if onlyDeleteWithAttachments := parsed.Switches["a"].Bool(); onlyDeleteWithAttachments { + if parsed.Switches["a"].Bool() { filters = append(filters, &MessagesWithAttachmentsFilter{}) } @@ -1384,23 +1381,10 @@ func (f *MessageAgeFilter) Matches(msg *dstate.MessageState) (delete bool) { } // Do not delete pinned messages. -type IgnorePinnedMessagesFilter struct { - PinnedMsgIDs map[int64]struct{} -} - -func NewIgnorePinnedMessagesFilter(pinned []*discordgo.Message) *IgnorePinnedMessagesFilter { - ids := make(map[int64]struct{}) - for _, msg := range pinned { - ids[msg.ID] = struct{}{} - } - return &IgnorePinnedMessagesFilter{ids} -} +type IgnorePinnedMessagesFilter struct{} func (f *IgnorePinnedMessagesFilter) Matches(msg *dstate.MessageState) (delete bool) { - if _, pinned := f.PinnedMsgIDs[msg.ID]; pinned { - return false - } - return true + return !msg.Pinned } // Only delete messages with attachments. diff --git a/moderation/plugin_bot.go b/moderation/plugin_bot.go index 9f9b8eac3a..dce76540e2 100644 --- a/moderation/plugin_bot.go +++ b/moderation/plugin_bot.go @@ -189,6 +189,7 @@ func RefreshMuteOverrides(guildID int64, createRole bool) { for _, v := range guild.Channels { RefreshMuteOverrideForChannel(config, v) + time.Sleep(1 * time.Second) } } diff --git a/notifications/assets/notifications_general.html b/notifications/assets/notifications_general.html index 004910ea6e..34aa077bce 100644 --- a/notifications/assets/notifications_general.html +++ b/notifications/assets/notifications_general.html @@ -38,7 +38,7 @@

General

@@ -79,7 +79,7 @@

General

@@ -139,7 +139,7 @@

General

diff --git a/notifications/plugin_bot.go b/notifications/plugin_bot.go index 0d1d0f5af3..180ab67a86 100644 --- a/notifications/plugin_bot.go +++ b/notifications/plugin_bot.go @@ -70,6 +70,15 @@ func HandleGuildMemberAdd(evtData *eventsystem.EventData) (retry bool, err error ms := dstate.MemberStateFromMember(evt.Member) ms.GuildID = evt.GuildID + joinedAt, err := ms.Member.JoinedAt.Parse() + if err != nil { + return true, errors.WithStackIf(err) + } + + if time.Since(joinedAt) > 1*time.Minute { + return + } + // Beware of the pyramid and its curses if config.JoinDMEnabled && !evt.User.Bot { cid, err := common.BotSession.UserChannelCreate(evt.User.ID) diff --git a/premium/assets/premium-perks.html b/premium/assets/premium-perks.html index 7ffe2a051d..7ed92e60a5 100644 --- a/premium/assets/premium-perks.html +++ b/premium/assets/premium-perks.html @@ -2,7 +2,7 @@ {{template "cp_head" .}}
-

YAGPDB Premium

+

YAGPDB Premium

{{template "cp_alerts" .}} @@ -20,18 +20,26 @@

Premium Features

  • Change Bot Avatar (profile picture) and Banner for your server
  • Trigger CCs on Message Edit
  • Bulk Role Removal and Assignment
    • -
  • Custom Thanks Detection Regex
    • +
  • Custom Thanks Detection Regex for Reputation System
    • +
  • Custom Announcement for Twitch Notifications
  • Retroactive AutoRole Scan and Assignment
    • +
  • Use Private Threads for tickets
    • Increased Limits
      -
    • Message cache duration increased from 1 hour to 12 hours, which means you will be able to see the removed messages in the logs if the message was sent in the previous 12 hours
      • +
    • Message cache duration increased from 1 hour to 12 hours, which means + you will be able to see the removed messages in the logs if the message was sent in + the previous 12 hours
    • Max custom commands increased from 100 to 250
    • Max Reddit feeds increased from 20 to 1000
    • Max Youtube feeds increased from 10 to 250
      • +
    • Max Twitch feeds increased from 3 to 15
    • Max Soundboard sounds increased from 50 to 250
    • Max RSS Feeds increased from 2 to 10
      • -
    • Max Custom Command Length increased to 20,000 characters from 10,000
      • +
    • Max Voice Roles increased from 1 to 10
      • +
    • Max Custom Command Length increased to 20,000 characters from 10,000 +
      • +
    • Reduced Cooldown on Role Change Custom Commands and Increased limit to 5 from 1
    • Increased database storage and interaction limits.
    • Various custom command function limits increased
    • Advanced Automod limits increased
      • @@ -44,10 +52,15 @@

      How to get premium?

      - Buy on Discord - Buy on Patreon + Buy on Discord + Buy on Patreon
      - Manage your subscription: Manage Premium + Manage your subscription: Manage Premium
      Note: Premium slots are not transferable between Patreon and Discord Purchases
      @@ -60,4 +73,4 @@

      How to get premium?

      {{template "cp_footer" .}} -{{end}} +{{end}} \ No newline at end of file diff --git a/premium/assets/premium.html b/premium/assets/premium.html index ced019df8f..40e8e0362b 100644 --- a/premium/assets/premium.html +++ b/premium/assets/premium.html @@ -12,23 +12,36 @@

      Manage Premium

      -

      Redeem code

      +

      How to claim your premium slots

      +
      +
        +
      • If you've subscribed from Patreon, you need to connect your discord to patreon. + Once that is done, your slots will appear below automatically with-in 10 minutes.
        • +
      • If you've subscribed from Discord, your slots should automatically show below as soon as discord processes your payment.
        • +
      • Premium slots are assigned to servers, you can assign them to any server you have manage server permissions on.
        • +
      • If you don't see your slots even after 10 minutes, please contact us on our support server.
        • +
      • Premium slots are not transferable between Patreon and Discord Purchases
        • +
      • To learn more about premium features and to subscribe to premium, check our premium perks list.
        • +
      • + For cancellation, read the instructions below for your subscription source. + +
        • +
      +
      +
      +
      -
      -

      If you're coming here after making a payment on patreon, you need to connect your discord to patreon - Once that is done, your slots will appear below automatically with-in 10 minutes. - Premium slots are assigned to servers, you can assign them to any server you have manage server permissions on. - If you don't see your slots after 10 minutes, please contact us on the support server.

      -

      To learn more about what premium features and how to get premium, check the premium perks list.

      -
      {{if .QueriedCode}}
      + {{template "cp_footer" .}} {{end}} diff --git a/premium/premium.go b/premium/premium.go index d66a761eab..2ec905030f 100644 --- a/premium/premium.go +++ b/premium/premium.go @@ -206,10 +206,7 @@ func FindSource(sourceID string) PremiumSource { func handleNewPremiumGuild(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) { for _, v := range common.Plugins { if cast, ok := v.(NewPremiumGuildListener); ok { - err := cast.OnNewPremiumGuild(evt.GuildID) - if err != nil { - return scheduledevents2.CheckDiscordErrRetry(err), err - } + cast.OnNewPremiumGuild(evt.GuildID) } } @@ -219,13 +216,9 @@ func handleNewPremiumGuild(evt *schEventsModels.ScheduledEvent, data interface{} func handleRemovedPremiumGuild(evt *schEventsModels.ScheduledEvent, data interface{}) (retry bool, err error) { for _, v := range common.Plugins { if cast, ok := v.(RemovedPremiumGuildListener); ok { - err := cast.OnRemovedPremiumGuild(evt.GuildID) - if err != nil { - return scheduledevents2.CheckDiscordErrRetry(err), err - } + cast.OnRemovedPremiumGuild(evt.GuildID) } } - return false, nil } diff --git a/reddit/assets/reddit.html b/reddit/assets/reddit.html index 07f2ab6f60..f7adf47027 100644 --- a/reddit/assets/reddit.html +++ b/reddit/assets/reddit.html @@ -63,7 +63,7 @@

      New feed

      @@ -107,7 +107,7 @@

      Current reddit feeds

    diff --git a/reddit/postfetcher.go b/reddit/postfetcher.go index 93ada7076d..1b3ec418a6 100644 --- a/reddit/postfetcher.go +++ b/reddit/postfetcher.go @@ -16,7 +16,7 @@ var KeyLastScannedPostIDFast = "reddit_last_post_id" var KeyLastScannedPostIDSlow = "reddit_slow_last_post_id" // PostFetcher is responsible from fetching posts from reddit at a given interval and delay -// delay bieng it will make sure not to call the handler on posts newer than the given delay +// delay being it will make sure not to call the handler on posts newer than the given delay type PostFetcher struct { Name string LastScannedPostIDKey string @@ -79,6 +79,7 @@ func (p *PostFetcher) Run() { continue } + lastFeedSuccessAt = time.Now() if len(links) < 1 { continue } @@ -139,7 +140,7 @@ func (p *PostFetcher) GetNewPosts() ([]*greddit.Link, error) { toFetch := make([]string, 100) - for i := int64(0); i < 100; i++ { + for i := range int64(100) { toFetch[i] = "t3_" + strconv.FormatInt(p.LastID+i+1, 36) } @@ -184,7 +185,7 @@ func (p *PostFetcher) GetNewPosts() ([]*greddit.Link, error) { logrus.Info("Redditfeed processed ", len(resp), " links") } - if len(resp) < 50 && !p.hasCaughtUp { + if len(resp) < 75 && !p.hasCaughtUp { logrus.Info("Reddit feed caught up in ", time.Since(p.started).String()) p.hasCaughtUp = true } diff --git a/reddit/redditbot.go b/reddit/redditbot.go index 147b8ad9d9..54fd027b27 100644 --- a/reddit/redditbot.go +++ b/reddit/redditbot.go @@ -18,6 +18,7 @@ import ( "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/mediocregopher/radix/v3" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" "github.com/volatiletech/sqlboiler/v4/queries/qm" @@ -33,43 +34,65 @@ var ( confMaxPostsHourFast = config.RegisterOption("yagpdb.reddit.fast_max_posts_hour", "Max posts per hour per guild for fast feed", 60) confMaxPostsHourSlow = config.RegisterOption("yagpdb.reddit.slow_max_posts_hour", "Max posts per hour per guild for slow feed", 120) - feedLock sync.Mutex - fastFeed *PostFetcher - slowFeed *PostFetcher + lastFeedSuccessAt = time.Now() + feedLock sync.Mutex + fastFeed *PostFetcher + slowFeed *PostFetcher ) func (p *Plugin) StartFeed() { go p.runBot() + go p.checkFeed() } func (p *Plugin) StopFeed(wg *sync.WaitGroup) { - wg.Add(1) - feedLock.Lock() if fastFeed != nil { + wg.Add(1) ff := fastFeed go func() { ff.StopChan <- wg }() fastFeed = nil - } else { - wg.Done() } if slowFeed != nil { + wg.Add(1) sf := slowFeed go func() { sf.StopChan <- wg }() slowFeed = nil - } else { - wg.Done() + } + + select { + case p.stopFeedChan <- wg: + wg.Add(1) + default: } feedLock.Unlock() } +func (p *Plugin) checkFeed() { + ticker := time.NewTicker(time.Minute * 1) + for { + select { + case <-ticker.C: + logger.Infof("Checking Feed Status, last success was %s ago", time.Since(lastFeedSuccessAt)) + if time.Since(lastFeedSuccessAt) > (10 * time.Minute) { + logger.Warnf("No successful feed since %s, restarting", time.Since(lastFeedSuccessAt)) + p.restartFeed() + return + } + case wg := <-p.stopFeedChan: + wg.Done() + return + } + } +} + func UserAgent() string { return fmt.Sprintf("YAGPDB:%s:%s (by /u/jonas747)", confClientID.GetString(), common.VERSION) } @@ -81,6 +104,17 @@ func setupClient() *reddit.Client { return redditClient } +func (p *Plugin) restartFeed() { + go func() { + wg := new(sync.WaitGroup) + p.StopFeed(wg) + wg.Wait() + common.RedisPool.Do(radix.Cmd(nil, "DEL", KeyLastScannedPostIDFast)) + common.RedisPool.Do(radix.Cmd(nil, "DEL", KeyLastScannedPostIDSlow)) + p.StartFeed() + }() +} + func (p *Plugin) runBot() { feedLock.Lock() diff --git a/rolecommands/bot.go b/rolecommands/bot.go index b7060492c7..63df4ae7a3 100644 --- a/rolecommands/bot.go +++ b/rolecommands/bot.go @@ -55,8 +55,8 @@ func (p *Plugin) AddCommands() { }, ArgSwitches: []*dcmd.ArgDef{ {Name: "m", Help: "Message ID", Type: dcmd.BigInt}, - {Name: "nodm", Help: "Disable DM"}, - {Name: "rr", Help: "Remove role on reaction removed"}, + {Name: "nodm", Help: "Disable assignment confirmation DMs"}, + {Name: "rr", Help: "Disable removing role upon removing reaction"}, {Name: "skip", Help: "Number of roles to skip", Default: 0, Type: dcmd.Int}, }, RunFunc: cmdFuncRoleMenuCreate, @@ -88,8 +88,8 @@ func (p *Plugin) AddCommands() { {Name: "Message-ID", Type: dcmd.BigInt}, }, ArgSwitches: []*dcmd.ArgDef{ - {Name: "nodm", Help: "Disable DM"}, - {Name: "rr", Help: "Remove role on reaction removed"}, + {Name: "nodm", Help: "Toggle assignment confirmation DMs"}, + {Name: "rr", Help: "Toggle removing role upon removing reaction"}, }, RunFunc: cmdFuncRoleMenuUpdate, } diff --git a/rss/assets/rss.html b/rss/assets/rss.html index c7835cbdd4..5424453572 100644 --- a/rss/assets/rss.html +++ b/rss/assets/rss.html @@ -2,11 +2,11 @@ {{template "cp_head" .}} + +
    +

    Twitch Feeds

    +
    + +{{template "cp_alerts" .}} + +
    +
    +
    +
    +

    Add New Feed

    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + {{checkbox "MentionEveryone" "mention-everyone" "Mention Everyone" false}} +
    +
    + {{checkbox "PublishVOD" "publish-vod" "Publish VOD (when stream goes offline)" false}} +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +

    Custom Announcement

    +
    +
    + {{if not .IsGuildPremium}} +
    + Custom announcements are a premium feature. Upgrade to Premium to unlock this + feature. +
    + {{end}} +
    +
    +
    + {{$announcementEnabled := false}} + {{if .TwitchAnnouncement}} + {{$announcementEnabled = .TwitchAnnouncement.Enabled}} + {{end}} + {{checkbox "Enabled" "announcement-enabled" `

    Enable

    ` + $announcementEnabled}} + + + + + + + +

    + Note: using Custom Announcement will override the default announcement message + mention settings, you will have to do mentions like they are done in custom commands +

    +

    + In addition to the full Custom Command syntax , the following templates are also + supported:
    +

      +
    • {{"{{"}} .User {{"}}"}} - The Twitch username.
      • +
    • {{"{{"}} .URL {{"}}"}} - The link to the stream.
      • +
    • {{"{{"}} .Title {{"}}"}} - The stream title, empty in case of a VOD.
      • +
    • {{"{{"}} .Game {{"}}"}} - The game being played, empty in case of a VOD.
      • +
    • {{"{{"}} .IsLive {{"}}"}} - Boolean, true if live, false if notification is for a VOD.
      • +
    • {{"{{"}} .VODUrl {{"}}"}} - The URL to the VOD (if offline).
      • +
    +

    +
    +
    +
    +
    +
    +
    +
    + + + +
    +
    +
    +
    +

    Current Feeds

    +
    +
    + {{$dot := .}} + {{range .TwitchSubs}} +
    + {{end}} + + + + + + + + + + + + + + {{range .TwitchSubs}} + + + + + + + + + + {{end}} + +
    Twitch UserDiscord ChannelMention EveryoneMention RolesPublish VODEnabledActions
    +

    {{.TwitchUsername}}

    +     		+ + + {{checkbox "MentionEveryone" (print "mention-everyone-" .ID) `Mention everyone` + .MentionEveryone (print `form="feed-item-` .ID `"`)}} + + + + {{checkbox "PublishVOD" (print "publish-vod-" .ID) `Publish VOD` .PublishVod (print + `form="feed-item-` .ID `"`)}} + + {{checkbox "Enabled" (print "enabled-" .ID) `` .Enabled (print `form="feed-item-` .ID + `"`)}} + + + +
    +
    +
    +
    +
    + +{{template "cp_footer" .}} +{{end}} \ No newline at end of file diff --git a/twitch/bot.go b/twitch/bot.go new file mode 100644 index 0000000000..0428573647 --- /dev/null +++ b/twitch/bot.go @@ -0,0 +1,156 @@ +package twitch + +import ( + "context" + "fmt" + "strconv" + + "github.com/botlabs-gg/yagpdb/v2/analytics" + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common/mqueue" + "github.com/botlabs-gg/yagpdb/v2/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/common/templates" + "github.com/botlabs-gg/yagpdb/v2/feeds" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/twitch/models" + "github.com/nicklaw5/helix/v2" + "github.com/prometheus/client_golang/prometheus" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +type CustomTwitchAnnouncement struct { + GuildID int64 `json:"guild_id"` + Subscription models.TwitchChannelSubscription `json:"subscription"` + Stream helix.Stream `json:"stream"` + IsLive bool `json:"is_live"` + VODUrl string `json:"vod_url"` +} + +func (p *Plugin) BotInit() { + pubsub.AddHandler("custom_twitch_announcement", func(evt *pubsub.Event) { + if evt.Data == nil { + return + } + data := evt.Data.(*CustomTwitchAnnouncement) + p.handleCustomAnnouncement(data) + }, CustomTwitchAnnouncement{}) +} + +func (p *Plugin) Status() (string, string) { + total, _ := models.TwitchChannelSubscriptions().CountG(context.Background()) + return "Total Subs", fmt.Sprintf("%d", total) +} + +func (p *Plugin) OnRemovedPremiumGuild(guildID int64) error { + ctx := context.Background() + + // 1. Disable Custom Announcements (Premium Only) + announcement, err := models.FindTwitchAnnouncementG(ctx, guildID) + if err == nil { + announcement.Enabled = false + _, err = announcement.UpdateG(ctx, boil.Whitelist("enabled")) + if err != nil { + logger.WithError(err).WithField("guild", guildID).Error("failed disabling custom twitch announcement") + } + } + + // 2. Enforce Feed Limits (Free Limit) + // Fetch all enabled subscriptions ordered by ID DESC + subs, err := models.TwitchChannelSubscriptions( + models.TwitchChannelSubscriptionWhere.GuildID.EQ(discordgo.StrID(guildID)), + models.TwitchChannelSubscriptionWhere.Enabled.EQ(true), + qm.OrderBy("id DESC"), + ).AllG(ctx) + + if err != nil { + logger.WithError(err).WithField("guild", guildID).Error("failed retrieving twitch subscriptions for limit enforcement") + return err + } + + if len(subs) > GuildMaxEnabledFeeds { + // Disable excess feeds + excessSubs := subs[GuildMaxEnabledFeeds:] + for _, sub := range excessSubs { + sub.Enabled = false + _, err := sub.UpdateG(ctx, boil.Whitelist("enabled")) + if err != nil { + logger.WithError(err).WithField("guild", guildID).WithField("sub_id", sub.ID).Error("failed disabling excess twitch subscription") + } + } + } + + return nil +} + +func (p *Plugin) handleCustomAnnouncement(notif *CustomTwitchAnnouncement) { + sub := notif.Subscription + stream := notif.Stream + guildID := notif.GuildID + isLive := notif.IsLive + vodUrl := notif.VODUrl + + logger.WithField("guild_id", guildID).WithField("channel_id", sub.ChannelID).WithField("stream_id", stream.ID).WithField("is_live", isLive).Info("handling custom twitch announcement") + + guildState := bot.State.GetGuild(guildID) + if guildState == nil { + return + } + + channelID, _ := strconv.ParseInt(sub.ChannelID, 10, 64) + channelState := guildState.GetChannel(channelID) + if channelState == nil { + return + } + + announcement, err := models.FindTwitchAnnouncementG(context.Background(), guildID) + if err != nil { + return + } + + if !announcement.Enabled { + return + } + + ctx := templates.NewContext(guildState, channelState, nil) + + ctx.Data["URL"] = "https://twitch.tv/" + stream.UserLogin + ctx.Data["User"] = stream.UserName + ctx.Data["Title"] = stream.Title + ctx.Data["Game"] = stream.GameName + ctx.Data["Stream"] = stream + ctx.Data["IsLive"] = isLive + ctx.Data["VODUrl"] = vodUrl + if isLive { + ctx.Data["Status"] = "live" + } else { + ctx.Data["Status"] = "offline" + } + + content, err := ctx.Execute(announcement.Message) + if err != nil { + logger.WithError(err).WithField("guild", guildID).Errorf("custom announcement parsing failed") + return + } + + if content == "" { + return + } + + go analytics.RecordActiveUnit(guildID, p, "posted_twitch_message") + feeds.MetricPostedMessages.With(prometheus.Labels{"source": "twitch"}).Inc() + + parseMentions := []discordgo.AllowedMentionType{discordgo.AllowedMentionTypeRoles, discordgo.AllowedMentionTypeEveryone} + mqueue.QueueMessage(&mqueue.QueuedElement{ + GuildID: guildID, + ChannelID: channelID, + Source: "twitch", + SourceItemID: stream.ID, + MessageStr: content, + Priority: 2, + PublishAnnouncement: false, + AllowedMentions: discordgo.AllowedMentions{ + Parse: parseMentions, + }, + }) +} diff --git a/twitch/feed.go b/twitch/feed.go new file mode 100644 index 0000000000..2e00998e70 --- /dev/null +++ b/twitch/feed.go @@ -0,0 +1,311 @@ +package twitch + +import ( + "context" + "fmt" + "strconv" + "sync" + "time" + + "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/common/pubsub" + "github.com/botlabs-gg/yagpdb/v2/feeds" + "github.com/botlabs-gg/yagpdb/v2/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/twitch/models" + "github.com/mediocregopher/radix/v3" + "github.com/nicklaw5/helix/v2" + "github.com/prometheus/client_golang/prometheus" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +const ( + // PollingInterval is how often we check for new streams + PollingInterval = time.Minute * 1 +) + +func (p *Plugin) StartFeed() { + p.Stop = make(chan *sync.WaitGroup) + go p.runPoller() +} + +func (p *Plugin) StopFeed(wg *sync.WaitGroup) { + if p.Stop != nil { + p.Stop <- wg + } else { + wg.Done() + } +} + +func (p *Plugin) SetupClient() error { + clientID := confClientId.GetString() + clientSecret := confClientSecret.GetString() + + if clientID == "" || clientSecret == "" { + return fmt.Errorf("twitch client id or secret not set") + } + + client, err := helix.NewClient(&helix.Options{ + ClientID: clientID, + ClientSecret: clientSecret, + }) + if err != nil { + return err + } + + resp, err := client.RequestAppAccessToken([]string{}) + if err != nil { + return err + } + client.SetAppAccessToken(resp.Data.AccessToken) + + p.HelixClient = client + return nil +} + +func (p *Plugin) runPoller() { + ticker := time.NewTicker(PollingInterval) + for { + select { + case wg := <-p.Stop: + wg.Done() + return + case <-ticker.C: + p.checkStreams() + } + } +} + +func (p *Plugin) checkStreams() { + var items models.TwitchChannelSubscriptionSlice + err := models.TwitchChannelSubscriptions( + qm.Select("DISTINCT "+models.TwitchChannelSubscriptionColumns.TwitchUserID), + models.TwitchChannelSubscriptionWhere.Enabled.EQ(true), + ).BindG(context.Background(), &items) + + if err != nil { + logger.WithError(err).Error("Failed retrieving twitch subscriptions") + return + } + + var allUserIDs []string + for _, item := range items { + if item.TwitchUserID != "" { + allUserIDs = append(allUserIDs, item.TwitchUserID) + } + } + + if len(allUserIDs) == 0 { + return + } + + // Process in chunks of 100 + chunks := chunkStringSlice(allUserIDs, 100) + for i, chunk := range chunks { + logger.Infof("Total: %d streams, Processing chunk %d/%d", len(allUserIDs), i+1, len(chunks)) + p.processStreamsBatch(chunk) + time.Sleep(time.Second * 1) + } +} + +func (p *Plugin) processStreamsBatch(userIDs []string) { + // Check if token is valid, refresh if needed + isValid, _, _ := p.HelixClient.ValidateToken(p.HelixClient.GetAppAccessToken()) + if !isValid { + resp, err := p.HelixClient.RequestAppAccessToken([]string{}) + if err != nil { + logger.WithError(err).Error("Failed refreshing twitch token") + return + } + p.HelixClient.SetAppAccessToken(resp.Data.AccessToken) + } + + // Get current stream status from Twitch + resp, err := p.HelixClient.GetStreams(&helix.StreamsParams{ + UserIDs: userIDs, + Type: "live", + }) + if err != nil { + logger.WithError(err).Error("Failed getting streams from twitch") + return + } + + // Create map of currently live users + liveMap := make(map[string]helix.Stream) + for _, stream := range resp.Data.Streams { + liveMap[stream.UserID] = stream + } + + now := time.Now() + for _, userID := range userIDs { + stream, isLive := liveMap[userID] + // Check if user is in the online set + var onlineScore string + err := common.RedisPool.Do(radix.Cmd(&onlineScore, "ZSCORE", "twitch_online_users", userID)) + wasOnline := err == nil && onlineScore != "" + + if !isLive && !wasOnline { + continue + } + if isLive && wasOnline { + // Past cooldown, update timestamp and continue (no new notification) + common.RedisPool.Do(radix.Cmd(nil, "ZADD", "twitch_online_users", strconv.FormatInt(now.Unix(), 10), userID)) + continue + } + if isLive { + common.RedisPool.Do(radix.Cmd(nil, "ZADD", "twitch_online_users", strconv.FormatInt(now.Unix(), 10), userID)) + // New stream - add to online set and notify + logger.Infof("Twitch stream live: %s (Stream ID: %s)", stream.UserName, stream.ID) + } else { + // Stream went offline - remove from set and notify + logger.Infof("Twitch stream offline: %s", userID) + lastTime, err := strconv.ParseInt(onlineScore, 10, 64) + if err != nil { + logger.WithError(err).Error("Failed parsing online score") + continue + } + if timeSinceOffline := now.Unix() - lastTime; timeSinceOffline < 300 { + // 5 minutes cooldown before sending offline notification + logger.Infof("Skipping notification for %s - only been offline for %d seconds", stream.UserName, timeSinceOffline) + continue + } + common.RedisPool.Do(radix.Cmd(nil, "ZREM", "twitch_online_users", userID)) + stream = helix.Stream{ + UserID: userID, + } + } + p.notifySubscribers(userID, stream, isLive) + } +} + +func chunkStringSlice(slice []string, chunkSize int) [][]string { + var chunks [][]string + for i := 0; i < len(slice); i += chunkSize { + end := min(i+chunkSize, len(slice)) + chunks = append(chunks, slice[i:end]) + } + return chunks +} + +func (p *Plugin) notifySubscribers(twitchUserID string, stream helix.Stream, isLive bool) { + userSubs, err := models.TwitchChannelSubscriptions( + models.TwitchChannelSubscriptionWhere.TwitchUserID.EQ(twitchUserID), + models.TwitchChannelSubscriptionWhere.Enabled.EQ(true), + ).AllG(context.Background()) + if err != nil { + logger.WithError(err).Error("Failed retrieving twitch subscriptions for notification") + return + } + + if len(userSubs) == 0 { + return + } + + // Fill in username if missing (offline case) + if stream.UserName == "" { + stream.UserName = userSubs[0].TwitchUsername + stream.UserLogin = userSubs[0].TwitchUsername + } + + // Fetch VOD if offline and needed + var vodUrl string + if !isLive { + // Check if any sub needs VOD + needsVOD := false + for _, sub := range userSubs { + if sub.PublishVod { + needsVOD = true + break + } + } + + if needsVOD { + // Fetch videos + resp, err := p.HelixClient.GetVideos(&helix.VideosParams{ + UserID: twitchUserID, + Type: "archive", + Period: "day", + First: 1, + }) + if err == nil && len(resp.Data.Videos) > 0 { + // Check if video is recent (created in last 6 hours to be safe) + video := resp.Data.Videos[0] + created, _ := time.Parse(time.RFC3339, video.CreatedAt) + if time.Since(created) < 6*time.Hour { + vodUrl = video.URL + } + } + } + } + + for _, sub := range userSubs { + p.sendStreamMessage(sub, stream, isLive, vodUrl) + } +} + +func (p *Plugin) sendStreamMessage(sub *models.TwitchChannelSubscription, stream helix.Stream, isLive bool, vodUrl string) { + parsedGuild, _ := strconv.ParseInt(sub.GuildID, 10, 64) + parsedChannel, _ := strconv.ParseInt(sub.ChannelID, 10, 64) + + // only send for Live events, for VODs only send if publish vod is enabled + if !isLive && (!sub.PublishVod || vodUrl == "") { + return + } + + // Check for custom announcement + announcement, err := models.FindTwitchAnnouncementG(context.Background(), parsedGuild) + if err == nil && announcement.Enabled && len(announcement.Message) > 0 { + // Publish event for custom announcement + pubsub.Publish("custom_twitch_announcement", parsedGuild, CustomTwitchAnnouncement{ + GuildID: parsedGuild, + Subscription: *sub, + Stream: stream, + IsLive: isLive, + VODUrl: vodUrl, + }) + return + } + + var content string + if isLive { + streamUrl := "https://www.twitch.tv/" + stream.UserLogin + if len(stream.GameName) > 0 { + content = fmt.Sprintf("**%s** is live now and playing **%s**!\n%s", stream.UserName, stream.GameName, streamUrl) + } else { + content = fmt.Sprintf("**%s** is live now!\n%s", stream.UserName, streamUrl) + } + } else { + content = fmt.Sprintf("**%s** has gone offline. Catch the VOD here: %s", stream.UserName, vodUrl) + } + + parseMentions := []discordgo.AllowedMentionType{} + + if sub.MentionEveryone { + content = "Hey @everyone " + content + parseMentions = []discordgo.AllowedMentionType{discordgo.AllowedMentionTypeEveryone} + } else if len(sub.MentionRoles) > 0 { + mentions := "Hey" + for _, roleId := range sub.MentionRoles { + mentions += fmt.Sprintf(" <@&%d>", roleId) + } + content = mentions + " " + content + parseMentions = []discordgo.AllowedMentionType{discordgo.AllowedMentionTypeRoles} + } + + go analytics.RecordActiveUnit(parsedGuild, p, "posted_twitch_message") + feeds.MetricPostedMessages.With(prometheus.Labels{"source": "twitch"}).Inc() + + mqueue.QueueMessage(&mqueue.QueuedElement{ + GuildID: parsedGuild, + ChannelID: parsedChannel, + Source: "twitch", + SourceItemID: stream.ID, + MessageStr: content, + Priority: 2, + PublishAnnouncement: false, + AllowedMentions: discordgo.AllowedMentions{ + Parse: parseMentions, + }, + }) +} diff --git a/twitch/models/boil_queries.go b/twitch/models/boil_queries.go new file mode 100644 index 0000000000..26694dc7df --- /dev/null +++ b/twitch/models/boil_queries.go @@ -0,0 +1,38 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "regexp" + + "github.com/volatiletech/sqlboiler/v4/drivers" + "github.com/volatiletech/sqlboiler/v4/queries" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +var dialect = drivers.Dialect{ + LQ: 0x22, + RQ: 0x22, + + UseIndexPlaceholders: true, + UseLastInsertID: false, + UseSchema: false, + UseDefaultKeyword: true, + UseAutoColumns: false, + UseTopClause: false, + UseOutputClause: false, + UseCaseWhenExistsClause: false, +} + +// This is a dummy variable to prevent unused regexp import error +var _ = ®exp.Regexp{} + +// NewQuery initializes a new Query using the passed in QueryMods +func NewQuery(mods ...qm.QueryMod) *queries.Query { + q := &queries.Query{} + queries.SetDialect(q, &dialect) + qm.Apply(q, mods...) + + return q +} diff --git a/twitch/models/boil_table_names.go b/twitch/models/boil_table_names.go new file mode 100644 index 0000000000..b0c24d22c4 --- /dev/null +++ b/twitch/models/boil_table_names.go @@ -0,0 +1,12 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +var TableNames = struct { + TwitchAnnouncements string + TwitchChannelSubscriptions string +}{ + TwitchAnnouncements: "twitch_announcements", + TwitchChannelSubscriptions: "twitch_channel_subscriptions", +} diff --git a/twitch/models/boil_types.go b/twitch/models/boil_types.go new file mode 100644 index 0000000000..13f92c42c3 --- /dev/null +++ b/twitch/models/boil_types.go @@ -0,0 +1,52 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "strconv" + + "github.com/friendsofgo/errors" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/strmangle" +) + +// M type is for providing columns and column values to UpdateAll. +type M map[string]interface{} + +// ErrSyncFail occurs during insert when the record could not be retrieved in +// order to populate default value information. This usually happens when LastInsertId +// fails or there was a primary key configuration that was not resolvable. +var ErrSyncFail = errors.New("models: failed to synchronize data after insert") + +type insertCache struct { + query string + retQuery string + valueMapping []uint64 + retMapping []uint64 +} + +type updateCache struct { + query string + valueMapping []uint64 +} + +func makeCacheKey(cols boil.Columns, nzDefaults []string) string { + buf := strmangle.GetBuffer() + + buf.WriteString(strconv.Itoa(cols.Kind)) + for _, w := range cols.Cols { + buf.WriteString(w) + } + + if len(nzDefaults) != 0 { + buf.WriteByte('.') + } + for _, nz := range nzDefaults { + buf.WriteString(nz) + } + + str := buf.String() + strmangle.PutBuffer(buf) + return str +} diff --git a/twitch/models/boil_view_names.go b/twitch/models/boil_view_names.go new file mode 100644 index 0000000000..25ff551e62 --- /dev/null +++ b/twitch/models/boil_view_names.go @@ -0,0 +1,7 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +var ViewNames = struct { +}{} diff --git a/twitch/models/psql_upsert.go b/twitch/models/psql_upsert.go new file mode 100644 index 0000000000..cd00500c2d --- /dev/null +++ b/twitch/models/psql_upsert.go @@ -0,0 +1,99 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "fmt" + "strings" + + "github.com/volatiletech/sqlboiler/v4/drivers" + "github.com/volatiletech/strmangle" +) + +type UpsertOptions struct { + conflictTarget string + updateSet string +} + +type UpsertOptionFunc func(o *UpsertOptions) + +func UpsertConflictTarget(conflictTarget string) UpsertOptionFunc { + return func(o *UpsertOptions) { + o.conflictTarget = conflictTarget + } +} + +func UpsertUpdateSet(updateSet string) UpsertOptionFunc { + return func(o *UpsertOptions) { + o.updateSet = updateSet + } +} + +// buildUpsertQueryPostgres builds a SQL statement string using the upsertData provided. +func buildUpsertQueryPostgres(dia drivers.Dialect, tableName string, updateOnConflict bool, ret, update, conflict, whitelist []string, opts ...UpsertOptionFunc) string { + conflict = strmangle.IdentQuoteSlice(dia.LQ, dia.RQ, conflict) + whitelist = strmangle.IdentQuoteSlice(dia.LQ, dia.RQ, whitelist) + ret = strmangle.IdentQuoteSlice(dia.LQ, dia.RQ, ret) + + upsertOpts := &UpsertOptions{} + for _, o := range opts { + o(upsertOpts) + } + + buf := strmangle.GetBuffer() + defer strmangle.PutBuffer(buf) + + columns := "DEFAULT VALUES" + if len(whitelist) != 0 { + columns = fmt.Sprintf("(%s) VALUES (%s)", + strings.Join(whitelist, ", "), + strmangle.Placeholders(dia.UseIndexPlaceholders, len(whitelist), 1, 1)) + } + + fmt.Fprintf( + buf, + "INSERT INTO %s %s ON CONFLICT ", + tableName, + columns, + ) + + if upsertOpts.conflictTarget != "" { + buf.WriteString(upsertOpts.conflictTarget) + } else if len(conflict) != 0 { + buf.WriteByte('(') + buf.WriteString(strings.Join(conflict, ", ")) + buf.WriteByte(')') + } + buf.WriteByte(' ') + + if !updateOnConflict || len(update) == 0 { + buf.WriteString("DO NOTHING") + } else { + buf.WriteString("DO UPDATE SET ") + + if upsertOpts.updateSet != "" { + buf.WriteString(upsertOpts.updateSet) + } else { + for i, v := range update { + if len(v) == 0 { + continue + } + if i != 0 { + buf.WriteByte(',') + } + quoted := strmangle.IdentQuote(dia.LQ, dia.RQ, v) + buf.WriteString(quoted) + buf.WriteString(" = EXCLUDED.") + buf.WriteString(quoted) + } + } + } + + if len(ret) != 0 { + buf.WriteString(" RETURNING ") + buf.WriteString(strings.Join(ret, ", ")) + } + + return buf.String() +} diff --git a/twitch/models/twitch_announcements.go b/twitch/models/twitch_announcements.go new file mode 100644 index 0000000000..c4dd7d3ecf --- /dev/null +++ b/twitch/models/twitch_announcements.go @@ -0,0 +1,835 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "context" + "database/sql" + "fmt" + "reflect" + "strconv" + "strings" + "sync" + "time" + + "github.com/friendsofgo/errors" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/sqlboiler/v4/queries" + "github.com/volatiletech/sqlboiler/v4/queries/qm" + "github.com/volatiletech/sqlboiler/v4/queries/qmhelper" + "github.com/volatiletech/strmangle" +) + +// TwitchAnnouncement is an object representing the database table. +type TwitchAnnouncement struct { + GuildID int64 `boil:"guild_id" json:"guild_id" toml:"guild_id" yaml:"guild_id"` + Message string `boil:"message" json:"message" toml:"message" yaml:"message"` + Enabled bool `boil:"enabled" json:"enabled" toml:"enabled" yaml:"enabled"` + + R *twitchAnnouncementR `boil:"-" json:"-" toml:"-" yaml:"-"` + L twitchAnnouncementL `boil:"-" json:"-" toml:"-" yaml:"-"` +} + +var TwitchAnnouncementColumns = struct { + GuildID string + Message string + Enabled string +}{ + GuildID: "guild_id", + Message: "message", + Enabled: "enabled", +} + +var TwitchAnnouncementTableColumns = struct { + GuildID string + Message string + Enabled string +}{ + GuildID: "twitch_announcements.guild_id", + Message: "twitch_announcements.message", + Enabled: "twitch_announcements.enabled", +} + +// Generated where + +type whereHelperint64 struct{ field string } + +func (w whereHelperint64) EQ(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.EQ, x) } +func (w whereHelperint64) NEQ(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) } +func (w whereHelperint64) LT(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LT, x) } +func (w whereHelperint64) LTE(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) } +func (w whereHelperint64) GT(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) } +func (w whereHelperint64) GTE(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) } +func (w whereHelperint64) IN(slice []int64) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereIn(fmt.Sprintf("%s IN ?", w.field), values...) +} +func (w whereHelperint64) NIN(slice []int64) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereNotIn(fmt.Sprintf("%s NOT IN ?", w.field), values...) +} + +type whereHelperstring struct{ field string } + +func (w whereHelperstring) EQ(x string) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.EQ, x) } +func (w whereHelperstring) NEQ(x string) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) } +func (w whereHelperstring) LT(x string) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LT, x) } +func (w whereHelperstring) LTE(x string) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) } +func (w whereHelperstring) GT(x string) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) } +func (w whereHelperstring) GTE(x string) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) } +func (w whereHelperstring) LIKE(x string) qm.QueryMod { return qm.Where(w.field+" LIKE ?", x) } +func (w whereHelperstring) NLIKE(x string) qm.QueryMod { return qm.Where(w.field+" NOT LIKE ?", x) } +func (w whereHelperstring) ILIKE(x string) qm.QueryMod { return qm.Where(w.field+" ILIKE ?", x) } +func (w whereHelperstring) NILIKE(x string) qm.QueryMod { return qm.Where(w.field+" NOT ILIKE ?", x) } +func (w whereHelperstring) SIMILAR(x string) qm.QueryMod { return qm.Where(w.field+" SIMILAR TO ?", x) } +func (w whereHelperstring) NSIMILAR(x string) qm.QueryMod { + return qm.Where(w.field+" NOT SIMILAR TO ?", x) +} +func (w whereHelperstring) IN(slice []string) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereIn(fmt.Sprintf("%s IN ?", w.field), values...) +} +func (w whereHelperstring) NIN(slice []string) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereNotIn(fmt.Sprintf("%s NOT IN ?", w.field), values...) +} + +type whereHelperbool struct{ field string } + +func (w whereHelperbool) EQ(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.EQ, x) } +func (w whereHelperbool) NEQ(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) } +func (w whereHelperbool) LT(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LT, x) } +func (w whereHelperbool) LTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) } +func (w whereHelperbool) GT(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) } +func (w whereHelperbool) GTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) } + +var TwitchAnnouncementWhere = struct { + GuildID whereHelperint64 + Message whereHelperstring + Enabled whereHelperbool +}{ + GuildID: whereHelperint64{field: "\"twitch_announcements\".\"guild_id\""}, + Message: whereHelperstring{field: "\"twitch_announcements\".\"message\""}, + Enabled: whereHelperbool{field: "\"twitch_announcements\".\"enabled\""}, +} + +// TwitchAnnouncementRels is where relationship names are stored. +var TwitchAnnouncementRels = struct { +}{} + +// twitchAnnouncementR is where relationships are stored. +type twitchAnnouncementR struct { +} + +// NewStruct creates a new relationship struct +func (*twitchAnnouncementR) NewStruct() *twitchAnnouncementR { + return &twitchAnnouncementR{} +} + +// twitchAnnouncementL is where Load methods for each relationship are stored. +type twitchAnnouncementL struct{} + +var ( + twitchAnnouncementAllColumns = []string{"guild_id", "message", "enabled"} + twitchAnnouncementColumnsWithoutDefault = []string{"guild_id", "message"} + twitchAnnouncementColumnsWithDefault = []string{"enabled"} + twitchAnnouncementPrimaryKeyColumns = []string{"guild_id"} + twitchAnnouncementGeneratedColumns = []string{} +) + +type ( + // TwitchAnnouncementSlice is an alias for a slice of pointers to TwitchAnnouncement. + // This should almost always be used instead of []TwitchAnnouncement. + TwitchAnnouncementSlice []*TwitchAnnouncement + + twitchAnnouncementQuery struct { + *queries.Query + } +) + +// Cache for insert, update and upsert +var ( + twitchAnnouncementType = reflect.TypeOf(&TwitchAnnouncement{}) + twitchAnnouncementMapping = queries.MakeStructMapping(twitchAnnouncementType) + twitchAnnouncementPrimaryKeyMapping, _ = queries.BindMapping(twitchAnnouncementType, twitchAnnouncementMapping, twitchAnnouncementPrimaryKeyColumns) + twitchAnnouncementInsertCacheMut sync.RWMutex + twitchAnnouncementInsertCache = make(map[string]insertCache) + twitchAnnouncementUpdateCacheMut sync.RWMutex + twitchAnnouncementUpdateCache = make(map[string]updateCache) + twitchAnnouncementUpsertCacheMut sync.RWMutex + twitchAnnouncementUpsertCache = make(map[string]insertCache) +) + +var ( + // Force time package dependency for automated UpdatedAt/CreatedAt. + _ = time.Second + // Force qmhelper dependency for where clause generation (which doesn't + // always happen) + _ = qmhelper.Where +) + +// OneG returns a single twitchAnnouncement record from the query using the global executor. +func (q twitchAnnouncementQuery) OneG(ctx context.Context) (*TwitchAnnouncement, error) { + return q.One(ctx, boil.GetContextDB()) +} + +// One returns a single twitchAnnouncement record from the query. +func (q twitchAnnouncementQuery) One(ctx context.Context, exec boil.ContextExecutor) (*TwitchAnnouncement, error) { + o := &TwitchAnnouncement{} + + queries.SetLimit(q.Query, 1) + + err := q.Bind(ctx, exec, o) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, sql.ErrNoRows + } + return nil, errors.Wrap(err, "models: failed to execute a one query for twitch_announcements") + } + + return o, nil +} + +// AllG returns all TwitchAnnouncement records from the query using the global executor. +func (q twitchAnnouncementQuery) AllG(ctx context.Context) (TwitchAnnouncementSlice, error) { + return q.All(ctx, boil.GetContextDB()) +} + +// All returns all TwitchAnnouncement records from the query. +func (q twitchAnnouncementQuery) All(ctx context.Context, exec boil.ContextExecutor) (TwitchAnnouncementSlice, error) { + var o []*TwitchAnnouncement + + err := q.Bind(ctx, exec, &o) + if err != nil { + return nil, errors.Wrap(err, "models: failed to assign all query results to TwitchAnnouncement slice") + } + + return o, nil +} + +// CountG returns the count of all TwitchAnnouncement records in the query using the global executor +func (q twitchAnnouncementQuery) CountG(ctx context.Context) (int64, error) { + return q.Count(ctx, boil.GetContextDB()) +} + +// Count returns the count of all TwitchAnnouncement records in the query. +func (q twitchAnnouncementQuery) Count(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + var count int64 + + queries.SetSelect(q.Query, nil) + queries.SetCount(q.Query) + + err := q.Query.QueryRowContext(ctx, exec).Scan(&count) + if err != nil { + return 0, errors.Wrap(err, "models: failed to count twitch_announcements rows") + } + + return count, nil +} + +// ExistsG checks if the row exists in the table using the global executor. +func (q twitchAnnouncementQuery) ExistsG(ctx context.Context) (bool, error) { + return q.Exists(ctx, boil.GetContextDB()) +} + +// Exists checks if the row exists in the table. +func (q twitchAnnouncementQuery) Exists(ctx context.Context, exec boil.ContextExecutor) (bool, error) { + var count int64 + + queries.SetSelect(q.Query, nil) + queries.SetCount(q.Query) + queries.SetLimit(q.Query, 1) + + err := q.Query.QueryRowContext(ctx, exec).Scan(&count) + if err != nil { + return false, errors.Wrap(err, "models: failed to check if twitch_announcements exists") + } + + return count > 0, nil +} + +// TwitchAnnouncements retrieves all the records using an executor. +func TwitchAnnouncements(mods ...qm.QueryMod) twitchAnnouncementQuery { + mods = append(mods, qm.From("\"twitch_announcements\"")) + q := NewQuery(mods...) + if len(queries.GetSelect(q)) == 0 { + queries.SetSelect(q, []string{"\"twitch_announcements\".*"}) + } + + return twitchAnnouncementQuery{q} +} + +// FindTwitchAnnouncementG retrieves a single record by ID. +func FindTwitchAnnouncementG(ctx context.Context, guildID int64, selectCols ...string) (*TwitchAnnouncement, error) { + return FindTwitchAnnouncement(ctx, boil.GetContextDB(), guildID, selectCols...) +} + +// FindTwitchAnnouncement retrieves a single record by ID with an executor. +// If selectCols is empty Find will return all columns. +func FindTwitchAnnouncement(ctx context.Context, exec boil.ContextExecutor, guildID int64, selectCols ...string) (*TwitchAnnouncement, error) { + twitchAnnouncementObj := &TwitchAnnouncement{} + + sel := "*" + if len(selectCols) > 0 { + sel = strings.Join(strmangle.IdentQuoteSlice(dialect.LQ, dialect.RQ, selectCols), ",") + } + query := fmt.Sprintf( + "select %s from \"twitch_announcements\" where \"guild_id\"=$1", sel, + ) + + q := queries.Raw(query, guildID) + + err := q.Bind(ctx, exec, twitchAnnouncementObj) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, sql.ErrNoRows + } + return nil, errors.Wrap(err, "models: unable to select from twitch_announcements") + } + + return twitchAnnouncementObj, nil +} + +// InsertG a single record. See Insert for whitelist behavior description. +func (o *TwitchAnnouncement) InsertG(ctx context.Context, columns boil.Columns) error { + return o.Insert(ctx, boil.GetContextDB(), columns) +} + +// Insert a single record using an executor. +// See boil.Columns.InsertColumnSet documentation to understand column list inference for inserts. +func (o *TwitchAnnouncement) Insert(ctx context.Context, exec boil.ContextExecutor, columns boil.Columns) error { + if o == nil { + return errors.New("models: no twitch_announcements provided for insertion") + } + + var err error + + nzDefaults := queries.NonZeroDefaultSet(twitchAnnouncementColumnsWithDefault, o) + + key := makeCacheKey(columns, nzDefaults) + twitchAnnouncementInsertCacheMut.RLock() + cache, cached := twitchAnnouncementInsertCache[key] + twitchAnnouncementInsertCacheMut.RUnlock() + + if !cached { + wl, returnColumns := columns.InsertColumnSet( + twitchAnnouncementAllColumns, + twitchAnnouncementColumnsWithDefault, + twitchAnnouncementColumnsWithoutDefault, + nzDefaults, + ) + + cache.valueMapping, err = queries.BindMapping(twitchAnnouncementType, twitchAnnouncementMapping, wl) + if err != nil { + return err + } + cache.retMapping, err = queries.BindMapping(twitchAnnouncementType, twitchAnnouncementMapping, returnColumns) + if err != nil { + return err + } + if len(wl) != 0 { + cache.query = fmt.Sprintf("INSERT INTO \"twitch_announcements\" (\"%s\") %%sVALUES (%s)%%s", strings.Join(wl, "\",\""), strmangle.Placeholders(dialect.UseIndexPlaceholders, len(wl), 1, 1)) + } else { + cache.query = "INSERT INTO \"twitch_announcements\" %sDEFAULT VALUES%s" + } + + var queryOutput, queryReturning string + + if len(cache.retMapping) != 0 { + queryReturning = fmt.Sprintf(" RETURNING \"%s\"", strings.Join(returnColumns, "\",\"")) + } + + cache.query = fmt.Sprintf(cache.query, queryOutput, queryReturning) + } + + value := reflect.Indirect(reflect.ValueOf(o)) + vals := queries.ValuesFromMapping(value, cache.valueMapping) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, vals) + } + + if len(cache.retMapping) != 0 { + err = exec.QueryRowContext(ctx, cache.query, vals...).Scan(queries.PtrsFromMapping(value, cache.retMapping)...) + } else { + _, err = exec.ExecContext(ctx, cache.query, vals...) + } + + if err != nil { + return errors.Wrap(err, "models: unable to insert into twitch_announcements") + } + + if !cached { + twitchAnnouncementInsertCacheMut.Lock() + twitchAnnouncementInsertCache[key] = cache + twitchAnnouncementInsertCacheMut.Unlock() + } + + return nil +} + +// UpdateG a single TwitchAnnouncement record using the global executor. +// See Update for more documentation. +func (o *TwitchAnnouncement) UpdateG(ctx context.Context, columns boil.Columns) (int64, error) { + return o.Update(ctx, boil.GetContextDB(), columns) +} + +// Update uses an executor to update the TwitchAnnouncement. +// See boil.Columns.UpdateColumnSet documentation to understand column list inference for updates. +// Update does not automatically update the record in case of default values. Use .Reload() to refresh the records. +func (o *TwitchAnnouncement) Update(ctx context.Context, exec boil.ContextExecutor, columns boil.Columns) (int64, error) { + var err error + key := makeCacheKey(columns, nil) + twitchAnnouncementUpdateCacheMut.RLock() + cache, cached := twitchAnnouncementUpdateCache[key] + twitchAnnouncementUpdateCacheMut.RUnlock() + + if !cached { + wl := columns.UpdateColumnSet( + twitchAnnouncementAllColumns, + twitchAnnouncementPrimaryKeyColumns, + ) + + if !columns.IsWhitelist() { + wl = strmangle.SetComplement(wl, []string{"created_at"}) + } + if len(wl) == 0 { + return 0, errors.New("models: unable to update twitch_announcements, could not build whitelist") + } + + cache.query = fmt.Sprintf("UPDATE \"twitch_announcements\" SET %s WHERE %s", + strmangle.SetParamNames("\"", "\"", 1, wl), + strmangle.WhereClause("\"", "\"", len(wl)+1, twitchAnnouncementPrimaryKeyColumns), + ) + cache.valueMapping, err = queries.BindMapping(twitchAnnouncementType, twitchAnnouncementMapping, append(wl, twitchAnnouncementPrimaryKeyColumns...)) + if err != nil { + return 0, err + } + } + + values := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(o)), cache.valueMapping) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, values) + } + var result sql.Result + result, err = exec.ExecContext(ctx, cache.query, values...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update twitch_announcements row") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by update for twitch_announcements") + } + + if !cached { + twitchAnnouncementUpdateCacheMut.Lock() + twitchAnnouncementUpdateCache[key] = cache + twitchAnnouncementUpdateCacheMut.Unlock() + } + + return rowsAff, nil +} + +// UpdateAllG updates all rows with the specified column values. +func (q twitchAnnouncementQuery) UpdateAllG(ctx context.Context, cols M) (int64, error) { + return q.UpdateAll(ctx, boil.GetContextDB(), cols) +} + +// UpdateAll updates all rows with the specified column values. +func (q twitchAnnouncementQuery) UpdateAll(ctx context.Context, exec boil.ContextExecutor, cols M) (int64, error) { + queries.SetUpdate(q.Query, cols) + + result, err := q.Query.ExecContext(ctx, exec) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update all for twitch_announcements") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: unable to retrieve rows affected for twitch_announcements") + } + + return rowsAff, nil +} + +// UpdateAllG updates all rows with the specified column values. +func (o TwitchAnnouncementSlice) UpdateAllG(ctx context.Context, cols M) (int64, error) { + return o.UpdateAll(ctx, boil.GetContextDB(), cols) +} + +// UpdateAll updates all rows with the specified column values, using an executor. +func (o TwitchAnnouncementSlice) UpdateAll(ctx context.Context, exec boil.ContextExecutor, cols M) (int64, error) { + ln := int64(len(o)) + if ln == 0 { + return 0, nil + } + + if len(cols) == 0 { + return 0, errors.New("models: update all requires at least one column argument") + } + + colNames := make([]string, len(cols)) + args := make([]interface{}, len(cols)) + + i := 0 + for name, value := range cols { + colNames[i] = name + args[i] = value + i++ + } + + // Append all of the primary key values for each column + for _, obj := range o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), twitchAnnouncementPrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := fmt.Sprintf("UPDATE \"twitch_announcements\" SET %s WHERE %s", + strmangle.SetParamNames("\"", "\"", 1, colNames), + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), len(colNames)+1, twitchAnnouncementPrimaryKeyColumns, len(o))) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args...) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update all in twitchAnnouncement slice") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: unable to retrieve rows affected all in update all twitchAnnouncement") + } + return rowsAff, nil +} + +// UpsertG attempts an insert, and does an update or ignore on conflict. +func (o *TwitchAnnouncement) UpsertG(ctx context.Context, updateOnConflict bool, conflictColumns []string, updateColumns, insertColumns boil.Columns, opts ...UpsertOptionFunc) error { + return o.Upsert(ctx, boil.GetContextDB(), updateOnConflict, conflictColumns, updateColumns, insertColumns, opts...) +} + +// Upsert attempts an insert using an executor, and does an update or ignore on conflict. +// See boil.Columns documentation for how to properly use updateColumns and insertColumns. +func (o *TwitchAnnouncement) Upsert(ctx context.Context, exec boil.ContextExecutor, updateOnConflict bool, conflictColumns []string, updateColumns, insertColumns boil.Columns, opts ...UpsertOptionFunc) error { + if o == nil { + return errors.New("models: no twitch_announcements provided for upsert") + } + + nzDefaults := queries.NonZeroDefaultSet(twitchAnnouncementColumnsWithDefault, o) + + // Build cache key in-line uglily - mysql vs psql problems + buf := strmangle.GetBuffer() + if updateOnConflict { + buf.WriteByte('t') + } else { + buf.WriteByte('f') + } + buf.WriteByte('.') + for _, c := range conflictColumns { + buf.WriteString(c) + } + buf.WriteByte('.') + buf.WriteString(strconv.Itoa(updateColumns.Kind)) + for _, c := range updateColumns.Cols { + buf.WriteString(c) + } + buf.WriteByte('.') + buf.WriteString(strconv.Itoa(insertColumns.Kind)) + for _, c := range insertColumns.Cols { + buf.WriteString(c) + } + buf.WriteByte('.') + for _, c := range nzDefaults { + buf.WriteString(c) + } + key := buf.String() + strmangle.PutBuffer(buf) + + twitchAnnouncementUpsertCacheMut.RLock() + cache, cached := twitchAnnouncementUpsertCache[key] + twitchAnnouncementUpsertCacheMut.RUnlock() + + var err error + + if !cached { + insert, _ := insertColumns.InsertColumnSet( + twitchAnnouncementAllColumns, + twitchAnnouncementColumnsWithDefault, + twitchAnnouncementColumnsWithoutDefault, + nzDefaults, + ) + + update := updateColumns.UpdateColumnSet( + twitchAnnouncementAllColumns, + twitchAnnouncementPrimaryKeyColumns, + ) + + if updateOnConflict && len(update) == 0 { + return errors.New("models: unable to upsert twitch_announcements, could not build update column list") + } + + ret := strmangle.SetComplement(twitchAnnouncementAllColumns, strmangle.SetIntersect(insert, update)) + + conflict := conflictColumns + if len(conflict) == 0 && updateOnConflict && len(update) != 0 { + if len(twitchAnnouncementPrimaryKeyColumns) == 0 { + return errors.New("models: unable to upsert twitch_announcements, could not build conflict column list") + } + + conflict = make([]string, len(twitchAnnouncementPrimaryKeyColumns)) + copy(conflict, twitchAnnouncementPrimaryKeyColumns) + } + cache.query = buildUpsertQueryPostgres(dialect, "\"twitch_announcements\"", updateOnConflict, ret, update, conflict, insert, opts...) + + cache.valueMapping, err = queries.BindMapping(twitchAnnouncementType, twitchAnnouncementMapping, insert) + if err != nil { + return err + } + if len(ret) != 0 { + cache.retMapping, err = queries.BindMapping(twitchAnnouncementType, twitchAnnouncementMapping, ret) + if err != nil { + return err + } + } + } + + value := reflect.Indirect(reflect.ValueOf(o)) + vals := queries.ValuesFromMapping(value, cache.valueMapping) + var returns []interface{} + if len(cache.retMapping) != 0 { + returns = queries.PtrsFromMapping(value, cache.retMapping) + } + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, vals) + } + if len(cache.retMapping) != 0 { + err = exec.QueryRowContext(ctx, cache.query, vals...).Scan(returns...) + if errors.Is(err, sql.ErrNoRows) { + err = nil // Postgres doesn't return anything when there's no update + } + } else { + _, err = exec.ExecContext(ctx, cache.query, vals...) + } + if err != nil { + return errors.Wrap(err, "models: unable to upsert twitch_announcements") + } + + if !cached { + twitchAnnouncementUpsertCacheMut.Lock() + twitchAnnouncementUpsertCache[key] = cache + twitchAnnouncementUpsertCacheMut.Unlock() + } + + return nil +} + +// DeleteG deletes a single TwitchAnnouncement record. +// DeleteG will match against the primary key column to find the record to delete. +func (o *TwitchAnnouncement) DeleteG(ctx context.Context) (int64, error) { + return o.Delete(ctx, boil.GetContextDB()) +} + +// Delete deletes a single TwitchAnnouncement record with an executor. +// Delete will match against the primary key column to find the record to delete. +func (o *TwitchAnnouncement) Delete(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if o == nil { + return 0, errors.New("models: no TwitchAnnouncement provided for delete") + } + + args := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(o)), twitchAnnouncementPrimaryKeyMapping) + sql := "DELETE FROM \"twitch_announcements\" WHERE \"guild_id\"=$1" + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args...) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete from twitch_announcements") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by delete for twitch_announcements") + } + + return rowsAff, nil +} + +func (q twitchAnnouncementQuery) DeleteAllG(ctx context.Context) (int64, error) { + return q.DeleteAll(ctx, boil.GetContextDB()) +} + +// DeleteAll deletes all matching rows. +func (q twitchAnnouncementQuery) DeleteAll(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if q.Query == nil { + return 0, errors.New("models: no twitchAnnouncementQuery provided for delete all") + } + + queries.SetDelete(q.Query) + + result, err := q.Query.ExecContext(ctx, exec) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete all from twitch_announcements") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by deleteall for twitch_announcements") + } + + return rowsAff, nil +} + +// DeleteAllG deletes all rows in the slice. +func (o TwitchAnnouncementSlice) DeleteAllG(ctx context.Context) (int64, error) { + return o.DeleteAll(ctx, boil.GetContextDB()) +} + +// DeleteAll deletes all rows in the slice, using an executor. +func (o TwitchAnnouncementSlice) DeleteAll(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if len(o) == 0 { + return 0, nil + } + + var args []interface{} + for _, obj := range o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), twitchAnnouncementPrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := "DELETE FROM \"twitch_announcements\" WHERE " + + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), 1, twitchAnnouncementPrimaryKeyColumns, len(o)) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete all from twitchAnnouncement slice") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by deleteall for twitch_announcements") + } + + return rowsAff, nil +} + +// ReloadG refetches the object from the database using the primary keys. +func (o *TwitchAnnouncement) ReloadG(ctx context.Context) error { + if o == nil { + return errors.New("models: no TwitchAnnouncement provided for reload") + } + + return o.Reload(ctx, boil.GetContextDB()) +} + +// Reload refetches the object from the database +// using the primary keys with an executor. +func (o *TwitchAnnouncement) Reload(ctx context.Context, exec boil.ContextExecutor) error { + ret, err := FindTwitchAnnouncement(ctx, exec, o.GuildID) + if err != nil { + return err + } + + *o = *ret + return nil +} + +// ReloadAllG refetches every row with matching primary key column values +// and overwrites the original object slice with the newly updated slice. +func (o *TwitchAnnouncementSlice) ReloadAllG(ctx context.Context) error { + if o == nil { + return errors.New("models: empty TwitchAnnouncementSlice provided for reload all") + } + + return o.ReloadAll(ctx, boil.GetContextDB()) +} + +// ReloadAll refetches every row with matching primary key column values +// and overwrites the original object slice with the newly updated slice. +func (o *TwitchAnnouncementSlice) ReloadAll(ctx context.Context, exec boil.ContextExecutor) error { + if o == nil || len(*o) == 0 { + return nil + } + + slice := TwitchAnnouncementSlice{} + var args []interface{} + for _, obj := range *o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), twitchAnnouncementPrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := "SELECT \"twitch_announcements\".* FROM \"twitch_announcements\" WHERE " + + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), 1, twitchAnnouncementPrimaryKeyColumns, len(*o)) + + q := queries.Raw(sql, args...) + + err := q.Bind(ctx, exec, &slice) + if err != nil { + return errors.Wrap(err, "models: unable to reload all in TwitchAnnouncementSlice") + } + + *o = slice + + return nil +} + +// TwitchAnnouncementExistsG checks if the TwitchAnnouncement row exists. +func TwitchAnnouncementExistsG(ctx context.Context, guildID int64) (bool, error) { + return TwitchAnnouncementExists(ctx, boil.GetContextDB(), guildID) +} + +// TwitchAnnouncementExists checks if the TwitchAnnouncement row exists. +func TwitchAnnouncementExists(ctx context.Context, exec boil.ContextExecutor, guildID int64) (bool, error) { + var exists bool + sql := "select exists(select 1 from \"twitch_announcements\" where \"guild_id\"=$1 limit 1)" + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, guildID) + } + row := exec.QueryRowContext(ctx, sql, guildID) + + err := row.Scan(&exists) + if err != nil { + return false, errors.Wrap(err, "models: unable to check if twitch_announcements exists") + } + + return exists, nil +} + +// Exists checks if the TwitchAnnouncement row exists. +func (o *TwitchAnnouncement) Exists(ctx context.Context, exec boil.ContextExecutor) (bool, error) { + return TwitchAnnouncementExists(ctx, exec, o.GuildID) +} diff --git a/twitch/models/twitch_channel_subscriptions.go b/twitch/models/twitch_channel_subscriptions.go new file mode 100644 index 0000000000..f9af1bd4e2 --- /dev/null +++ b/twitch/models/twitch_channel_subscriptions.go @@ -0,0 +1,921 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "context" + "database/sql" + "fmt" + "reflect" + "strconv" + "strings" + "sync" + "time" + + "github.com/friendsofgo/errors" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/sqlboiler/v4/queries" + "github.com/volatiletech/sqlboiler/v4/queries/qm" + "github.com/volatiletech/sqlboiler/v4/queries/qmhelper" + "github.com/volatiletech/sqlboiler/v4/types" + "github.com/volatiletech/strmangle" +) + +// TwitchChannelSubscription is an object representing the database table. +type TwitchChannelSubscription struct { + ID int `boil:"id" json:"id" toml:"id" yaml:"id"` + CreatedAt time.Time `boil:"created_at" json:"created_at" toml:"created_at" yaml:"created_at"` + UpdatedAt time.Time `boil:"updated_at" json:"updated_at" toml:"updated_at" yaml:"updated_at"` + GuildID string `boil:"guild_id" json:"guild_id" toml:"guild_id" yaml:"guild_id"` + ChannelID string `boil:"channel_id" json:"channel_id" toml:"channel_id" yaml:"channel_id"` + TwitchUserID string `boil:"twitch_user_id" json:"twitch_user_id" toml:"twitch_user_id" yaml:"twitch_user_id"` + TwitchUsername string `boil:"twitch_username" json:"twitch_username" toml:"twitch_username" yaml:"twitch_username"` + MentionEveryone bool `boil:"mention_everyone" json:"mention_everyone" toml:"mention_everyone" yaml:"mention_everyone"` + MentionRoles types.Int64Array `boil:"mention_roles" json:"mention_roles,omitempty" toml:"mention_roles" yaml:"mention_roles,omitempty"` + PublishVod bool `boil:"publish_vod" json:"publish_vod" toml:"publish_vod" yaml:"publish_vod"` + Enabled bool `boil:"enabled" json:"enabled" toml:"enabled" yaml:"enabled"` + + R *twitchChannelSubscriptionR `boil:"-" json:"-" toml:"-" yaml:"-"` + L twitchChannelSubscriptionL `boil:"-" json:"-" toml:"-" yaml:"-"` +} + +var TwitchChannelSubscriptionColumns = struct { + ID string + CreatedAt string + UpdatedAt string + GuildID string + ChannelID string + TwitchUserID string + TwitchUsername string + MentionEveryone string + MentionRoles string + PublishVod string + Enabled string +}{ + ID: "id", + CreatedAt: "created_at", + UpdatedAt: "updated_at", + GuildID: "guild_id", + ChannelID: "channel_id", + TwitchUserID: "twitch_user_id", + TwitchUsername: "twitch_username", + MentionEveryone: "mention_everyone", + MentionRoles: "mention_roles", + PublishVod: "publish_vod", + Enabled: "enabled", +} + +var TwitchChannelSubscriptionTableColumns = struct { + ID string + CreatedAt string + UpdatedAt string + GuildID string + ChannelID string + TwitchUserID string + TwitchUsername string + MentionEveryone string + MentionRoles string + PublishVod string + Enabled string +}{ + ID: "twitch_channel_subscriptions.id", + CreatedAt: "twitch_channel_subscriptions.created_at", + UpdatedAt: "twitch_channel_subscriptions.updated_at", + GuildID: "twitch_channel_subscriptions.guild_id", + ChannelID: "twitch_channel_subscriptions.channel_id", + TwitchUserID: "twitch_channel_subscriptions.twitch_user_id", + TwitchUsername: "twitch_channel_subscriptions.twitch_username", + MentionEveryone: "twitch_channel_subscriptions.mention_everyone", + MentionRoles: "twitch_channel_subscriptions.mention_roles", + PublishVod: "twitch_channel_subscriptions.publish_vod", + Enabled: "twitch_channel_subscriptions.enabled", +} + +// Generated where + +type whereHelperint struct{ field string } + +func (w whereHelperint) EQ(x int) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.EQ, x) } +func (w whereHelperint) NEQ(x int) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) } +func (w whereHelperint) LT(x int) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LT, x) } +func (w whereHelperint) LTE(x int) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) } +func (w whereHelperint) GT(x int) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) } +func (w whereHelperint) GTE(x int) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) } +func (w whereHelperint) IN(slice []int) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereIn(fmt.Sprintf("%s IN ?", w.field), values...) +} +func (w whereHelperint) NIN(slice []int) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereNotIn(fmt.Sprintf("%s NOT IN ?", w.field), values...) +} + +type whereHelpertime_Time struct{ field string } + +func (w whereHelpertime_Time) EQ(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.EQ, x) +} +func (w whereHelpertime_Time) NEQ(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.NEQ, x) +} +func (w whereHelpertime_Time) LT(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.LT, x) +} +func (w whereHelpertime_Time) LTE(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.LTE, x) +} +func (w whereHelpertime_Time) GT(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.GT, x) +} +func (w whereHelpertime_Time) GTE(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.GTE, x) +} + +type whereHelpertypes_Int64Array struct{ field string } + +func (w whereHelpertypes_Int64Array) EQ(x types.Int64Array) qm.QueryMod { + return qmhelper.WhereNullEQ(w.field, false, x) +} +func (w whereHelpertypes_Int64Array) NEQ(x types.Int64Array) qm.QueryMod { + return qmhelper.WhereNullEQ(w.field, true, x) +} +func (w whereHelpertypes_Int64Array) LT(x types.Int64Array) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.LT, x) +} +func (w whereHelpertypes_Int64Array) LTE(x types.Int64Array) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.LTE, x) +} +func (w whereHelpertypes_Int64Array) GT(x types.Int64Array) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.GT, x) +} +func (w whereHelpertypes_Int64Array) GTE(x types.Int64Array) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.GTE, x) +} + +func (w whereHelpertypes_Int64Array) IsNull() qm.QueryMod { return qmhelper.WhereIsNull(w.field) } +func (w whereHelpertypes_Int64Array) IsNotNull() qm.QueryMod { return qmhelper.WhereIsNotNull(w.field) } + +var TwitchChannelSubscriptionWhere = struct { + ID whereHelperint + CreatedAt whereHelpertime_Time + UpdatedAt whereHelpertime_Time + GuildID whereHelperstring + ChannelID whereHelperstring + TwitchUserID whereHelperstring + TwitchUsername whereHelperstring + MentionEveryone whereHelperbool + MentionRoles whereHelpertypes_Int64Array + PublishVod whereHelperbool + Enabled whereHelperbool +}{ + ID: whereHelperint{field: "\"twitch_channel_subscriptions\".\"id\""}, + CreatedAt: whereHelpertime_Time{field: "\"twitch_channel_subscriptions\".\"created_at\""}, + UpdatedAt: whereHelpertime_Time{field: "\"twitch_channel_subscriptions\".\"updated_at\""}, + GuildID: whereHelperstring{field: "\"twitch_channel_subscriptions\".\"guild_id\""}, + ChannelID: whereHelperstring{field: "\"twitch_channel_subscriptions\".\"channel_id\""}, + TwitchUserID: whereHelperstring{field: "\"twitch_channel_subscriptions\".\"twitch_user_id\""}, + TwitchUsername: whereHelperstring{field: "\"twitch_channel_subscriptions\".\"twitch_username\""}, + MentionEveryone: whereHelperbool{field: "\"twitch_channel_subscriptions\".\"mention_everyone\""}, + MentionRoles: whereHelpertypes_Int64Array{field: "\"twitch_channel_subscriptions\".\"mention_roles\""}, + PublishVod: whereHelperbool{field: "\"twitch_channel_subscriptions\".\"publish_vod\""}, + Enabled: whereHelperbool{field: "\"twitch_channel_subscriptions\".\"enabled\""}, +} + +// TwitchChannelSubscriptionRels is where relationship names are stored. +var TwitchChannelSubscriptionRels = struct { +}{} + +// twitchChannelSubscriptionR is where relationships are stored. +type twitchChannelSubscriptionR struct { +} + +// NewStruct creates a new relationship struct +func (*twitchChannelSubscriptionR) NewStruct() *twitchChannelSubscriptionR { + return &twitchChannelSubscriptionR{} +} + +// twitchChannelSubscriptionL is where Load methods for each relationship are stored. +type twitchChannelSubscriptionL struct{} + +var ( + twitchChannelSubscriptionAllColumns = []string{"id", "created_at", "updated_at", "guild_id", "channel_id", "twitch_user_id", "twitch_username", "mention_everyone", "mention_roles", "publish_vod", "enabled"} + twitchChannelSubscriptionColumnsWithoutDefault = []string{"created_at", "updated_at", "guild_id", "channel_id", "twitch_user_id", "twitch_username", "mention_everyone"} + twitchChannelSubscriptionColumnsWithDefault = []string{"id", "mention_roles", "publish_vod", "enabled"} + twitchChannelSubscriptionPrimaryKeyColumns = []string{"id"} + twitchChannelSubscriptionGeneratedColumns = []string{} +) + +type ( + // TwitchChannelSubscriptionSlice is an alias for a slice of pointers to TwitchChannelSubscription. + // This should almost always be used instead of []TwitchChannelSubscription. + TwitchChannelSubscriptionSlice []*TwitchChannelSubscription + + twitchChannelSubscriptionQuery struct { + *queries.Query + } +) + +// Cache for insert, update and upsert +var ( + twitchChannelSubscriptionType = reflect.TypeOf(&TwitchChannelSubscription{}) + twitchChannelSubscriptionMapping = queries.MakeStructMapping(twitchChannelSubscriptionType) + twitchChannelSubscriptionPrimaryKeyMapping, _ = queries.BindMapping(twitchChannelSubscriptionType, twitchChannelSubscriptionMapping, twitchChannelSubscriptionPrimaryKeyColumns) + twitchChannelSubscriptionInsertCacheMut sync.RWMutex + twitchChannelSubscriptionInsertCache = make(map[string]insertCache) + twitchChannelSubscriptionUpdateCacheMut sync.RWMutex + twitchChannelSubscriptionUpdateCache = make(map[string]updateCache) + twitchChannelSubscriptionUpsertCacheMut sync.RWMutex + twitchChannelSubscriptionUpsertCache = make(map[string]insertCache) +) + +var ( + // Force time package dependency for automated UpdatedAt/CreatedAt. + _ = time.Second + // Force qmhelper dependency for where clause generation (which doesn't + // always happen) + _ = qmhelper.Where +) + +// OneG returns a single twitchChannelSubscription record from the query using the global executor. +func (q twitchChannelSubscriptionQuery) OneG(ctx context.Context) (*TwitchChannelSubscription, error) { + return q.One(ctx, boil.GetContextDB()) +} + +// One returns a single twitchChannelSubscription record from the query. +func (q twitchChannelSubscriptionQuery) One(ctx context.Context, exec boil.ContextExecutor) (*TwitchChannelSubscription, error) { + o := &TwitchChannelSubscription{} + + queries.SetLimit(q.Query, 1) + + err := q.Bind(ctx, exec, o) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, sql.ErrNoRows + } + return nil, errors.Wrap(err, "models: failed to execute a one query for twitch_channel_subscriptions") + } + + return o, nil +} + +// AllG returns all TwitchChannelSubscription records from the query using the global executor. +func (q twitchChannelSubscriptionQuery) AllG(ctx context.Context) (TwitchChannelSubscriptionSlice, error) { + return q.All(ctx, boil.GetContextDB()) +} + +// All returns all TwitchChannelSubscription records from the query. +func (q twitchChannelSubscriptionQuery) All(ctx context.Context, exec boil.ContextExecutor) (TwitchChannelSubscriptionSlice, error) { + var o []*TwitchChannelSubscription + + err := q.Bind(ctx, exec, &o) + if err != nil { + return nil, errors.Wrap(err, "models: failed to assign all query results to TwitchChannelSubscription slice") + } + + return o, nil +} + +// CountG returns the count of all TwitchChannelSubscription records in the query using the global executor +func (q twitchChannelSubscriptionQuery) CountG(ctx context.Context) (int64, error) { + return q.Count(ctx, boil.GetContextDB()) +} + +// Count returns the count of all TwitchChannelSubscription records in the query. +func (q twitchChannelSubscriptionQuery) Count(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + var count int64 + + queries.SetSelect(q.Query, nil) + queries.SetCount(q.Query) + + err := q.Query.QueryRowContext(ctx, exec).Scan(&count) + if err != nil { + return 0, errors.Wrap(err, "models: failed to count twitch_channel_subscriptions rows") + } + + return count, nil +} + +// ExistsG checks if the row exists in the table using the global executor. +func (q twitchChannelSubscriptionQuery) ExistsG(ctx context.Context) (bool, error) { + return q.Exists(ctx, boil.GetContextDB()) +} + +// Exists checks if the row exists in the table. +func (q twitchChannelSubscriptionQuery) Exists(ctx context.Context, exec boil.ContextExecutor) (bool, error) { + var count int64 + + queries.SetSelect(q.Query, nil) + queries.SetCount(q.Query) + queries.SetLimit(q.Query, 1) + + err := q.Query.QueryRowContext(ctx, exec).Scan(&count) + if err != nil { + return false, errors.Wrap(err, "models: failed to check if twitch_channel_subscriptions exists") + } + + return count > 0, nil +} + +// TwitchChannelSubscriptions retrieves all the records using an executor. +func TwitchChannelSubscriptions(mods ...qm.QueryMod) twitchChannelSubscriptionQuery { + mods = append(mods, qm.From("\"twitch_channel_subscriptions\"")) + q := NewQuery(mods...) + if len(queries.GetSelect(q)) == 0 { + queries.SetSelect(q, []string{"\"twitch_channel_subscriptions\".*"}) + } + + return twitchChannelSubscriptionQuery{q} +} + +// FindTwitchChannelSubscriptionG retrieves a single record by ID. +func FindTwitchChannelSubscriptionG(ctx context.Context, iD int, selectCols ...string) (*TwitchChannelSubscription, error) { + return FindTwitchChannelSubscription(ctx, boil.GetContextDB(), iD, selectCols...) +} + +// FindTwitchChannelSubscription retrieves a single record by ID with an executor. +// If selectCols is empty Find will return all columns. +func FindTwitchChannelSubscription(ctx context.Context, exec boil.ContextExecutor, iD int, selectCols ...string) (*TwitchChannelSubscription, error) { + twitchChannelSubscriptionObj := &TwitchChannelSubscription{} + + sel := "*" + if len(selectCols) > 0 { + sel = strings.Join(strmangle.IdentQuoteSlice(dialect.LQ, dialect.RQ, selectCols), ",") + } + query := fmt.Sprintf( + "select %s from \"twitch_channel_subscriptions\" where \"id\"=$1", sel, + ) + + q := queries.Raw(query, iD) + + err := q.Bind(ctx, exec, twitchChannelSubscriptionObj) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, sql.ErrNoRows + } + return nil, errors.Wrap(err, "models: unable to select from twitch_channel_subscriptions") + } + + return twitchChannelSubscriptionObj, nil +} + +// InsertG a single record. See Insert for whitelist behavior description. +func (o *TwitchChannelSubscription) InsertG(ctx context.Context, columns boil.Columns) error { + return o.Insert(ctx, boil.GetContextDB(), columns) +} + +// Insert a single record using an executor. +// See boil.Columns.InsertColumnSet documentation to understand column list inference for inserts. +func (o *TwitchChannelSubscription) Insert(ctx context.Context, exec boil.ContextExecutor, columns boil.Columns) error { + if o == nil { + return errors.New("models: no twitch_channel_subscriptions provided for insertion") + } + + var err error + if !boil.TimestampsAreSkipped(ctx) { + currTime := time.Now().In(boil.GetLocation()) + + if o.CreatedAt.IsZero() { + o.CreatedAt = currTime + } + if o.UpdatedAt.IsZero() { + o.UpdatedAt = currTime + } + } + + nzDefaults := queries.NonZeroDefaultSet(twitchChannelSubscriptionColumnsWithDefault, o) + + key := makeCacheKey(columns, nzDefaults) + twitchChannelSubscriptionInsertCacheMut.RLock() + cache, cached := twitchChannelSubscriptionInsertCache[key] + twitchChannelSubscriptionInsertCacheMut.RUnlock() + + if !cached { + wl, returnColumns := columns.InsertColumnSet( + twitchChannelSubscriptionAllColumns, + twitchChannelSubscriptionColumnsWithDefault, + twitchChannelSubscriptionColumnsWithoutDefault, + nzDefaults, + ) + + cache.valueMapping, err = queries.BindMapping(twitchChannelSubscriptionType, twitchChannelSubscriptionMapping, wl) + if err != nil { + return err + } + cache.retMapping, err = queries.BindMapping(twitchChannelSubscriptionType, twitchChannelSubscriptionMapping, returnColumns) + if err != nil { + return err + } + if len(wl) != 0 { + cache.query = fmt.Sprintf("INSERT INTO \"twitch_channel_subscriptions\" (\"%s\") %%sVALUES (%s)%%s", strings.Join(wl, "\",\""), strmangle.Placeholders(dialect.UseIndexPlaceholders, len(wl), 1, 1)) + } else { + cache.query = "INSERT INTO \"twitch_channel_subscriptions\" %sDEFAULT VALUES%s" + } + + var queryOutput, queryReturning string + + if len(cache.retMapping) != 0 { + queryReturning = fmt.Sprintf(" RETURNING \"%s\"", strings.Join(returnColumns, "\",\"")) + } + + cache.query = fmt.Sprintf(cache.query, queryOutput, queryReturning) + } + + value := reflect.Indirect(reflect.ValueOf(o)) + vals := queries.ValuesFromMapping(value, cache.valueMapping) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, vals) + } + + if len(cache.retMapping) != 0 { + err = exec.QueryRowContext(ctx, cache.query, vals...).Scan(queries.PtrsFromMapping(value, cache.retMapping)...) + } else { + _, err = exec.ExecContext(ctx, cache.query, vals...) + } + + if err != nil { + return errors.Wrap(err, "models: unable to insert into twitch_channel_subscriptions") + } + + if !cached { + twitchChannelSubscriptionInsertCacheMut.Lock() + twitchChannelSubscriptionInsertCache[key] = cache + twitchChannelSubscriptionInsertCacheMut.Unlock() + } + + return nil +} + +// UpdateG a single TwitchChannelSubscription record using the global executor. +// See Update for more documentation. +func (o *TwitchChannelSubscription) UpdateG(ctx context.Context, columns boil.Columns) (int64, error) { + return o.Update(ctx, boil.GetContextDB(), columns) +} + +// Update uses an executor to update the TwitchChannelSubscription. +// See boil.Columns.UpdateColumnSet documentation to understand column list inference for updates. +// Update does not automatically update the record in case of default values. Use .Reload() to refresh the records. +func (o *TwitchChannelSubscription) Update(ctx context.Context, exec boil.ContextExecutor, columns boil.Columns) (int64, error) { + if !boil.TimestampsAreSkipped(ctx) { + currTime := time.Now().In(boil.GetLocation()) + + o.UpdatedAt = currTime + } + + var err error + key := makeCacheKey(columns, nil) + twitchChannelSubscriptionUpdateCacheMut.RLock() + cache, cached := twitchChannelSubscriptionUpdateCache[key] + twitchChannelSubscriptionUpdateCacheMut.RUnlock() + + if !cached { + wl := columns.UpdateColumnSet( + twitchChannelSubscriptionAllColumns, + twitchChannelSubscriptionPrimaryKeyColumns, + ) + + if !columns.IsWhitelist() { + wl = strmangle.SetComplement(wl, []string{"created_at"}) + } + if len(wl) == 0 { + return 0, errors.New("models: unable to update twitch_channel_subscriptions, could not build whitelist") + } + + cache.query = fmt.Sprintf("UPDATE \"twitch_channel_subscriptions\" SET %s WHERE %s", + strmangle.SetParamNames("\"", "\"", 1, wl), + strmangle.WhereClause("\"", "\"", len(wl)+1, twitchChannelSubscriptionPrimaryKeyColumns), + ) + cache.valueMapping, err = queries.BindMapping(twitchChannelSubscriptionType, twitchChannelSubscriptionMapping, append(wl, twitchChannelSubscriptionPrimaryKeyColumns...)) + if err != nil { + return 0, err + } + } + + values := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(o)), cache.valueMapping) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, values) + } + var result sql.Result + result, err = exec.ExecContext(ctx, cache.query, values...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update twitch_channel_subscriptions row") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by update for twitch_channel_subscriptions") + } + + if !cached { + twitchChannelSubscriptionUpdateCacheMut.Lock() + twitchChannelSubscriptionUpdateCache[key] = cache + twitchChannelSubscriptionUpdateCacheMut.Unlock() + } + + return rowsAff, nil +} + +// UpdateAllG updates all rows with the specified column values. +func (q twitchChannelSubscriptionQuery) UpdateAllG(ctx context.Context, cols M) (int64, error) { + return q.UpdateAll(ctx, boil.GetContextDB(), cols) +} + +// UpdateAll updates all rows with the specified column values. +func (q twitchChannelSubscriptionQuery) UpdateAll(ctx context.Context, exec boil.ContextExecutor, cols M) (int64, error) { + queries.SetUpdate(q.Query, cols) + + result, err := q.Query.ExecContext(ctx, exec) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update all for twitch_channel_subscriptions") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: unable to retrieve rows affected for twitch_channel_subscriptions") + } + + return rowsAff, nil +} + +// UpdateAllG updates all rows with the specified column values. +func (o TwitchChannelSubscriptionSlice) UpdateAllG(ctx context.Context, cols M) (int64, error) { + return o.UpdateAll(ctx, boil.GetContextDB(), cols) +} + +// UpdateAll updates all rows with the specified column values, using an executor. +func (o TwitchChannelSubscriptionSlice) UpdateAll(ctx context.Context, exec boil.ContextExecutor, cols M) (int64, error) { + ln := int64(len(o)) + if ln == 0 { + return 0, nil + } + + if len(cols) == 0 { + return 0, errors.New("models: update all requires at least one column argument") + } + + colNames := make([]string, len(cols)) + args := make([]interface{}, len(cols)) + + i := 0 + for name, value := range cols { + colNames[i] = name + args[i] = value + i++ + } + + // Append all of the primary key values for each column + for _, obj := range o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), twitchChannelSubscriptionPrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := fmt.Sprintf("UPDATE \"twitch_channel_subscriptions\" SET %s WHERE %s", + strmangle.SetParamNames("\"", "\"", 1, colNames), + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), len(colNames)+1, twitchChannelSubscriptionPrimaryKeyColumns, len(o))) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args...) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update all in twitchChannelSubscription slice") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: unable to retrieve rows affected all in update all twitchChannelSubscription") + } + return rowsAff, nil +} + +// UpsertG attempts an insert, and does an update or ignore on conflict. +func (o *TwitchChannelSubscription) UpsertG(ctx context.Context, updateOnConflict bool, conflictColumns []string, updateColumns, insertColumns boil.Columns, opts ...UpsertOptionFunc) error { + return o.Upsert(ctx, boil.GetContextDB(), updateOnConflict, conflictColumns, updateColumns, insertColumns, opts...) +} + +// Upsert attempts an insert using an executor, and does an update or ignore on conflict. +// See boil.Columns documentation for how to properly use updateColumns and insertColumns. +func (o *TwitchChannelSubscription) Upsert(ctx context.Context, exec boil.ContextExecutor, updateOnConflict bool, conflictColumns []string, updateColumns, insertColumns boil.Columns, opts ...UpsertOptionFunc) error { + if o == nil { + return errors.New("models: no twitch_channel_subscriptions provided for upsert") + } + if !boil.TimestampsAreSkipped(ctx) { + currTime := time.Now().In(boil.GetLocation()) + + if o.CreatedAt.IsZero() { + o.CreatedAt = currTime + } + o.UpdatedAt = currTime + } + + nzDefaults := queries.NonZeroDefaultSet(twitchChannelSubscriptionColumnsWithDefault, o) + + // Build cache key in-line uglily - mysql vs psql problems + buf := strmangle.GetBuffer() + if updateOnConflict { + buf.WriteByte('t') + } else { + buf.WriteByte('f') + } + buf.WriteByte('.') + for _, c := range conflictColumns { + buf.WriteString(c) + } + buf.WriteByte('.') + buf.WriteString(strconv.Itoa(updateColumns.Kind)) + for _, c := range updateColumns.Cols { + buf.WriteString(c) + } + buf.WriteByte('.') + buf.WriteString(strconv.Itoa(insertColumns.Kind)) + for _, c := range insertColumns.Cols { + buf.WriteString(c) + } + buf.WriteByte('.') + for _, c := range nzDefaults { + buf.WriteString(c) + } + key := buf.String() + strmangle.PutBuffer(buf) + + twitchChannelSubscriptionUpsertCacheMut.RLock() + cache, cached := twitchChannelSubscriptionUpsertCache[key] + twitchChannelSubscriptionUpsertCacheMut.RUnlock() + + var err error + + if !cached { + insert, _ := insertColumns.InsertColumnSet( + twitchChannelSubscriptionAllColumns, + twitchChannelSubscriptionColumnsWithDefault, + twitchChannelSubscriptionColumnsWithoutDefault, + nzDefaults, + ) + + update := updateColumns.UpdateColumnSet( + twitchChannelSubscriptionAllColumns, + twitchChannelSubscriptionPrimaryKeyColumns, + ) + + if updateOnConflict && len(update) == 0 { + return errors.New("models: unable to upsert twitch_channel_subscriptions, could not build update column list") + } + + ret := strmangle.SetComplement(twitchChannelSubscriptionAllColumns, strmangle.SetIntersect(insert, update)) + + conflict := conflictColumns + if len(conflict) == 0 && updateOnConflict && len(update) != 0 { + if len(twitchChannelSubscriptionPrimaryKeyColumns) == 0 { + return errors.New("models: unable to upsert twitch_channel_subscriptions, could not build conflict column list") + } + + conflict = make([]string, len(twitchChannelSubscriptionPrimaryKeyColumns)) + copy(conflict, twitchChannelSubscriptionPrimaryKeyColumns) + } + cache.query = buildUpsertQueryPostgres(dialect, "\"twitch_channel_subscriptions\"", updateOnConflict, ret, update, conflict, insert, opts...) + + cache.valueMapping, err = queries.BindMapping(twitchChannelSubscriptionType, twitchChannelSubscriptionMapping, insert) + if err != nil { + return err + } + if len(ret) != 0 { + cache.retMapping, err = queries.BindMapping(twitchChannelSubscriptionType, twitchChannelSubscriptionMapping, ret) + if err != nil { + return err + } + } + } + + value := reflect.Indirect(reflect.ValueOf(o)) + vals := queries.ValuesFromMapping(value, cache.valueMapping) + var returns []interface{} + if len(cache.retMapping) != 0 { + returns = queries.PtrsFromMapping(value, cache.retMapping) + } + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, vals) + } + if len(cache.retMapping) != 0 { + err = exec.QueryRowContext(ctx, cache.query, vals...).Scan(returns...) + if errors.Is(err, sql.ErrNoRows) { + err = nil // Postgres doesn't return anything when there's no update + } + } else { + _, err = exec.ExecContext(ctx, cache.query, vals...) + } + if err != nil { + return errors.Wrap(err, "models: unable to upsert twitch_channel_subscriptions") + } + + if !cached { + twitchChannelSubscriptionUpsertCacheMut.Lock() + twitchChannelSubscriptionUpsertCache[key] = cache + twitchChannelSubscriptionUpsertCacheMut.Unlock() + } + + return nil +} + +// DeleteG deletes a single TwitchChannelSubscription record. +// DeleteG will match against the primary key column to find the record to delete. +func (o *TwitchChannelSubscription) DeleteG(ctx context.Context) (int64, error) { + return o.Delete(ctx, boil.GetContextDB()) +} + +// Delete deletes a single TwitchChannelSubscription record with an executor. +// Delete will match against the primary key column to find the record to delete. +func (o *TwitchChannelSubscription) Delete(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if o == nil { + return 0, errors.New("models: no TwitchChannelSubscription provided for delete") + } + + args := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(o)), twitchChannelSubscriptionPrimaryKeyMapping) + sql := "DELETE FROM \"twitch_channel_subscriptions\" WHERE \"id\"=$1" + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args...) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete from twitch_channel_subscriptions") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by delete for twitch_channel_subscriptions") + } + + return rowsAff, nil +} + +func (q twitchChannelSubscriptionQuery) DeleteAllG(ctx context.Context) (int64, error) { + return q.DeleteAll(ctx, boil.GetContextDB()) +} + +// DeleteAll deletes all matching rows. +func (q twitchChannelSubscriptionQuery) DeleteAll(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if q.Query == nil { + return 0, errors.New("models: no twitchChannelSubscriptionQuery provided for delete all") + } + + queries.SetDelete(q.Query) + + result, err := q.Query.ExecContext(ctx, exec) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete all from twitch_channel_subscriptions") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by deleteall for twitch_channel_subscriptions") + } + + return rowsAff, nil +} + +// DeleteAllG deletes all rows in the slice. +func (o TwitchChannelSubscriptionSlice) DeleteAllG(ctx context.Context) (int64, error) { + return o.DeleteAll(ctx, boil.GetContextDB()) +} + +// DeleteAll deletes all rows in the slice, using an executor. +func (o TwitchChannelSubscriptionSlice) DeleteAll(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if len(o) == 0 { + return 0, nil + } + + var args []interface{} + for _, obj := range o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), twitchChannelSubscriptionPrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := "DELETE FROM \"twitch_channel_subscriptions\" WHERE " + + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), 1, twitchChannelSubscriptionPrimaryKeyColumns, len(o)) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete all from twitchChannelSubscription slice") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by deleteall for twitch_channel_subscriptions") + } + + return rowsAff, nil +} + +// ReloadG refetches the object from the database using the primary keys. +func (o *TwitchChannelSubscription) ReloadG(ctx context.Context) error { + if o == nil { + return errors.New("models: no TwitchChannelSubscription provided for reload") + } + + return o.Reload(ctx, boil.GetContextDB()) +} + +// Reload refetches the object from the database +// using the primary keys with an executor. +func (o *TwitchChannelSubscription) Reload(ctx context.Context, exec boil.ContextExecutor) error { + ret, err := FindTwitchChannelSubscription(ctx, exec, o.ID) + if err != nil { + return err + } + + *o = *ret + return nil +} + +// ReloadAllG refetches every row with matching primary key column values +// and overwrites the original object slice with the newly updated slice. +func (o *TwitchChannelSubscriptionSlice) ReloadAllG(ctx context.Context) error { + if o == nil { + return errors.New("models: empty TwitchChannelSubscriptionSlice provided for reload all") + } + + return o.ReloadAll(ctx, boil.GetContextDB()) +} + +// ReloadAll refetches every row with matching primary key column values +// and overwrites the original object slice with the newly updated slice. +func (o *TwitchChannelSubscriptionSlice) ReloadAll(ctx context.Context, exec boil.ContextExecutor) error { + if o == nil || len(*o) == 0 { + return nil + } + + slice := TwitchChannelSubscriptionSlice{} + var args []interface{} + for _, obj := range *o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), twitchChannelSubscriptionPrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := "SELECT \"twitch_channel_subscriptions\".* FROM \"twitch_channel_subscriptions\" WHERE " + + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), 1, twitchChannelSubscriptionPrimaryKeyColumns, len(*o)) + + q := queries.Raw(sql, args...) + + err := q.Bind(ctx, exec, &slice) + if err != nil { + return errors.Wrap(err, "models: unable to reload all in TwitchChannelSubscriptionSlice") + } + + *o = slice + + return nil +} + +// TwitchChannelSubscriptionExistsG checks if the TwitchChannelSubscription row exists. +func TwitchChannelSubscriptionExistsG(ctx context.Context, iD int) (bool, error) { + return TwitchChannelSubscriptionExists(ctx, boil.GetContextDB(), iD) +} + +// TwitchChannelSubscriptionExists checks if the TwitchChannelSubscription row exists. +func TwitchChannelSubscriptionExists(ctx context.Context, exec boil.ContextExecutor, iD int) (bool, error) { + var exists bool + sql := "select exists(select 1 from \"twitch_channel_subscriptions\" where \"id\"=$1 limit 1)" + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, iD) + } + row := exec.QueryRowContext(ctx, sql, iD) + + err := row.Scan(&exists) + if err != nil { + return false, errors.Wrap(err, "models: unable to check if twitch_channel_subscriptions exists") + } + + return exists, nil +} + +// Exists checks if the TwitchChannelSubscription row exists. +func (o *TwitchChannelSubscription) Exists(ctx context.Context, exec boil.ContextExecutor) (bool, error) { + return TwitchChannelSubscriptionExists(ctx, exec, o.ID) +} diff --git a/twitch/schema.go b/twitch/schema.go new file mode 100644 index 0000000000..117d3c2ef7 --- /dev/null +++ b/twitch/schema.go @@ -0,0 +1,28 @@ +package twitch + +var DBSchemas = []string{` +CREATE TABLE IF NOT EXISTS twitch_channel_subscriptions ( + id SERIAL PRIMARY KEY, + created_at TIMESTAMP WITH TIME ZONE NOT NULL, + updated_at TIMESTAMP WITH TIME ZONE NOT NULL, + + guild_id TEXT NOT NULL, + channel_id TEXT NOT NULL, + twitch_user_id TEXT NOT NULL, + twitch_username TEXT NOT NULL, + + mention_everyone BOOLEAN NOT NULL, + mention_roles BIGINT[], + + publish_vod BOOLEAN NOT NULL DEFAULT false, + enabled BOOLEAN NOT NULL DEFAULT TRUE +); +`, ` +CREATE INDEX IF NOT EXISTS idx_twitch_user_id ON twitch_channel_subscriptions (twitch_user_id); +`, ` +CREATE TABLE IF NOT EXISTS twitch_announcements ( + guild_id BIGINT PRIMARY KEY, + message TEXT NOT NULL, + enabled BOOLEAN NOT NULL DEFAULT FALSE +); +`} diff --git a/twitch/sqlboiler.toml b/twitch/sqlboiler.toml new file mode 100644 index 0000000000..bafeb234b3 --- /dev/null +++ b/twitch/sqlboiler.toml @@ -0,0 +1,15 @@ +add-global-variants = true +no-hooks = true +no-tests = true + +[psql] +dbname = "yagpdb" +host = "localhost" +user="yagpdb" +pass="ihateducks" +sslmode = "disable" +whitelist = ["twitch_channel_subscriptions", "twitch_announcements"] + +[auto-columns] +created = "created_at" +updated = "updated_at" diff --git a/twitch/twitch.go b/twitch/twitch.go new file mode 100644 index 0000000000..91162bb833 --- /dev/null +++ b/twitch/twitch.go @@ -0,0 +1,85 @@ +package twitch + +import ( + "context" + "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/discordgo" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/twitch/models" + "github.com/nicklaw5/helix/v2" +) + +//go:generate sqlboiler --no-hooks psql + +var ( + confClientId = config.RegisterOption("yagpdb.twitch.clientid", "Twitch Client ID", "") + confClientSecret = config.RegisterOption("yagpdb.twitch.clientsecret", "Twitch Client Secret", "") + logger = common.GetPluginLogger(&Plugin{}) +) + +const ( + GuildMaxFeeds = 15 + GuildMaxEnabledFeeds = 3 + GuildMaxEnabledFeedsPremium = 15 +) + +func MaxFeedsForContext(ctx context.Context) int { + if premium.ContextPremium(ctx) { + return GuildMaxEnabledFeedsPremium + } + return GuildMaxEnabledFeeds +} + +type Plugin struct { + HelixClient *helix.Client + Stop chan *sync.WaitGroup +} + +func (p *Plugin) PluginInfo() *common.PluginInfo { + return &common.PluginInfo{ + Name: "Twitch", + SysName: "twitch", + Category: common.PluginCategoryFeeds, + } +} + +func RegisterPlugin() { + p := &Plugin{} + + mqueue.RegisterSource("twitch", p) + + err := p.SetupClient() + if err != nil { + logger.WithError(err).Error("Failed setting up twitch plugin, twitch plugin will not be enabled.") + return + } + common.RegisterPlugin(p) + + common.InitSchemas("twitch", DBSchemas...) +} + +var _ mqueue.PluginWithSourceDisabler = (*Plugin)(nil) + +func (p *Plugin) DisableFeed(elem *mqueue.QueuedElement, err error) { + p.DisableChannelFeeds(elem.ChannelID) +} + +func (p *Plugin) DisableChannelFeeds(channelID int64) error { + _, err := models.TwitchChannelSubscriptions(models.TwitchChannelSubscriptionWhere.ChannelID.EQ(discordgo.StrID(channelID))).UpdateAllG(context.Background(), models.M{"enabled": false}) + if err != nil { + logger.WithError(err).WithField("channel", channelID).Error("failed disabling feeds in channel") + } + return err +} + +func (p *Plugin) DisableGuildFeeds(guildID int64) error { + _, err := models.TwitchChannelSubscriptions(models.TwitchChannelSubscriptionWhere.GuildID.EQ(discordgo.StrID(guildID))).UpdateAllG(context.Background(), models.M{"enabled": false}) + if err != nil { + logger.WithError(err).WithField("guild", guildID).Error("failed disabling feeds in guild") + } + return err +} diff --git a/twitch/web.go b/twitch/web.go new file mode 100644 index 0000000000..d3b34b5b15 --- /dev/null +++ b/twitch/web.go @@ -0,0 +1,346 @@ +package twitch + +import ( + "context" + _ "embed" + "fmt" + "html/template" + "net/http" + "net/url" + "strconv" + "strings" + + "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/premium" + "github.com/botlabs-gg/yagpdb/v2/twitch/models" + "github.com/botlabs-gg/yagpdb/v2/web" + + "github.com/nicklaw5/helix/v2" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/sqlboiler/v4/queries/qm" + "goji.io" + "goji.io/pat" +) + +//go:embed assets/twitch.html +var PageHTML string + +var ( + panelLogKeyAddedFeed = cplogs.RegisterActionFormat(&cplogs.ActionFormat{Key: "twitch_added_feed", FormatString: "Added twitch feed from %s"}) + panelLogKeyAnnouncement = cplogs.RegisterActionFormat(&cplogs.ActionFormat{Key: "twitch_announcement", FormatString: "Updated Twitch Announcement"}) + panelLogKeyRemovedFeed = cplogs.RegisterActionFormat(&cplogs.ActionFormat{Key: "twitch_removed_feed", FormatString: "Removed twitch feed from %s"}) + panelLogKeyUpdatedFeed = cplogs.RegisterActionFormat(&cplogs.ActionFormat{Key: "twitch_updated_feed", FormatString: "Updated twitch feed from %s"}) +) + +type TwitchFeedForm struct { + TwitchUsername string + DiscordChannel int64 `valid:"channel,false"` + MentionEveryone bool + MentionRoles []int64 + PublishVOD bool + Enabled bool +} + +type TwitchAnnouncementForm struct { + Message string `json:"message" valid:"template,5000"` + Enabled bool +} + +type ContextKey int + +const ( + ContextKeySub ContextKey = iota +) + +func (p *Plugin) InitWeb() { + web.AddHTMLTemplate("twitch/assets/twitch.html", PageHTML) + web.AddSidebarItem(web.SidebarCategoryFeeds, &web.SidebarItem{ + Name: "Twitch", + URL: "twitch", + Icon: "fab fa-twitch", + }) + + mux := goji.SubMux() + web.CPMux.Handle(pat.New("/twitch/*"), mux) + web.CPMux.Handle(pat.New("/twitch"), mux) + + // All handlers here require guild channels present + mux.Use(web.RequireBotMemberMW) + mux.Use(web.RequirePermMW(discordgo.PermissionMentionEveryone)) + mux.Use(premium.PremiumGuildMW) + + mainGetHandler := web.ControllerHandler(p.HandleTwitch, "cp_twitch") + + mux.Handle(pat.Get("/"), mainGetHandler) + mux.Handle(pat.Get(""), mainGetHandler) + + addHandler := web.ControllerPostHandler(p.HandleNew, mainGetHandler, TwitchFeedForm{}) + + mux.Handle(pat.Post(""), addHandler) + mux.Handle(pat.Post("/"), addHandler) + mux.Handle(pat.Post("/announcement"), web.ControllerPostHandler(p.HandleTwitchAnnouncement, mainGetHandler, TwitchAnnouncementForm{})) + mux.Handle(pat.Post("/:item/update"), web.ControllerPostHandler(BaseEditHandler(p.HandleEdit), mainGetHandler, TwitchFeedForm{})) + mux.Handle(pat.Post("/:item/delete"), web.ControllerPostHandler(BaseEditHandler(p.HandleRemove), mainGetHandler, nil)) + mux.Handle(pat.Get("/:item/delete"), web.ControllerPostHandler(BaseEditHandler(p.HandleRemove), mainGetHandler, nil)) +} + +func (p *Plugin) HandleTwitch(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + activeGuild, templateData := web.GetBaseCPContextData(ctx) + + subs, err := models.TwitchChannelSubscriptions(models.TwitchChannelSubscriptionWhere.GuildID.EQ(discordgo.StrID(activeGuild.ID)), qm.OrderBy("id DESC")).AllG(ctx) + if err != nil { + return templateData, err + } + + templateData["TwitchSubs"] = subs + + announcement, err := models.FindTwitchAnnouncementG(ctx, activeGuild.ID) + if err != nil { + announcement = &models.TwitchAnnouncement{ + GuildID: activeGuild.ID, + Message: `{{if not .IsLive}} +{{.User}} went offline! Catch the VOD here: +{{.VODUrl}} +{{else}} +{{.User}} is now live! +{{.URL}} +{{end}}`, + Enabled: false, + } + } + templateData["TwitchAnnouncement"] = announcement + + return templateData, nil +} + +func (p *Plugin) HandleTwitchAnnouncement(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + activeGuild, templateData := web.GetBaseCPContextData(ctx) + + // Check premium for custom announcements + if !premium.ContextPremium(ctx) { + return templateData.AddAlerts(web.ErrorAlert("Custom announcements are premium only")), nil + } + + form := ctx.Value(common.ContextKeyParsedForm).(*TwitchAnnouncementForm) + + announcement := &models.TwitchAnnouncement{ + GuildID: activeGuild.ID, + Message: form.Message, + Enabled: form.Enabled, + } + + err := announcement.UpsertG(ctx, true, []string{"guild_id"}, boil.Whitelist("message", "enabled"), boil.Infer()) + if err != nil { + return templateData, err + } + + go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyAnnouncement)) + + return templateData, nil +} + +func (p *Plugin) HandleNew(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + activeGuild, templateData := web.GetBaseCPContextData(ctx) + + // Check limits + maxFeeds := MaxFeedsForContext(ctx) + + count, err := models.TwitchChannelSubscriptions(models.TwitchChannelSubscriptionWhere.GuildID.EQ(discordgo.StrID(activeGuild.ID))).CountG(ctx) + if err != nil { + return templateData, err + } + + if int(count) >= maxFeeds { + return templateData.AddAlerts(web.ErrorAlert(fmt.Sprintf("Max %d feeds allowed (upgrade to premium for more)", maxFeeds))), nil + } + + data := ctx.Value(common.ContextKeyParsedForm).(*TwitchFeedForm) + + // Extract username from URL if a URL was provided + username := extractTwitchUsername(data.TwitchUsername) + + // Validate Twitch User + // We need to get the user ID from Twitch + users, err := p.HelixClient.GetUsers(&helix.UsersParams{ + Logins: []string{username}, + }) + if err != nil { + logger.Error("Failed to get twitch user", "err", err) + return templateData.AddAlerts(web.ErrorAlert("Failed to get twitch user")), nil + } + + if len(users.Data.Users) == 0 { + return templateData.AddAlerts(web.ErrorAlert("Twitch user not found")), nil + } + + twitchUser := users.Data.Users[0] + + sub := &models.TwitchChannelSubscription{ + GuildID: discordgo.StrID(activeGuild.ID), + ChannelID: discordgo.StrID(data.DiscordChannel), + TwitchUserID: twitchUser.ID, + TwitchUsername: twitchUser.Login, + MentionEveryone: data.MentionEveryone, + MentionRoles: data.MentionRoles, + PublishVod: data.PublishVOD, + } + + err = sub.InsertG(ctx, boil.Infer()) + if err != nil { + return templateData, err + } + + go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyAddedFeed, &cplogs.Param{Type: cplogs.ParamTypeString, Value: sub.TwitchUsername})) + + return templateData, nil +} + +// extractTwitchUsername extracts the username from a Twitch URL or returns the input if it's already a username +// Supports formats like: +// - https://twitch.tv/username +// - https://www.twitch.tv/username +// - twitch.tv/username +// - username +func extractTwitchUsername(input string) string { + input = strings.TrimSpace(input) + + // If it doesn't contain a slash, assume it's already a username + if !strings.Contains(input, "/") { + return input + } + + // Parse as URL + // Add scheme if missing + urlStr := input + if !strings.HasPrefix(input, "http://") && !strings.HasPrefix(input, "https://") { + urlStr = "https://" + input + } + + parsedURL, err := url.Parse(urlStr) + if err != nil { + // If parsing fails, return the original input + return input + } + + // Check if it's a Twitch domain + if parsedURL.Host != "twitch.tv" && parsedURL.Host != "www.twitch.tv" { + return input + } + + // Extract the first path segment as the username + path := strings.Trim(parsedURL.Path, "/") + parts := strings.Split(path, "/") + if len(parts) > 0 && parts[0] != "" { + return parts[0] + } + + return input +} + +func BaseEditHandler(inner web.ControllerHandlerFunc) web.ControllerHandlerFunc { + return func(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + activeGuild, templateData := web.GetBaseCPContextData(ctx) + + id, err := strconv.Atoi(pat.Param(r, "item")) + if err != nil { + return templateData.AddAlerts(web.ErrorAlert("Invalid feed ID")), err + } + + sub, err := models.FindTwitchChannelSubscriptionG(ctx, id) + if err != nil { + return templateData.AddAlerts(web.ErrorAlert("Failed retrieving that feed item")), err + } + + if sub.GuildID != discordgo.StrID(activeGuild.ID) { + return templateData.AddAlerts(web.ErrorAlert("This appears to belong somewhere else...")), nil + } + + ctx = context.WithValue(ctx, ContextKeySub, sub) + + return inner(w, r.WithContext(ctx)) + } +} + +func (p *Plugin) HandleEdit(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + activeGuild, templateData := web.GetBaseCPContextData(ctx) + + data := ctx.Value(common.ContextKeyParsedForm).(*TwitchFeedForm) + sub := ctx.Value(ContextKeySub).(*models.TwitchChannelSubscription) + + // Check if we're trying to enable a disabled feed + if !sub.Enabled && data.Enabled { + // Count currently enabled feeds + enabledCount, err := models.TwitchChannelSubscriptions( + models.TwitchChannelSubscriptionWhere.GuildID.EQ(discordgo.StrID(activeGuild.ID)), + models.TwitchChannelSubscriptionWhere.Enabled.EQ(true), + ).CountG(ctx) + if err != nil { + return templateData, err + } + + maxFeeds := MaxFeedsForContext(ctx) + if int(enabledCount) >= maxFeeds { + return templateData.AddAlerts(web.ErrorAlert(fmt.Sprintf("Max %d enabled feeds allowed (%d for premium servers)", GuildMaxEnabledFeeds, GuildMaxEnabledFeedsPremium))), nil + } + } + + sub.MentionEveryone = data.MentionEveryone + sub.MentionRoles = data.MentionRoles + sub.PublishVod = data.PublishVOD + sub.Enabled = data.Enabled + sub.ChannelID = discordgo.StrID(data.DiscordChannel) + + _, err := sub.UpdateG(ctx, boil.Infer()) + if err != nil { + return templateData, err + } + + go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyUpdatedFeed, &cplogs.Param{Type: cplogs.ParamTypeString, Value: sub.TwitchUsername})) + + return templateData, nil +} + +func (p *Plugin) HandleRemove(w http.ResponseWriter, r *http.Request) (templateData web.TemplateData, err error) { + ctx := r.Context() + sub := ctx.Value(ContextKeySub).(*models.TwitchChannelSubscription) + + _, err = sub.DeleteG(ctx) + if err != nil { + return + } + + go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyRemovedFeed, &cplogs.Param{Type: cplogs.ParamTypeString, Value: sub.TwitchUsername})) + return +} + +var _ web.PluginWithServerHomeWidget = (*Plugin)(nil) + +func (p *Plugin) LoadServerHomeWidget(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + activeGuild, templateData := web.GetBaseCPContextData(r.Context()) + + templateData["WidgetTitle"] = "Twitch feeds" + templateData["SettingsPath"] = "/twitch" + + numFeeds, err := models.TwitchChannelSubscriptions(models.TwitchChannelSubscriptionWhere.GuildID.EQ(discordgo.StrID(activeGuild.ID)), models.TwitchChannelSubscriptionWhere.Enabled.EQ(true)).CountG(r.Context()) + if err != nil { + return templateData, err + } + + if numFeeds > 0 { + templateData["WidgetEnabled"] = true + } else { + templateData["WidgetDisabled"] = true + } + + const format = `

    Active Twitch feeds: %d

    ` + templateData["WidgetBody"] = template.HTML(fmt.Sprintf(format, numFeeds)) + + return templateData, nil +} diff --git a/twitter/assets/twitter.html b/twitter/assets/twitter.html index 7036084044..52a35633b0 100644 --- a/twitter/assets/twitter.html +++ b/twitter/assets/twitter.html @@ -29,7 +29,7 @@

    New feed

    @@ -61,7 +61,7 @@

    Current twitter feeds

    diff --git a/verification/assets/verification_control_panel.html b/verification/assets/verification_control_panel.html index e353da72fe..a073773e20 100644 --- a/verification/assets/verification_control_panel.html +++ b/verification/assets/verification_control_panel.html @@ -58,7 +58,7 @@

    Verification


    diff --git a/verification/verification_bot.go b/verification/verification_bot.go index 5813c89157..bbf99a94d2 100644 --- a/verification/verification_bot.go +++ b/verification/verification_bot.go @@ -66,6 +66,7 @@ func memberPresentInVerificationPendingSet(guildID int64, userID int64) bool { // Function to check if member is present in verification pending set, and add if not present func addMemberToVerificationPendingSet(guildID int64, userID int64) { + logger.WithField("guild", guildID).WithField("user", userID).Info("Adding member to verification pending set") if memberPresentInVerificationPendingSet(guildID, userID) { // Member is already in the set return @@ -86,6 +87,7 @@ func RandStringRunes(n int) string { } func (p *Plugin) handleVerificationAfterScreening(member *discordgo.Member) { + conf, err := models.FindVerificationConfigG(context.Background(), member.GuildID) if err != nil { if err != sql.ErrNoRows { @@ -97,6 +99,7 @@ func (p *Plugin) handleVerificationAfterScreening(member *discordgo.Member) { if !conf.Enabled { return } + logger.WithField("guild", member.GuildID).WithField("user", member.User.ID).Info("Initiating verification!") gs := bot.State.GetGuild(member.GuildID) roleInvalid := true for _, role := range gs.Roles { @@ -109,15 +112,18 @@ func (p *Plugin) handleVerificationAfterScreening(member *discordgo.Member) { cop := *conf cop.Enabled = false cop.UpdateG(context.Background(), boil.Whitelist("enabled")) + logger.WithField("guild", member.GuildID).WithField("user", member.User.ID).Error("Verification config disabled, because the verified role is invalid or deleted") return } // Check if member is already verified, if yes then remove any scheduled events if common.ContainsInt64Slice(member.Roles, conf.VerifiedRole) { + logger.WithField("guild", member.GuildID).WithField("user", member.User.ID).Info("Member already verified, clearing scheduled events") err = p.clearScheduledEvents(context.Background(), member.GuildID, member.User.ID) if err != nil { logger.WithError(err).WithField("guild", member.GuildID).WithField("user", member.User.ID).Error("failed clearing past scheduled warn/kick events") } + return } @@ -189,7 +195,7 @@ func (p *Plugin) createVerificationSession(userID, guildID int64) (string, error } func (p *Plugin) startVerificationProcess(conf *models.VerificationConfig, guildID int64, target *discordgo.User) { - + logger.WithField("guild", guildID).WithField("user", target.ID).Info("Creating verification session") token, err := p.createVerificationSession(target.ID, guildID) if err != nil { logger.WithError(err).WithField("user", target.ID).WithField("guild", guildID).Error("failed creating verification session") @@ -198,7 +204,7 @@ func (p *Plugin) startVerificationProcess(conf *models.VerificationConfig, guild gs := bot.State.GetGuild(guildID) if gs == nil { - logger.Error("guild not available") + logger.WithField("guild", guildID).WithField("user", target.ID).Error("guild not available") return } @@ -209,13 +215,13 @@ func (p *Plugin) startVerificationProcess(conf *models.VerificationConfig, guild ms, err := bot.GetMember(guildID, target.ID) if err != nil { - logger.WithError(err).Error("failed retrieving member") + logger.WithError(err).WithField("guild", guildID).WithField("user", target.ID).Error("failed retrieving member") return } channel, err := common.BotSession.UserChannelCreate(ms.User.ID) if err != nil { - logger.WithError(err).Error("failed creating user channel") + logger.WithError(err).WithField("guild", guildID).WithField("user", target.ID).Error("failed creating user channel") return } @@ -531,7 +537,7 @@ func (p *Plugin) logAction(guildID int64, channelID int64, author *discordgo.Use if common.IsDiscordErr(err, discordgo.ErrCodeMissingPermissions, discordgo.ErrCodeUnknownChannel) { go p.disableLogChannel(guildID) } else { - logger.WithError(err).WithField("channel", channelID).Error("failed sending log message") + logger.WithError(err).WithField("guild", guildID).WithField("channel", channelID).Error("failed sending log message") } } } diff --git a/voiceroles/assets/voiceroles.html b/voiceroles/assets/voiceroles.html new file mode 100644 index 0000000000..dd23817341 --- /dev/null +++ b/voiceroles/assets/voiceroles.html @@ -0,0 +1,135 @@ +{{define "cp_voiceroles"}} +{{template "cp_head" .}} + + + +
    +

    Voice Roles

    +
    + +{{template "cp_alerts" .}} + +
    +
    +
    +
    +

    Automatically assign roles to users when they join voice or stage channels.

    +
    +
    + {{if not .CanAddMore}} + {{if .IsGuildPremium}} +
    + You have reached the maximum limit of {{.MaxConfigs}} + voice roles. +
    + {{else}} +
    + You have reached the free limit of {{.FreeLimit}} voice + roles. + Upgrade to Premium to add up to {{.PremiumLimit}} + voice roles! +
    + {{end}} + {{end}} +

    Note: Each channel can only have one voice role. The role will be removed when the + user leaves the channel.

    +
    +
    +
    +
    +
    + + + Only voice and stage channels are shown +
    +
    +
    +
    + + + The bot must have permission to assign this role +
    +
    +
    + +
    +
    +
    +
    + + + {{if .VoiceRoles}} +
    + {{$dot := .}} + {{range .VoiceRoles}} +
    + {{end}} + + + + + + + + + + + + {{range .VoiceRoles}} + + + + + + + {{end}} + +
    ChannelRoleEnabledActions
    + + + + + {{checkbox "Enabled" (print "enabled-" .ID) "" .Enabled (print `form="item-` .ID `"`)}} + + + +
    +
    + {{end}} +
    +
    +
    +
    + +{{template "cp_footer" .}} + +{{end}} \ No newline at end of file diff --git a/voiceroles/bot.go b/voiceroles/bot.go new file mode 100644 index 0000000000..f38998211a --- /dev/null +++ b/voiceroles/bot.go @@ -0,0 +1,280 @@ +package voiceroles + +import ( + "context" + "database/sql" + "time" + + "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/lib/discordgo" + "github.com/botlabs-gg/yagpdb/v2/voiceroles/models" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +var _ bot.BotInitHandler = (*Plugin)(nil) + +func (p *Plugin) BotInit() { + // Use OrderSyncPreState to get the state before it's updated + eventsystem.AddHandlerFirst(p, handleVoiceStateUpdate, eventsystem.EventVoiceStateUpdate) +} + +func handleVoiceStateUpdate(evt *eventsystem.EventData) (retry bool, err error) { + vs := evt.VoiceStateUpdate() + + if vs.UserID == 0 { + return false, nil + } + + totalConfig, err := GetVoiceRolesCount(evt.Context(), vs.GuildID) + if err != nil { + return false, err + } + + if totalConfig == 0 { + return false, nil + } + + gs := bot.State.GetGuild(vs.GuildID) + if gs == nil { + return false, nil + } + + ms := bot.State.GetMember(gs.ID, vs.UserID) + if ms == nil { + return false, nil + } + + oldVs := gs.GetVoiceState(vs.UserID) + beforeChannelID := int64(0) + if oldVs != nil { + beforeChannelID = oldVs.ChannelID + } + + afterChannelID := vs.ChannelID + + // User left voice completely + if beforeChannelID != 0 && afterChannelID == 0 { + return handleVoiceLeave(gs.ID, vs.UserID, beforeChannelID) + } + + // User joined voice + if beforeChannelID == 0 && afterChannelID != 0 { + return handleVoiceJoin(gs.ID, vs.UserID, afterChannelID) + } + + // User moved between channels + if beforeChannelID != 0 && afterChannelID != 0 && beforeChannelID != afterChannelID { + // Remove role from old channel + _, err := handleVoiceLeave(gs.ID, vs.UserID, beforeChannelID) + if err != nil { + logger.WithError(err).WithField("guild", gs.ID).WithField("user", vs.UserID).Error("Failed removing role on channel move") + } + + // Add role for new channel + _, err = handleVoiceJoin(gs.ID, vs.UserID, afterChannelID) + if err != nil { + logger.WithError(err).WithField("guild", gs.ID).WithField("user", vs.UserID).Error("Failed adding role on channel move") + } + } + + return false, nil +} + +func handleVoiceJoin(guildID int64, userID int64, channelID int64) (retry bool, err error) { + ctx := context.Background() + + // Get voice role config for this channel + config, err := models.VoiceRoles( + qm.Where("channel_id = ? and enabled = true", channelID), + ).OneG(ctx) + + if err == sql.ErrNoRows { + // No config for this channel, ignore + return false, nil + } + + if err != nil { + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed getting voice role config") + return false, err + } + + // Assign the role + err = common.BotSession.GuildMemberRoleAdd(guildID, userID, config.RoleID) + if err != nil { + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Error("Failed adding voice role") + code, _ := common.DiscordError(err) + // Check if it's a permissions error or role hierarchy error + switch code { + case discordgo.ErrCodeUnknownRole: + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed adding voice role (role not found), deleting config") + DeleteVoiceRoles(ctx, config.ID) + return false, nil + case discordgo.ErrCodeMissingPermissions: + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed adding voice role (permissions issue), disabling config") + DisableVoiceRoles(ctx, config.ID) + return false, nil + default: + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed adding voice role (permissions issue)") + return false, err + } + } + + return false, nil +} + +func handleVoiceLeave(guildID int64, userID int64, channelID int64) (retry bool, err error) { + ctx := context.Background() + + // Get voice role config for this channel + config, err := models.VoiceRoles( + qm.Where("channel_id = ? and enabled = true", channelID), + ).OneG(ctx) + + if err == sql.ErrNoRows { + // No config for this channel, ignore + return false, nil + } + + if err != nil { + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed getting voice role config") + return false, err + } + + // Remove the role + err = common.BotSession.GuildMemberRoleRemove(guildID, userID, config.RoleID) + if err != nil { + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Error("Failed removing voice role") + code, _ := common.DiscordError(err) + // Check if it's a permissions error or role hierarchy error + switch code { + case discordgo.ErrCodeUnknownRole: + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed removing voice role (role not found), deleting config") + DeleteVoiceRoles(ctx, config.ID) + return false, nil + case discordgo.ErrCodeMissingPermissions: + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed removing voice role (permissions issue), disabling config") + DisableVoiceRoles(ctx, config.ID) + return false, nil + default: + logger.WithError(err).WithField("guild", guildID).WithField("user", userID).WithField("role", config.RoleID).Warn("Failed removing voice role (permissions issue)") + return false, err + } + } + + return false, nil +} + +// GetVoiceRoles returns all voice role configs for a guild +func GetVoiceRoles(ctx context.Context, guildID int64) (*models.VoiceRoleSlice, error) { + configs, err := models.VoiceRoles( + qm.Where("guild_id = ?", guildID), + qm.OrderBy("created_at ASC"), + ).AllG(ctx) + + if err == sql.ErrNoRows { + // No config for this channel, ignore + return nil, nil + } + + if err != nil { + return nil, err + } + + return &configs, nil +} + +// GetVoiceRolesCount returns the count of voice role configs for a guild +func GetVoiceRolesCount(ctx context.Context, guildID int64) (int64, error) { + count, err := models.VoiceRoles( + qm.Where("guild_id = ?", guildID), + ).CountG(ctx) + + if err == sql.ErrNoRows { + // No config for this channel, ignore + return 0, nil + } + + if err != nil { + return 0, err + } + + return count, nil +} + +// CreateVoiceRoles creates a new voice role config +func CreateVoiceRoles(ctx context.Context, guildID int64, channelID int64, roleID int64) (*models.VoiceRole, error) { + config := &models.VoiceRole{ + GuildID: guildID, + ChannelID: channelID, + RoleID: roleID, + CreatedAt: time.Now(), + UpdatedAt: time.Now(), + } + + err := config.InsertG(ctx, boil.Infer()) + if err != nil { + return nil, err + } + + return config, nil +} + +// DisableVoiceRoles disables an existing voice role config +func DisableVoiceRoles(ctx context.Context, id int64) error { + config, err := models.FindVoiceRoleG(ctx, id) + if err == sql.ErrNoRows { + // No config for this channel, ignore + return nil + } + + if err != nil { + return err + } + + config.Enabled = false + + _, err = config.UpdateG(ctx, boil.Infer()) + return err +} + +// DeleteVoiceRoles deletes a voice role config +func DeleteVoiceRoles(ctx context.Context, id int64) error { + config, err := models.FindVoiceRoleG(ctx, id) + if err == sql.ErrNoRows { + // No config for this channel, ignore + return nil + } + + if err != nil { + return err + } + + _, err = config.DeleteG(ctx) + return err +} + +func (p *Plugin) OnRemovedPremiumGuild(guildID int64) error { + ctx := context.Background() + + configs, err := models.VoiceRoles( + qm.Where("guild_id = ?", guildID), + qm.OrderBy("id DESC"), + ).AllG(ctx) + + if err != nil { + logger.WithError(err).WithField("guild", guildID).Error("failed retrieving voice roles for limit enforcement") + return err + } + + if len(configs) > MaxVoiceRoles { + excessConfigs := configs[MaxVoiceRoles:] + for _, config := range excessConfigs { + DisableVoiceRoles(ctx, config.ID) + } + } + + return nil +} diff --git a/voiceroles/models/boil_queries.go b/voiceroles/models/boil_queries.go new file mode 100644 index 0000000000..26694dc7df --- /dev/null +++ b/voiceroles/models/boil_queries.go @@ -0,0 +1,38 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "regexp" + + "github.com/volatiletech/sqlboiler/v4/drivers" + "github.com/volatiletech/sqlboiler/v4/queries" + "github.com/volatiletech/sqlboiler/v4/queries/qm" +) + +var dialect = drivers.Dialect{ + LQ: 0x22, + RQ: 0x22, + + UseIndexPlaceholders: true, + UseLastInsertID: false, + UseSchema: false, + UseDefaultKeyword: true, + UseAutoColumns: false, + UseTopClause: false, + UseOutputClause: false, + UseCaseWhenExistsClause: false, +} + +// This is a dummy variable to prevent unused regexp import error +var _ = ®exp.Regexp{} + +// NewQuery initializes a new Query using the passed in QueryMods +func NewQuery(mods ...qm.QueryMod) *queries.Query { + q := &queries.Query{} + queries.SetDialect(q, &dialect) + qm.Apply(q, mods...) + + return q +} diff --git a/voiceroles/models/boil_table_names.go b/voiceroles/models/boil_table_names.go new file mode 100644 index 0000000000..247e2286fa --- /dev/null +++ b/voiceroles/models/boil_table_names.go @@ -0,0 +1,10 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +var TableNames = struct { + VoiceRoles string +}{ + VoiceRoles: "voice_roles", +} diff --git a/voiceroles/models/boil_types.go b/voiceroles/models/boil_types.go new file mode 100644 index 0000000000..13f92c42c3 --- /dev/null +++ b/voiceroles/models/boil_types.go @@ -0,0 +1,52 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "strconv" + + "github.com/friendsofgo/errors" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/strmangle" +) + +// M type is for providing columns and column values to UpdateAll. +type M map[string]interface{} + +// ErrSyncFail occurs during insert when the record could not be retrieved in +// order to populate default value information. This usually happens when LastInsertId +// fails or there was a primary key configuration that was not resolvable. +var ErrSyncFail = errors.New("models: failed to synchronize data after insert") + +type insertCache struct { + query string + retQuery string + valueMapping []uint64 + retMapping []uint64 +} + +type updateCache struct { + query string + valueMapping []uint64 +} + +func makeCacheKey(cols boil.Columns, nzDefaults []string) string { + buf := strmangle.GetBuffer() + + buf.WriteString(strconv.Itoa(cols.Kind)) + for _, w := range cols.Cols { + buf.WriteString(w) + } + + if len(nzDefaults) != 0 { + buf.WriteByte('.') + } + for _, nz := range nzDefaults { + buf.WriteString(nz) + } + + str := buf.String() + strmangle.PutBuffer(buf) + return str +} diff --git a/voiceroles/models/boil_view_names.go b/voiceroles/models/boil_view_names.go new file mode 100644 index 0000000000..25ff551e62 --- /dev/null +++ b/voiceroles/models/boil_view_names.go @@ -0,0 +1,7 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +var ViewNames = struct { +}{} diff --git a/voiceroles/models/psql_upsert.go b/voiceroles/models/psql_upsert.go new file mode 100644 index 0000000000..cd00500c2d --- /dev/null +++ b/voiceroles/models/psql_upsert.go @@ -0,0 +1,99 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "fmt" + "strings" + + "github.com/volatiletech/sqlboiler/v4/drivers" + "github.com/volatiletech/strmangle" +) + +type UpsertOptions struct { + conflictTarget string + updateSet string +} + +type UpsertOptionFunc func(o *UpsertOptions) + +func UpsertConflictTarget(conflictTarget string) UpsertOptionFunc { + return func(o *UpsertOptions) { + o.conflictTarget = conflictTarget + } +} + +func UpsertUpdateSet(updateSet string) UpsertOptionFunc { + return func(o *UpsertOptions) { + o.updateSet = updateSet + } +} + +// buildUpsertQueryPostgres builds a SQL statement string using the upsertData provided. +func buildUpsertQueryPostgres(dia drivers.Dialect, tableName string, updateOnConflict bool, ret, update, conflict, whitelist []string, opts ...UpsertOptionFunc) string { + conflict = strmangle.IdentQuoteSlice(dia.LQ, dia.RQ, conflict) + whitelist = strmangle.IdentQuoteSlice(dia.LQ, dia.RQ, whitelist) + ret = strmangle.IdentQuoteSlice(dia.LQ, dia.RQ, ret) + + upsertOpts := &UpsertOptions{} + for _, o := range opts { + o(upsertOpts) + } + + buf := strmangle.GetBuffer() + defer strmangle.PutBuffer(buf) + + columns := "DEFAULT VALUES" + if len(whitelist) != 0 { + columns = fmt.Sprintf("(%s) VALUES (%s)", + strings.Join(whitelist, ", "), + strmangle.Placeholders(dia.UseIndexPlaceholders, len(whitelist), 1, 1)) + } + + fmt.Fprintf( + buf, + "INSERT INTO %s %s ON CONFLICT ", + tableName, + columns, + ) + + if upsertOpts.conflictTarget != "" { + buf.WriteString(upsertOpts.conflictTarget) + } else if len(conflict) != 0 { + buf.WriteByte('(') + buf.WriteString(strings.Join(conflict, ", ")) + buf.WriteByte(')') + } + buf.WriteByte(' ') + + if !updateOnConflict || len(update) == 0 { + buf.WriteString("DO NOTHING") + } else { + buf.WriteString("DO UPDATE SET ") + + if upsertOpts.updateSet != "" { + buf.WriteString(upsertOpts.updateSet) + } else { + for i, v := range update { + if len(v) == 0 { + continue + } + if i != 0 { + buf.WriteByte(',') + } + quoted := strmangle.IdentQuote(dia.LQ, dia.RQ, v) + buf.WriteString(quoted) + buf.WriteString(" = EXCLUDED.") + buf.WriteString(quoted) + } + } + } + + if len(ret) != 0 { + buf.WriteString(" RETURNING ") + buf.WriteString(strings.Join(ret, ", ")) + } + + return buf.String() +} diff --git a/voiceroles/models/voice_roles.go b/voiceroles/models/voice_roles.go new file mode 100644 index 0000000000..61eef41004 --- /dev/null +++ b/voiceroles/models/voice_roles.go @@ -0,0 +1,877 @@ +// Code generated by SQLBoiler 4.19.5 (https://github.com/volatiletech/sqlboiler). DO NOT EDIT. +// This file is meant to be re-generated in place and/or deleted at any time. + +package models + +import ( + "context" + "database/sql" + "fmt" + "reflect" + "strconv" + "strings" + "sync" + "time" + + "github.com/friendsofgo/errors" + "github.com/volatiletech/sqlboiler/v4/boil" + "github.com/volatiletech/sqlboiler/v4/queries" + "github.com/volatiletech/sqlboiler/v4/queries/qm" + "github.com/volatiletech/sqlboiler/v4/queries/qmhelper" + "github.com/volatiletech/strmangle" +) + +// VoiceRole is an object representing the database table. +type VoiceRole struct { + ID int64 `boil:"id" json:"id" toml:"id" yaml:"id"` + CreatedAt time.Time `boil:"created_at" json:"created_at" toml:"created_at" yaml:"created_at"` + UpdatedAt time.Time `boil:"updated_at" json:"updated_at" toml:"updated_at" yaml:"updated_at"` + GuildID int64 `boil:"guild_id" json:"guild_id" toml:"guild_id" yaml:"guild_id"` + ChannelID int64 `boil:"channel_id" json:"channel_id" toml:"channel_id" yaml:"channel_id"` + RoleID int64 `boil:"role_id" json:"role_id" toml:"role_id" yaml:"role_id"` + Enabled bool `boil:"enabled" json:"enabled" toml:"enabled" yaml:"enabled"` + + R *voiceRoleR `boil:"-" json:"-" toml:"-" yaml:"-"` + L voiceRoleL `boil:"-" json:"-" toml:"-" yaml:"-"` +} + +var VoiceRoleColumns = struct { + ID string + CreatedAt string + UpdatedAt string + GuildID string + ChannelID string + RoleID string + Enabled string +}{ + ID: "id", + CreatedAt: "created_at", + UpdatedAt: "updated_at", + GuildID: "guild_id", + ChannelID: "channel_id", + RoleID: "role_id", + Enabled: "enabled", +} + +var VoiceRoleTableColumns = struct { + ID string + CreatedAt string + UpdatedAt string + GuildID string + ChannelID string + RoleID string + Enabled string +}{ + ID: "voice_roles.id", + CreatedAt: "voice_roles.created_at", + UpdatedAt: "voice_roles.updated_at", + GuildID: "voice_roles.guild_id", + ChannelID: "voice_roles.channel_id", + RoleID: "voice_roles.role_id", + Enabled: "voice_roles.enabled", +} + +// Generated where + +type whereHelperint64 struct{ field string } + +func (w whereHelperint64) EQ(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.EQ, x) } +func (w whereHelperint64) NEQ(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) } +func (w whereHelperint64) LT(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LT, x) } +func (w whereHelperint64) LTE(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) } +func (w whereHelperint64) GT(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) } +func (w whereHelperint64) GTE(x int64) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) } +func (w whereHelperint64) IN(slice []int64) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereIn(fmt.Sprintf("%s IN ?", w.field), values...) +} +func (w whereHelperint64) NIN(slice []int64) qm.QueryMod { + values := make([]interface{}, 0, len(slice)) + for _, value := range slice { + values = append(values, value) + } + return qm.WhereNotIn(fmt.Sprintf("%s NOT IN ?", w.field), values...) +} + +type whereHelpertime_Time struct{ field string } + +func (w whereHelpertime_Time) EQ(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.EQ, x) +} +func (w whereHelpertime_Time) NEQ(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.NEQ, x) +} +func (w whereHelpertime_Time) LT(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.LT, x) +} +func (w whereHelpertime_Time) LTE(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.LTE, x) +} +func (w whereHelpertime_Time) GT(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.GT, x) +} +func (w whereHelpertime_Time) GTE(x time.Time) qm.QueryMod { + return qmhelper.Where(w.field, qmhelper.GTE, x) +} + +type whereHelperbool struct{ field string } + +func (w whereHelperbool) EQ(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.EQ, x) } +func (w whereHelperbool) NEQ(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.NEQ, x) } +func (w whereHelperbool) LT(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LT, x) } +func (w whereHelperbool) LTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.LTE, x) } +func (w whereHelperbool) GT(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GT, x) } +func (w whereHelperbool) GTE(x bool) qm.QueryMod { return qmhelper.Where(w.field, qmhelper.GTE, x) } + +var VoiceRoleWhere = struct { + ID whereHelperint64 + CreatedAt whereHelpertime_Time + UpdatedAt whereHelpertime_Time + GuildID whereHelperint64 + ChannelID whereHelperint64 + RoleID whereHelperint64 + Enabled whereHelperbool +}{ + ID: whereHelperint64{field: "\"voice_roles\".\"id\""}, + CreatedAt: whereHelpertime_Time{field: "\"voice_roles\".\"created_at\""}, + UpdatedAt: whereHelpertime_Time{field: "\"voice_roles\".\"updated_at\""}, + GuildID: whereHelperint64{field: "\"voice_roles\".\"guild_id\""}, + ChannelID: whereHelperint64{field: "\"voice_roles\".\"channel_id\""}, + RoleID: whereHelperint64{field: "\"voice_roles\".\"role_id\""}, + Enabled: whereHelperbool{field: "\"voice_roles\".\"enabled\""}, +} + +// VoiceRoleRels is where relationship names are stored. +var VoiceRoleRels = struct { +}{} + +// voiceRoleR is where relationships are stored. +type voiceRoleR struct { +} + +// NewStruct creates a new relationship struct +func (*voiceRoleR) NewStruct() *voiceRoleR { + return &voiceRoleR{} +} + +// voiceRoleL is where Load methods for each relationship are stored. +type voiceRoleL struct{} + +var ( + voiceRoleAllColumns = []string{"id", "created_at", "updated_at", "guild_id", "channel_id", "role_id", "enabled"} + voiceRoleColumnsWithoutDefault = []string{"created_at", "updated_at", "guild_id", "channel_id", "role_id"} + voiceRoleColumnsWithDefault = []string{"id", "enabled"} + voiceRolePrimaryKeyColumns = []string{"id"} + voiceRoleGeneratedColumns = []string{} +) + +type ( + // VoiceRoleSlice is an alias for a slice of pointers to VoiceRole. + // This should almost always be used instead of []VoiceRole. + VoiceRoleSlice []*VoiceRole + + voiceRoleQuery struct { + *queries.Query + } +) + +// Cache for insert, update and upsert +var ( + voiceRoleType = reflect.TypeOf(&VoiceRole{}) + voiceRoleMapping = queries.MakeStructMapping(voiceRoleType) + voiceRolePrimaryKeyMapping, _ = queries.BindMapping(voiceRoleType, voiceRoleMapping, voiceRolePrimaryKeyColumns) + voiceRoleInsertCacheMut sync.RWMutex + voiceRoleInsertCache = make(map[string]insertCache) + voiceRoleUpdateCacheMut sync.RWMutex + voiceRoleUpdateCache = make(map[string]updateCache) + voiceRoleUpsertCacheMut sync.RWMutex + voiceRoleUpsertCache = make(map[string]insertCache) +) + +var ( + // Force time package dependency for automated UpdatedAt/CreatedAt. + _ = time.Second + // Force qmhelper dependency for where clause generation (which doesn't + // always happen) + _ = qmhelper.Where +) + +// OneG returns a single voiceRole record from the query using the global executor. +func (q voiceRoleQuery) OneG(ctx context.Context) (*VoiceRole, error) { + return q.One(ctx, boil.GetContextDB()) +} + +// One returns a single voiceRole record from the query. +func (q voiceRoleQuery) One(ctx context.Context, exec boil.ContextExecutor) (*VoiceRole, error) { + o := &VoiceRole{} + + queries.SetLimit(q.Query, 1) + + err := q.Bind(ctx, exec, o) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, sql.ErrNoRows + } + return nil, errors.Wrap(err, "models: failed to execute a one query for voice_roles") + } + + return o, nil +} + +// AllG returns all VoiceRole records from the query using the global executor. +func (q voiceRoleQuery) AllG(ctx context.Context) (VoiceRoleSlice, error) { + return q.All(ctx, boil.GetContextDB()) +} + +// All returns all VoiceRole records from the query. +func (q voiceRoleQuery) All(ctx context.Context, exec boil.ContextExecutor) (VoiceRoleSlice, error) { + var o []*VoiceRole + + err := q.Bind(ctx, exec, &o) + if err != nil { + return nil, errors.Wrap(err, "models: failed to assign all query results to VoiceRole slice") + } + + return o, nil +} + +// CountG returns the count of all VoiceRole records in the query using the global executor +func (q voiceRoleQuery) CountG(ctx context.Context) (int64, error) { + return q.Count(ctx, boil.GetContextDB()) +} + +// Count returns the count of all VoiceRole records in the query. +func (q voiceRoleQuery) Count(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + var count int64 + + queries.SetSelect(q.Query, nil) + queries.SetCount(q.Query) + + err := q.Query.QueryRowContext(ctx, exec).Scan(&count) + if err != nil { + return 0, errors.Wrap(err, "models: failed to count voice_roles rows") + } + + return count, nil +} + +// ExistsG checks if the row exists in the table using the global executor. +func (q voiceRoleQuery) ExistsG(ctx context.Context) (bool, error) { + return q.Exists(ctx, boil.GetContextDB()) +} + +// Exists checks if the row exists in the table. +func (q voiceRoleQuery) Exists(ctx context.Context, exec boil.ContextExecutor) (bool, error) { + var count int64 + + queries.SetSelect(q.Query, nil) + queries.SetCount(q.Query) + queries.SetLimit(q.Query, 1) + + err := q.Query.QueryRowContext(ctx, exec).Scan(&count) + if err != nil { + return false, errors.Wrap(err, "models: failed to check if voice_roles exists") + } + + return count > 0, nil +} + +// VoiceRoles retrieves all the records using an executor. +func VoiceRoles(mods ...qm.QueryMod) voiceRoleQuery { + mods = append(mods, qm.From("\"voice_roles\"")) + q := NewQuery(mods...) + if len(queries.GetSelect(q)) == 0 { + queries.SetSelect(q, []string{"\"voice_roles\".*"}) + } + + return voiceRoleQuery{q} +} + +// FindVoiceRoleG retrieves a single record by ID. +func FindVoiceRoleG(ctx context.Context, iD int64, selectCols ...string) (*VoiceRole, error) { + return FindVoiceRole(ctx, boil.GetContextDB(), iD, selectCols...) +} + +// FindVoiceRole retrieves a single record by ID with an executor. +// If selectCols is empty Find will return all columns. +func FindVoiceRole(ctx context.Context, exec boil.ContextExecutor, iD int64, selectCols ...string) (*VoiceRole, error) { + voiceRoleObj := &VoiceRole{} + + sel := "*" + if len(selectCols) > 0 { + sel = strings.Join(strmangle.IdentQuoteSlice(dialect.LQ, dialect.RQ, selectCols), ",") + } + query := fmt.Sprintf( + "select %s from \"voice_roles\" where \"id\"=$1", sel, + ) + + q := queries.Raw(query, iD) + + err := q.Bind(ctx, exec, voiceRoleObj) + if err != nil { + if errors.Is(err, sql.ErrNoRows) { + return nil, sql.ErrNoRows + } + return nil, errors.Wrap(err, "models: unable to select from voice_roles") + } + + return voiceRoleObj, nil +} + +// InsertG a single record. See Insert for whitelist behavior description. +func (o *VoiceRole) InsertG(ctx context.Context, columns boil.Columns) error { + return o.Insert(ctx, boil.GetContextDB(), columns) +} + +// Insert a single record using an executor. +// See boil.Columns.InsertColumnSet documentation to understand column list inference for inserts. +func (o *VoiceRole) Insert(ctx context.Context, exec boil.ContextExecutor, columns boil.Columns) error { + if o == nil { + return errors.New("models: no voice_roles provided for insertion") + } + + var err error + if !boil.TimestampsAreSkipped(ctx) { + currTime := time.Now().In(boil.GetLocation()) + + if o.CreatedAt.IsZero() { + o.CreatedAt = currTime + } + if o.UpdatedAt.IsZero() { + o.UpdatedAt = currTime + } + } + + nzDefaults := queries.NonZeroDefaultSet(voiceRoleColumnsWithDefault, o) + + key := makeCacheKey(columns, nzDefaults) + voiceRoleInsertCacheMut.RLock() + cache, cached := voiceRoleInsertCache[key] + voiceRoleInsertCacheMut.RUnlock() + + if !cached { + wl, returnColumns := columns.InsertColumnSet( + voiceRoleAllColumns, + voiceRoleColumnsWithDefault, + voiceRoleColumnsWithoutDefault, + nzDefaults, + ) + + cache.valueMapping, err = queries.BindMapping(voiceRoleType, voiceRoleMapping, wl) + if err != nil { + return err + } + cache.retMapping, err = queries.BindMapping(voiceRoleType, voiceRoleMapping, returnColumns) + if err != nil { + return err + } + if len(wl) != 0 { + cache.query = fmt.Sprintf("INSERT INTO \"voice_roles\" (\"%s\") %%sVALUES (%s)%%s", strings.Join(wl, "\",\""), strmangle.Placeholders(dialect.UseIndexPlaceholders, len(wl), 1, 1)) + } else { + cache.query = "INSERT INTO \"voice_roles\" %sDEFAULT VALUES%s" + } + + var queryOutput, queryReturning string + + if len(cache.retMapping) != 0 { + queryReturning = fmt.Sprintf(" RETURNING \"%s\"", strings.Join(returnColumns, "\",\"")) + } + + cache.query = fmt.Sprintf(cache.query, queryOutput, queryReturning) + } + + value := reflect.Indirect(reflect.ValueOf(o)) + vals := queries.ValuesFromMapping(value, cache.valueMapping) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, vals) + } + + if len(cache.retMapping) != 0 { + err = exec.QueryRowContext(ctx, cache.query, vals...).Scan(queries.PtrsFromMapping(value, cache.retMapping)...) + } else { + _, err = exec.ExecContext(ctx, cache.query, vals...) + } + + if err != nil { + return errors.Wrap(err, "models: unable to insert into voice_roles") + } + + if !cached { + voiceRoleInsertCacheMut.Lock() + voiceRoleInsertCache[key] = cache + voiceRoleInsertCacheMut.Unlock() + } + + return nil +} + +// UpdateG a single VoiceRole record using the global executor. +// See Update for more documentation. +func (o *VoiceRole) UpdateG(ctx context.Context, columns boil.Columns) (int64, error) { + return o.Update(ctx, boil.GetContextDB(), columns) +} + +// Update uses an executor to update the VoiceRole. +// See boil.Columns.UpdateColumnSet documentation to understand column list inference for updates. +// Update does not automatically update the record in case of default values. Use .Reload() to refresh the records. +func (o *VoiceRole) Update(ctx context.Context, exec boil.ContextExecutor, columns boil.Columns) (int64, error) { + if !boil.TimestampsAreSkipped(ctx) { + currTime := time.Now().In(boil.GetLocation()) + + o.UpdatedAt = currTime + } + + var err error + key := makeCacheKey(columns, nil) + voiceRoleUpdateCacheMut.RLock() + cache, cached := voiceRoleUpdateCache[key] + voiceRoleUpdateCacheMut.RUnlock() + + if !cached { + wl := columns.UpdateColumnSet( + voiceRoleAllColumns, + voiceRolePrimaryKeyColumns, + ) + + if !columns.IsWhitelist() { + wl = strmangle.SetComplement(wl, []string{"created_at"}) + } + if len(wl) == 0 { + return 0, errors.New("models: unable to update voice_roles, could not build whitelist") + } + + cache.query = fmt.Sprintf("UPDATE \"voice_roles\" SET %s WHERE %s", + strmangle.SetParamNames("\"", "\"", 1, wl), + strmangle.WhereClause("\"", "\"", len(wl)+1, voiceRolePrimaryKeyColumns), + ) + cache.valueMapping, err = queries.BindMapping(voiceRoleType, voiceRoleMapping, append(wl, voiceRolePrimaryKeyColumns...)) + if err != nil { + return 0, err + } + } + + values := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(o)), cache.valueMapping) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, values) + } + var result sql.Result + result, err = exec.ExecContext(ctx, cache.query, values...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update voice_roles row") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by update for voice_roles") + } + + if !cached { + voiceRoleUpdateCacheMut.Lock() + voiceRoleUpdateCache[key] = cache + voiceRoleUpdateCacheMut.Unlock() + } + + return rowsAff, nil +} + +// UpdateAllG updates all rows with the specified column values. +func (q voiceRoleQuery) UpdateAllG(ctx context.Context, cols M) (int64, error) { + return q.UpdateAll(ctx, boil.GetContextDB(), cols) +} + +// UpdateAll updates all rows with the specified column values. +func (q voiceRoleQuery) UpdateAll(ctx context.Context, exec boil.ContextExecutor, cols M) (int64, error) { + queries.SetUpdate(q.Query, cols) + + result, err := q.Query.ExecContext(ctx, exec) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update all for voice_roles") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: unable to retrieve rows affected for voice_roles") + } + + return rowsAff, nil +} + +// UpdateAllG updates all rows with the specified column values. +func (o VoiceRoleSlice) UpdateAllG(ctx context.Context, cols M) (int64, error) { + return o.UpdateAll(ctx, boil.GetContextDB(), cols) +} + +// UpdateAll updates all rows with the specified column values, using an executor. +func (o VoiceRoleSlice) UpdateAll(ctx context.Context, exec boil.ContextExecutor, cols M) (int64, error) { + ln := int64(len(o)) + if ln == 0 { + return 0, nil + } + + if len(cols) == 0 { + return 0, errors.New("models: update all requires at least one column argument") + } + + colNames := make([]string, len(cols)) + args := make([]interface{}, len(cols)) + + i := 0 + for name, value := range cols { + colNames[i] = name + args[i] = value + i++ + } + + // Append all of the primary key values for each column + for _, obj := range o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), voiceRolePrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := fmt.Sprintf("UPDATE \"voice_roles\" SET %s WHERE %s", + strmangle.SetParamNames("\"", "\"", 1, colNames), + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), len(colNames)+1, voiceRolePrimaryKeyColumns, len(o))) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args...) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to update all in voiceRole slice") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: unable to retrieve rows affected all in update all voiceRole") + } + return rowsAff, nil +} + +// UpsertG attempts an insert, and does an update or ignore on conflict. +func (o *VoiceRole) UpsertG(ctx context.Context, updateOnConflict bool, conflictColumns []string, updateColumns, insertColumns boil.Columns, opts ...UpsertOptionFunc) error { + return o.Upsert(ctx, boil.GetContextDB(), updateOnConflict, conflictColumns, updateColumns, insertColumns, opts...) +} + +// Upsert attempts an insert using an executor, and does an update or ignore on conflict. +// See boil.Columns documentation for how to properly use updateColumns and insertColumns. +func (o *VoiceRole) Upsert(ctx context.Context, exec boil.ContextExecutor, updateOnConflict bool, conflictColumns []string, updateColumns, insertColumns boil.Columns, opts ...UpsertOptionFunc) error { + if o == nil { + return errors.New("models: no voice_roles provided for upsert") + } + if !boil.TimestampsAreSkipped(ctx) { + currTime := time.Now().In(boil.GetLocation()) + + if o.CreatedAt.IsZero() { + o.CreatedAt = currTime + } + o.UpdatedAt = currTime + } + + nzDefaults := queries.NonZeroDefaultSet(voiceRoleColumnsWithDefault, o) + + // Build cache key in-line uglily - mysql vs psql problems + buf := strmangle.GetBuffer() + if updateOnConflict { + buf.WriteByte('t') + } else { + buf.WriteByte('f') + } + buf.WriteByte('.') + for _, c := range conflictColumns { + buf.WriteString(c) + } + buf.WriteByte('.') + buf.WriteString(strconv.Itoa(updateColumns.Kind)) + for _, c := range updateColumns.Cols { + buf.WriteString(c) + } + buf.WriteByte('.') + buf.WriteString(strconv.Itoa(insertColumns.Kind)) + for _, c := range insertColumns.Cols { + buf.WriteString(c) + } + buf.WriteByte('.') + for _, c := range nzDefaults { + buf.WriteString(c) + } + key := buf.String() + strmangle.PutBuffer(buf) + + voiceRoleUpsertCacheMut.RLock() + cache, cached := voiceRoleUpsertCache[key] + voiceRoleUpsertCacheMut.RUnlock() + + var err error + + if !cached { + insert, _ := insertColumns.InsertColumnSet( + voiceRoleAllColumns, + voiceRoleColumnsWithDefault, + voiceRoleColumnsWithoutDefault, + nzDefaults, + ) + + update := updateColumns.UpdateColumnSet( + voiceRoleAllColumns, + voiceRolePrimaryKeyColumns, + ) + + if updateOnConflict && len(update) == 0 { + return errors.New("models: unable to upsert voice_roles, could not build update column list") + } + + ret := strmangle.SetComplement(voiceRoleAllColumns, strmangle.SetIntersect(insert, update)) + + conflict := conflictColumns + if len(conflict) == 0 && updateOnConflict && len(update) != 0 { + if len(voiceRolePrimaryKeyColumns) == 0 { + return errors.New("models: unable to upsert voice_roles, could not build conflict column list") + } + + conflict = make([]string, len(voiceRolePrimaryKeyColumns)) + copy(conflict, voiceRolePrimaryKeyColumns) + } + cache.query = buildUpsertQueryPostgres(dialect, "\"voice_roles\"", updateOnConflict, ret, update, conflict, insert, opts...) + + cache.valueMapping, err = queries.BindMapping(voiceRoleType, voiceRoleMapping, insert) + if err != nil { + return err + } + if len(ret) != 0 { + cache.retMapping, err = queries.BindMapping(voiceRoleType, voiceRoleMapping, ret) + if err != nil { + return err + } + } + } + + value := reflect.Indirect(reflect.ValueOf(o)) + vals := queries.ValuesFromMapping(value, cache.valueMapping) + var returns []interface{} + if len(cache.retMapping) != 0 { + returns = queries.PtrsFromMapping(value, cache.retMapping) + } + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, cache.query) + fmt.Fprintln(writer, vals) + } + if len(cache.retMapping) != 0 { + err = exec.QueryRowContext(ctx, cache.query, vals...).Scan(returns...) + if errors.Is(err, sql.ErrNoRows) { + err = nil // Postgres doesn't return anything when there's no update + } + } else { + _, err = exec.ExecContext(ctx, cache.query, vals...) + } + if err != nil { + return errors.Wrap(err, "models: unable to upsert voice_roles") + } + + if !cached { + voiceRoleUpsertCacheMut.Lock() + voiceRoleUpsertCache[key] = cache + voiceRoleUpsertCacheMut.Unlock() + } + + return nil +} + +// DeleteG deletes a single VoiceRole record. +// DeleteG will match against the primary key column to find the record to delete. +func (o *VoiceRole) DeleteG(ctx context.Context) (int64, error) { + return o.Delete(ctx, boil.GetContextDB()) +} + +// Delete deletes a single VoiceRole record with an executor. +// Delete will match against the primary key column to find the record to delete. +func (o *VoiceRole) Delete(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if o == nil { + return 0, errors.New("models: no VoiceRole provided for delete") + } + + args := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(o)), voiceRolePrimaryKeyMapping) + sql := "DELETE FROM \"voice_roles\" WHERE \"id\"=$1" + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args...) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete from voice_roles") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by delete for voice_roles") + } + + return rowsAff, nil +} + +func (q voiceRoleQuery) DeleteAllG(ctx context.Context) (int64, error) { + return q.DeleteAll(ctx, boil.GetContextDB()) +} + +// DeleteAll deletes all matching rows. +func (q voiceRoleQuery) DeleteAll(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if q.Query == nil { + return 0, errors.New("models: no voiceRoleQuery provided for delete all") + } + + queries.SetDelete(q.Query) + + result, err := q.Query.ExecContext(ctx, exec) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete all from voice_roles") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by deleteall for voice_roles") + } + + return rowsAff, nil +} + +// DeleteAllG deletes all rows in the slice. +func (o VoiceRoleSlice) DeleteAllG(ctx context.Context) (int64, error) { + return o.DeleteAll(ctx, boil.GetContextDB()) +} + +// DeleteAll deletes all rows in the slice, using an executor. +func (o VoiceRoleSlice) DeleteAll(ctx context.Context, exec boil.ContextExecutor) (int64, error) { + if len(o) == 0 { + return 0, nil + } + + var args []interface{} + for _, obj := range o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), voiceRolePrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := "DELETE FROM \"voice_roles\" WHERE " + + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), 1, voiceRolePrimaryKeyColumns, len(o)) + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, args) + } + result, err := exec.ExecContext(ctx, sql, args...) + if err != nil { + return 0, errors.Wrap(err, "models: unable to delete all from voiceRole slice") + } + + rowsAff, err := result.RowsAffected() + if err != nil { + return 0, errors.Wrap(err, "models: failed to get rows affected by deleteall for voice_roles") + } + + return rowsAff, nil +} + +// ReloadG refetches the object from the database using the primary keys. +func (o *VoiceRole) ReloadG(ctx context.Context) error { + if o == nil { + return errors.New("models: no VoiceRole provided for reload") + } + + return o.Reload(ctx, boil.GetContextDB()) +} + +// Reload refetches the object from the database +// using the primary keys with an executor. +func (o *VoiceRole) Reload(ctx context.Context, exec boil.ContextExecutor) error { + ret, err := FindVoiceRole(ctx, exec, o.ID) + if err != nil { + return err + } + + *o = *ret + return nil +} + +// ReloadAllG refetches every row with matching primary key column values +// and overwrites the original object slice with the newly updated slice. +func (o *VoiceRoleSlice) ReloadAllG(ctx context.Context) error { + if o == nil { + return errors.New("models: empty VoiceRoleSlice provided for reload all") + } + + return o.ReloadAll(ctx, boil.GetContextDB()) +} + +// ReloadAll refetches every row with matching primary key column values +// and overwrites the original object slice with the newly updated slice. +func (o *VoiceRoleSlice) ReloadAll(ctx context.Context, exec boil.ContextExecutor) error { + if o == nil || len(*o) == 0 { + return nil + } + + slice := VoiceRoleSlice{} + var args []interface{} + for _, obj := range *o { + pkeyArgs := queries.ValuesFromMapping(reflect.Indirect(reflect.ValueOf(obj)), voiceRolePrimaryKeyMapping) + args = append(args, pkeyArgs...) + } + + sql := "SELECT \"voice_roles\".* FROM \"voice_roles\" WHERE " + + strmangle.WhereClauseRepeated(string(dialect.LQ), string(dialect.RQ), 1, voiceRolePrimaryKeyColumns, len(*o)) + + q := queries.Raw(sql, args...) + + err := q.Bind(ctx, exec, &slice) + if err != nil { + return errors.Wrap(err, "models: unable to reload all in VoiceRoleSlice") + } + + *o = slice + + return nil +} + +// VoiceRoleExistsG checks if the VoiceRole row exists. +func VoiceRoleExistsG(ctx context.Context, iD int64) (bool, error) { + return VoiceRoleExists(ctx, boil.GetContextDB(), iD) +} + +// VoiceRoleExists checks if the VoiceRole row exists. +func VoiceRoleExists(ctx context.Context, exec boil.ContextExecutor, iD int64) (bool, error) { + var exists bool + sql := "select exists(select 1 from \"voice_roles\" where \"id\"=$1 limit 1)" + + if boil.IsDebug(ctx) { + writer := boil.DebugWriterFrom(ctx) + fmt.Fprintln(writer, sql) + fmt.Fprintln(writer, iD) + } + row := exec.QueryRowContext(ctx, sql, iD) + + err := row.Scan(&exists) + if err != nil { + return false, errors.Wrap(err, "models: unable to check if voice_roles exists") + } + + return exists, nil +} + +// Exists checks if the VoiceRole row exists. +func (o *VoiceRole) Exists(ctx context.Context, exec boil.ContextExecutor) (bool, error) { + return VoiceRoleExists(ctx, exec, o.ID) +} diff --git a/voiceroles/schema.go b/voiceroles/schema.go new file mode 100644 index 0000000000..9af8acffe3 --- /dev/null +++ b/voiceroles/schema.go @@ -0,0 +1,17 @@ +package voiceroles + +var DBSchemas = []string{` +CREATE TABLE IF NOT EXISTS voice_roles ( + id bigserial NOT NULL PRIMARY KEY, + created_at timestamptz NOT NULL, + updated_at timestamptz NOT NULL, + guild_id bigint NOT NULL, + channel_id bigint NOT NULL, + role_id bigint NOT NULL, + enabled boolean NOT NULL DEFAULT true +); +`, ` +CREATE UNIQUE INDEX IF NOT EXISTS voice_roles_channel_idx ON voice_roles(channel_id); +`, ` +CREATE INDEX IF NOT EXISTS voice_roles_guild_idx ON voice_roles(guild_id); +`} diff --git a/voiceroles/sqlboiler.toml b/voiceroles/sqlboiler.toml new file mode 100644 index 0000000000..1f747cdd25 --- /dev/null +++ b/voiceroles/sqlboiler.toml @@ -0,0 +1,12 @@ +add-global-variants="true" +no-hooks="true" +no-tests="true" + +[psql] +dbname="yagpdb" +host="localhost" +user="yagpdb" +pass="ihateducks" +sslmode="disable" + +whitelist = ["voice_roles"] diff --git a/voiceroles/voiceroles.go b/voiceroles/voiceroles.go new file mode 100644 index 0000000000..7602d8d682 --- /dev/null +++ b/voiceroles/voiceroles.go @@ -0,0 +1,50 @@ +// voicerole is a plugin that assigns roles to users when they join voice channels +package voiceroles + +//go:generate sqlboiler --no-hooks psql + +import ( + "context" + + "github.com/botlabs-gg/yagpdb/v2/bot" + "github.com/botlabs-gg/yagpdb/v2/common" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/web" +) + +type Plugin struct{} + +func (p *Plugin) PluginInfo() *common.PluginInfo { + return &common.PluginInfo{ + Name: "VoiceRoles", + SysName: "voiceroles", + Category: common.PluginCategoryMisc, + } +} + +var logger = common.GetPluginLogger(&Plugin{}) + +var ( + _ common.Plugin = (*Plugin)(nil) + _ web.Plugin = (*Plugin)(nil) + _ bot.BotInitHandler = (*Plugin)(nil) +) + +const ( + MaxVoiceRoles = 1 + MaxVoiceRolesPremium = 10 +) + +func MaxConfigsForContext(ctx context.Context) int { + if premium.ContextPremium(ctx) { + return MaxVoiceRolesPremium + } + return MaxVoiceRoles +} + +func RegisterPlugin() { + p := &Plugin{} + common.RegisterPlugin(p) + + common.InitSchemas("voiceroles", DBSchemas...) +} diff --git a/voiceroles/web.go b/voiceroles/web.go new file mode 100644 index 0000000000..1c02e52ed6 --- /dev/null +++ b/voiceroles/web.go @@ -0,0 +1,320 @@ +package voiceroles + +import ( + _ "embed" + "fmt" + "html/template" + "net/http" + "strconv" + + "emperror.dev/errors" + "github.com/botlabs-gg/yagpdb/v2/autorole" + "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/moderation" + "github.com/botlabs-gg/yagpdb/v2/premium" + "github.com/botlabs-gg/yagpdb/v2/streaming" + "github.com/botlabs-gg/yagpdb/v2/voiceroles/models" + "github.com/botlabs-gg/yagpdb/v2/web" + "github.com/volatiletech/sqlboiler/v4/boil" + "goji.io" + "goji.io/pat" +) + +//go:embed assets/voiceroles.html +var PageHTML string + +type FormVoiceRole struct { + ID int64 + ChannelID int64 `valid:"channel,false"` + RoleID int64 `valid:"role,false"` + Enabled bool +} + +var ( + panelLogKeyNewConfig = cplogs.RegisterActionFormat(&cplogs.ActionFormat{Key: "voicerole_new_config", FormatString: "Created voice role config for channel %d with role %d"}) + panelLogKeyUpdatedConfig = cplogs.RegisterActionFormat(&cplogs.ActionFormat{Key: "voicerole_updated_config", FormatString: "Updated voice role config %d"}) + panelLogKeyRemovedConfig = cplogs.RegisterActionFormat(&cplogs.ActionFormat{Key: "voicerole_removed_config", FormatString: "Removed voice role config %d"}) +) + +// getExcludedRoleIDs returns the IDs of roles that should be excluded from voice role operations +// This includes AutoRole, MuteRole, and StreamingRole +func getExcludedRoleIDs(guildID int64) []int64 { + var excluded []int64 + + if autoroleConfig, err := autorole.GetAutoroleConfig(guildID); err == nil && autoroleConfig.Role != 0 { + excluded = append(excluded, autoroleConfig.Role) + } + + if modConfig, err := moderation.FetchConfig(guildID); err == nil && modConfig.MuteRole != 0 { + excluded = append(excluded, modConfig.MuteRole) + } + + if streamingConfig, err := streaming.GetConfig(guildID); err == nil && streamingConfig.GiveRole != 0 { + excluded = append(excluded, streamingConfig.GiveRole) + } + + return excluded +} + +func (p *Plugin) InitWeb() { + web.AddHTMLTemplate("voiceroles/assets/voiceroles.html", PageHTML) + + web.AddSidebarItem(web.SidebarCategoryRoles, &web.SidebarItem{ + Name: "Voice Roles", + URL: "voiceroles", + Icon: "fas fa-microphone", + }) + + muxer := goji.SubMux() + + web.CPMux.Handle(pat.New("/voiceroles"), muxer) + web.CPMux.Handle(pat.New("/voiceroles/*"), muxer) + + muxer.Use(web.RequireBotMemberMW) + muxer.Use(premium.PremiumGuildMW) + muxer.Use(web.RequirePermMW(discordgo.PermissionManageRoles)) + + getHandler := web.RenderHandler(handleGetVoiceRole, "cp_voiceroles") + + muxer.Handle(pat.Get(""), getHandler) + muxer.Handle(pat.Get("/"), getHandler) + + muxer.Handle(pat.Post("/new"), web.ControllerPostHandler(handleNewVoiceRole, getHandler, FormVoiceRole{})) + muxer.Handle(pat.Post("/:id/update"), web.ControllerPostHandler(handleUpdateVoiceRole, getHandler, FormVoiceRole{})) + muxer.Handle(pat.Post("/:id/delete"), web.ControllerPostHandler(handleDeleteVoiceRole, getHandler, nil)) +} + +func handleGetVoiceRole(w http.ResponseWriter, r *http.Request) interface{} { + ctx := r.Context() + activeGuild, tmpl := web.GetBaseCPContextData(ctx) + + configs, err := GetVoiceRoles(ctx, activeGuild.ID) + web.CheckErr(tmpl, err, "Failed retrieving voice role configs", logger.Error) + + // Enrich configs with channel and role names + type EnrichedConfig struct { + *models.VoiceRole + ChannelName string + RoleName string + } + + enrichedConfigs := make([]*EnrichedConfig, 0, len(*configs)) + for _, config := range *configs { + enriched := &EnrichedConfig{ + VoiceRole: config, + ChannelName: "Unknown Channel", + RoleName: "Unknown Role", + } + + // Get channel name + if channel := activeGuild.GetChannel(config.ChannelID); channel != nil { + enriched.ChannelName = channel.Name + } + + // Get role name + if role := activeGuild.GetRole(config.RoleID); role != nil { + enriched.RoleName = role.Name + } + + enrichedConfigs = append(enrichedConfigs, enriched) + } + + tmpl["VoiceRoles"] = enrichedConfigs + + // Pass excluded role IDs to template + excludedRoleIDs := getExcludedRoleIDs(activeGuild.ID) + tmpl["ExcludedRoleIDs"] = excludedRoleIDs + + // Calculate limits + configCount := len(*configs) + tmpl["ConfigCount"] = configCount + + // Check enabled count for limits + enabledCount := 0 + for _, c := range *configs { + if c.Enabled { + enabledCount++ + } + } + + // Max limit is always 10 for storage, but free servers can only enable 1 + maxAllowed := MaxConfigsForContext(ctx) + tmpl["CanAddMore"] = configCount < maxAllowed + tmpl["MaxConfigs"] = maxAllowed + tmpl["PremiumLimit"] = MaxVoiceRolesPremium + tmpl["FreeLimit"] = MaxVoiceRoles + + return tmpl +} + +func handleNewVoiceRole(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + activeGuild, tmpl := web.GetBaseCPContextData(ctx) + + form := ctx.Value(common.ContextKeyParsedForm).(*FormVoiceRole) + + // Validate channel is a voice or stage channel + channel := activeGuild.GetChannel(form.ChannelID) + if channel == nil { + return tmpl.AddAlerts(web.ErrorAlert("Channel not found")), nil + } + + if channel.Type != discordgo.ChannelTypeGuildVoice && channel.Type != discordgo.ChannelTypeGuildStageVoice { + return tmpl.AddAlerts(web.ErrorAlert("Selected channel must be a voice or stage channel")), nil + } + + // Check total limits + count, err := GetVoiceRolesCount(ctx, activeGuild.ID) + if err != nil { + return tmpl, errors.WithMessage(err, "failed getting config count") + } + + maxAllowed := MaxConfigsForContext(ctx) + if count >= int64(maxAllowed) { + return tmpl.AddAlerts(web.ErrorAlert("Maximum of " + strconv.Itoa(maxAllowed) + " voice role configurations reached")), nil + } + + // Create the config (Enabled by default) + config, err := CreateVoiceRoles(ctx, activeGuild.ID, form.ChannelID, form.RoleID) + if err != nil { + // Check for unique constraint violation + if common.ErrPQIsUniqueViolation(err) { + return tmpl.AddAlerts(web.ErrorAlert("A voice role configuration already exists for this channel")), nil + } + return tmpl, errors.WithMessage(err, "failed creating voice role config") + } + + config.Enabled = true + _, err = config.UpdateG(ctx, boil.Infer()) + if err != nil { + return tmpl, errors.WithMessage(err, "failed enabling voice role config") + } + + go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyNewConfig, &cplogs.Param{Type: cplogs.ParamTypeInt, Value: form.ChannelID}, &cplogs.Param{Type: cplogs.ParamTypeInt, Value: form.RoleID})) + + return tmpl.AddAlerts(web.SucessAlert("Voice role configuration created!")), nil +} + +func handleUpdateVoiceRole(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + activeGuild, tmpl := web.GetBaseCPContextData(ctx) + + form := ctx.Value(common.ContextKeyParsedForm).(*FormVoiceRole) + + idStr := pat.Param(r, "id") + id, err := strconv.ParseInt(idStr, 10, 64) + if err != nil { + return tmpl.AddAlerts(web.ErrorAlert("Invalid ID")), nil + } + + // Validate channel is a voice or stage channel + channel := activeGuild.GetChannel(form.ChannelID) + if channel == nil { + return tmpl.AddAlerts(web.ErrorAlert("Channel not found")), nil + } + + if channel.Type != discordgo.ChannelTypeGuildVoice && channel.Type != discordgo.ChannelTypeGuildStageVoice { + return tmpl.AddAlerts(web.ErrorAlert("Selected channel must be a voice or stage channel")), nil + } + + // Check concurrent limits if enabling + if form.Enabled { + // Get current config to see if it was already enabled + currentConfig, err := models.FindVoiceRoleG(ctx, id) + if err != nil { + return tmpl, errors.WithMessage(err, "failed finding config") + } + + if !currentConfig.Enabled { + // We are enabling it, check limits + enabledCount, err := models.VoiceRoles( + models.VoiceRoleWhere.GuildID.EQ(activeGuild.ID), + models.VoiceRoleWhere.Enabled.EQ(true), + ).CountG(ctx) + if err != nil { + return tmpl, errors.WithMessage(err, "failed counting enabled configs") + } + + limit := MaxConfigsForContext(ctx) + if int(enabledCount) >= limit { + return tmpl.AddAlerts(web.ErrorAlert(fmt.Sprintf("Max %d enabled voice roles allowed", limit))), nil + } + } + } + + // Update the config + config, err := models.FindVoiceRoleG(ctx, id) + if err != nil { + return tmpl, errors.WithMessage(err, "failed finding config") + } + + config.ChannelID = form.ChannelID + config.RoleID = form.RoleID + config.Enabled = form.Enabled + + _, err = config.UpdateG(ctx, boil.Infer()) + + if err != nil { + // Check for unique constraint violation + if common.ErrPQIsUniqueViolation(err) { + return tmpl.AddAlerts(web.ErrorAlert("A voice role already exists for this channel")), nil + } + return tmpl, errors.WithMessage(err, "failed updating voice role config") + } + + go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyUpdatedConfig, &cplogs.Param{Type: cplogs.ParamTypeInt, Value: id})) + + return tmpl.AddAlerts(web.SucessAlert("Voice role updated!")), nil +} + +func handleDeleteVoiceRole(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ctx := r.Context() + _, tmpl := web.GetBaseCPContextData(ctx) + + idStr := pat.Param(r, "id") + id, err := strconv.ParseInt(idStr, 10, 64) + if err != nil { + return tmpl.AddAlerts(web.ErrorAlert("Invalid ID")), nil + } + + err = DeleteVoiceRoles(ctx, id) + if err != nil { + return tmpl, errors.WithMessage(err, "failed deleting voice role config") + } + + go cplogs.RetryAddEntry(web.NewLogEntryFromContext(r.Context(), panelLogKeyRemovedConfig, &cplogs.Param{Type: cplogs.ParamTypeInt, Value: id})) + + return tmpl.AddAlerts(web.SucessAlert("Voice role deleted!")), nil +} + +var _ web.PluginWithServerHomeWidget = (*Plugin)(nil) + +func (p *Plugin) LoadServerHomeWidget(w http.ResponseWriter, r *http.Request) (web.TemplateData, error) { + ag, templateData := web.GetBaseCPContextData(r.Context()) + + templateData["WidgetTitle"] = "Voice Role" + templateData["SettingsPath"] = "/voiceroles" + + configs, err := GetVoiceRoles(r.Context(), ag.ID) + if err != nil { + return templateData, err + } + + if len(*configs) > 0 { + templateData["WidgetEnabled"] = true + } else { + templateData["WidgetDisabled"] = true + } + + format := `
      +
    • Status: %s
      • +
    • Voice Roles: %d
      • +
    ` + + status := web.EnabledDisabledSpanStatus(len(*configs) > 0) + templateData["WidgetBody"] = template.HTML(fmt.Sprintf(format, status, len(*configs))) + + return templateData, nil +} diff --git a/web/middleware.go b/web/middleware.go index e7d140cd09..1e15af9788 100644 --- a/web/middleware.go +++ b/web/middleware.go @@ -10,6 +10,7 @@ import ( "reflect" "strconv" "strings" + "sync" "time" "emperror.dev/errors" @@ -356,7 +357,40 @@ func RequireServerAdminMiddleware(inner http.Handler) http.Handler { return http.HandlerFunc(mw) } -// RequireBotMemberMW ensures that the bot member for the curreng guild is available, mostly used for checking the bot's roles +var guildPathMutexes sync.Map + +// Prevents Race Conditions on POST and PUT endpoints. +func GuildPathMutexMiddleware(inner http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + method := strings.ToUpper(r.Method) + if method != "POST" && method != "PUT" { + inner.ServeHTTP(w, r) + return + } + + guildInterface := r.Context().Value(common.ContextKeyCurrentGuild) + if guildInterface == nil { + // No guild in context, pass through + inner.ServeHTTP(w, r) + return + } + + guild := guildInterface.(*dstate.GuildSet) + guildID := guild.ID + + mutexKey := fmt.Sprintf("%d:%s", guildID, r.URL.Path) + + mutexInterface, _ := guildPathMutexes.LoadOrStore(mutexKey, &sync.Mutex{}) + mutex := mutexInterface.(*sync.Mutex) + + mutex.Lock() + defer mutex.Unlock() + + inner.ServeHTTP(w, r) + }) +} + +// RequireBotMemberMW ensures that the bot member for the current guild is available, mostly used for checking the bot's roles func RequireBotMemberMW(inner http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { parsedGuildID, _ := strconv.ParseInt(pat.Param(r, "server"), 10, 64) diff --git a/web/template.go b/web/template.go index 6c9d79f74e..5966465a34 100644 --- a/web/template.go +++ b/web/template.go @@ -411,12 +411,24 @@ func (g *channelOptsHTMLGenState) outputCategorizedChannels() { continue } - g.output(``) + // First check if the category has any visible channels + hasVisibleChannels := false + channels := make([]dstate.ChannelState, 0) for _, c := range g.channels { if c.ParentID == cat.ID && g.include(c.Type) { - g.outputChannel(c.ID, c.Name, c.Type) + hasVisibleChannels = true + channels = append(channels, c) } } + + if !hasVisibleChannels { + continue + } + + g.output(``) + for _, c := range channels { + g.outputChannel(c.ID, c.Name, c.Type) + } g.output("") } } @@ -442,10 +454,14 @@ func (g *channelOptsHTMLGenState) outputChannel(id int64, name string, channelTy switch channelType { case discordgo.ChannelTypeGuildText: prefix = "#" - case discordgo.ChannelTypeGuildVoice, discordgo.ChannelTypeGuildStageVoice: + case discordgo.ChannelTypeGuildVoice: prefix = "🔊" + case discordgo.ChannelTypeGuildStageVoice: + prefix = "🎤" case discordgo.ChannelTypeGuildForum: prefix = "📃" + case discordgo.ChannelTypeGuildNews: + prefix = "📢" default: prefix = "" } diff --git a/web/validation.go b/web/validation.go index d60d869763..434aaf63d0 100644 --- a/web/validation.go +++ b/web/validation.go @@ -31,7 +31,6 @@ import ( "regexp" "strconv" "strings" - "unicode" "unicode/utf8" "github.com/botlabs-gg/yagpdb/v2/common" @@ -198,21 +197,7 @@ func ValidateForm(guild *dstate.GuildSet, tmpl TemplateData, form interface{}) b } if err != nil { - - // Create a pretty name for the field by turing: "AnnounceMessage" into "Announce Message" - prettyField := "" - for _, r := range tField.Name { - if unicode.IsUpper(r) { - if prettyField != "" { - prettyField += " " - } - } - - prettyField += string(r) - } - prettyField = strings.TrimSpace(prettyField) - - tmpl.AddAlerts(ErrorAlert(prettyField, ": ", err.Error())) + tmpl.AddAlerts(ErrorAlert(tField.Name, ": ", err.Error())) ok = false } } diff --git a/web/web.go b/web/web.go index 8ac74e27b6..7a8623b693 100644 --- a/web/web.go +++ b/web/web.go @@ -99,7 +99,7 @@ func init() { "roleOptionsMulti": tmplRoleDropdownMulti, "roleOptionsExclude": tmplRoleDropdownExclude, "roleOptionsMultiExclude": tmplRoleDropdownMultiExclude, - + "textOnlyChannelOptions": tmplChannelOpts([]discordgo.ChannelType{discordgo.ChannelTypeGuildText, discordgo.ChannelTypeGuildNews}), "textChannelOptions": tmplChannelOpts([]discordgo.ChannelType{discordgo.ChannelTypeGuildText, discordgo.ChannelTypeGuildNews, discordgo.ChannelTypeGuildVoice, discordgo.ChannelTypeGuildForum, discordgo.ChannelTypeGuildStageVoice}), "textChannelOptionsMulti": tmplChannelOptsMulti([]discordgo.ChannelType{discordgo.ChannelTypeGuildText, discordgo.ChannelTypeGuildNews, discordgo.ChannelTypeGuildVoice, discordgo.ChannelTypeGuildForum, @@ -323,6 +323,7 @@ func setupRoutes() *goji.Mux { CPMux.Use(LoadCoreConfigMiddleware) CPMux.Use(SetGuildMemberMiddleware) CPMux.Use(RequireServerAdminMiddleware) + CPMux.Use(GuildPathMutexMiddleware) RootMux.Handle(pat.New("/manage/:server"), CPMux) RootMux.Handle(pat.New("/manage/:server/*"), CPMux) diff --git a/yagpdb_docker/Dockerfile b/yagpdb_docker/Dockerfile index d15676a5a8..3ddc4dc9a2 100644 --- a/yagpdb_docker/Dockerfile +++ b/yagpdb_docker/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.25.0 AS builder +FROM docker.io/golang:1.25.4 AS builder WORKDIR /appbuild/yagpdb COPY go.mod go.sum ./ diff --git a/yagpdb_docker/Dockerfile.debug b/yagpdb_docker/Dockerfile.debug index d3707bf3f2..3f0f4205d9 100644 --- a/yagpdb_docker/Dockerfile.debug +++ b/yagpdb_docker/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM docker.io/golang:1.25.0-alpine +FROM docker.io/golang:1.25.4-alpine # Dependencies: ca-certificates for client TLS, tzdata for timezone and ffmpeg for soundboard support RUN apk --no-cache add ca-certificates ffmpeg tzdata RUN GOEXPERIMENT=jsonv2 CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest diff --git a/yagpdb_docker/app.example.env b/yagpdb_docker/app.example.env index 34a5d18a36..545b352ca9 100644 --- a/yagpdb_docker/app.example.env +++ b/yagpdb_docker/app.example.env @@ -59,4 +59,9 @@ GOOGLE_APPLICATION_CREDENTIALS=path/to/credentials.json # This will be used as the pubsubhubbub (websub) verify token when receiving callbacks on new video uploads # if this gets leaked, people could spam feeds YAGPDB_YOUTUBE_VERIFY_TOKEN= -YAGPDB_DISCORD_PREMIUM_SKU_ID= \ No newline at end of file +YAGPDB_DISCORD_PREMIUM_SKU_ID= + + +#client id and secret to poll live status for users +YAGPDB_TWITCH_CLIENTID= +YAGPDB_TWITCH_CLIENTSECRET= \ No newline at end of file diff --git a/yagpdb_docker/docker-compose.debug.yml b/yagpdb_docker/docker-compose.debug.yml index 844c4fff2e..21f453e396 100644 --- a/yagpdb_docker/docker-compose.debug.yml +++ b/yagpdb_docker/docker-compose.debug.yml @@ -4,9 +4,11 @@ volumes: cert_cache: soundboard: + networks: default: + services: app: build: @@ -27,7 +29,7 @@ services: ports: - '5000:5000' - '4000:4000' - - '5100-5999:5100-5999' + #- '5100-5999:5100-5999' env_file: - app.env security_opt: @@ -44,6 +46,8 @@ services: db: image: docker.io/postgres:11 restart: unless-stopped + ports: + - 5432:5432 volumes: - db:/var/lib/postgresql/data networks: diff --git a/youtube/assets/youtube.html b/youtube/assets/youtube.html index 80cc86ea92..84f022b4eb 100644 --- a/youtube/assets/youtube.html +++ b/youtube/assets/youtube.html @@ -66,7 +66,7 @@

    Add New Feed

    @@ -100,7 +100,7 @@

    Custom Announcement

    {{checkbox "Enabled" "yt-announcement-enabled" `

    Enable

    ` .Announcement.Enabled}} - + @@ -161,7 +161,7 @@

    Current subscribed channels