Squashed commit of the following:

commit 2267e77
Author: drklee3 <[email protected]>
Date:   Sun Apr 16 16:53:40 2023 -0700

    Make prune count required, sort before filtering

commit 28848b6
Author: drklee3 <[email protected]>
Date:   Sun Apr 16 15:37:26 2023 -0700

    Remove twilight-dispatch, keydb, rabbitmq, ory oathkeeper

commit 9e0c92c
Author: drklee3 <[email protected]>
Date:   Sun Apr 16 13:56:40 2023 -0700

    Escape notificiation search % chars

commit 3e73a81
Author: drklee3 <[email protected]>
Date:   Sun Apr 16 13:56:22 2023 -0700

    Add wip lookup

commit b25e777
Author: drklee3 <[email protected]>
Date:   Tue Apr 11 21:16:45 2023 -0700

    Update minor bugs

commit a73633b
Author: drklee3 <[email protected]>
Date:   Tue Apr 11 21:16:28 2023 -0700

    Add db stats task

commit 3c0fd11
Author: drklee3 <[email protected]>
Date:   Tue Apr 11 21:16:15 2023 -0700

    reason, roles: Delete ephemeral messages after 5s

commit db9e494
Author: drklee3 <[email protected]>
Date:   Tue Apr 11 21:15:35 2023 -0700

    Use actual port for metrics server log

commit 4a029d8
Author: drklee3 <[email protected]>
Date:   Tue Apr 11 21:15:17 2023 -0700

    Update levelhandler to use kysely

commit b93c549
Author: drklee3 <[email protected]>
Date:   Sun Apr 9 21:38:50 2023 -0700

    Remove level role apply

commit 3fd2ddb
Author: drklee3 <[email protected]>
Date:   Sun Apr 9 20:21:26 2023 -0700

    Remove catchApiError func

commit 20e89b3
Author: drklee3 <[email protected]>
Date:   Sun Apr 9 17:36:23 2023 -0700

    Add keysly pg client

commit d9c2f5d
Author: drklee3 <[email protected]>
Date:   Fri Apr 7 21:56:26 2023 -0700

    Fix rest command registration

commit bd8de44
Author: drklee3 <[email protected]>
Date:   Wed Apr 5 20:09:23 2023 -0700

    Remove legacy rest usage

commit 0b20665
Author: drklee3 <[email protected]>
Date:   Tue Apr 4 21:09:19 2023 -0700

    Update remaining classes

commit 8b1be95
Author: drklee3 <[email protected]>
Date:   Tue Apr 4 21:03:48 2023 -0700

    Update legacy mod log notifier

commit 81d2b8a
Author: drklee3 <[email protected]>
Date:   Tue Apr 4 20:54:54 2023 -0700

    Remove extra discord deps

commit 31b339e
Author: drklee3 <[email protected]>
Date:   Tue Apr 4 20:52:21 2023 -0700

    Update deps, remove discordjs/builders

commit a7e870b
Author: drklee3 <[email protected]>
Date:   Tue Apr 4 20:01:19 2023 -0700

    Update event handlers to Discord.js

commit e04abed
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 18:46:48 2023 -0700

    Remove resolver

commit 8df12bf
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 18:46:28 2023 -0700

    Update userinfo

commit e285e77
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 18:41:23 2023 -0700

    Update xp

commit a911a1f
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 18:33:15 2023 -0700

    Update tags

commit 3c989ae
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 18:14:17 2023 -0700

    Update settings

commit ba8b79c
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 17:12:15 2023 -0700

    Update roles

commit 5da17a6
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 16:49:43 2023 -0700

    Update user commands

commit c07d77b
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 16:31:47 2023 -0700

    Update userinfo service'

commit a1050de
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 16:05:32 2023 -0700

    Update catchApiError to not use callback func

commit 595bde4
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 15:54:06 2023 -0700

    Update error response funcs to accept more interaction types

