wip

Author: typeofweb

package.json

@@ -23,6 +23,7 @@
   "author": "Michał Miszczyszyn <[email protected]> (https://typeofweb.com/)",
   "license": "AGPL",
   "dependencies": {
+    "@discordjs/rest": "1.1.0",
     "@types/bluebird": "3.5.36",
     "algoliasearch": "4.14.2",
     "bluebird": "3.7.2",

src/app.ts

@@ -1,9 +1,9 @@
-import Discord, { GatewayIntentBits } from 'discord.js';
+import Discord, { GatewayIntentBits, REST, Routes, SlashCommandBuilder } from 'discord.js';
 import MonitoRSS from 'monitorss';
 import type { ClientConfig } from 'monitorss';
 import Cache from 'node-cache';
 
-import { handleCommand } from './commands';
+import { handleCommand, handleSlashCommand, legacyCommandsToSlashCommands } from './commands';
 import { KARMA_REGEX } from './commands/karma';
 import { messageToReflinks } from './commands/reflink';
 import { getConfig } from './config';
@@ -81,6 +81,16 @@ function isCommand(msg: Discord.Message) {
   return msg.content.startsWith(getConfig('PREFIX')) || KARMA_REGEX.test(msg.content);
 }
 
+client.on('interactionCreate', async (interaction) => {
+  if (!interaction.isChatInputCommand()) return;
+
+  try {
+    await handleSlashCommand(interaction);
+  } catch (err) {
+    console.error(err);
+  }
+});
+
 // const ROLE_MUTED_NAME = 'muted' as const;
 // const MAX_MENTIONS_PER_MESSAGE = 10;
 
@@ -190,11 +200,25 @@ client.on('messageDelete', async (msg) => {
 });
 
 async function init() {
+  const rest = new REST({ version: '10' }).setToken(getConfig('DISCORD_BOT_TOKEN'));
+
+  const TYPE_OF_WEB_GUILD_ID = '440163731704643589';
+
+  try {
+    await rest.put(
+      Routes.applicationGuildCommands(getConfig('DISCORD_CLIENT_ID'), TYPE_OF_WEB_GUILD_ID),
+      {
+        body: legacyCommandsToSlashCommands(),
+      },
+    );
+  } catch (err) {
+    console.error(err);
+  }
+
   await client.login(getConfig('DISCORD_BOT_TOKEN'));
 
   // Auto assign roles
   {
-    const TYPE_OF_WEB_GUILD_ID = '440163731704643589';
     const guild = await client.guilds.fetch(TYPE_OF_WEB_GUILD_ID);
     void updateRoles(guild);
     setInterval(() => {

src/commands/index.ts

@@ -1,4 +1,4 @@
-import Discord from 'discord.js';
+import Discord, { SlashCommandBuilder } from 'discord.js';
 import type { PermissionsString } from 'discord.js';
 
 import { getConfig } from '../config';
@@ -143,26 +143,80 @@ function printHelp(msg: Discord.Message, member: Discord.GuildMember) {
     });
 }
 
+export const legacyCommandsToSlashCommands = () => {
+  return allCommands
+    .filter((legacyCommand) => legacyCommand.name)
+    .map((legacyCommand) => {
+      const slashCommand = new SlashCommandBuilder()
+        .setName(legacyCommand.name)
+        .setDescription(legacyCommand.description.slice(0, 100));
+
+      if (legacyCommand.args === 'optional') {
+        slashCommand.addStringOption((option) =>
+          option.setName('arg').setDescription('arg').setRequired(false),
+        );
+      }
+      if (legacyCommand.args === 'required') {
+        slashCommand.addStringOption((option) =>
+          option.setName('arg').setDescription('arg').setRequired(true),
+        );
+      }
+
+      return slashCommand;
+    })
+    .map((c) => c.toJSON());
+};
+
+export const handleSlashCommand = async (
+  interaction: Discord.ChatInputCommandInteraction<Discord.CacheType>,
+) => {
+  if (!interaction.isChatInputCommand()) {
+    return;
+  }
+
+  try {
+    const content = `${getConfig('PREFIX')}${interaction.commandName} ${
+      interaction.options.getString('arg') ?? ''
+    }`.trim();
+    // @ts-ignore
+    interaction.content = content;
+    // @ts-ignore
+    interaction.author = interaction.user;
+    // @ts-ignore
+    interaction.channel.send = interaction.reply.bind(interaction);
+    // @ts-ignore
+    await handleCommand(interaction);
+  } catch (err) {
+    console.error(err);
+  }
+};
+
 export function handleCommand(msg: Discord.Message) {
+  console.log(1);
   if (!msg.guild) {
     return undefined;
   }
 
+  console.log(2);
   if (KARMA_REGEX.test(msg.content)) {
     return processCommand(msg, addKarma, null);
   }
+  console.log(3);
 
   const [, maybeCommand, rest] = COMMAND_PATTERN.exec(msg.content) || [null, null, null];
 
+  console.log(4, msg.content);
   if (maybeCommand === 'help') {
     const member = msg.guild.members.cache.get(msg.author.id);
     if (member) {
       return printHelp(msg, member);
     }
   }
 
+  console.log(5);
   const command = allCommands.find((c) => maybeCommand === c.name);
 
+  console.log(6, command, maybeCommand);
   if (!command || !maybeCommand) {
     return undefined;
   }
@@ -171,30 +225,40 @@ export function handleCommand(msg: Discord.Message) {
 }
 
 async function processCommand(msg: Discord.Message, command: Command, rest: string | null) {
+  console.log(10);
+  console.log(msg.guild);
   const member = msg.guild?.members.cache.get(msg.author.id);
 
+  console.log(11);
   if (!member || (command.permissions && !member.permissions.has(command.permissions))) {
     return undefined; // silence is golden
   }
 
+  console.log(12);
   await msg.channel.sendTyping();
 
+  console.log(13);
   if (command.guildOnly && msg.channel.type !== Discord.ChannelType.GuildText) {
     throw new InvalidUsageError(`to polecenie można wywołać tylko na kanałach.`);
   }
 
+  console.log(14);
   verifyCooldown(msg, command);
   const args = rest ? rest.split(/\s+/g) : [];
 
+  console.log(15);
   if (command.args === 'optional') {
     return command.execute(msg, args);
   }
+  console.log(16);
   if (!args.length && command.args === 'required') {
     throw new InvalidUsageError(`nie podano argumentów!`);
   }
+  console.log(17);
   if (args.length && command.args === 'prohibited') {
     throw new InvalidUsageError(`argumenty niedozwolone!`);
   }
 
+  console.log(18);
   return command.execute(msg, args);
 }

tsconfig.json

@@ -5,19 +5,19 @@
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
     "experimentalDecorators": true,
-    "lib": ["es2021"],
+    "lib": ["es2022"],
     "module": "commonjs",
     "noFallthroughCasesInSwitch": true,
     "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
     "outDir": "dist",
     "resolveJsonModule": true,
     "rootDir": ".",
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "target": "es2019",
+    "target": "es2022",
     "typeRoots": ["./node_modules/@types", "./typings"]
   },
   "exclude": ["dist"]

yarn.lock

@@ -341,7 +341,7 @@
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-"@discordjs/rest@^1.1.0":
+"@discordjs/rest@1.1.0", "@discordjs/rest@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.1.0.tgz#5c283571a22b911ca334316245487af40baffe8b"
   integrity sha512-yCrthRTQeUyNThQEpCk7bvQJlwQmz6kU0tf3dcWBv2WX3Bncl41x7Wc+v5b5OsIxfNYq38PvVtWircu9jtYZug==