Add 'yesno' command (#64)

* Add 'yesno' command

* Fixes

* Capitalize

Co-authored-by: Michal Miszczyszyn <[email protected]>

Author: Eghizio

package-lock.json

@@ -22,45 +22,45 @@
   "author": "Michał Miszczyszyn <[email protected]> (https://typeofweb.com/)",
   "license": "ISC",
   "dependencies": {
-    "bufferutil": "4.0.1",
+    "bufferutil": "4.0.3",
     "discord.js": "11.6.4",
     "discord.rss": "5.0.6",
     "dotenv": "8.2.0",
     "erlpack": "github:discordapp/erlpack",
     "isolated-vm": "3.3.7",
     "node-cache": "5.1.2",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.6.1",
     "polish-plurals": "1.1.0",
     "request": "2.88.2",
     "request-promise": "4.2.5",
-    "secure-json-parse": "2.1.0",
-    "typescript": "3.8.3",
-    "zlib-sync": "0.1.6"
+    "secure-json-parse": "2.4.0",
+    "typescript": "4.2.4",
+    "zlib-sync": "0.1.7"
   },
   "devDependencies": {
-    "@types/chai": "4.2.11",
-    "@types/chai-as-promised": "7.1.2",
+    "@types/chai": "4.2.16",
+    "@types/chai-as-promised": "7.1.3",
     "@types/dotenv": "8.2.0",
-    "@types/mocha": "7.0.2",
+    "@types/mocha": "8.2.2",
     "@types/nock": "11.1.0",
-    "@types/node": "13.13.4",
-    "@types/node-fetch": "2.5.7",
+    "@types/node": "12.20.10",
+    "@types/node-fetch": "2.5.10",
     "@types/secure-json-parse": "1.0.2",
-    "@types/sinon": "9.0.0",
-    "@types/sinon-chai": "3.2.4",
-    "chai": "4.2.0",
+    "@types/sinon": "10.0.0",
+    "@types/sinon-chai": "3.2.5",
+    "chai": "4.3.4",
     "chai-as-promised": "7.1.1",
     "husky": "4.2.5",
-    "mocha": "7.1.2",
-    "nock": "12.0.3",
-    "nyc": "15.0.1",
-    "prettier": "2.0.5",
-    "pretty-quick": "2.0.1",
-    "sinon": "9.0.2",
-    "sinon-chai": "3.5.0",
+    "mocha": "8.3.2",
+    "nock": "13.0.11",
+    "nyc": "15.1.0",
+    "prettier": "2.2.1",
+    "pretty-quick": "3.1.0",
+    "sinon": "10.0.0",
+    "sinon-chai": "3.6.0",
     "source-map-support": "0.5.19",
-    "ts-node": "8.9.1",
-    "tsc-watch": "4.2.3",
+    "ts-node": "9.1.1",
+    "tsc-watch": "4.2.9",
     "tslint": "6.1.1",
     "tslint-config-prettier": "1.18.0",
     "tslint-immutable": "6.0.1"

package.json

@@ -23,6 +23,7 @@ import typeofweb from './towarticle';
 import wiki from './wiki';
 import m1 from './m1';
 import skierowanie from './skierowanie';
+import yesno from './yesno';
 
 const COMMAND_PATTERN = new RegExp(getConfig('PREFIX') + '([a-z1-9]+)(?: (.*))?');
 
@@ -48,6 +49,7 @@ const allCommands = [
   typeofweb,
   wiki,
   skierowanie,
+  yesno,
 ];
 
 const cooldowns = new Discord.Collection<string, Discord.Collection<string, number>>();
@@ -155,12 +157,12 @@ export async function handleCommand(msg: Discord.Message) {
 
   await verifyCooldown(msg, command);
 
-  if (!command.args) {
+  if (command.args === false) {
     return command.execute(msg);
   }
 
   const args = rest ? rest.split(/\s+/g) : [];
-  if (!args.length) {
+  if (!args.length && command.args === true) {
     throw new InvalidUsageError(`nie podano argumentów!`);
   }
 

src/commands/index.ts

@@ -0,0 +1,39 @@
+import Discord from 'discord.js';
+import { Command } from '../types';
+import fetch from 'node-fetch';
+import { capitalizeFirst } from '../utils';
+
+const answerToColor = {
+  yes: '#5ab783',
+  no: '#e91e63',
+  maybe: '#eb8921',
+} as const;
+
+const yesno: Command = {
+  name: 'yesno',
+  description: 'Podejmie decyzję za ciebie',
+  args: 'optional',
+  async execute(msg, [force]) {
+    const url = ['yes', 'no', 'maybe'].includes(force)
+      ? `https://yesno.wtf/api?force=${force}`
+      : 'https://yesno.wtf/api';
+
+    const res = await fetch(url);
+    const { answer, image } = (await res.json()) as YesNoApiResponse;
+
+    const answerEmbed = new Discord.RichEmbed()
+      .setTitle(capitalizeFirst(answer))
+      .setImage(image)
+      .setColor(answerToColor[answer]);
+
+    return msg.channel.send(answerEmbed);
+  },
+};
+
+export default yesno;
+
+interface YesNoApiResponse {
+  answer: 'yes' | 'no' | 'maybe';
+  forced: boolean;
+  image: string;
+}

src/commands/yesno.ts

@@ -6,7 +6,6 @@ import { expect } from 'chai';
 import Sinon from 'sinon';
 import nock from 'nock';
 import Http from 'http';
-import { promisify } from 'util';
 import { AddressInfo } from 'net';
 import Discord from 'discord.js';
 import fetch from 'node-fetch';
@@ -72,7 +71,7 @@ describe('handleGithubWebhook - integration tests', () => {
     } as Discord.Client;
 
     httpServer = createHttpServer(discordClientMock, [], [], []);
-    await promisify(httpServer.listen.bind(httpServer))(0);
+    await new Promise<void>((resolve) => httpServer.listen(0, resolve));
 
     baseUrl = `http://localhost:${(httpServer.address() as AddressInfo).port}`;
   });

src/handle-github-webhook.spec.ts

@@ -9,7 +9,7 @@ interface CommandCommon {
 }
 
 type CommandWithArgs = {
-  args: true;
+  args: true | 'optional';
   execute(
     msg: Discord.Message,
     args: string[]

src/types.ts

@@ -6,3 +6,7 @@ export function randomizeArray<T>(arr: T[]) {
   }
   return array;
 }
+
+export function capitalizeFirst<T extends string>(str: T): Capitalize<T> {
+  return (str.charAt(0).toUpperCase() + str.slice(1)) as Capitalize<T>;
+}