![](\"https://img.shields.io/github/all-contributors/discord-tickets/bot?color=ee8449&style=flat-square\"alt=\"All)
\n\n",
"contributors": [
{
"login": "eartharoid",
diff --git a/.commitlintrc.js b/.commitlintrc.js
new file mode 100644
index 0000000..3d88028
--- /dev/null
+++ b/.commitlintrc.js
@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };
\ No newline at end of file
diff --git a/.dockerignore b/.dockerignore
index b512c09..cbeb323 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,19 @@
-node_modules
\ No newline at end of file
+# only db, scripts, src, and user directories are needed
+.github
+.husky
+.vscode
+logs
+node_modules
+# prisma will generated by postinstall script
+prisma
+.all-contributorsrc
+.commitlintrc.js
+.dockerignore
+.env
+.eslintrc.json
+.gitattributes
+.gitignore
+CONTRIBUTORS.md
+Dockerfile
+jsconfig.json
+README.md
\ No newline at end of file
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..a8a125a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+indent_style = space
+indent_size = 4
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index 9a258ff..0000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,189 +0,0 @@
-module.exports = {
- 'env': {
- 'commonjs': true,
- 'es2021': true,
- 'node': true
- },
- 'extends': 'eslint:recommended',
- 'parserOptions': { 'ecmaVersion': 12 },
- 'rules': {
- 'array-bracket-newline': [
- 'error',
- 'consistent'
- ],
- 'array-bracket-spacing': [
- 'error',
- 'never'
- ],
- 'array-element-newline': [
- 'error',
- 'consistent'
- ],
- 'arrow-body-style': [
- 'error',
- 'as-needed'
- ],
- 'arrow-parens': [
- 'error',
- 'as-needed'
- ],
- 'block-spacing': [
- 'error',
- 'always'
- ],
- 'brace-style': [
- 'error',
- '1tbs'
- ],
- 'comma-dangle': [
- 'error',
- 'never'
- ],
- 'comma-spacing': [
- 'error',
- {
- 'after': true,
- 'before': false
- }
- ],
- 'comma-style': [
- 'error',
- 'last'
- ],
- 'computed-property-spacing': [
- 'error',
- 'never'
- ],
- 'curly': [
- 'error',
- 'multi-line', // 'multi'
- 'consistent'
- ],
- 'default-case-last': [
- 'error'
- ],
- 'dot-location': [
- 'error',
- 'property'
- ],
- 'dot-notation': [
- 'error'
- ],
- 'eqeqeq': [
- 'error'
- ],
- 'func-call-spacing': [
- 'error',
- 'never'
- ],
- 'indent': [
- 'error',
- 'tab'
- ],
- 'linebreak-style': [
- 'off',
- 'windows'
- ],
- 'max-depth': [
- 'warn',
- { 'max': 5 }
- ],
- 'max-len': [
- 'warn',
- {
- 'code': 150,
- 'ignoreRegExpLiterals': true,
- 'ignoreStrings': true,
- 'ignoreTemplateLiterals': true,
- 'ignoreTrailingComments': true,
- 'ignoreUrls': true
- }
- ],
- 'max-lines': [
- 'warn',
- 500
- ],
- 'max-statements-per-line': [
- 'error'
- ],
- 'multiline-comment-style': [
- 'warn'
- ],
- 'no-console': [
- 'warn'
- ],
- 'no-return-assign': [
- 'error'
- ],
- 'no-template-curly-in-string': [
- 'warn'
- ],
- 'no-trailing-spaces': [
- 'error'
- ],
- 'no-underscore-dangle': [
- 'error'
- ],
- 'no-unneeded-ternary': [
- 'error'
- ],
- 'no-var': [
- 'error'
- ],
- 'no-whitespace-before-property': [
- 'error'
- ],
- 'object-curly-newline': [
- 'error',
- {
- 'minProperties': 2,
- 'multiline': true
- }
- ],
- 'object-curly-spacing': [
- 'error',
- 'always'
- ],
- 'object-property-newline': [
- 'error'
- ],
- 'operator-linebreak': [
- 'error'
- ],
- 'prefer-arrow-callback': [
- 'error'
- ],
- 'prefer-const': [
- 'error',
- {
- 'destructuring': 'all',
- 'ignoreReadBeforeAssign': false
- }
- ],
- 'quotes': [
- 'error',
- 'single'
- ],
- 'rest-spread-spacing': [
- 'error',
- 'never'
- ],
- 'semi': [
- 'error',
- 'always'
- ],
- 'sort-keys': [
- 'error',
- 'asc',
- { 'natural': true }
- ],
- 'space-in-parens': [
- 'error',
- 'never'
- ],
- 'spaced-comment': [
- 'error',
- 'always'
- ]
- }
-};
\ No newline at end of file
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..f2aff2d
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,228 @@
+{
+ "env": {
+ "browser": false,
+ "commonjs": false,
+ "es6": true,
+ "node": true
+ },
+ "extends": [
+ "eslint:recommended"
+ ],
+ "parserOptions": {
+ "ecmaVersion": 12,
+ "sourceType": "module"
+ },
+ "plugins": [
+ "unused-imports"
+ ],
+ "root": true,
+ "rules": {
+ "array-bracket-newline": [
+ "error",
+ "consistent"
+ ],
+ "array-bracket-spacing": [
+ "error",
+ "never"
+ ],
+ "array-element-newline": [
+ "error",
+ "consistent"
+ ],
+ "arrow-body-style": [
+ "error",
+ "as-needed"
+ ],
+ "arrow-parens": [
+ "error",
+ "as-needed"
+ ],
+ "block-spacing": [
+ "error",
+ "always"
+ ],
+ "brace-style": [
+ "error",
+ "1tbs"
+ ],
+ "comma-dangle": [
+ "error",
+ {
+ "arrays": "always-multiline",
+ "exports": "always-multiline",
+ "functions": "always-multiline",
+ "imports": "always-multiline",
+ "objects": "always-multiline"
+ }
+ ],
+ "comma-spacing": [
+ "error",
+ {
+ "after": true,
+ "before": false
+ }
+ ],
+ "comma-style": [
+ "error",
+ "last"
+ ],
+ "computed-property-spacing": [
+ "error",
+ "never"
+ ],
+ "curly": [
+ "error",
+ "multi-line", // "multi"
+ "consistent"
+ ],
+ "default-case-last": [
+ "error"
+ ],
+ "dot-location": [
+ "error",
+ "property"
+ ],
+ "dot-notation": [
+ "error"
+ ],
+ "eqeqeq": [
+ "error"
+ ],
+ "func-call-spacing": [
+ "error",
+ "never"
+ ],
+ "indent": [
+ "error",
+ "tab"
+ ],
+ "linebreak-style": [
+ "off",
+ "windows"
+ ],
+ "max-depth": [
+ "warn",
+ {
+ "max": 5
+ }
+ ],
+ "max-len": [
+ "warn",
+ {
+ "code": 180,
+ "ignoreRegExpLiterals": true,
+ "ignoreStrings": true,
+ "ignoreTemplateLiterals": true,
+ "ignoreTrailingComments": true,
+ "ignoreUrls": true
+ }
+ ],
+ "max-lines": [
+ "warn"
+ ],
+ "max-statements-per-line": [
+ "error"
+ ],
+ "multiline-comment-style": [
+ "off"
+ ],
+ "no-console": [
+ "warn"
+ ],
+ "no-prototype-builtins": [
+ "off"
+ ],
+ "no-return-assign": [
+ "error"
+ ],
+ "no-template-curly-in-string": [
+ "warn"
+ ],
+ "no-trailing-spaces": [
+ "error"
+ ],
+ "no-underscore-dangle": [
+ "warn",
+ {
+ "allowAfterThis": true,
+ "allowFunctionParams": true
+ }
+ ],
+ "no-unneeded-ternary": [
+ "error"
+ ],
+ "no-unused-expressions": [
+ "error"
+ ],
+ "no-var": [
+ "error"
+ ],
+ "no-whitespace-before-property": [
+ "error"
+ ],
+ "object-curly-newline": [
+ "error",
+ {
+ "minProperties": 2,
+ "multiline": true
+ }
+ ],
+ "object-curly-spacing": [
+ "error",
+ "always"
+ ],
+ "object-property-newline": [
+ "error"
+ ],
+ "operator-linebreak": [
+ "error"
+ ],
+ "prefer-arrow-callback": [
+ "error"
+ ],
+ "prefer-const": [
+ "error",
+ {
+ "destructuring": "all",
+ "ignoreReadBeforeAssign": false
+ }
+ ],
+ "quotes": [
+ "error",
+ "single"
+ ],
+ "rest-spread-spacing": [
+ "error",
+ "never"
+ ],
+ "semi": [
+ "error",
+ "always"
+ ],
+ "sort-keys": [
+ "warn",
+ "asc",
+ {
+ "natural": true
+ }
+ ],
+ "space-in-parens": [
+ "error",
+ "never"
+ ],
+ "spaced-comment": [
+ "error",
+ "always"
+ ],
+ "unused-imports/no-unused-imports": "error",
+ "unused-imports/no-unused-vars": [
+ "warn",
+ {
+ "vars": "all",
+ "varsIgnorePattern": "^_",
+ "args": "after-used",
+ "argsIgnorePattern": "^_"
+ }
+ ]
+ }
+}
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 0921801..994b8b3 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -6,10 +6,10 @@ Release versions that will receive security updates.
| Version | Supported |
| ------- | --------- |
-| 4.x | ✅ |
-| 3.x | ✅ |
-| 2.x | ❌ |
| 1.x | ❌ |
+| 2.x | ❌ |
+| 3.x | ❌ |
+| 4.x | ✅ |
## Reporting a vulnerability
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 0000000..2244b3b
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,58 @@
+name: Publish Docker image
+
+on:
+ push:
+ branches:
+ - 'main'
+ tags:
+ - 'v*'
+ pull_request:
+ branches:
+ - 'main'
+
+jobs:
+ push_to_registries:
+ name: Push Docker image to multiple registries
+ runs-on: ubuntu-latest
+ permissions:
+ packages: write
+ contents: read
+ steps:
+ - name: Check out the repo
+ uses: actions/checkout@v3
+
+ - name: Log in to Docker Hub
+ if: github.event_name != 'pull_request'
+ uses: docker/login-action@v2
+ with:
+ username: ${{ secrets.DOCKER_USERNAME }}
+ password: ${{ secrets.DOCKER_TOKEN }}
+
+ - name: Log in to the Container registry
+ if: github.event_name != 'pull_request'
+ uses: docker/login-action@v2
+ with:
+ registry: ghcr.io
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Extract metadata (tags, labels) for Docker
+ id: meta
+ uses: docker/metadata-action@v4
+ with:
+ images: |
+ eartharoid/discord-tickets
+ ghcr.io/${{ github.repository }}
+ tags: |
+ type=ref,event=branch
+ type=ref,event=pr
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+
+ - name: Build and push Docker images
+ uses: docker/build-push-action@v4
+ with:
+ context: .
+ push: ${{ github.event_name != 'pull_request' }}
+ tags: ${{ steps.meta.outputs.tags }}
+ labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 10bae39..7c0e78c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,30 +1,32 @@
-name: eslint
-on:
- push:
- branches:
- - main
+name: Lint
+on: [push, pull_request]
+ # push:
+ # branches:
+ # - main
# pull_request:
- # branches:
- # - main
+ # branches:
+ # - main
jobs:
- lint:
+ commitlint:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-node@v2
- - name: Cache pnpm modules
- uses: actions/cache@v2
- env:
- cache-name: cache-pnpm-modules
+ - uses: actions/checkout@v3
with:
- path: ~/.pnpm-store
- key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-${{ hashFiles('**/package.json') }}
- restore-keys: |
- ${{ runner.os }}-build-${{ env.cache-name }}-${{ matrix.node-version }}-
- - uses: pnpm/action-setup@v2.0.1
+ fetch-depth: 0
+ - uses: wagoid/commitlint-github-action@v5
with:
- version: 6.3.0
- run_install: false
- - run: pnpm install eslint
- - run: pnpm run lint
+ configFile: .commitlintrc.js
+ eslint:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: pnpm/action-setup@v2
+ with:
+ version: 7
+ - uses: actions/setup-node@v3
+ with:
+ node-version: 18
+ cache: 'pnpm'
+ - run: pnpm install
+ - run: pnpm run lint
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index dcc5186..10457e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,14 @@
# directories
+.history/
.vscode/
node_modules/
-logs/
-site/
+prisma/
# files
-.env
-version
-user/config.js
-user/database.sqlite
-user/plugins/*/
\ No newline at end of file
+*.env*
+*.db*
+*.log
+user/config.yml
+user/**/*.*
+!user/**/.gitkeep
+!user/templates/*
\ No newline at end of file
diff --git a/.husky/commit-msg b/.husky/commit-msg
new file mode 100644
index 0000000..c160a77
--- /dev/null
+++ b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit ${1}
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100644
index 0000000..d24fdfc
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npx lint-staged
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 0000000..18ae03c
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,2 @@
+auto-install-peers=true
+engine-strict=true
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
new file mode 100644
index 0000000..e4f1473
--- /dev/null
+++ b/.nvmrc
@@ -0,0 +1 @@
+lts/*
\ No newline at end of file
diff --git a/Caddyfile b/Caddyfile
new file mode 100644
index 0000000..6320210
--- /dev/null
+++ b/Caddyfile
@@ -0,0 +1,3 @@
+tickets.example.com {
+ reverse_proxy 127.0.0.1:8169
+}
diff --git a/Dockerfile b/Dockerfile
index a842521..ae5d9a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,23 @@
-# Use the alpine image of node 16
-FROM node:16-alpine
+# syntax=docker/dockerfile:1
-# Create a dir for the app and make it owned by a non-root user (node)
-RUN mkdir /tickets && \
- chown -R 1000:1000 /tickets
-WORKDIR /tickets
+FROM node:18-alpine AS builder
+WORKDIR /build
+# install python etc so node-gyp works for the optional dependencies
+RUN apk add --no-cache make gcc g++ python3
+# install pnpm to make dependency installation faster (because it has a lockfile)
+RUN npm install -g pnpm
+COPY package.json pnpm-lock.yaml ./
+COPY --link scripts scripts
+RUN chmod +x ./scripts/start.sh
+# install dependencies, CI=true to skip pre/postinstall scripts
+RUN CI=true pnpm install --prod --frozen-lockfile
+COPY --link . .
-# Change user to node
-USER node
-
-# Install packages
-COPY --chown=1000:1000 package.json pnpm-lock.yaml ./
-RUN npx pnpm install --prod --frozen-lockfile
-
-# Copy src folder
-COPY src ./src
-
-# Set the command
-CMD ["node", "src/"]
+FROM node:18-alpine AS runner
+ENV NODE_ENV=production \
+ HTTP_HOST=0.0.0.0 \
+ HTTP_PORT=80
+WORKDIR /usr/bot
+COPY --from=builder /build ./
+EXPOSE ${HTTP_PORT}
+ENTRYPOINT [ "/usr/bot/scripts/start.sh" ]
diff --git a/README.md b/README.md
index 08b5fa5..1cbdbab 100644
--- a/README.md
+++ b/README.md
@@ -1,244 +1,156 @@
-
- An open-source ticket management bot for Discord - a free alternative to the premium and white-label plans of other popular ticketing bots.
-
-
-
- 
+
+
+
+**A free alternative to the premium and white-label plans of other ticket management bots.**
+
+
+
+
-
- 
-
- 
-
-
-
- 
- - reSkybounds - - |
-
-
- 
- - DarkHosting™️ - - |
-
-
- 
- - Simply Vanilla - - |
-
-
- 
- - URHOST - - |
-
-
- 
- - SunriseNode - - |
-
{{count.responses}}
-Responses
-{{count.users}}
-Users
-| {{.}} | - {{/columns}} -
|---|
| {{.}} | - {{/.}} -
| {{.}} | - {{/columns}} -
-