Improve text around kick/ban/timeout reasons, voting resolutions (#241)

vcarl · web-flow · commit 5b1daf007ae0 · 2026-01-12T14:25:11.000-05:00
diff --git a/app/commands/escalate/handlers.ts b/app/commands/escalate/handlers.ts
@@ -102,7 +102,7 @@ export const EscalationHandlers = {
       const reportedMember =
         await interaction.guild!.members.fetch(reportedUserId);
       await Promise.allSettled([
-        kick(reportedMember),
+        kick(reportedMember, "single moderator decision"),
         interaction.reply(
           `<@${reportedUserId}> kicked by ${interaction.user.username}`,
         ),
@@ -136,7 +136,7 @@ export const EscalationHandlers = {
       const reportedMember =
         await interaction.guild!.members.fetch(reportedUserId);
       await Promise.allSettled([
-        ban(reportedMember),
+        ban(reportedMember, "single moderator decision"),
         interaction.reply(
           `<@${reportedUserId}> banned by ${interaction.user.username}`,
         ),
@@ -204,7 +204,7 @@ export const EscalationHandlers = {
       const reportedMember =
         await interaction.guild!.members.fetch(reportedUserId);
       await Promise.allSettled([
-        timeout(reportedMember),
+        timeout(reportedMember, "single moderator decision"),
         interaction.reply(
           `<@${reportedUserId}> timed out by ${interaction.user.username}`,
         ),
diff --git a/app/commands/escalate/strings.ts b/app/commands/escalate/strings.ts
@@ -49,7 +49,7 @@ export function buildVoteMessageContent(
     // Majority voting: always wait for timeout, plurality wins
     if (tally.totalVotes === 0) {
       status = scheduledFor
-        ? `Majority voting. Resolves <t:${scheduledFor}:R> with leading option.`
+        ? `Majority voting. Resolves <t:${scheduledFor}:R> with a simple majority of participants.`
         : `Majority voting. Waiting for votes.`;
     } else if (tally.isTied) {
       status = `Tied between: ${tally.tiedResolutions.map((r) => humanReadableResolutions[r]).join(", ")}. Tiebreak needed before timeout.`;
diff --git a/app/discord/escalationResolver.ts b/app/discord/escalationResolver.ts
@@ -75,19 +75,19 @@ export async function executeResolution(
       //       }
 
       case resolutions.timeout:
-        await timeout(reportedMember);
+        await timeout(reportedMember, "voted resolution");
         break;
 
       case resolutions.restrict:
         await applyRestriction(reportedMember);
         break;
 
       case resolutions.kick:
-        await kick(reportedMember);
+        await kick(reportedMember, "voted resolution");
         break;
 
       case resolutions.ban:
-        await ban(reportedMember);
+        await ban(reportedMember, "voted resolution");
         break;
     }
   } catch (error) {
@@ -147,11 +147,13 @@ async function executeScheduledResolution(
     const { modLog } = await fetchSettings(escalation.guild_id, [
       SETTINGS.modLog,
     ]);
-    const [guild, channel, reportedUser] = await Promise.all([
+    const [guild, channel, reportedUser, votes] = await Promise.all([
       client.guilds.fetch(escalation.guild_id),
       client.channels.fetch(escalation.thread_id) as Promise<ThreadChannel>,
       client.users.fetch(escalation.reported_user_id).catch(() => null),
+      getVotesForEscalation(escalation.id),
     ]);
+    const voters = new Set(votes.map((v) => v.voter_id));
     const [reportedMember, vote] = await Promise.all([
       guild.members.fetch(escalation.reported_user_id).catch(() => null),
       channel.messages.fetch(escalation.vote_message_id),
@@ -162,13 +164,16 @@ async function executeScheduledResolution(
       Number(new Date(escalation.created_at)) / 1000,
     );
     const elapsedHours = Math.floor((now - createdAt) / 60 / 60);
+    const totalVotes = votes.length;
+    const totalVoters = voters.size;
+
+    const noticeText = `Resolved with ${totalVotes} votes from ${totalVoters} voters: **${humanReadableResolutions[resolution]}** <@${escalation.reported_user_id}> (${reportedUser?.displayName ?? "no user"})`;
+    const timing = `-# Resolved <t:${now}:s>, ${elapsedHours}hrs after escalation`;
 
     // Handle case where user left the server or deleted their account
     if (!reportedMember) {
       const userLeft = reportedUser !== null;
-      const reason = userLeft
-        ? "User left the server"
-        : "User account no longer exists";
+      const reason = userLeft ? "left the server" : "account no longer exists";
 
       log("info", "EscalationResolver", "Resolving escalation - user gone", {
         ...logBag,
@@ -180,10 +185,8 @@ async function executeScheduledResolution(
       await resolveEscalation(escalation.id, resolutions.track);
       await vote.edit({ components: getDisabledButtons(vote) });
       try {
-        const displayName = reportedUser?.username ?? "Unknown User";
         const notice = await vote.reply({
-          content: `Resolved: **${humanReadableResolutions[resolutions.track]}** <@${escalation.reported_user_id}> (${displayName})
--# ${reason}. Resolved <t:${now}:s>, ${elapsedHours}hrs after escalation`,
+          content: `${noticeText}\n${timing} (${reason})`,
         });
         await notice.forward(modLog);
       } catch (error) {
@@ -203,8 +206,7 @@ async function executeScheduledResolution(
 
     try {
       const notice = await vote.reply({
-        content: `Resolved: **${humanReadableResolutions[resolution]}** <@${escalation.reported_user_id}> (${reportedMember.displayName})
--# Resolved <t:${now}:s>, ${elapsedHours}hrs after escalation`,
+        content: `${noticeText}\n${timing}`,
       });
       await notice.forward(modLog);
     } catch (error) {
diff --git a/app/helpers/modLog.ts b/app/helpers/modLog.ts
@@ -338,9 +338,9 @@ const constructLog = async ({
 
   // Add indicator if this is forwarded content
   const forwardNote = isForwardedMessage(message) ? " (forwarded)" : "";
-  const preface = `${report}${forwardNote} ${constructDiscordLink(message)} by <@${lastReport.message.author.id}> (${
+  const preface = `${constructDiscordLink(message)} by <@${lastReport.message.author.id}> (${
     lastReport.message.author.username
-  })`;
+  })${forwardNote}`;
   const extra = origExtra ? `${origExtra}\n` : "";
 
   // For forwarded messages, get attachments from the snapshot
@@ -353,7 +353,7 @@ const constructLog = async ({
   );
   return {
     content: truncateMessage(`${preface}
--# ${extra}${formatDistanceToNowStrict(lastReport.message.createdAt)} ago · <t:${Math.floor(lastReport.message.createdTimestamp / 1000)}:R>`).trim(),
+-# ${extra}${formatDistanceToNowStrict(lastReport.message.createdAt)} ago · <t:${Math.floor(lastReport.message.createdTimestamp / 1000)}:R> · ${report}`).trim(),
     embeds: embeds.length === 0 ? undefined : embeds,
     allowedMentions: { roles: [moderator] },
   };
diff --git a/app/helpers/modResponse.ts b/app/helpers/modResponse.ts
@@ -7,7 +7,7 @@ export const resolutions = {
   ban: "ban",
 } as const;
 export const humanReadableResolutions = {
-  [resolutions.track]: "No action",
+  [resolutions.track]: "No action (abstain)",
   // [resolutions.warning]: "Formal Warning",
   [resolutions.timeout]: "Timeout Overnight",
   [resolutions.restrict]: "Restrict",
diff --git a/app/models/discord.server.ts b/app/models/discord.server.ts
@@ -77,29 +77,29 @@ export const applyRestriction = async (member: GuildMember | null) => {
   return member.roles.add(restrictedRole);
 };
 
-export const kick = async (member: GuildMember | null) => {
+export const kick = async (member: GuildMember | null, reason: string) => {
   if (!member) {
     console.log("Tried to kick a null member");
     return;
   }
-  return member.guild.members.kick(member, "Voted resolution");
+  return member.guild.members.kick(member, reason);
 };
 
-export const ban = async (member: GuildMember | null) => {
+export const ban = async (member: GuildMember | null, reason: string) => {
   if (!member) {
     console.log("Tried to ban a null member");
     return;
   }
-  return member.guild.bans.create(member, { reason: "Voted resolution" });
+  return member.guild.bans.create(member, { reason });
 };
 
 const OVERNIGHT = 1000 * 60 * 60 * 20;
-export const timeout = async (member: GuildMember | null) => {
+export const timeout = async (member: GuildMember | null, reason: string) => {
   if (!member) {
     console.log("Tried to timeout a null member");
     return;
   }
-  return member.timeout(OVERNIGHT, "Voted resolution");
+  return member.timeout(OVERNIGHT, reason);
 };
 
 const authzRoles = {
