merge

.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

.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

automod/assets/automod.html

@@ -338,7 +338,7 @@ <h2 class="card-title">List: <span contenteditable="true" data-content-editable-
         {{textChannelOptionsMulti .ActiveGuild.Channels nil}}
     </select>
     <select id="automod-channel-single-template" class="form-control">
-        {{textChannelOptions .ActiveGuild.Channels nil true "None"}}
+        {{textOnlyChannelOptions .ActiveGuild.Channels nil true "None"}}
     </select>
     <select id="automod-list-selection-template" class="form-control">
         {{range .AutomodLists}}

automod/triggers.go

@@ -1074,6 +1074,7 @@ func (spam *SpamTrigger) CheckMessage(triggerCtx *TriggerContext, cs *dstate.Cha
 	settingsCast := triggerCtx.Data.(*SpamTriggerData)
 
 	mToCheckAgainst := strings.TrimSpace(strings.ToLower(m.Content))
+	totalAttachments := len(m.GetMessageAttachments())
 
 	count := 1
 
@@ -1102,8 +1103,8 @@ func (spam *SpamTrigger) CheckMessage(triggerCtx *TriggerContext, cs *dstate.Cha
 			break
 		}
 
-		if len(v.GetMessageAttachments()) > 0 {
-			break // treat any attachment as a different message, in the future i may download them and check hash or something? maybe too much
+		if len(v.GetMessageAttachments()) != totalAttachments {
+			break // attachment count don't match
 		}
 
 		contentStripped := strings.TrimSpace(v.Content)

autorole/autorole.go

@@ -33,8 +33,9 @@ func RegisterPlugin() {
 }
 
 type AutoroleConfig struct {
-	Role             int64 `json:",string" valid:"role,true"`
-	RequiredDuration int   `valid:"0,"`
+	Role             int64   `json:",string" valid:"role,true"`
+	Roles            []int64 `json:"role" valid:"role,true"`
+	RequiredDuration int     `valid:"0,"`
 
 	RequiredRoles            []int64 `valid:"role,true"`
 	IgnoreRoles              []int64 `valid:"role,true"`

bot/bot.go

@@ -260,56 +260,50 @@ type identifyRatelimiter struct {
 	lastRatelimitAt      time.Time
 }
 
-var identifyMaxConcurrency int
-var identifyConcurrencyOnce sync.Once
-
-func (rl *identifyRatelimiter) getIdentifyMaxConcurrency() int {
-	identifyConcurrencyOnce.Do(func() {
-		identifyMaxConcurrency = 0
-		const redisKey = "yagpdb.gateway.identify.max_concurrency"
-		lockKey := redisKey + ":lock"
-		err := common.BlockingLockRedisKey(lockKey, 0, 30)
-		if err != nil {
-			logger.WithError(err).Warn("failed to acquire lock for fetching gateway bot info")
-			return
-		}
-		defer common.UnlockRedisKey(lockKey)
-		var cached string
-		if err := common.RedisPool.Do(radix.Cmd(&cached, "GET", redisKey)); err == nil && cached != "" {
-			if parsed, perr := strconv.Atoi(cached); perr == nil && parsed > 0 {
-				identifyMaxConcurrency = parsed
-				logger.Infof("Gateway identify max_concurrency (cached): %d", identifyMaxConcurrency)
-				return
-			}
-		}
-		s, err := discordgo.New(common.GetBotToken())
-		if err != nil {
-			logger.WithError(err).Warn("failed to create session to fetch gateway bot info")
-			return
-		}
-		resp, err := s.GatewayBot()
-		if err != nil {
-			logger.WithError(err).Warn("failed to fetch gateway bot info")
-			return
-		}
-		if resp != nil && resp.SessionStartLimit.MaxConcurrency > 0 {
-			identifyMaxConcurrency = resp.SessionStartLimit.MaxConcurrency
-		}
-		const ttlSeconds = 21600 // cache for 6 hours, this doesn't change often.
-		_ = common.RedisPool.Do(radix.FlatCmd(nil, "SETEX", redisKey, ttlSeconds, strconv.Itoa(identifyMaxConcurrency)))
-		logger.Infof("Gateway identify max_concurrency: %d", identifyMaxConcurrency)
-	})
-	return identifyMaxConcurrency
-}
+// var identifyMaxConcurrency int
+// var identifyConcurrencyOnce sync.Once
+
+// func (rl *identifyRatelimiter) getIdentifyMaxConcurrency() int {
+// 	identifyConcurrencyOnce.Do(func() {
+// 		identifyMaxConcurrency = 0
+// 		const redisKey = "yagpdb.gateway.identify.max_concurrency"
+// 		lockKey := redisKey + ":lock"
+// 		err := common.BlockingLockRedisKey(lockKey, 0, 30)
+// 		if err != nil {
+// 			logger.WithError(err).Warn("failed to acquire lock for fetching gateway bot info")
+// 			return
+// 		}
+// 		defer common.UnlockRedisKey(lockKey)
+// 		var cached string
+// 		if err := common.RedisPool.Do(radix.Cmd(&cached, "GET", redisKey)); err == nil && cached != "" {
+// 			if parsed, perr := strconv.Atoi(cached); perr == nil && parsed > 0 {
+// 				identifyMaxConcurrency = parsed
+// 				logger.Infof("Gateway identify max_concurrency (cached): %d", identifyMaxConcurrency)
+// 				return
+// 			}
+// 		}
+// 		s, err := discordgo.New(common.GetBotToken())
+// 		if err != nil {
+// 			logger.WithError(err).Warn("failed to create session to fetch gateway bot info")
+// 			return
+// 		}
+// 		resp, err := s.GatewayBot()
+// 		if err != nil {
+// 			logger.WithError(err).Warn("failed to fetch gateway bot info")
+// 			return
+// 		}
+// 		if resp != nil && resp.SessionStartLimit.MaxConcurrency > 0 {
+// 			identifyMaxConcurrency = resp.SessionStartLimit.MaxConcurrency
+// 		}
+// 		const ttlSeconds = 21600 // cache for 6 hours, this doesn't change often.
+// 		_ = common.RedisPool.Do(radix.FlatCmd(nil, "SETEX", redisKey, ttlSeconds, strconv.Itoa(identifyMaxConcurrency)))
+// 		logger.Infof("Gateway identify max_concurrency: %d", identifyMaxConcurrency)
+// 	})
+// 	return identifyMaxConcurrency
+// }
 
 func (rl *identifyRatelimiter) RatelimitIdentify(shardID int) {
-	mc := 0
-	for mc == 0 {
-		mc = rl.getIdentifyMaxConcurrency()
-		if mc == 0 {
-			time.Sleep(5 * time.Second)
-		}
-	}
+	mc := 5
 	// total buckets is equal to the value of max_concurrency.
 	bucket := shardID % mc
 	key := "yagpdb.gateway.identify.bucket." + strconv.Itoa(bucket)

bot/discordevents.go

@@ -324,7 +324,9 @@ func handleDmGuildInfoInteraction(evt *eventsystem.EventData) {
 		logger.Errorf("DM interaction received with incorrect customID: %s from user %d", customID, ic.User.ID)
 	}
 	gs, err := evt.Session.Guild(guild_id)
-	logger.WithError(err).Errorf("Failed getting guild info for DM %s from user %d", customID, ic.User.ID)
+	if err != nil {
+		logger.WithError(err).Errorf("Failed getting guild info for DM %s from user %d", customID, ic.User.ID)
+	}
 	response := discordgo.InteractionResponse{
 		Type: discordgo.InteractionResponseChannelMessageWithSource,
 		Data: &discordgo.InteractionResponseData{Flags: 64},
@@ -337,7 +339,9 @@ func handleDmGuildInfoInteraction(evt *eventsystem.EventData) {
 	}
 	response.Data.Content = content
 	err = evt.Session.CreateInteractionResponse(ic.ID, ic.Token, &response)
-	logger.WithError(err).Printf("Interaction Response!")
+	if err != nil {
+		logger.WithError(err).Errorf("DM interaction response failed.")
+	}
 }
 
 func HandleInteractionCreate(evt *eventsystem.EventData) {