illegitimate/illegitimate-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request illegitimate/illegitimate-bot!320
This commit is contained in:
Taken
2024-12-30 18:31:35 +00:00
parent 045251e717 6a11b05539
commit 8880fead56
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

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

14
.gitlab-ci.yml
View File

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

4
docker-compose.yml
View File

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

2
src/commands-contextmenu/congratsmessage.ts
View File

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

2
src/commands-contextmenu/resetnick.ts
View File

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

2
src/commands-contextmenu/updateuser.ts
View File

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