Merge pull request #22 from chillsynth/main

Update develop with main and trigger push

Author: HurleybirdJr

.github/workflows/fly-dev-deploy.yml .github/workflows/fly-develop-deploy.yml.github/workflows/fly-dev-deploy.yml renamed to .github/workflows/fly-develop-deploy.yml

@@ -1,6 +1,6 @@
 # See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
 
-name: Fly Deploy [dev]
+name: Fly Deploy [develop]
 on:
   push:
     branches:
@@ -13,6 +13,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: flyctl deploy --config fly.dev.toml --remote-only
+      - run: flyctl deploy --config fly.develop.toml --remote-only
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_DEV_TOKEN }}

.github/workflows/fly-prod-deploy.yml .github/workflows/fly-live-deploy.yml.github/workflows/fly-prod-deploy.yml renamed to .github/workflows/fly-live-deploy.yml

@@ -1,6 +1,6 @@
 # See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
 
-name: Fly Deploy [prod]
+name: Fly Deploy [live]
 on:
   push:
     branches:
@@ -13,6 +13,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - run: flyctl deploy --config fly.prod.toml --remote-only
+      - run: flyctl deploy --config fly.live.toml --remote-only
         env:
           FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

fly.dev.toml fly.develop.tomlfly.dev.toml renamed to fly.develop.toml

@@ -3,7 +3,7 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = 'chillbot-dev'
+app = 'chillbot-develop'
 primary_region = 'iad'
 
 [env]

fly.prod.toml fly.live.tomlfly.prod.toml renamed to fly.live.toml

@@ -3,7 +3,7 @@
 # See https://fly.io/docs/reference/configuration/ for information about how to use this file.
 #
 
-app = 'chillbot-prod'
+app = 'chillbot-live'
 primary_region = 'iad'
 
 [env]

internal/automod/bot_autoban.go

@@ -15,7 +15,7 @@ func (m *AutoModule) BotAutoBanner(msg *discordgo.MessageCreate) error {
 		return fmt.Errorf("delete bot message: %w", err)
 	}
 
-	err = m.Bot.Discord.GuildBanCreateWithReason(msg.GuildID, msg.Author.ID, "Suspected bot", 7, discordgo.WithRetryOnRatelimit(true))
+	err = m.Bot.Discord.GuildBanCreateWithReason(msg.GuildID, msg.Author.ID, "Suspected bot: #avoid-this sent message", 7, discordgo.WithRetryOnRatelimit(true))
 
 	if err != nil {
 		return fmt.Errorf("guild ban bot: %w", err)
@@ -76,7 +76,7 @@ func (m *AutoModule) SetupInstantBanButton() error {
 			}
 
 			// GET BANNED
-			err = m.Bot.Discord.GuildBanCreateWithReason(i.GuildID, i.Member.User.ID, "Suspected bot", 7, discordgo.WithRetryOnRatelimit(true))
+			err = m.Bot.Discord.GuildBanCreateWithReason(i.GuildID, i.Member.User.ID, "Suspected bot: #avoid-this clicked button", 7, discordgo.WithRetryOnRatelimit(true))
 
 			if err != nil {
 				m.Bot.HandleError(fmt.Errorf("ban user from ban button interaction: %w", err))