commit d6fb219
Author: drklee3 <[email protected]>
Date:   Fri Mar 24 15:53:40 2023 -0700

    Update lookup handler to use Discord.js

commit ff77023
Author: drklee3 <[email protected]>
Date:   Thu Mar 23 21:51:02 2023 -0700

    Update reason commands to Discord.js

commit dafaa0d
Author: drklee3 <[email protected]>
Date:   Thu Mar 23 21:13:43 2023 -0700

    Remove amqp client

commit 5582096
Author: drklee3 <[email protected]>
Date:   Thu Mar 23 21:08:34 2023 -0700

    Update reminders to Discord.js

commit 92996fa
Author: drklee3 <[email protected]>
Date:   Thu Mar 23 20:54:10 2023 -0700

    Update notifications to Discord.js

commit 0f003bb
Author: drklee3 <[email protected]>
Date:   Thu Mar 23 20:46:38 2023 -0700

    Update ping to Discord.js

commit 1cdf446
Author: drklee3 <[email protected]>
Date:   Thu Mar 23 20:46:21 2023 -0700

    Update moderation commands to Discord.js

commit c20364e
Author: drklee3 <[email protected]>
Date:   Thu Mar 23 18:08:14 2023 -0700

    Update moderation exec to use discord.js

commit 73daaa8
Author: drklee3 <[email protected]>
Date:   Wed Mar 22 21:43:50 2023 -0700

    Update ModActionData to use Discord.js

commit e9ef847
Author: drklee3 <[email protected]>
Date:   Wed Mar 22 21:20:22 2023 -0700

    Update client and parent handler classes to use discord.js

commit f7500ff
Author: drklee3 <[email protected]>
Date:   Wed Mar 22 19:52:50 2023 -0700

    Add discord.js client, update config to use zod

Author: drklee3

.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

@@ -1,2 +1,7 @@
-yarnPath: ".yarn/releases/yarn-berry.cjs"
-nodeLinker: "node-modules"
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-berry.cjs

.yarnrc.yml

@@ -13,17 +13,16 @@ services:
         restart: unless-stopped
         environment:
             - NODE_ENV=production
+            - DISCORD_TOKEN=$DISCORD_TOKEN
+            - DATABASE_URL=$DATABASE_URL
             - SUSHII_GRAPHQL_TOKEN=$SUSHII_GRAPHQL_TOKEN
             - SENTRY_DSN=$SENTRY_DSN
-            - DISCORD_TOKEN=$DISCORD_TOKEN
             # sushiiDev application ID, different from bot user id
             - APPLICATION_ID=193163942502072320
             # No per guild commands
             # - GUILD_ID=167058919611564043,418504865543749642
             - SUSHII_GRAPHQL_URL=http://sushii_data:8080/graphql
             - SUSHII_GRAPHQL_WS_URL=ws://sushii_data:8080/graphql
-            - AMQP_URL=amqp://rabbitmq:5672
-            - AMQP_QUEUE_NAME=gateway.recv
             - TWILIGHT_PROXY_URL=http://twilight-http-proxy:80/api
             - SUSHII_IMAGE_SERVER_URL=http://sushii-image-server:3000
         networks:
@@ -45,23 +44,6 @@ services:
             - sushii_net
         labels:
             - "traefik.enable=false"
-    oathkeeper:
-        image: oryd/oathkeeper:v0.38
-        restart: unless-stopped
-        command: serve --config=/etc/config/oathkeeper/config.yaml
-        ports:
-            - "4455:4455"
-            - "4456:4456"
-        environment:
-            - TRACING_PROVIDER=jaeger
-            - TRACING_PROVIDER_JAEGER_SAMPLING_SERVER_URL=http://jaeger:5778/sampling
-            - TRACING_PROVIDER_JAEGER_LOCAL_AGENT_ADDRESS=jaeger:6831
-            - TRACING_PROVIDER_JAEGER_SAMPLING_TYPE=const
-            - TRACING_PROVIDER_JAEGER_SAMPLING_VALUE=1
-        volumes:
-            - ./ory/oathkeeper:/etc/config/oathkeeper
-        networks:
-            - sushii_net
     jaeger:
         image: jaegertracing/all-in-one
         restart: unless-stopped
