acmcsufoss · EthanThatOneKid · Apr 16, 2024 · Apr 15, 2024 · Apr 16, 2024
diff --git a/app_schema.ts b/app_schema.ts
@@ -1,44 +0,0 @@
-import * as discord from "discord-api-types";
-import type { AppSchema } from "discord-app";
-
-export const appSchema = {
-  chatInput: {
-    name: "shorter",
-    description: "Manage shortlinks.",
-    subcommands: {
-      add: {
-        description: "Add a shortlink.",
-        options: {
-          alias: {
-            type: discord.ApplicationCommandOptionType.String,
-            description: "The alias of the shortlink",
-            required: true,
-          },
-          destination: {
-            type: discord.ApplicationCommandOptionType.String,
-            description: "The destination of the shortlink",
-            required: true,
-          },
-          force: {
-            type: discord.ApplicationCommandOptionType.Boolean,
-            description: "Whether to overwrite an existing shortlink",
-          },
-          ttl: {
-            type: discord.ApplicationCommandOptionType.String,
-            description: "The time-to-live of the shortlink",
-          },
-        },
-      },
-      remove: {
-        description: "Remove a shortlink.",
-        options: {
-          alias: {
-            type: discord.ApplicationCommandOptionType.String,
-            description: "The alias of the shortlink",
-            required: true,
-          },
-        },
-      },
-    },
-  },
-} as const satisfies AppSchema;

diff --git a/deno.jsonc b/deno.jsonc
@@ -1,15 +1,13 @@
 {
   "tasks": {
-    "start": "deno run -A --unstable-kv main.ts",
+    "start": "deno run -A --unstable-kv --env main.ts",
     "ngrok": "ngrok http 8080"
   },
   "imports": {
-    "discord-api-types": "https://deno.land/x/[email protected]/v10.ts",
+    "@discord-applications/app": "jsr:@discord-applications/app@^0.0.4",
     "codemod": "https://deno.land/x/[email protected]/github/mod.ts",
     "durationjs": "https://deno.land/x/[email protected]/mod.ts",
-    "discord-app": "https://deno.land/x/[email protected]/mod.ts",
-    "tweetnacl": "npm:[email protected]",
-    "@std/dotenv": "jsr:@std/dotenv@^0.222.1",
-    "shorter/": "./"
+    "shorter/": "./",
+    "tweetnacl": "npm:[email protected]"
   }
 }
diff --git a/deno.lock b/deno.lock
diff --git a/env.ts b/env.ts
@@ -1,7 +1,3 @@
-import { load } from "@std/dotenv";
-
-await load({ export: true });
-
 /**
  * PORT is the port to listen on.
  */

diff --git a/lib/discord/discord_api_client.ts b/lib/discord/discord_api_client.ts
diff --git a/lib/discord/discord_api_client_interface.ts b/lib/discord/discord_api_client_interface.ts
diff --git a/lib/discord/mod.ts b/lib/discord/mod.ts
diff --git a/main.ts b/main.ts
@@ -1,9 +1,17 @@
-import * as discord from "discord-api-types";
 import { Duration } from "durationjs";
-import { createApp } from "discord-app";
+import type {
+  APIInteractionResponseDeferredChannelMessageWithSource,
+  AppSchema,
+} from "@discord-applications/app";
+import {
+  ApplicationCommandOptionType,
+  createApp,
+  DiscordAPI,
+  InteractionResponseType,
+  MessageFlags,
+} from "@discord-applications/app";
 import type { ShorterOptions } from "shorter/lib/shorter/mod.ts";
 import { shorter } from "shorter/lib/shorter/mod.ts";
