Merge branch 'main' into fix-fastify

Author: eartharoid

.all-contributorsrc

@@ -271,7 +271,18 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/28811713?v=4",
       "profile": "https://github.com/VinDotRun",
       "contributions": [
-        "translation"
+        "translation",
+        "bug",
+        "code"
+      ]
+    },
+    {
+      "login": "M4rlus",
+      "name": "Marius",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43551856?v=4",
+      "profile": "https://github.com/M4rlus",
+      "contributions": [
+        "code"
       ]
     }
   ],

.gitignore

@@ -3,13 +3,10 @@
 .vscode/
 node_modules/
 prisma/
+user/
 
 # files
 *.env*
 *.db*
 *.log
-user/config.yml
-user/**/*.*
-!user/**/.gitkeep
-!user/templates/*
 summary.md

CHANGELOG.md

@@ -1,3 +1,62 @@
+## [4.0.13](https://github.com/discord-tickets/bot/compare/v4.0.12...v4.0.13) (2023-12-24)
+
+
+### Bug Fixes
+
+* `npx` stdin command's child process stderr logging ([296002e](https://github.com/discord-tickets/bot/commit/296002e04f545189912b05ef92dae68085fef33e))
+* allow no activities ([bd15bd8](https://github.com/discord-tickets/bot/commit/bd15bd8145f4f9fe9b35e4069feafe04777a7d67))
+
+
+### Features
+
+* **i18n:** add Thai translations ([e2a88f8](https://github.com/discord-tickets/bot/commit/e2a88f82e7189814b15edf3834e153d8dfed6ae4))
+* **i18n:** update Finnish translations ([f5b2fc7](https://github.com/discord-tickets/bot/commit/f5b2fc795b37dd81bfdf11f4a848f3666b687e06))
+* **i18n:** update Hungarian translations ([717ed0f](https://github.com/discord-tickets/bot/commit/717ed0f4052e1b8c2768e32e33301b0461ed4fd8))
+* **i18n:** update Italian translations ([c021f8a](https://github.com/discord-tickets/bot/commit/c021f8a42345de34fc7f64c8a9599778cdf0b721))
+* **i18n:** update Italian translations ([cbc62dc](https://github.com/discord-tickets/bot/commit/cbc62dcb046ea96e251c17207cdb5fcd06199b0a))
+* **i18n:** update Italian translations ([26e3ac2](https://github.com/discord-tickets/bot/commit/26e3ac26cec2b320fe17a06bfb3c5e6c4b5082e2))
+* **i18n:** update Thai translations ([106473b](https://github.com/discord-tickets/bot/commit/106473b26ab137346b3c587e51725ae122ed3bf7))
+* **i18n:** update Thai translations ([e30fb14](https://github.com/discord-tickets/bot/commit/e30fb146d7a88e0ba28e02c3a8f55a56e918835a))
+* **i18n:** update Thai translations ([081d7a8](https://github.com/discord-tickets/bot/commit/081d7a8cebffade6f849d104d00ea4f85421de71))
+* **i18n:** update Thai translations ([fcd174d](https://github.com/discord-tickets/bot/commit/fcd174d827b1df1b42337a3757fa8c89e857743c))
+
+
+
+## [4.0.12](https://github.com/discord-tickets/bot/compare/v4.0.11...v4.0.12) (2023-11-18)
+
+
+### Bug Fixes
+
+* activity name update ([#503](https://github.com/discord-tickets/bot/issues/503)) ([12c4c96](https://github.com/discord-tickets/bot/commit/12c4c96c1fe7c56990fd385fc9e26217ea9ff467))
+
+
+
+## [4.0.11](https://github.com/discord-tickets/bot/compare/v4.0.10...v4.0.11) (2023-11-16)
+
+
+### Bug Fixes
+
+* **i18n:** update Portuguese (Brazil) translations ([#497](https://github.com/discord-tickets/bot/issues/497)) ([efc7885](https://github.com/discord-tickets/bot/commit/efc7885367552955cd1857eb94b0940a56505ec6))
+* open tickets count ([#500](https://github.com/discord-tickets/bot/issues/500)) ([b329d5a](https://github.com/discord-tickets/bot/commit/b329d5ae2e0e64b0752d0f452170f4d58accc735))
+
+
+### Features
+
+* add ticket/channel ID on closed tickets list ([#496](https://github.com/discord-tickets/bot/issues/496)) ([cab1b3b](https://github.com/discord-tickets/bot/commit/cab1b3b6ca067578dabf05a2075697361e7d031b))
+* **i18n:** add Romanian translations ([f87d880](https://github.com/discord-tickets/bot/commit/f87d88075395fc13841329ca4c9ed29ac157371d))
+* **i18n:** update Czech translations ([a707869](https://github.com/discord-tickets/bot/commit/a7078697b61722aec5bc7ecbb437dab31bb50465))
+* **i18n:** update Czech translations ([80bedbc](https://github.com/discord-tickets/bot/commit/80bedbc2ba1204376a93260b25c8bbb6a1dbdac1))
+* **i18n:** update Dutch translations ([6b8cd9e](https://github.com/discord-tickets/bot/commit/6b8cd9eb290ea2a97927d4bf57541d4e8221d022))
+* **i18n:** update Dutch translations ([1e834fd](https://github.com/discord-tickets/bot/commit/1e834fdeb3f726d59aef06a8f42ab1de5e4a9b04))
+* **i18n:** update Dutch translations ([4c8bba3](https://github.com/discord-tickets/bot/commit/4c8bba3917c8ce6e1c088487d15f858c1a58ff31))
+* **i18n:** update Finnish translations ([e7a1aac](https://github.com/discord-tickets/bot/commit/e7a1aac42411c85186b5f4af3b4590c53f2dfdba))
+* **i18n:** update Russian translations ([380d315](https://github.com/discord-tickets/bot/commit/380d315a91718e20eb6b47ea64e6f23f5c7c0677))
+* **i18n:** update Spanish translations ([1f7899b](https://github.com/discord-tickets/bot/commit/1f7899b7723555736c697b1a790ddfb8f877eae0))
+* **i18n:** update Turkish translations ([99904c2](https://github.com/discord-tickets/bot/commit/99904c2f7af2a9eda164b16ec1e92d3a02a3d461))
+* **i18n:** update Turkish translations ([830b1b1](https://github.com/discord-tickets/bot/commit/830b1b1edc03aadf4c8a284615ac80f8b0c42e81))
+
+
+
 ## [4.0.10](https://github.com/discord-tickets/bot/compare/v4.0.9...v4.0.10) (2023-09-07)
 
 

CONTRIBUTORS.md

@@ -1,6 +1,6 @@
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-28-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-29-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## Contributors ✨
@@ -46,7 +46,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/GeckoBoy84"><img src="https://avatars.githubusercontent.com/u/67899387?v=4?s=100" width="100px;" alt="GeckoBoy84"/><br /><sub><b>GeckoBoy84</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/issues?q=author%3AGeckoBoy84" title="Bug reports">🐛</a> <a href="#ideas-GeckoBoy84" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-GeckoBoy84" title="Answering Questions">💬</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Manfred-exe"><img src="https://avatars.githubusercontent.com/u/81268335?v=4?s=100" width="100px;" alt="Manfred.exe"/><br /><sub><b>Manfred.exe</b></sub></a><br /><a href="#translation-Manfred-exe" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Thomasthegama"><img src="https://avatars.githubusercontent.com/u/70441539?v=4?s=100" width="100px;" alt="Thomasthegama"/><br /><sub><b>Thomasthegama</b></sub></a><br /><a href="#translation-Thomasthegama" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VinDotRun"><img src="https://avatars.githubusercontent.com/u/28811713?v=4?s=100" width="100px;" alt="Vin"/><br /><sub><b>Vin</b></sub></a><br /><a href="#translation-VinDotRun" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/VinDotRun"><img src="https://avatars.githubusercontent.com/u/28811713?v=4?s=100" width="100px;" alt="Vin"/><br /><sub><b>Vin</b></sub></a><br /><a href="#translation-VinDotRun" title="Translation">🌍</a> <a href="https://github.com/discord-tickets/bot/issues?q=author%3AVinDotRun" title="Bug reports">🐛</a> <a href="https://github.com/discord-tickets/bot/commits?author=VinDotRun" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/M4rlus"><img src="https://avatars.githubusercontent.com/u/43551856?v=4?s=100" width="100px;" alt="Marius"/><br /><sub><b>Marius</b></sub></a><br /><a href="https://github.com/discord-tickets/bot/commits?author=M4rlus" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

Dockerfile

@@ -15,17 +15,19 @@ COPY --link . .
 
 FROM node:18-alpine AS runner
 RUN apk --no-cache add curl \
-	&& adduser --disabled-password --home /home/container container
+	&& adduser --disabled-password --home /home/container container \
+	&& mkdir /app \
+	&& chown container:container /app \
+	&& chmod -R 777 /app
 USER container
 ENV USER=container \
 	HOME=/home/container \
 	NODE_ENV=production \
 	HTTP_HOST=0.0.0.0 \
-	HTTP_PORT=80
+	DOCKER=true
 WORKDIR /home/container
-COPY --from=builder --chown=container:container /build ./
-EXPOSE ${HTTP_PORT}/tcp
-ENTRYPOINT [ "/home/container/scripts/start.sh" ]
+COPY --from=builder --chown=container:container --chmod=777 /build /app
+ENTRYPOINT [ "/app/scripts/start.sh" ]
 HEALTHCHECK --interval=15s --timeout=5s --start-period=60s \
 	CMD curl -f http://localhost:${HTTP_PORT}/status || exit 1
 LABEL org.opencontainers.image.source=https://github.com/discord-tickets/bot \

README.md

@@ -30,9 +30,9 @@
 
 ---
 
-[![PebbleHost](https://img.eartharoid.me/insecure/rs:auto:180/plain/s3://eartharoid/sharex/21/10/pebblehost.webp)](https://pebble.host/discordtickets)
+[![BisectHosting](https://www.bisecthosting.com/partners/custom-banners/41ca8074-184e-4ad1-a44d-77750ee8bfb9.webp)](https://bisecthosting.com/discordtickets)
 
-<a href="https://pebble.host/discordtickets">Partnered with PebbleHost</a>
+<a href="https://bisecthosting.com/discordtickets">Partnered with BisectHosting</a>
 <br>
 <sub>for affordable bot hosting</sub>
 

db/sqlite/schema.prisma

@@ -4,7 +4,7 @@ generator client {
 
 datasource db {
     provider = "sqlite"
-    url      = "file:../user/database.db"
+    url      = env("DB_CONNECTION_URL")
 }
 
 model ArchivedChannel {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "discord-tickets",
-	"version": "4.0.11",
+	"version": "4.0.13",
 	"private": "true",
 	"description": "The most popular open-source ticket management bot for Discord.",
 	"main": "src/",
@@ -45,52 +45,52 @@
 		"node": ">=18"
 	},
 	"dependencies": {
-		"@discord-tickets/settings": "^2.1.6",
-		"@eartharoid/dbf": "^0.4.1",
+		"@discord-tickets/settings": "^2.2.0",
+		"@eartharoid/dbf": "^0.4.2",
 		"@eartharoid/dtf": "^2.0.1",
 		"@eartharoid/i18n": "^1.2.1",
 		"@fastify/cookie": "^9.3.1",
 		"@fastify/jwt": "^8.0.0",
 		"@fastify/oauth2": "^7.8.0",
-		"@prisma/client": "^4.16.1",
-		"boxen": "^7.1.0",
-		"cryptr": "^6.2.0",
-		"discord.js": "^14.11.0",
-		"dotenv": "^16.0.3",
+		"@prisma/client": "^4.16.2",
+		"boxen": "^7.1.1",
+		"cryptr": "^6.3.0",
+		"discord.js": "^14.14.1",
+		"dotenv": "^16.3.1",
 		"fastify": "^4.25.2",
-		"figlet": "^1.6.0",
+		"figlet": "^1.7.0",
 		"fs-extra": "^10.1.0",
-		"keyv": "^4.5.2",
+		"keyv": "^4.5.4",
 		"leeks.js": "^0.3.0",
-		"leekslazylogger": "^5.0.1",
+		"leekslazylogger": "^6.0.0",
 		"ms": "^2.1.3",
 		"mustache": "^4.2.0",
 		"node-dir": "^0.1.17",
 		"node-emoji": "^1.11.0",
 		"object-diffy": "^1.0.4",
-		"prisma": "^4.16.1",
-		"semver": "^7.5.1",
+		"prisma": "^4.16.2",
+		"semver": "^7.5.4",
 		"short-unique-id": "^4.4.4",
-		"spacetime": "^7.4.4",
+		"spacetime": "^7.5.0",
 		"terminal-link": "^2.1.1",
-		"yaml": "^2.3.2"
+		"yaml": "^2.3.4"
 	},
 	"devDependencies": {
-		"@commitlint/cli": "^17.6.3",
-		"@commitlint/config-conventional": "^17.6.3",
-		"all-contributors-cli": "^6.26.0",
+		"@commitlint/cli": "^17.8.1",
+		"@commitlint/config-conventional": "^17.8.1",
+		"all-contributors-cli": "^6.26.1",
 		"conventional-changelog-cli": "^2.2.2",
-		"eslint": "^8.41.0",
+		"eslint": "^8.56.0",
 		"eslint-plugin-unused-imports": "^2.0.0",
 		"husky": "^8.0.3",
-		"lint-staged": "^13.2.2",
+		"lint-staged": "^13.3.0",
 		"markdown-table": "^3.0.3",
 		"nodemon": "^2.0.22"
 	},
 	"optionalDependencies": {
-		"bufferutil": "^4.0.7",
+		"bufferutil": "^4.0.8",
 		"erlpack": "github:discord/erlpack",
 		"utf-8-validate": "^5.0.10",
-		"zlib-sync": "^0.1.8"
+		"zlib-sync": "^0.1.9"
 	}
 }