From a0aed1bd3b3ebb3cde13ec57a3db0b4d62577f10 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Sun, 29 Dec 2024 20:29:49 +0100
Subject: [PATCH 1/4] Updated dockerignore

---
 .dockerignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index dac731a..6b1cd91 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,7 +3,6 @@
 .vscode
 dev
 dist
-old
 node_modules
 scripts
 .dockerignore

From 25ddb1bf2609b49da18ff38042a4af1672bf96bc Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Mon, 30 Dec 2024 10:34:41 +0100
Subject: [PATCH 2/4] Removed the journald driver

---
 docker-compose.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1777846..7603f3f 100644
--- a/docker-compose.yml
+++ b/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:

From 4c247e0fb0898435623fb9cc224cfb18f887a30a Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Mon, 30 Dec 2024 10:58:41 +0100
Subject: [PATCH 3/4] Chnaged comment

---
 src/commands-contextmenu/congratsmessage.ts | 2 +-
 src/commands-contextmenu/resetnick.ts       | 2 +-
 src/commands-contextmenu/updateuser.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands-contextmenu/congratsmessage.ts b/src/commands-contextmenu/congratsmessage.ts
index 4c922f6..a53dcfa 100644
--- a/src/commands-contextmenu/congratsmessage.ts
+++ b/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),
diff --git a/src/commands-contextmenu/resetnick.ts b/src/commands-contextmenu/resetnick.ts
index aaa6ff2..2fa9484 100644
--- a/src/commands-contextmenu/resetnick.ts
+++ b/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),
diff --git a/src/commands-contextmenu/updateuser.ts b/src/commands-contextmenu/updateuser.ts
index b297e02..6533170 100644
--- a/src/commands-contextmenu/updateuser.ts
+++ b/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),

From 6a11b055398c6dce5ae8003cfc47c2ddca61bfe7 Mon Sep 17 00:00:00 2001
From: Taken <taken@mairimashita.org>
Date: Mon, 30 Dec 2024 19:29:24 +0100
Subject: [PATCH 4/4] Updated gitlab ci file

---
 .gitlab-ci.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 185612b..047bbbd 100644
--- a/.gitlab-ci.yml
+++ b/.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'