Merge branch 'master' of https://github.com/PolyMC/bot

package.json

@@ -3,29 +3,27 @@
   "version": "1.0.0",
   "license": "MIT",
   "scripts": {
-    "dev": "NODE_ENV=development nodemon --ext ts,json --watch src --exec esno src/index.ts",
+    "dev": "NODE_ENV=development tsx watch src/index.ts",
-    "start": "esno src/index.ts",
+    "start": "tsx src/index.ts",
     "lint": "eslint **/*.ts"
   },
   "dependencies": {
     "@cliqz/adblocker": "^1.23.8",
     "discord-command-parser": "^1.5.3",
-    "discord.js": "^13.7.0",
+    "discord.js": "^13.8.0",
-    "dotenv": "^16.0.1",
     "kleur": "^4.1.4",
-    "node-fetch": "^3.2.4",
+    "node-fetch": "^3.2.5",
     "remove-markdown": "^0.5.0",
+    "tsx": "^3.4.2",
     "url-regex": "^5.0.0"
   },
   "devDependencies": {
-    "@esbuild-plugins/node-resolve": "^0.1.4",
+    "@types/node": "^17.0.41",
-    "@types/node": "^17.0.38",
+    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
+    "@typescript-eslint/parser": "^5.27.1",
-    "@typescript-eslint/parser": "^5.25.0",
+    "dotenv": "^16.0.1",
-    "esbuild": "^0.14.39",
+    "esbuild": "^0.14.43",
-    "eslint": "^8.16.0",
+    "eslint": "^8.17.0",
-    "esno": "^0.16.3",
-    "nodemon": "^2.0.16",
     "prettier": "^2.6.2",
     "typescript": "^4.6.4"
   }

src/commands/help.ts

@@ -30,6 +30,6 @@ export const cmd: Command = {
       embed.addField('!' + cmd.name, resp.join('\n'));
     }
 
-    return e.reply({ embeds: [embed] });
+    await e.reply({ embeds: [embed] });
   },
 };

src/commands/members.ts

@@ -8,7 +8,7 @@ export const cmd: Command = {
     const memes = await e.guild?.members.fetch().then((r) => r.toJSON());
     if (!memes) return;
 
-    return e.reply({
+    await e.reply({
       embeds: [
         {
           title: `${memes.length} total members!`,

src/commands/ping.ts

@@ -5,6 +5,6 @@ export const cmd: Command = {
   desc: 'Shows the ping of the bot',
   aliases: ['test'],
   exec: async (e) => {
-    return await e.reply(`${e.client.ws.ping}ms`);
+    await e.reply(`${e.client.ws.ping}ms`);
   },
 };

src/commands/stars.ts

@@ -8,7 +8,7 @@ export const cmd: Command = {
     const count = await fetch('https://api.github.com/repos/PolyMC/PolyMC')
       .then((r) => r.json() as Promise<{ stargazers_count: number }>)
       .then((j) => j.stargazers_count);
-    return e.reply({
+    await e.reply({
       embeds: [
         {
           title: `⭐ ${count} total stars!`,

src/commands/tags.ts

@@ -22,6 +22,6 @@ export const cmd: Command = {
       }
       em.addField(tag.name, text);
     }
-    return e.reply({ embeds: [em] });
+    await e.reply({ embeds: [em] });
   },
 };

src/index.ts

@@ -25,7 +25,7 @@ export interface Command {
   exec(
     m: Message,
     p: SuccessfulParsedMessage<Message<boolean>>
-  ): Promise<Message> | Promise<any> | any;
+  ): Promise<void> | void;
 }
 
 type Commands = Array<Command>;
@@ -80,7 +80,7 @@ client.once('ready', async () => {
     )
   );
 
-  const POLYMC_GUILD = await client.guilds.fetch(BuildConfig.GUILD_ID);
+  // const POLYMC_GUILD = await client.guilds.fetch(BuildConfig.GUILD_ID);
 
   client.on('messageCreate', async (e) => {
     if (!e.content) return;

src/tags.json

@@ -2,7 +2,7 @@
   {
     "name": "migrate",
     "text": "https://polymc.org/wiki/getting-started/migrating-multimc/",
-    "aliases": ["migr", "mmc"]
+    "aliases": ["migr", "mmc", "multimc"]
   },
   {
     "name": "thematrix",
@@ -10,12 +10,12 @@
   },
   {
     "name": "log",
-    "aliases": ["sendlog", "log"],
+    "aliases": ["sendlog", "logs"],
     "text": "Please send logs: https://cdn.discordapp.com/attachments/981957331430539267/983680253367058452/1.png https://cdn.discordapp.com/attachments/981957331430539267/983680253715165234/2.png"
   },
   {
     "name": "optifine",
-    "aliases": ["of", "optimize"],
+    "aliases": ["of", "optimize", "opticrap", "notfine"],
     "embed": {
       "color": "DARK_GREEN",
       "title": "OptiFine",
@@ -64,7 +64,13 @@
   },
   {
     "name": "eta",
-    "text": "Sometime"
+    "text": "Sometime",
+    "aliases": ["wen", "when"]
+  },
+  {
+    "name": "why",
+    "text": "https://polymc.org/wiki/overview/faq/#why-did-our-community-choose-to-fork https://polymc.org/news/moving-on/",
+    "aliases": ["whywaspolymcmade", "mmcdrama", "devlauncher"]
   },
   {
     "name": "curseforge",
@@ -73,7 +79,7 @@
       "description": "CurseForge added a new option to block third party clients like PolyMC from accessing mod files, and they started to enforce this option lately. We can't allow you to download those mods directly from PolyMC, but PolyMC 1.3.1 and higher have a workaround to let modpacks work: letting you to download those opted out mods manually. We highly encourage asking authors that opted out to stop doing so.",
       "color": "ORANGE"
     },
-    "aliases": ["cf", "curse", "cursed"]
+    "aliases": ["cf", "curse", "cursed", "cursedfrog"]
   },
   {
     "name": "piracy",