diff --git a/.github/workflows/fly-dev-deploy.yml b/.github/workflows/fly-develop-deploy.yml similarity index 82% rename from .github/workflows/fly-dev-deploy.yml rename to .github/workflows/fly-develop-deploy.yml index 1aa4509..572e486 100644 --- a/.github/workflows/fly-dev-deploy.yml +++ b/.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 }} diff --git a/.github/workflows/fly-prod-deploy.yml b/.github/workflows/fly-live-deploy.yml similarity index 83% rename from .github/workflows/fly-prod-deploy.yml rename to .github/workflows/fly-live-deploy.yml index 63393d9..8595cbd 100644 --- a/.github/workflows/fly-prod-deploy.yml +++ b/.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 }} diff --git a/fly.dev.toml b/fly.develop.toml similarity index 95% rename from fly.dev.toml rename to fly.develop.toml index 017701e..ab5374f 100644 --- a/fly.dev.toml +++ b/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] diff --git a/fly.prod.toml b/fly.live.toml similarity index 95% rename from fly.prod.toml rename to fly.live.toml index e30f4c3..86a87ca 100644 --- a/fly.prod.toml +++ b/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] diff --git a/internal/automod/bot_autoban.go b/internal/automod/bot_autoban.go index 544289c..c2be75a 100644 --- a/internal/automod/bot_autoban.go +++ b/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))