Skip to content

🐛 fix: correct timeout duration calculation in repel command #18

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
hmd-ali merged 2 commits into from
Oct 19, 2025
Merged

🐛 fix: correct timeout duration calculation in repel command #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
057972d
🐛 fix: correct timeout duration calculation in repel command
hmd-ali Oct 19, 2025
cfcf41a
🔨 refactor: update variable names for timeout duration and look back …
hmd-ali Oct 19, 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
26 changes: 13 additions & 13 deletions src/commands/moderation/repel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import { getPublicChannels } from '../../util/channel.js';
import { logToChannel } from '../../util/channel-logging.js';
import { buildCommandString, createCommand } from '../../util/commands.js';

const DEFAULT_LOOK_BACK = 10 * MINUTE;
const DEFAULT_TIMEOUT_DURATION = 1 * HOUR;
const DEFAULT_LOOK_BACK_MS = 10 * MINUTE;
const DEFAULT_TIMEOUT_DURATION_MS = 1 * HOUR;

const isUserInServer = (target: User | GuildMember): target is GuildMember => {
return target instanceof GuildMember;
Expand Down Expand Up @@ -108,17 +108,17 @@ const getTargetFromInteraction = async (

const handleTimeout = async ({
target,
duration,
durationInMilliseconds,
}: {
target: GuildMember | User;
duration: number;
durationInMilliseconds: number;
}): Promise<number> => {
if (duration === 0 || !isUserInServer(target) || isUserTimedOut(target)) {
if (durationInMilliseconds === 0 || !isUserInServer(target) || isUserTimedOut(target)) {
return 0;
}
try {
await target.timeout(duration * HOUR, 'Repel command executed');
return duration;
await target.timeout(durationInMilliseconds, 'Repel command executed');
return durationInMilliseconds;
} catch (error) {
console.error('Error applying timeout to user:', error);
return 0;
Expand Down Expand Up @@ -307,7 +307,7 @@ export const repelCommand = createCommand({
name: RepelOptions.LOOK_BACK,
required: false,
type: ApplicationCommandOptionType.Integer,
description: `Number of recent messages to delete (default: ${timeToString(DEFAULT_LOOK_BACK)})`,
description: `Number of recent messages to delete (default: ${timeToString(DEFAULT_LOOK_BACK_MS)})`,
choices: [
{
name: '10 minutes (Default)',
Expand All @@ -331,8 +331,8 @@ export const repelCommand = createCommand({
name: RepelOptions.TIMEOUT_DURATION,
required: false,
type: ApplicationCommandOptionType.Integer,
description: `Duration of the timeout in hours (default: ${timeToString(DEFAULT_TIMEOUT_DURATION)})`,
min_value: 1,
description: `Duration of the timeout in hours (default: ${timeToString(DEFAULT_TIMEOUT_DURATION_MS)})`,
min_value: 0,
max_value: 24,
},
{
Expand Down Expand Up @@ -396,19 +396,19 @@ export const repelCommand = createCommand({
try {
const reason = interaction.options.getString(RepelOptions.REASON, true);
const lookBack = interaction.options.getInteger(RepelOptions.LOOK_BACK);
const timeoutDuration = interaction.options.getInteger(RepelOptions.TIMEOUT_DURATION);
const timeoutHours = interaction.options.getInteger(RepelOptions.TIMEOUT_DURATION);

const timeout = await handleTimeout({
target: target,
duration: timeoutDuration ? timeoutDuration * HOUR : DEFAULT_TIMEOUT_DURATION,
durationInMilliseconds: timeoutHours ? timeoutHours * HOUR : DEFAULT_TIMEOUT_DURATION_MS,
});

const channels = getTextChannels(interaction);

const { deleted, failedChannels } = await handleDeleteMessages({
channels,
target: target,
lookBack: lookBack ?? DEFAULT_LOOK_BACK,
lookBack: lookBack ?? DEFAULT_LOOK_BACK_MS,
});

logRepelAction({
Expand Down