Merge remote-tracking branch 'upstream/main'

.devcontainer/devcontainer.json

@@ -1,31 +1,30 @@
 {
-    "name": "Deno",
-    "dockerFile": "Dockerfile",
+  "name": "Deno",
+  "dockerFile": "Dockerfile",
 
-    // Set *default* container specific settings.json values on container create.
-    "settings": { 
-        "terminal.integrated.shell.linux": "/bin/bash",
-        "deno.enable": true,
-        "deno.lint": true,
-        "editor.defaultFormatter": "denoland.vscode-deno",
-        "editor.formatOnSave": true,
-        "editor.codeActionsOnSave": {
-            "source.organizeImports": true,
-            "source.fixAll": true
-        }
-    },
+  // Set *default* container specific settings.json values on container create.
+  "settings": {
+    "terminal.integrated.shell.linux": "/bin/bash",
+    "deno.enable": true,
+    "deno.lint": true,
+    "editor.defaultFormatter": "denoland.vscode-deno",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": true,
+      "source.fixAll": true
+    }
+  },
 
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": [
-        "denoland.vscode-deno"
-    ],
+  // Add the IDs of extensions you want installed when the container is created.
+  "extensions": [
+    "denoland.vscode-deno"
+  ]
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
 
-    // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    // "forwardPorts": [],
+  // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
+  // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
 
-    // Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
-    // "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
-
-    // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-    // "remoteUser": "vscode"
+  // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+  // "remoteUser": "vscode"
 }

.vscode/settings.json

@@ -1,10 +1,10 @@
 {
-    "deno.enable": true,
-    "deno.lint": true,
-    "editor.defaultFormatter": "denoland.vscode-deno",
-    "editor.formatOnSave": true,
-    "editor.codeActionsOnSave": {
-        "source.organizeImports": true,
-        "source.fixAll": true
-    }
+  "deno.enable": true,
+  "deno.lint": true,
+  "editor.defaultFormatter": "denoland.vscode-deno",
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true,
+    "source.fixAll": true
+  }
 }

docs/src/stepbystep/createlanguage.md

@@ -45,7 +45,7 @@ translations work properly now.
 
 ```json
 {
-	"DESCRIPTION": "Hug yourself or another user."
+  "DESCRIPTION": "Hug yourself or another user."
 }
 ```
 
@@ -58,9 +58,9 @@ add those in.
 
 ```json
 {
-	"DESCRIPTION": "Hug yourself or another user.",
-	"SELF": "If you had no one to hug you could have hugged me. Years from now, when you're thinking about me, you're gonna say: 'How did I ever get along without that wonderful, constant companion?' *Woof.*",
-	"OTHER": "{{user}} was hugged by {{mention}}"
+  "DESCRIPTION": "Hug yourself or another user.",
+  "SELF": "If you had no one to hug you could have hugged me. Years from now, when you're thinking about me, you're gonna say: 'How did I ever get along without that wonderful, constant companion?' *Woof.*",
+  "OTHER": "{{user}} was hugged by {{mention}}"
 }
 ```
 
@@ -127,9 +127,9 @@ example of different languages.
 
 ```json
 {
-	"DESCRIPTION": "Abrázate a ti mismo oa otro usuario",
-	"SELF": "Si no tuvieras a nadie a quien abrazar, podrías haberme abrazado. Años a partir de ahora, cuando estés pensando en mí, dirás: '¿Cómo me las arreglé sin esa maravillosa y constante compañera?' *Guau.*",
-	"OTHER": "{{user}} fue abrazado por {{mention}}"
+  "DESCRIPTION": "Abrázate a ti mismo oa otro usuario",
+  "SELF": "Si no tuvieras a nadie a quien abrazar, podrías haberme abrazado. Años a partir de ahora, cuando estés pensando en mí, dirás: '¿Cómo me las arreglé sin esa maravillosa y constante compañera?' *Guau.*",
+  "OTHER": "{{user}} fue abrazado por {{mention}}"
 }
 ```
 

test/mod.test.ts

@@ -1,10 +1,3 @@
-import {
-  deleteChannel,
-  deleteRole,
-  deleteServer,
-  getChannel,
-} from "../src/api/handlers/guild.ts";
-import { eventHandlers } from "../src/bot.ts";
 import {
   addReaction,
   assertEquals,
@@ -18,9 +11,13 @@ import {
   createGuildRole,
   createServer,
   delay,
+  deleteChannel,
   deleteMessageByID,
+  deleteRole,
+  deleteServer,
   editChannel,
   editRole,
+  getChannel,
   getMessage,
   getPins,
   Guild,
@@ -37,6 +34,7 @@ import {
 export const defaultTestOptions: Partial<Deno.TestDefinition> = {
   sanitizeOps: false,
   sanitizeResources: false,
+  sanitizeExit: false,
 };
 
 // Temporary data
@@ -340,9 +338,9 @@ Deno.test({
 
 // Forcefully exit the Deno process once all tests are done.
 Deno.test({
-  name: "[main] close the websocket connection",
+  name: "[main] exit the process forcefully",
   fn() {
-    closeWS();
+    Deno.exit();
   },
   ...defaultTestOptions,
 });