Some simple changes

.docker-compose.yml

@@ -0,0 +1,62 @@
+# You should configure the passwords/username's where expected
+services:
+  web: 
+    build: .
+    ports:
+      - "127.0.0.1:3000:3000" # Expected to be proxied via something like Nginx
+    restart: always
+    shm_size: 1024mb # Set 1gb default memory alloc. 1gb should be more than enough
+    depends_on:
+      - redis
+      - mongo
+    networks:
+      - mongo
+      - redis
+      - public
+
+  mongo:
+    image: mongo
+    restart: always
+    env_file: .env.production
+    networks:
+      - mongo
+    volumes:
+      - ./data/mongo:/data/db
+    healthcheck:
+      test: ["CMD", "echo 'db.runCommand(\"ping\").ok' | mongo mongo:27017/test --quiet"]
+      interval: 10s
+      timeout: 10s
+      retries: 5
+      start_period: 40s
+
+  mongo-express:
+    image: mongo-express
+    restart: always
+    env_file: .env.production
+    ports:
+      - "127.0.0.1:8081:8081" # Expected to be proxied by something like Nginx
+    networks:
+      - mongo
+    depends_on:
+      - mongo
+
+  redis:
+    restart: always
+    image: redis:7-alpine
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 10s
+      retries: 5
+      start_period: 40s
+    volumes:
+      - ./data/redis:/data
+    networks:
+      - redis
+
+networks:
+  mongo:
+    internal: true
+  redis:
+    internal: true
+  public:

.dockerignore

@@ -1,5 +1,5 @@
 .gitignore
 .gitattributes
-settings.json
 .git
-node_modules/
+node_modules/
+data/

.env.production.sample

@@ -0,0 +1,22 @@
+# This is a sample configuration file. You will need to copy this file
+# and fill in the appropriate values before attempting to run
+# this in a production environment! This is important!
+
+# This assumes usage of docker-compose.yml - this file is generally useless
+# otherwise, and you can, ignore it should you choose.
+
+# MongoDB
+# -----
+MONGO_INITDB_ROOT_USERNAME: del
+MONGO_INITDB_ROOT_PASSWORD: h@ckm3 # CHANGE ME
+
+# MongoDB-Express Admin Interface
+# -----
+ME_CONFIG_MONGODB_SERVER: mongo # Assumes mongo docker network
+ME_CONFIG_MONGODB_ENABLE_ADMIN: false
+ME_CONFIG_MONGODB_AUTH_USERNAME: del
+ME_CONFIG_MONGODB_AUTH_PASSWORD: h@ckm3
+ME_CONFIG_BASICAUTH_USERNAME: deluser
+ME_CONFIG_BASICAUTH_PASSWORD: h@ckm3
+ME_CONFIG_SITE_COOKIESECRET: 'cookiesecret' # CHANGE ME
+ME_CONFIG_SITE_SESSIONSECRET: 'sessionsecret' # CHANGE ME

.github/workflows/compile.yml

@@ -7,17 +7,16 @@ on:
   pull_request:
 
 jobs:
-  node14:
-    name: node v17 - tsc
+  node18:
+    name: node v18 - tsc
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: install node v17
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v3
+      - name: install node v18
+        uses: actions/setup-node@v3
         with:
-          node-version: 17
-      - name: install
-        run: npm install
+          node-version: 18
+          cache: 'npm'
       - name: dependencies
         run: npm ci
       - name: settings
@@ -26,5 +25,3 @@ jobs:
         uses: icrawl/action-tsc@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          job-name: tsc

.github/workflows/deploy.yml

@@ -7,7 +7,7 @@ jobs:
     build:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3
             - name: Login
               run: echo "${{secrets.DOCKER_PASSWORD}}" | docker login ${{secrets.DOCKER_URL}} -u admin --password-stdin
             - name: Build

.gitignore

@@ -111,6 +111,7 @@ dist
 .tern-port
 
 # SSL & configuration files
+.env.production
 settings.json
 .env
 ssl/

@types/del.d.ts

@@ -17,7 +17,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import type { UserFlags, APIChannel, APIRole, APIUser, APIApplicationCommand, RESTPostOAuth2AccessTokenResult, OAuth2Scopes, Snowflake } from 'discord-api-types/v10'
+import type { UserFlags, APIChannel, APIRole, APIUser, APIApplicationCommand, RESTPostOAuth2AccessTokenResult, OAuth2Scopes, Snowflake } from 'discord.js'
 
 declare global {
     interface authUser extends RESTPostOAuth2AccessTokenResult {
@@ -247,6 +247,11 @@ declare global {
             options: string;
             server: string;
         };
+        date?: {
+            submitted: number;
+            approved: number;
+            edited: number;
+        };
         status: {
             approved: boolean;
             premium: boolean;
@@ -257,6 +262,8 @@ declare global {
         };
     }
 
+    type partialBot = Partial<Omit<delBot, 'status'> & { status: Partial<delBot["status"]> }>;
+
     interface delServer {
         _id: Snowflake;
         inviteCode: string;

Dockerfile

@@ -1,9 +1,20 @@
-FROM node:17.9.0-alpine3.14
-WORKDIR /app
-RUN apk update && apk add git ca-certificates
-COPY . .
-RUN mv settings.example.json settings.json
+# syntax=docker/dockerfile:1.4
+# NOTE: You should have made a settings.json file before running docker compose.
+# Node v17 is EOL, Node v18 is current
+ARG NODE_VERSION="18.15.0-alpine3.16"
+FROM node:${NODE_VERSION}
+# Copy to-be-compiled files to container filesystem
+COPY . /opt/del
+# Set new working dir
+WORKDIR /opt/del
+# Run apt update & add needed packages
+RUN apk update && \
+    apk add git ca-certificates
+# Install node modules
 RUN npm ci --production
+# Compile new dist file
 RUN npx tsc-transpile-only
-RUN rm -rf src/ @types/ settings.json
+# Remove non-dist files
+RUN rm -rf src/ @types/ .env.production
+# Start the process within the container
 CMD ["npm", "start"]