Skip to content

Fix/gateway rate limit pt3 #67

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
alfianchii merged 3 commits into from
Jan 3, 2026
Merged

Fix/gateway rate limit pt3 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6edfc6
chore: cached fetching
alfianchii Jan 3, 2026
6222a96
fix: bulk fetching members
alfianchii Jan 3, 2026
1a6bd31
fix: validate the `reviewed_by` when get checkin status
alfianchii Jan 3, 2026
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
2 changes: 1 addition & 1 deletion src/bot/commands/checkin/validators/checkin-status.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class CheckinStatus extends CheckinStatusMessage {
return { content, embed }
}

const flamewarden = await getMember(guild, checkin.reviewed_by!)
const flamewarden = checkin.reviewed_by ? await getMember(guild, checkin.reviewed_by) : undefined
embed = createEmbed(
`🕯️ Check-In #${checkin.public_id}`,
CheckinStatus.MSG.LastCheckin(guild.name, userDiscordId, checkin, flamewarden),
Expand Down
7 changes: 5 additions & 2 deletions src/bot/events/client-ready/jobs/validators/reset-grinder-roles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { FLAMEWARDEN_ROLE, getGrindRoles, GRINDER_ROLE } from '@config/discord'
import { GOODBYE_NOTE_BUTTON_ID, ResetGrinderRolesButtonError } from '@events/interaction-create/jobs/handlers/reset-grinder-roles-button'
import { decodeSnowflakes, encodeSnowflake, getCustomId } from '@utils/component'
import { isDateToday, isDateYesterday } from '@utils/date'
import { DiscordAssert, getChannel, getMember, sendAsBot } from '@utils/discord'
import { DiscordAssert, getChannel, getMembers, sendAsBot } from '@utils/discord'
import { log } from '@utils/logger'
import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from 'discord.js'
import { ResetGrinderRolesMessage } from '../messages/reset-grinder-roles'
Expand Down Expand Up @@ -91,6 +91,9 @@ export class ResetGrinderRoles extends ResetGrinderRolesMessage {
}

static async validateUsers(prisma: PrismaClient, guild: Guild, grindAshesChannel: TextChannel, auditFlameChannel: TextChannel, users: User[]) {
const discordIds = users.map(u => u.discord_id).filter(Boolean)
const members = await getMembers(guild, discordIds, { withPresences: false })

for (const user of users) {
const checkinStreak = user.checkin_streaks?.[0]
if (!checkinStreak)
Expand All @@ -100,7 +103,7 @@ export class ResetGrinderRoles extends ResetGrinderRolesMessage {
if (this.hasValidCheckin(lastCheckin))
continue

const member = await getMember(guild, user.discord_id)
const member = members.get(user.discord_id) as GuildMember
await this.removeGrinderRoles(member)
await this.breakCheckinStreakAt(prisma, checkinStreak, lastCheckin!)
const thread = await this.validateWaitingCheckin(guild, auditFlameChannel, member, user, lastCheckin!)
Expand Down
20 changes: 15 additions & 5 deletions src/utils/discord/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,31 @@
import type { Attachment, ChatInputCommandInteraction, ClientUser, Guild, GuildMember, Interaction, InteractionDeferReplyOptions, InteractionReplyOptions, MessageCreateOptions, PermissionsBitField, Role, TextChannel, ThreadChannel } from 'discord.js'
import type { Attachment, ChatInputCommandInteraction, ClientUser, FetchMembersOptions, Guild, GuildMember, Interaction, InteractionDeferReplyOptions, InteractionReplyOptions, MessageCreateOptions, PermissionsBitField, Role, TextChannel, ThreadChannel } from 'discord.js'
import { MessageFlags } from 'discord.js'

export async function getChannel(guild: Guild, id: string, isThread: boolean = false): Promise<TextChannel | ThreadChannel> {
const cached = guild!.channels.cache.get(id)

if (isThread) {
return guild!.channels.cache.get(id) as TextChannel ?? await guild!.channels.fetch(id).then(channel => channel as TextChannel)
return cached as TextChannel ?? await guild!.channels.fetch(id).then(channel => channel as TextChannel)
}
else {
return guild!.channels.cache.get(id) as ThreadChannel ?? await guild!.channels.fetch(id).then(channel => channel as ThreadChannel)
return cached as ThreadChannel ?? await guild!.channels.fetch(id).then(channel => channel as ThreadChannel)
}
}

export async function getRole(guild: Guild, id: string): Promise<Role> {
return guild!.roles.cache.get(id) as Role ?? await guild!.roles.fetch(id)
const cached = guild!.roles.cache.get(id)

return cached as Role ?? await guild!.roles.fetch(id)
}

export async function getMember(guild: Guild, discordId: string) {
return guild.members.cache.get(discordId) as GuildMember ?? await guild.members.fetch(discordId)
const cached = guild.members.cache.get(discordId)

return cached as GuildMember ?? await guild.members.fetch(discordId)
}

export async function getMembers(guild: Guild, userIds: string[], opts?: FetchMembersOptions) {
return await guild.members.fetch({ user: userIds, ...opts })
}

export const getMissPerms = (channelPerms: Readonly<PermissionsBitField>, requiredPerms: bigint[]): bigint[] => requiredPerms.filter(p => !channelPerms.has(p))
Expand Down