@@ -89,84 +71,6 @@ services:
             - sushii_net
         labels:
             - "traefik.enable=false"
-    twilight-dispatch:
-        image: chamburr/twilight-dispatch:0.4.3
-        restart: unless-stopped
-        expose:
-            - "8005" # prometheus
-        environment:
-            - RUST_LOG=info
-            - BOT_TOKEN=$DISCORD_TOKEN
-            - SHARDS_START=0
-            - SHARDS_END=2
-            - SHARDS_TOTAL=3
-            - SHARDS_CONCURRENCY=1
-            - SHARDS_WAIT=6
-            - CLUSTERS=1
-            - DEFAULT_QUEUE=true
-            - RESUME=true
-            - INTENTS=37391
-            - LARGE_THRESHOLD=250
-            - STATUS=online
-            - ACTIVITY_TYPE=0
-            - ACTIVITY_NAME=sushii.xyz
-            # Discord channel logs
-            - LOG_CHANNEL=749822555019280434
-            - LOG_GUILD_CHANNEL=749822555019280434
-            - STATE_ENABLED=true
-            - STATE_MEMBER=true
-            - STATE_MEMBER_TTL=60000
-            - STATE_MESSAGE=true
-            - STATE_MESSAGE_TTL=60000
-            - STATE_PRESENCE=false
-            - STATE_EMOJI=true
-            - STATE_VOICE=false
-            - STATE_OLD=false
-            - RABBIT_HOST=rabbitmq
-            - RABBIT_PORT=5672
-            - RABBIT_USERNAME=guest
-            - RABBIT_PASSWORD=guest
-            - REDIS_HOST=keydb
-            - REDIS_PORT=6379
-            - PROMETHEUS_HOST=127.0.0.1
-            - PROMETHEUS_PORT=8005
-        networks:
-            - sushii_net
-        labels:
-            - "traefik.enable=false"
-    rabbitmq:
-        image: rabbitmq:3-management
-        container_name: rabbitmq
-        restart: unless-stopped
-        logging:
-            options:
-                max-size: "10m"
-                max-file: "3"
-        expose:
-            - "5672"
-            - "15672"
-        env_file:
-            # user/pass
-            - .rabbitmq.env
-        networks:
-            - sushii_net
-        labels:
-            - "traefik.docker.network=sushii-2_web"
-            - "traefik.http.services.rabbitmq.loadbalancer.server.port=15672"
-            - "traefik.http.routers.rabbitmq.rule=Host(`rabbit.sushii.xyz`)"
-            - "traefik.http.routers.rabbitmq.entrypoints=secure"
-            - "traefik.http.routers.rabbitmq.tls.certresolver=acme"
-            - "traefik.http.routers.rabbitmq.middlewares=auth@file"
-    keydb:
-        image: eqalpha/keydb:x86_64_v6.3.1
-        container_name: sushii-keydb
-        restart: unless-stopped
-        expose:
-            - "6379"
-        networks:
-            - sushii_net
-        labels:
-            - "traefik.enable=false"
     shlink:
         image: shlinkio/shlink:stable
         container_name: shlink

docker-compose.yml

@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAAUxI31bMoFtD3N/T/LEvTttRkegZ
+O0tq34PyGRCe37cYk+ZW+d9DIib4AaE36k2wIrOZkRzjbcT2/s/fJZeyjSUAnxOd
+tcMdDhSeJz3ENui59djkAXp9/TU+n1AvrXKtdb67uxmGlC9+F+R6eiLXRAmNVh+u
+yTouMc8NBfsi8d2GdfQ=
+-----END PUBLIC KEY-----

