Skip to content

Commit

Permalink
Merge branch 'main' into l10n_main
Browse files Browse the repository at this point in the history
  • Loading branch information
dev-737 authored Nov 9, 2024
2 parents cf22ab5 + 3819548 commit f01d70d
Show file tree
Hide file tree
Showing 76 changed files with 1,578 additions and 1,217 deletions.
1 change: 0 additions & 1 deletion dev/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3.7'
services:
mongodb_container:
# This image automatically creates a replica set required for transactions
Expand Down
2 changes: 1 addition & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default config({
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-shadow': ['error', { allow: ['err', 'resolve', 'reject'] }],

// 'class-methods-use-this': 'warn', // TODO: Turn this into error soon
// 'class-methods-use-this': 'warn',
'no-nested-ternary': 'error',

'object-shorthand': 'error',
Expand Down
1 change: 1 addition & 0 deletions locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ errors:
banned: |
{emoji} You have been banned from using InterChat for violating our [guidelines](https://interchat.fun/guidelines).
If you think an appeal is applicable create a ticket in the [support server]( {support_invite} ).
misc:
webhookNoLongerExists: '{emoji} The webhook for this channel no longer exists. To continue using InterChat, please re-create the webhook by using `/connection unpause`.'
noReason: No reason provided.
Expand Down
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "interchat",
"private": true,
"version": "4.0.1",
"version": "4.0.2",
"description": "A growing Discord bot which provides inter-server chat!",
"main": "build/index.js",
"license": "AGPL-3.0-only",
Expand All @@ -22,8 +22,8 @@
},
"type": "module",
"dependencies": {
"@prisma/client": "^5.21.1",
"@sentry/node": "^8.36.0",
"@prisma/client": "^5.22.0",
"@sentry/node": "^8.37.1",
"common-tags": "^1.8.2",
"discord-hybrid-sharding": "^2.2.3",
"discord.js": "^14.16.3",
Expand All @@ -39,6 +39,7 @@
"parse-duration": "^1.1.0",
"reflect-metadata": "^0.2.2",
"source-map-support": "^0.5.21",
"uuid": "^11.0.2",
"winston": "^3.16.0"
},
"devDependencies": {
Expand All @@ -48,17 +49,17 @@
"@types/js-yaml": "^4.0.9",
"@types/lodash": "^4.17.13",
"@types/ms": "^0.7.34",
"@types/node": "^22.8.6",
"@types/node": "^22.9.0",
"@types/source-map-support": "^0.5.10",
"cz-conventional-changelog": "^3.3.0",
"eslint": "9.14.0",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"prisma": "^5.21.1",
"prisma": "^5.22.0",
"release-it": "^17.10.0",
"tsc-watch": "^6.2.0",
"typescript": "^5.6.3",
"typescript-eslint": "^8.12.2"
"typescript-eslint": "^8.13.0"
},
"config": {
"commitizen": {
Expand Down
Loading

0 comments on commit f01d70d

Please sign in to comment.