-import { DiscordAPIClient } from "shorter/lib/discord/mod.ts";
 import {
   addTTLMessage,
   makeTTLMessageListener,
@@ -16,14 +24,59 @@ import {
   GITHUB_TOKEN,
   PORT,
 } from "shorter/env.ts";
-import { appSchema } from "./app_schema.ts";
 
 const INVITE_URL =
   `https://discord.com/api/oauth2/authorize?client_id=${DISCORD_CLIENT_ID}&scope=applications.commands`;
 const APPLICATION_URL =
   `https://discord.com/developers/applications/${DISCORD_CLIENT_ID}/bot`;
 
-const discordAPI = new DiscordAPIClient();
+const discordAPI = new DiscordAPI({
+  applicationID: DISCORD_CLIENT_ID,
+  token: DISCORD_TOKEN,
+  publicKey: DISCORD_PUBLIC_KEY,
+});
+
+export const shorterSchema = {
+  chatInput: {
+    name: "Shorter",
+    description: "Manage shortlinks.",
+    subcommands: {
+      add: {
+        description: "Add a shortlink.",
+        options: {
+          alias: {
+            type: ApplicationCommandOptionType.String,
+            description: "The alias of the shortlink",
+            required: true,
+          },
+          destination: {
+            type: ApplicationCommandOptionType.String,
+            description: "The destination of the shortlink",
+            required: true,
+          },
+          force: {
+            type: ApplicationCommandOptionType.Boolean,
+            description: "Whether to overwrite an existing shortlink",
+          },
+          ttl: {
+            type: ApplicationCommandOptionType.String,
+            description: "The time-to-live of the shortlink",
+          },
+        },
+      },
+      remove: {
+        description: "Remove a shortlink.",
+        options: {
+          alias: {
+            type: ApplicationCommandOptionType.String,
+            description: "The alias of the shortlink",
+            required: true,
+          },
+        },
+      },
+    },
+  },
+} as const satisfies AppSchema;
 
 if (import.meta.main) {
   await main();
@@ -41,12 +94,13 @@ export async function main() {
   });
 
   // Create the Discord application.
-  const handleInteraction = await createApp(
+  const shorterApp = await createApp(
     {
+      schema: shorterSchema,
       applicationID: DISCORD_CLIENT_ID,
       publicKey: DISCORD_PUBLIC_KEY,
-      register: { token: DISCORD_TOKEN },
-      schema: appSchema,
+      token: DISCORD_TOKEN,
+      register: true,
     },
     {
       add(interaction) {
@@ -58,9 +112,9 @@ export async function main() {
           !interaction.member.roles.some((role) => DISCORD_ROLE_ID === role)
         ) {
           return {
-            type: discord.InteractionResponseType.ChannelMessageWithSource,
+            type: InteractionResponseType.ChannelMessageWithSource,
             data: {
-              flags: discord.MessageFlags.Ephemeral,
+              flags: MessageFlags.Ephemeral,
               content: "You do not have permission to use this command.",
             },
           };
@@ -101,8 +155,6 @@ export async function main() {
 
             // Send the success message.
             await discordAPI.editOriginalInteractionResponse({
-              botID: DISCORD_CLIENT_ID,
-              botToken: DISCORD_TOKEN,
               interactionToken: interaction.token,
               content,
             });
@@ -124,8 +176,6 @@ export async function main() {
           .catch((error) => {
             if (error instanceof Error) {
               discordAPI.editOriginalInteractionResponse({
-                botID: DISCORD_CLIENT_ID,
-                botToken: DISCORD_TOKEN,
                 interactionToken: interaction.token,
                 content: `Error: ${error.message}`,
               });
@@ -136,9 +186,8 @@ export async function main() {
 
         // Acknowledge the interaction.
         return {
-          type:
-            discord.InteractionResponseType.DeferredChannelMessageWithSource,
-        } satisfies discord.APIInteractionResponseDeferredChannelMessageWithSource;
+          type: InteractionResponseType.DeferredChannelMessageWithSource,
+        } satisfies APIInteractionResponseDeferredChannelMessageWithSource;
       },
       remove(interaction) {
         if (!interaction.member?.user) {
@@ -149,9 +198,9 @@ export async function main() {
           !interaction.member.roles.some((role) => DISCORD_ROLE_ID === role)
         ) {
           return {
-            type: discord.InteractionResponseType.ChannelMessageWithSource,
+            type: InteractionResponseType.ChannelMessageWithSource,
             data: {
-              flags: discord.MessageFlags.Ephemeral,
+              flags: MessageFlags.Ephemeral,
               content: "You do not have permission to use this command.",
             },
           };
@@ -172,8 +221,6 @@ export async function main() {
           .then(async (result) => {
             // Send the success message.
             await discordAPI.editOriginalInteractionResponse({
-              botID: DISCORD_CLIENT_ID,
-              botToken: DISCORD_TOKEN,
               interactionToken: interaction.token,
               content:
                 `Removed \`${interaction.data.parsedOptions.alias}\` in commit [${result.message}](https://acmcsuf.com/code/commit/${result.sha}).`,
@@ -182,8 +229,6 @@ export async function main() {
           .catch((error) => {
             if (error instanceof Error) {
               discordAPI.editOriginalInteractionResponse({
-                botID: DISCORD_CLIENT_ID,
-                botToken: DISCORD_TOKEN,
                 interactionToken: interaction.token,
                 content: `Error: ${error.message}`,
               });
@@ -194,9 +239,8 @@ export async function main() {
 
         // Acknowledge the interaction.
         return {
-          type:
-            discord.InteractionResponseType.DeferredChannelMessageWithSource,
-        } satisfies discord.APIInteractionResponseDeferredChannelMessageWithSource;
+          type: InteractionResponseType.DeferredChannelMessageWithSource,
+        } satisfies APIInteractionResponseDeferredChannelMessageWithSource;
       },
     },
   );
@@ -213,7 +257,7 @@ export async function main() {
         console.log("Discord application information:", APPLICATION_URL);
       },
     },
-    handleInteraction,
+    shorterApp,
   );
 }