Merge pull request #21 from taranvohra/dev

Dev

Author: Taran Vohra

README.md

@@ -232,6 +232,13 @@ When the picking finishes, it will randomly decide which team won mapvote.
 
 Disabled coin flip feature for the specified gametype.
 
+**teamemojis** 🐱‍👤<br/>
+`Usage -> .teameojis emoji gametype`
+
+Sets the preferred teamemoji for the gametype. `emoji` can be one of `agonies`, `cores` or `logos`.
+
+Note that if `gametype` is omitted then the default is change it for **ALL** gametypes.
+
 ### Queries
 
 **addqueryserver, aqs** 🐱‍👤<br/>

src/actions/index.ts

@@ -281,3 +281,20 @@ export const createNewUserLog = (
     description,
     timestamp: new Date(),
   });
+
+export const updateGuildGameTypeTeamEmojis = (
+  guildId: string,
+  gameType: string,
+  teamEmojis: TeamEmojis
+) =>
+  Guilds.findOneAndUpdate(
+    {
+      _id: guildId,
+      'gameTypes.name': gameType,
+    },
+    {
+      $set: {
+        'gameTypes.$.teamEmojis': teamEmojis,
+      },
+    }
+  ).exec();

src/commands/pugs.ts

@@ -218,6 +218,14 @@ const pugsCommandList: Command[] = [
     isPrivileged: true,
     needsRegisteredGuild: true,
   },
+  {
+    group,
+    key: 'handleAdminUpdateTeamEmojis',
+    aliases: ['teamemojis'],
+    type: 'args',
+    isPrivileged: true,
+    needsRegisteredGuild: true,
+  },
 ];
 
 export default pugsCommandList;

src/formatting.ts

