Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!320

.dockerignore

@@ -3,7 +3,6 @@
 .vscode
 dev
 dist
-old
 node_modules
 scripts
 .dockerignore

.gitlab-ci.yml

@@ -3,10 +3,8 @@ merge:
   stage: test
   services:
     - docker:dind
-  variables:
-    DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   script:
-    - docker build -t "$DOCKER_IMAGE_NAME" .
+    - docker build -t "$CI_REGISTRY_IMAGE:merge-request" .
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
 
@@ -15,14 +13,16 @@ build:
   stage: build
   services:
     - docker:dind
-  variables:
-    DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
     - |
-        docker build -t "$DOCKER_IMAGE_NAME" .
-        docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:main"
+        docker build -t "illegitimate" .
+
+        docker tag "illegitimate" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
+        docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
+
+        docker tag "illegitimate" "$CI_REGISTRY_IMAGE:main"
         docker push "$CI_REGISTRY_IMAGE:main"
   rules:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'

docker-compose.yml

@@ -4,8 +4,6 @@ services:
     container_name: illegitimate
     image: registry.gitlab.com/illegitimate/illegitimate-bot:main
     restart: unless-stopped
-    logging:
-      driver: journald
     environment:
       - TOKEN=${TOKEN}
       - MONGOURI=${MONGOURI}
@@ -20,8 +18,6 @@ services:
     container_name: illegitimate-postgres
     image: postgres:16.4
     restart: unless-stopped
-    logging:
-      driver: journald
     volumes:
       - ${DB_PATH}:/var/lib/postgresql/data
     ports:

src/commands-contextmenu/congratsmessage.ts

@@ -8,7 +8,7 @@ export default {
 
     data: new ContextMenuCommandBuilder()
         .setName("Congratulate")
-        // @ts-ignore: known issue
+        // @ts-expect-error: known issue with d.js
         .setType(ApplicationCommandType.Message)
         .setContexts(InteractionContextType.Guild)
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageMessages),

src/commands-contextmenu/resetnick.ts

@@ -8,7 +8,7 @@ export default {
 
     data: new ContextMenuCommandBuilder()
         .setName("Reset Nickname")
-        // @ts-ignore: known issue
+        // @ts-expect-error: known issue with d.js
         .setType(ApplicationCommandType.User)
         .setContexts(InteractionContextType.Guild)
         .setDefaultMemberPermissions(PermissionFlagsBits.ManageNicknames),

src/commands-contextmenu/updateuser.ts

@@ -14,7 +14,7 @@ export default {
 
     data: new ContextMenuCommandBuilder()
         .setName("Update User")
-        // @ts-ignore: known issue
+        // @ts-expect-error: known issue with d.js
         .setType(ApplicationCommandType.User)
         .setContexts(InteractionContextType.Guild)
         .setDefaultMemberPermissions(PermissionFlagsBits.Administrator),