Skip to content

Update develop with main and trigger push #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HurleybirdJr merged 10 commits into from
Oct 2, 2025
Merged

Update develop with main and trigger push #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d636b0
Merge pull request #17 from chillsynth/develop
npgy Apr 8, 2025
3c6c729
Merge pull request #18 from chillsynth/develop
npgy Aug 31, 2025
c6a0f98
Added more detailed ban reasons for #avoid-this
HurleybirdJr Aug 31, 2025
8c12ab7
Merge pull request #19 from chillsynth/avoid-this-reason-patch
HurleybirdJr Aug 31, 2025
09d2097
Update and rename fly.prod.toml to fly.live.toml
HurleybirdJr Oct 2, 2025
e6a9ac9
Renamed develop toml
HurleybirdJr Oct 2, 2025
6e2b06e
Merge pull request #20 from chillsynth/HurleybirdJr-FlyTransfer
HurleybirdJr Oct 2, 2025
31267a7
Update and rename fly-prod-deploy.yml to fly-live-deploy.yml
HurleybirdJr Oct 2, 2025
0332313
Rename develop
HurleybirdJr Oct 2, 2025
0eb92a4
Merge pull request #21 from chillsynth/FlyRename2
HurleybirdJr Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/fly-dev-deploy.yml → .github/workflows/fly-develop-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/fly-prod-deploy.yml → .github/workflows/fly-live-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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 }}
2 changes: 1 addition & 1 deletion fly.dev.toml → fly.develop.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion fly.prod.toml → fly.live.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions internal/automod/bot_autoban.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down