id_ecdsa.ci.pub.pem

@@ -19,7 +19,7 @@ module.exports = {
     "@typescript-eslint",
   ],
   rules: {
-    "quotes": ["error", "double"],
+    "quotes": ["error", "double", { "avoidEscape": true }],
     "consistent-return": "off",
     "default-case": "off",
     "@typescript-eslint/explicit-function-return-type": "error",

packages/sushii-worker/.eslintrc.js

@@ -96425,15 +96425,15 @@
       },
       {
         "name": "specifiedBy",
-        "description": "Exposes a URL that specifies the behavior of this scalar.",
+        "description": "Exposes a URL that specifies the behaviour of this scalar.",
         "isRepeatable": false,
         "locations": [
           "SCALAR"
         ],
         "args": [
           {
             "name": "url",
-            "description": "The URL that specifies the behavior of this scalar.",
+            "description": "The URL that specifies the behaviour of this scalar.",
             "type": {
               "kind": "NON_NULL",
               "name": null,

packages/sushii-worker/graphql.schema.json

@@ -7,13 +7,11 @@
     "test": "jest",
     "build": "tsc --skipLibCheck",
     "build:graphql": "graphql-codegen --config codegen.yml",
+    "codegen:pg": "kysely-codegen --out-file ./src/model/dbTypes.ts",
     "dev": "ts-node src/index.ts | pino-pretty -c -t"
   },
   "dependencies": {
     "@cloudamqp/amqp-client": "^2.1.0",
-    "@discordjs/builders": "^1.4.0",
-    "@discordjs/collection": "^0.5.0",
-    "@discordjs/rest": "^0.3.0",
     "@godaddy/terminus": "^4.11.1",
     "@opentelemetry/auto-instrumentations-node": "^0.32.1",
     "@opentelemetry/exporter-trace-otlp-http": "^0.33.0",
@@ -28,27 +26,32 @@
     "cron": "^2.1.0",
     "dayjs": "^1.10.7",
     "discord-api-types": "next",
-    "discord.js": "^14.5.0",
+    "discord.js": "^14.9.0",
     "dotenv": "^16.0.0",
     "express": "^4.18.1",
-    "graphql": "^16.3.0",
-    "graphql-request": "^5.0.0",
+    "graphql": "^16.6.0",
+    "graphql-request": "5.1.0",
     "graphql-tag": "^2.12.6",
     "graphql-ws": "^5.11.2",
     "i18next": "^21.6.13",
     "i18next-fs-backend": "^1.1.4",
+    "kysely": "^0.24.2",
+    "kysely-codegen": "^0.10.0",
     "node-fetch": "2.6.7",
     "parse-duration": "^1.0.2",
     "path-to-regexp": "^6.2.1",
+    "pg": "^8.10.0",
+    "pg-cursor": "^2.9.0",
     "pino": "^7.8.0",
     "prom-client": "^14.0.1",
     "ts-results": "^3.3.0",
-    "ws": "^8.11.0"
+    "ws": "^8.11.0",
+    "zod": "^3.21.4"
   },
   "devDependencies": {
     "@babel/core": "^7.17.10",
     "@babel/preset-typescript": "^7.16.7",
-    "@graphql-codegen/cli": "2.6.2",
+    "@graphql-codegen/cli": "^3.3.0",
     "@graphql-codegen/introspection": "2.1.1",
     "@graphql-codegen/typescript": "2.4.8",
     "@graphql-codegen/typescript-generic-sdk": "^3.0.4",
@@ -60,6 +63,7 @@
     "@types/jest": "^27.4.1",
     "@types/node": "^17.0.18",
     "@types/node-fetch": "^2.6.2",
+    "@types/pg-cursor": "^2.7.0",
     "@typescript-eslint/eslint-plugin": "^5.12.0",
     "@typescript-eslint/parser": "^5.12.0",
     "eslint": "^8.9.0",