Add MarshalJSON for WebhookParams to make editing consistent across all edit types

Author: ashishjh-bst

automod_legacy/bot.go

@@ -30,10 +30,9 @@ func (p *Plugin) BotInit() {
 
 	pubsub.AddHandler("update_automod_legacy_rules", HandleUpdateAutomodRules, nil)
 	confCache = ccache.New(ccache.Configure().MaxSize(1000))
-	// invitesCacheDuration is the period between ticks for the invitesCache gc in minutes
-	const invitesCacheDuration = 60
+
 	invitesCache = cachedGuildInvites{guilds: make(map[int64]GuildInvites)}
-	go invitesCache.gc(invitesCacheDuration * time.Minute)
+	go invitesCache.gc(60 * time.Minute)
 }
 
 // Invalidate the cache when the rules have changed

automod_legacy/rules.go

@@ -206,6 +206,7 @@ type cachedGuildInvites struct {
 }
 
 func (c *cachedGuildInvites) gc(d time.Duration) {
+	logger.Info("Init worker for invite cache GC")
 	ticker := time.NewTicker(d)
 	for range ticker.C {
 		c.tick(d)

lib/discordgo/structs.go

@@ -1477,6 +1477,33 @@ type WebhookParams struct {
 	AllowedMentions *AllowedMentions    `json:"allowed_mentions,omitempty"`
 }
 
+func (m *WebhookParams) MarshalJSON() ([]byte, error) {
+	type WebhookParamsAlias WebhookParams
+	temp := struct {
+		*WebhookParamsAlias
+		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"`
+	}{
+		WebhookParamsAlias: (*WebhookParamsAlias)(m),
+		Content:            m.Content,
+		AllowedMentions:    m.AllowedMentions,
+		Flags:              &m.Flags,
+	}
+
+	if m.Components != nil {
+		temp.Components = &m.Components
+	}
+
+	if m.Embeds != nil {
+		temp.Embeds = &m.Embeds
+	}
+
+	return json.Marshal(temp)
+}
+
 // MessageReaction stores the data for a message reaction.
 type MessageReaction struct {
 	UserID    int64 `json:"user_id,string"`