Merge pull request #25 from taranvohra/dev

fix autoremove bugs and messaging

Author: Taran Vohra

src/formatting.ts

@@ -122,8 +122,7 @@ export const formatLeaveStatus = (
     reasonMsg = `because the user went offline ${emojis.residentsleeper}${emojis.pupcurn}`;
   else if (reason === 'left')
     reasonMsg = 'because the user left this discord server';
-  else if (reason === 'autoremove')
-    reasonMsg = 'because the user had autoremoval added';
+  else if (reason === 'autoremove') reasonMsg = 'because of autoremove';
   else reasonMsg = '';
 
   return `${left.length > 0 ? `${username} left  ${left} ${reasonMsg}` : ``}${

src/handlers/pugHandlers.ts

@@ -5,6 +5,7 @@ import { formatDistance } from 'date-fns';
 import { User } from 'discord.js';
 import { Pug, Users, Pugs, GuildStats } from '~/models';
 import {
+  Period,
   computePickingOrder,
   CONSTANTS,
   emojis,
@@ -15,6 +16,7 @@ import {
   getRandomPickIndex,
   teamEmojiTypes,
   getPlayerIndexFromPlayerList,
+  getHumanReadablePeriodName,
 } from '~/utils';
 import {
   addGuildGameType,
@@ -424,6 +426,9 @@ export const handleJoinGameTypes: Handler = async (
     toBroadcast.players.forEach((player) => {
       const user = message.client.users.cache.get(player.id);
       user?.send(DM);
+      store.dispatch(
+        clearAutoRemoval({ guildId: guild.id, userId: player.id })
+      );
     });
 
     // If 1v1/mix/deathmatch pug, there wont be live picking
@@ -459,9 +464,6 @@ export const handleJoinGameTypes: Handler = async (
         `Remove pug ${toBroadcast.name} at guild ${guild.id} from store`
       );
       store.dispatch(removePug({ guildId: guild.id, name: toBroadcast.name }));
-      store.dispatch(
-        clearAutoRemoval({ guildId: guild.id, userId: author.id })
-      );
     }
   }
 
@@ -1402,10 +1404,7 @@ export const handleAdminBlockPlayer: Handler = async (message, args) => {
   const blockLength = parseInt(blockLengthString);
   if (blockLength <= 0) return;
 
-  const expiry = calculateExpiry(
-    blockPeriodString as 'm' | 'h' | 'd',
-    blockLength
-  );
+  const expiry = calculateExpiry(blockPeriodString as Period, blockLength);
 
   const newBlock = {
     blockedOn: new Date(),
@@ -1742,7 +1741,7 @@ export const handleAddAutoRemove: Handler = async (message, args) => {
   const { list } = pugs;
 
   const userHasJoinedAtleastOnePug = list.some((pug) =>
-    pug.players.find((p) => p.id === userId)
+    pug.players.some((p) => p.id === userId)
   );
 
   if (!userHasJoinedAtleastOnePug) {
@@ -1753,6 +1752,17 @@ export const handleAddAutoRemove: Handler = async (message, args) => {
     return;
   }
 
+  const userIsPartOfFilledPug = list.some(
+    (pug) => pug.isInPickingMode && pug.players.some((p) => p.id === userId)
+  );
+  if (userIsPartOfFilledPug) {
+    log.debug(`User ${userId} is part of filled pug, so no autoremoval`);
+    message.channel.send(
+      `You cannot use autoremove while you're in a filled pug`
+    );
+    return;
+  }
+
   const [timeframe = ''] = args;
   const [autoRemoveLengthString] = timeframe.match(/[0-9]+/g) ?? [];
   const [autoRemovePeriodString] = timeframe.match(/[m|h|d]/g) ?? [];
@@ -1766,15 +1776,17 @@ export const handleAddAutoRemove: Handler = async (message, args) => {
   if (autoRemoveLength <= 0) return;
 
   const expiry = calculateExpiry(
-    autoRemovePeriodString as 'm' | 'h' | 'd',
+    autoRemovePeriodString as Period,
     autoRemoveLength
   );
 
   store.dispatch(addAutoRemoval({ guildId: guild.id, userId, expiry }));
   log.info(`Autoremoval added for user ${userId} at ${expiry.toUTCString()}`);
 
   message.channel.send(
-    `<@${userId}>, you will be autoremoved from every pug at **${expiry.toUTCString()}**`
+    `<@${userId}>, you will be automatically removed from every pug in **${autoRemoveLength} ${getHumanReadablePeriodName(
+      autoRemovePeriodString as Period
+    )}${autoRemoveLength > 1 ? 's' : ''}** (${expiry.toUTCString()})`
   );
 
   log.info(`Exiting handleAddAutoRemove`);

src/utils/index.ts

@@ -26,6 +26,14 @@ export const CONSTANTS = {
   commandGroups: ['pugs', 'queries'],
 };
 
+export type Period = 'm' | 'h' | 'd';
+
+export const PERIOD_NAMES: Record<Period, string> = {
+  m: 'minute',
+  h: 'hour',
+  d: 'day',
+};
+
 export const isGuildRegistered = (guildId: string) => {
   const cache = store.getState();
   return cache.misc[guildId] !== undefined;
@@ -186,14 +194,17 @@ export const isCommandConstraintSatified = (command: Command, cmd: string) =>
     ? command.aliases.some((a) => command.rgx!(a).test(cmd))
     : command.aliases.includes(cmd);
 
-export const calculateExpiry = (period: 'm' | 'h' | 'd', length: number) => {
+export const calculateExpiry = (period: Period, length: number) => {
   const expiry = new Date();
   if (period === 'm') expiry.setMinutes(expiry.getMinutes() + length);
   else if (period === 'h') expiry.setHours(expiry.getHours() + length);
   else expiry.setHours(expiry.getHours() + length * 24);
   return expiry;
 };
 
+export const getHumanReadablePeriodName = (period: Period) =>
+  PERIOD_NAMES[period];
+
 export const getHostPortPasswordFromAddress = (
   address: string
 ): { host: string; port: number; password: string } => {