Skip to content

feat(giveaway): purge ended giveaways and hide them from view #172

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
eamonwatson merged 1 commit into from
Nov 2, 2026
Merged

feat(giveaway): purge ended giveaways and hide them from view #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions apps/bot/src/commands/utility/giveaway.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function buildViewEmbed(

const slice = shown.slice(page * 20, (page + 1) * 20);
const list = slice.length
? slice.map((entry) => `\`${entry.position}.\` <@${entry.userId}> \`${entry.userId}\``).join('\n')
? slice.map((entry) => `${entry.position}\\. <@${entry.userId}> \`${entry.userId}\``).join('\n')
: query
? 'No entries match that search.'
: 'No entries yet.';
Expand Down Expand Up @@ -227,10 +227,7 @@ export class GiveawayCommand extends Command {
const giveaways = await searchGuildGiveaways(interaction.guildId, interaction.options.getFocused().trim());

await interaction.respond(
giveaways.map((giveaway) => ({
name: `${truncate(giveaway.prize, 88)} (${giveaway.ended ? 'ended' : 'active'})`,
value: giveaway.messageId!,
})),
giveaways.map((giveaway) => ({ name: truncate(giveaway.prize, 100), value: giveaway.messageId! })),
);
}

Expand Down
13 changes: 10 additions & 3 deletions apps/bot/src/lib/giveaways.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,23 @@ export async function searchGuildGiveaways(guildId: string, query: string) {
where: {
guildId,
messageId: { not: null },
ended: false,
OR: query
? [{ prize: { contains: query, mode: 'insensitive' } }, { messageId: { startsWith: query } }]
: undefined,
},
select: { messageId: true, prize: true, ended: true },
orderBy: [{ ended: 'asc' }, { createdAt: 'desc' }],
select: { messageId: true, prize: true },
orderBy: { createdAt: 'desc' },
take: 25,
});
}

export async function clearExpiredGiveaways() {
return prisma.giveaway.deleteMany({
where: { ended: true, endsAt: { lt: new Date(Date.now() - 7 * 86_400_000) } }, // 7d after ending
});
}

export async function deleteGiveawayByMessageId(messageId: string) {
await prisma.giveaway.deleteMany({ where: { messageId } });
}
Expand Down Expand Up @@ -225,7 +232,7 @@ export async function finishGiveaway(giveawayId: string): Promise<FinishGiveaway
const winnerIds = pickWinners(giveaway.entries, giveaway.winnerCount);
const updated = await tx.giveaway.update({
where: { id: giveawayId },
data: { ended: true, winnerIds },
data: { ended: true, winnerIds, endsAt: new Date() },
});

return { status: 'ended', giveaway: updated };
Expand Down
2 changes: 2 additions & 0 deletions apps/bot/src/lib/purgeScheduler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Copyright(C) 2026 Vantern
// SPDX-License-Identifier: AGPL-3.0-or-later

import { clearExpiredGiveaways } from './giveaways.js';
import { logger } from './logger.js';
import { createQueue } from './queue.js';
import { clearExpiredReminders } from './reminders.js';
Expand All @@ -13,6 +14,7 @@ export function initPurgeScheduler(): void {
await purgeExpiredWarns();
await purgeDeletedServers();
await clearExpiredReminders();
await clearExpiredGiveaways();
});

queue
Expand Down
Loading