Skip to content

Feat include current channel in repel #963

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
merged 8 commits into from
Aug 9, 2025
Merged

Feat include current channel in repel #963

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
262ac25
refractor: use repel role id instead of name
hmd-ali Aug 8, 2025
76321e3
fix: fix typescript errors
hmd-ali Aug 8, 2025
0bc4998
feat: add channel logger utility
hmd-ali Aug 9, 2025
552cac6
feat: add Discord error codes enum
hmd-ali Aug 9, 2025
642e7ff
feat: implement new repel command options + logging
hmd-ali Aug 9, 2025
320e1bf
fix: include channel where the command is used in
hmd-ali Aug 9, 2025
ae407dc
remove unused imports
hmd-ali Aug 9, 2025
07fac36
chore: merge master into branch
Yofou Aug 9, 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
27 changes: 21 additions & 6 deletions src/v2/commands/repel/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ export const repelInteraction: CommandDataWithHandler = {
RepelCommandOptions.TARGET,
false,
)?.user as User;
console.log('Target User:', targetUser);

let targetGuildMember: GuildMember | null = null;
let userNotInServer = false;
Expand Down Expand Up @@ -236,11 +235,22 @@ export const repelInteraction: CommandDataWithHandler = {
false,
) ?? REPEL_DEFAULT_DELETE_COUNT;
let deletedCount = 0;
const textChannels = interaction.guild.channels.cache.filter(
ch => ch.type === ChannelType.GuildText,
);
const textChannels = interaction.guild.channels.cache
.filter(
(ch): ch is TextChannel =>
(ch.type === ChannelType.GuildText ||
ch.type === ChannelType.GuildVoice) &&
ch.id !== interaction.channelId &&
Boolean(ch.lastMessageId),
)
.sort((a, b) => {
const aLastMessage = a.lastMessageId ? BigInt(a.lastMessageId) : 0n;
const bLastMessage = b.lastMessageId ? BigInt(b.lastMessageId) : 0n;
return Number(bLastMessage - aLastMessage);
})
.first(50);

for (const [, channel] of textChannels) {
for (const channel of [interaction.channel, ...textChannels]) {
if (deletedCount >= messagesToDelete) break;

try {
Expand Down Expand Up @@ -289,10 +299,15 @@ export const repelInteraction: CommandDataWithHandler = {
});
}

const channelInfo =
interaction.channel?.type === ChannelType.GuildVoice
? `**${interaction.channel.name}** voice chat`
: `<#${interaction.channelId}>`;

const embed = new EmbedBuilder()
.setTitle('Repel Action')
.setDescription(
`<@${targetId}> has been repelled by <@${member.id}> in <#${interaction.channelId}>.`,
`<@${targetId}> has been repelled by <@${member.id}> in ${channelInfo}.`,
)
.addFields(
{
Expand Down
Loading