feat: Allow giving karma to multiple people

Author: typeofweb

.eslintrc

@@ -50,6 +50,13 @@
       "rules": {
         "import/no-default-export": 0
       }
+    },
+    {
+      "files": ["**/*.spec.ts"],
+      "rules": {
+        "no-magic-numbers": 0,
+        "no-implicit-dependencies": 0
+      }
     }
   ]
 }

package.json

@@ -23,7 +23,9 @@
   "author": "Michał Miszczyszyn <[email protected]> (https://typeofweb.com/)",
   "license": "ISC",
   "dependencies": {
+    "@types/bluebird": "3.5.36",
     "algoliasearch": "4.12.0",
+    "bluebird": "3.7.2",
     "bufferutil": "4.0.3",
     "discord.js": "12.5.3",
     "dotenv": "10.0.0",

src/commands/co.spec.ts

@@ -1,6 +1,3 @@
-/* eslint no-implicit-dependencies: "off" */
-/* eslint no-magic-numbers: "off" */
-
 import co from './co';
 import { getMessageMock } from '../../test/mocks';
 import { expect } from 'chai';

src/commands/co.ts

@@ -3,7 +3,7 @@ import { Command } from '../types';
 const co: Command = {
   name: 'co',
   description: 'co?',
-  args: false,
+  args: 'prohibited',
   cooldown: 60,
   execute(msg) {
     return msg.channel.send({

src/commands/execute.spec.ts

@@ -1,6 +1,3 @@
-/* eslint no-implicit-dependencies: "off" */
-/* eslint no-magic-numbers: "off" */
-
 import { expect } from 'chai';
 import 'mocha';
 import * as execute from './execute';

src/commands/execute.ts

@@ -174,7 +174,7 @@ const errorMessage = (error: Error | string) =>
 const execute: Command = {
   name: 'execute',
   description: 'Wykonuje kod JS/TS',
-  args: false,
+  args: 'prohibited',
   cooldown: COOLDOWN,
   async execute(msg: Message) {
     try {

src/commands/index.ts

@@ -173,15 +173,17 @@ function processCommand(msg: Discord.Message, command: Command, rest: string | n
   }
 
   verifyCooldown(msg, command);
+  const args = rest ? rest.split(/\s+/g) : [];
 
-  if (command.args === false) {
-    return command.execute(msg);
+  if (command.args === 'optional') {
+    return command.execute(msg, args);
   }
-
-  const args = rest ? rest.split(/\s+/g) : [];
-  if (!args.length && command.args === true) {
+  if (!args.length && command.args === 'required') {
     throw new InvalidUsageError(`nie podano argumentów!`);
   }
+  if (args.length && command.args === 'prohibited') {
+    throw new InvalidUsageError(`argumenty niedozwolone!`);
+  }
 
   return command.execute(msg, args);
 }

src/commands/karma.ts

@@ -1,62 +1,75 @@
 import Discord from 'discord.js';
 import { polishPlurals } from 'polish-plurals';
+import Bluebird from 'bluebird';
 
 import {
   getEmojiForKarmaValue,
   getKarmaForMember,
-  getKarmaForMembers,
+  getKarmaForAllMembers,
   KarmaAgg,
+  getKarmaForMembers,
 } from '../data/karma';
 import { getKarmaCollection, initDb } from '../db';
 import type { Command } from '../types';
 
 export const KARMA_REGEX = new RegExp(
-  `^${Discord.MessageMentions.USERS_PATTERN.source}\\s*\\+\\+\\s*(?<description>.*)$`,
+  `^(${Discord.MessageMentions.USERS_PATTERN.source}\\s*)+\\+\\+\\s*$`,
 );
 
 const addKarma: Command = {
   name: '++',
   description: 'Podziękuj użytkownikom wpisując `@nazwa ++`',
-  args: false,
-  cooldown: 10,
+  args: 'optional',
+  cooldown: 5,
   async execute(msg) {
-    const member = await msg.mentions.members?.first()?.fetch();
-    if (!member) {
+    if (!msg.mentions.members?.size) {
       return null;
     }
 
+    const db = await initDb();
+    const karmaCollection = getKarmaCollection(db);
+
     const from = msg.author.id;
-    const to = member.id;
 
-    if (from === to) {
+    const membersToReward = await Bluebird.resolve(Array.from(msg.mentions.members.values()))
+      .map((m) => m.fetch())
+      .filter((m) => m && m.id !== from);
+
+    if (membersToReward.length === 0) {
       return null;
     }
 
-    const db = await initDb();
-    const karmaCollection = getKarmaCollection(db);
-
-    await karmaCollection.insertOne({
-      from,
-      to,
-      createdAt: new Date(),
-      value: 1,
-    });
+    await karmaCollection.insertMany(
+      membersToReward.map((m) => {
+        return {
+          from,
+          to: m.id,
+          createdAt: new Date(),
+          value: 1,
+        };
+      }),
+    );
 
-    const agg = await getKarmaForMember(to, db);
-    const value = agg?.value ?? 0;
+    const membersKarma = await getKarmaForMembers(
+      db,
+      membersToReward.map((m) => m.id),
+    );
 
-    return msg.channel.send(
-      `${msg.author.toString()} podziękował(a) ${member.toString()}! Karma ${member.toString()} wynosi ${value.toFixed(
+    const messages = membersKarma.map(({ value, _id }) => {
+      const member = membersToReward.find((m) => m.id === _id);
+      return `${msg.author.toString()} podziękował(a) ${member?.toString()}! Karma ${member?.toString()} wynosi ${value.toFixed(
         2,
-      )} ${getEmojiForKarmaValue(value)}`,
-    );
+      )} ${getEmojiForKarmaValue(value)}`;
+    });
+
+    return msg.channel.send(messages.join('\n'));
   },
 };
 
 const karma: Command = {
   name: 'karma',
   description: 'Sprawdź ile kto ma pkt. karmy.',
-  args: false,
+  args: 'optional',
   async execute(msg) {
     const member = await msg.mentions.members?.first()?.fetch();
 
@@ -72,7 +85,7 @@ const karma: Command = {
         `${member.displayName} ma ${value.toFixed(2)} ${pkt} karmy ${getEmojiForKarmaValue(value)}`,
       );
     } else {
-      const agg = await getKarmaForMembers(db);
+      const agg = await getKarmaForAllMembers(db);
       const data = agg.filter((el): el is KarmaAgg => !!el);
       await Promise.allSettled(data.map(({ _id: memberId }) => msg.guild?.members.fetch(memberId)));
 

src/commands/link.ts

@@ -5,7 +5,7 @@ import type { Command } from '../types';
 const link: Command = {
   name: 'link',
   description: 'Wyświetla link do zapraszania.',
-  args: false,
+  args: 'prohibited',
   execute(msg: Discord.Message) {
     return msg.channel.send(`Link do zapraszania: https://discord.typeofweb.com/`);
   },

src/commands/m1.ts

@@ -3,7 +3,7 @@ import { Command } from '../types';
 const m1: Command = {
   name: 'm1',
   description: 'Apple silicon m1',
-  args: false,
+  args: 'prohibited',
   cooldown: 10,
   execute(msg) {
     return msg.channel.send([