@@ -11,7 +11,7 @@ import {
 import {
   CONSTANTS,
   emojis,
-  teamEmojis,
+  allTeamEmojis,
   teams,
   isDuelPug,
   sanitizeName,
@@ -234,9 +234,15 @@ const getTeamIndex = (index: number) => {
   }
 };
 
+const getTeamEmojis = (emoji?: TeamEmojis) => {
+  if (!emoji) return allTeamEmojis['agonies'];
+  return allTeamEmojis[emoji];
+};
+
 export const formatBroadcastCaptainsReady = (pug: Pug) => {
   const pugCaptains = pug.captains.reduce((acc, curr, index) => {
     const teamIndex = getTeamIndex(index);
+    const teamEmojis = getTeamEmojis(pug.teamEmojis);
     acc += `<@${curr}> is the captain for ${teamEmojis[teamIndex]} **${teams[teamIndex]}** ${teamEmojis[teamIndex]}\n`;
     return acc;
   }, ``);
@@ -258,8 +264,13 @@ export const formatBroadcastCaptainsReady = (pug: Pug) => {
   return `${pugCaptains}\n${turn}\n${nonCaptainPlayers}`;
 };
 
-export const formatAddCaptainStatus = (username: string, team: number) => {
+export const formatAddCaptainStatus = (
+  username: string,
+  team: number,
+  pug: Pug
+) => {
   const teamIndex = getTeamIndex(team);
+  const teamEmojis = getTeamEmojis(pug.teamEmojis);
   return `**${username}** became captain for ${teamEmojis[teamIndex]} **${teams[
     teamIndex
   ].toUpperCase()}** ${teamEmojis[teamIndex]}`;
@@ -302,6 +313,7 @@ export const formatPickPlayerStatus = (
     (_, i) => i
   ).reduce((acc, _, i) => {
     const teamIndex = getTeamIndex(i);
+    const teamEmojis = getTeamEmojis(pug.teamEmojis);
     acc[i] = `**${teams[teamIndex]}** ${teamEmojis[teamIndex]} `;
     return acc;
   }, {} as { [team: number]: string });
@@ -335,9 +347,13 @@ export const formatPickPlayerStatus = (
   }\n${activeTeams}`;
 };
 
-export const formatCoinFlipMapvoteWinner = (winningTeamIndex: number) => {
+export const formatCoinFlipMapvoteWinner = (
+  winningTeamIndex: number,
+  pug: Pug
+) => {
   const head = `---- *mapvote coin flip* ----`;
   const teamIndex = getTeamIndex(winningTeamIndex);
+  const teamEmojis = getTeamEmojis(pug.teamEmojis);
   const body = `${teamEmojis[teamIndex]} **${teams[
     teamIndex
   ].toUpperCase()}** ${teamEmojis[teamIndex]} won **mapvote**`;
@@ -370,6 +386,7 @@ export const formatPugsInPicking = (pugs: Array<Pug>) => {
       (_, i) => i
     ).reduce((acc, _, i) => {
       const teamIndex = getTeamIndex(i);
+      const teamEmojis = getTeamEmojis(pug.teamEmojis);
       acc[i] = `**${teams[teamIndex]}** ${teamEmojis[teamIndex]}`;
       return acc;
     }, {} as { [team: number]: string });
@@ -485,6 +502,7 @@ export const formatLastPug = (
       : Array.from({ length: pug.noOfTeams }, (_, i) => i).reduce(
           (acc, _, i) => {
             const teamIndex = getTeamIndex(i);
+            const teamEmojis = getTeamEmojis(pug.teamEmojis);
             acc[i] = `**${teams[teamIndex]}** ${teamEmojis[teamIndex]} `;
             return acc;
           },
@@ -524,7 +542,7 @@ export const formatLastPug = (
 
   const mapvoteWinnerTeam =
     typeof coinFlipWinner === 'number'
-      ? `${formatMapvoteWinner(coinFlipWinner)}\n`
+      ? `${formatMapvoteWinner(coinFlipWinner, pug)}\n`
       : ``;
 
   if (guildName) {
@@ -537,9 +555,10 @@ export const formatLastPug = (
   }
 };
 
-export const formatMapvoteWinner = (team: number) => {
+export const formatMapvoteWinner = (team: number, pug: Pug) => {
   const { top, bottom } = edges[team];
   const winningTeam = teams[getTeamIndex(team)].toUpperCase();
+  const teamEmojis = getTeamEmojis(pug.teamEmojis);
   const winningTeamEmoji = teamEmojis[getTeamIndex(team)];
   const mapvoteWinnerTeam = `${winningTeamEmoji} **${winningTeam}** ${winningTeamEmoji}`;
   return `${top}\n| ${mapvoteWinnerTeam} |\n${bottom}`;

src/global.d.ts

@@ -42,4 +42,6 @@ declare global {
     user?: User;
     pug?: Pug;
   };
+
+  export type TeamEmojis = 'agonies' | 'cores' | 'logos';
 }

src/handlers/pugHandlers.ts

@@ -13,6 +13,7 @@ import {
   calculateBlockExpiry,
   isDuelPug,
   getRandomPickIndex,
+  teamEmojiTypes,
 } from '~/utils';
 import {
   addGuildGameType,
@@ -25,6 +26,7 @@ import {
   setGuildGameTypeCoinFlipTo,
   updateGuildUserDefaultJoins,
   createNewUserLog,
+  updateGuildGameTypeTeamEmojis,
 } from '~/actions';
 import store, {
   addGameType,
@@ -36,6 +38,7 @@ import store, {
   removeBlockedUser,
   enableCoinFlip,
   disableCoinFlip,
+  updateTeamEmojis,
 } from '~/store';
 import {
   formatPugFilledDM,
@@ -129,7 +132,9 @@ export const handleAddGameType: Handler = async (message, args) => {
     pickingOrder,
     isCoinFlipEnabled: false,
     isMix,
-  };
+    teamEmojis: 'logos',
+  } as const;
+
   await addGuildGameType(guildId, newGameType);
   log.info(`Added new gametype ${name} to guild ${guildId}`);
 
@@ -658,7 +663,9 @@ export const handleAddCaptain: Handler = async (message) => {
     `Added captain ${author.username} for pug ${forPug.name} at ${guild.id}`
   );
 
-  message.channel.send(formatAddCaptainStatus(author.username, assignedTeam));
+  message.channel.send(
+    formatAddCaptainStatus(author.username, assignedTeam, forPug)
+  );
 
   if (forPug.areCaptainsDecided()) {
     pugPubSub.emit('captains_ready', guild.id, forPug.name);
@@ -741,7 +748,7 @@ export const handlePickPlayer: Handler = async (
     const { isCoinFlipEnabled } = gameType;
     const coinflip = getRandomInt(0, forPug.noOfTeams - 1);
     if (isCoinFlipEnabled) {
-      message.channel.send(formatCoinFlipMapvoteWinner(coinflip));
+      message.channel.send(formatCoinFlipMapvoteWinner(coinflip, forPug));
     }
 
     const sequences = await getNextSequences(guild.id, forPug.name);
@@ -1446,3 +1453,47 @@ export const handleAdminDisableMapvoteCoinFlip: Handler = async (
   message.channel.send(`Mapvote coinflip disabled for **${gameType}**`);
   log.info(`Exiting handleAdminDisableMapvoteCoinFlip`);
 };
+
+export const handleAdminUpdateTeamEmojis: Handler = async (message, args) => {
+  log.info(`Entering handleAdminUpdateTeamEmojis`);
+  const { guild } = message;
+  if (!guild) return;
+
+  const cache = store.getState();
+  const { gameTypes } = cache.pugs[guild.id];
+
+  const emoji = args[0].toLowerCase();
+  if (!(emoji in teamEmojiTypes)) {
+    message.channel.send(
+      `Invalid emoji type! Choose one of agonies, cores or logos`
+    );
+    return;
+  }
+
+  const forAllGameTypes = args[1] === undefined;
+  const gameTypeNames = forAllGameTypes
+    ? gameTypes.map((g) => g.name)
+    : [args[1].toLowerCase()];
+
+  const teamEmojis = emoji as TeamEmojis;
+  gameTypeNames.forEach(async (name) => {
+    await updateGuildGameTypeTeamEmojis(guild.id, name, teamEmojis);
+    store.dispatch(
+      updateTeamEmojis({
+        guildId: guild.id,
+        name,
+        teamEmojis,
+      })
+    );
+    log.info(
+      `Updated team emoji preference for gametype ${name} at guild ${guild.id}`
+    );
+  });
+
+  message.channel.send(
+    `Team Emojis have been changed to **${emoji}** for **${
+      forAllGameTypes ? 'all gametypes' : `${args[1].toUpperCase()}`
+    }**`
+  );
+  log.info(`Exiting handleAdminUpdateTeamEmojis`);
+};

src/models/Pug.ts

@@ -34,6 +34,7 @@ export class Pug {
   timerFn: ReturnType<typeof setTimeout> | null;
   isCoinFlipEnabled: boolean;
   isMix: boolean;
+  teamEmojis?: TeamEmojis;
 
   constructor({
     name,
@@ -42,13 +43,15 @@ export class Pug {
     pickingOrder,
     isCoinFlipEnabled,
     isMix,
+    teamEmojis,
   }: {
     name: string;
     noOfPlayers: number;
     noOfTeams: number;
     pickingOrder: Array<number>;
     isCoinFlipEnabled: boolean;
     isMix: boolean;
+    teamEmojis?: TeamEmojis;
   }) {
     this.name = name;
     this.noOfPlayers = noOfPlayers;
@@ -61,6 +64,7 @@ export class Pug {
     this.captains = [];
     this.timerFn = null;
     this.isMix = isMix;
+    this.teamEmojis = teamEmojis;
   }
 
   addPlayer(user: PugUser) {

src/models/guilds.ts

@@ -18,6 +18,9 @@ export class GameType {
 
   @prop()
   isMix!: boolean;
+
+  @prop()
+  teamEmojis?: TeamEmojis;
 }
 
 export class QueryServer {

src/store/slices/pugs.ts

@@ -9,6 +9,8 @@ type AddPugPayload = WithGuildID & { pug: Pug };
 type RemovePugPayload = WithGuildID & GameTypeName;
 type EnableCoinFlipPayload = WithGuildID & GameTypeName;
 type DisableCoinFlipPayload = WithGuildID & GameTypeName;
+type UpdateTeamEmojiPayload = WithGuildID &
+  GameTypeName & { teamEmojis: TeamEmojis };
 
 type GameTypeName = { name: string };
 
@@ -18,6 +20,7 @@ type GameType = GameTypeName & {
   noOfTeams: number;
   isCoinFlipEnabled: boolean;
   isMix: boolean;
+  teamEmojis?: TeamEmojis;
 };
 
 type GuildPugsState = {
@@ -81,6 +84,15 @@ const pugsSlice = createSlice({
       if (pugIndex !== -1)
         state[guildId].list[pugIndex].isCoinFlipEnabled = false;
     },
+    updateTeamEmojis(state, action: PayloadAction<UpdateTeamEmojiPayload>) {
+      const { guildId, name, teamEmojis } = action.payload;
+      const { gameTypes, list } = state[guildId];
+      const gameTypeIndex = gameTypes.findIndex((gt) => gt.name === name);
+      const pugIndex = list.findIndex((pug) => pug.name === name);
+      state[guildId].gameTypes[gameTypeIndex].teamEmojis = teamEmojis;
+      if (pugIndex !== -1)
+        state[guildId].list[pugIndex].teamEmojis = teamEmojis;
+    },
   },
 });
 
@@ -93,5 +105,6 @@ export const {
   enableCoinFlip,
   disableCoinFlip,
   setPugChannel,
+  updateTeamEmojis,
 } = pugsSlice.actions;
 export const pugsReducer = pugsSlice.reducer;