mirror of
https://github.com/ReVanced/revanced-bots.git
synced 2026-01-11 21:56:17 +00:00
Compare commits
75 Commits
@revanced/
...
@revanced/
| Author | SHA1 | Date | |
|---|---|---|---|
|
9897f244e0 | ||
|
eaa25f2eb5 | ||
|
|
a976dd2acc | ||
|
|
c567ef25c6 | ||
|
|
de8bef6520 | ||
|
|
98dea81eeb | ||
|
|
9f3295cc0f | ||
|
|
4da6175cf5 | ||
|
|
d90ad5c955 | ||
|
|
65add4dfee | ||
|
|
2c2f6b76d4 | ||
|
|
49c29bebfb | ||
|
|
4e889d4991 | ||
|
|
6d463df586 | ||
|
|
2d8688bd4c | ||
|
|
bc9951c9b5 | ||
|
|
a7688fa9b9 | ||
|
|
5925d90209 | ||
|
|
5506518635 | ||
|
|
b9d08fff64 | ||
|
|
6875b32fd0 | ||
|
|
c36684091d | ||
|
|
f5939e2528 | ||
|
|
412e00317d | ||
|
|
8fe78e424e | ||
|
|
9fe6b4ca70 | ||
|
|
bf661556e1 | ||
|
|
763ef253f9 | ||
|
|
561426028c | ||
|
|
b726c40fd4 | ||
|
|
bc437a5ec7 | ||
|
|
620f9339f0 | ||
|
|
1a4ec1ece8 | ||
|
|
98ec37b5d1 | ||
|
|
711f57f4a1 | ||
|
|
e29e9c3dd1 | ||
|
|
b832311f7e | ||
|
|
887ee85e41 | ||
|
|
c9b788dc51 | ||
|
|
ab62e55e76 | ||
|
|
8f83687b7c | ||
|
|
a60c60c0f9 | ||
|
|
95a122a225 | ||
|
|
d234d79310 | ||
|
|
3188f8dbed | ||
|
|
9b9bb1e1e6 | ||
|
|
d31616ebcb | ||
|
|
2efedc47df | ||
|
|
646ec8da87 | ||
|
|
a848a9c896 | ||
|
|
8168f79ac6 | ||
|
|
38c06997b4 | ||
|
|
cdb6001955 | ||
|
|
e748a4da92 | ||
|
|
300e5cff3b | ||
|
|
6685ffb855 | ||
|
|
cbf91162e2 | ||
|
|
bd906fbf54 | ||
|
|
27662ed91a | ||
|
|
d0acab1915 | ||
|
|
e86180fe29 | ||
|
|
1f5c5a92a6 | ||
|
|
b79a1c7575 | ||
|
|
3559ed1cb5 | ||
|
|
042b155b5e | ||
|
|
673aa189be | ||
|
|
c503a86c53 | ||
|
|
1bd973ea6c | ||
|
|
4bb965e9ff | ||
|
|
a8ceeb29ae | ||
|
|
96a6540434 | ||
|
|
e02c86a9c4 | ||
|
|
e82f2ab34b | ||
|
|
2a6f3c3013 | ||
|
|
875bd209b2 |
1
.github/workflows/release.yml
vendored
1
.github/workflows/release.yml
vendored
@@ -14,6 +14,7 @@ jobs:
|
||||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
timeout-minutes: 10
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
@@ -1,3 +1,28 @@
|
||||
# @revanced/bot-websocket-api [1.0.0-dev.9](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.8...@revanced/bot-websocket-api@1.0.0-dev.9) (2024-08-03)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **apis/websocket:** return `true` for data on a `TrainedMessage` packet ([65add4d](https://github.com/revanced/revanced-helper/commit/65add4dfeed2fa067c2c8e2377f7d01d505ade54))
|
||||
|
||||
# @revanced/bot-websocket-api [1.0.0-dev.8](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.7...@revanced/bot-websocket-api@1.0.0-dev.8) (2024-07-31)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* other small issues ([bc437a5](https://github.com/revanced/revanced-helper/commit/bc437a5ec7ce1d339094d608e2a61ac5f460c163))
|
||||
|
||||
# @revanced/bot-websocket-api [1.0.0-dev.7](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.6...@revanced/bot-websocket-api@1.0.0-dev.7) (2024-07-30)
|
||||
|
||||
# @revanced/bot-websocket-api [1.0.0-dev.6](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.5...@revanced/bot-websocket-api@1.0.0-dev.6) (2024-07-30)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** hanging process when disconnecting from API too many times ([d31616e](https://github.com/revanced/revanced-helper/commit/d31616ebcba6f1dcd8bde183bcb8d1adb1501b61))
|
||||
|
||||
# @revanced/bot-websocket-api [1.0.0-dev.5](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.4...@revanced/bot-websocket-api@1.0.0-dev.5) (2024-07-23)
|
||||
|
||||
# @revanced/bot-websocket-api [1.0.0-dev.4](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.3...@revanced/bot-websocket-api@1.0.0-dev.4) (2024-07-23)
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ FROM base AS build
|
||||
WORKDIR /build
|
||||
COPY . .
|
||||
RUN bun install --frozen-lockfile
|
||||
RUN cd apis/websocket && bun --bun run build
|
||||
RUN cd apis/websocket && bun run build
|
||||
|
||||
FROM base AS release
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@revanced/bot-websocket-api",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"version": "1.0.0-dev.4",
|
||||
"version": "1.0.0-dev.9",
|
||||
"description": "🧦 WebSocket API server for bots assisting ReVanced",
|
||||
"main": "dist/index.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -11,7 +11,6 @@ await Bun.build({
|
||||
entrypoints: ['./src/index.ts'],
|
||||
outdir: './dist',
|
||||
target: 'bun',
|
||||
minify: true,
|
||||
sourcemap: 'external',
|
||||
})
|
||||
|
||||
@@ -21,7 +20,6 @@ await Bun.build({
|
||||
external: ['tesseract.js-core/*'],
|
||||
target: 'bun',
|
||||
outdir: './dist/worker',
|
||||
minify: true,
|
||||
sourcemap: 'external',
|
||||
})
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ const trainMessageEventHandler: EventHandler<ClientOperation.TrainMessage> = asy
|
||||
client.send(
|
||||
{
|
||||
op: ServerOperation.TrainedMessage,
|
||||
d: null,
|
||||
d: true,
|
||||
},
|
||||
nextSeq,
|
||||
)
|
||||
|
||||
@@ -21,6 +21,9 @@
|
||||
},
|
||||
"useNodejsImportProtocol": {
|
||||
"level": "off"
|
||||
},
|
||||
"useNumberNamespace": {
|
||||
"level": "off"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
3
bots/discord/.gitignore
vendored
3
bots/discord/.gitignore
vendored
@@ -174,9 +174,6 @@ dist
|
||||
# Finder (MacOS) folder config
|
||||
.DS_Store
|
||||
|
||||
# Config
|
||||
config.ts
|
||||
|
||||
# DB
|
||||
*.db
|
||||
*.sqlite
|
||||
|
||||
@@ -1,3 +1,163 @@
|
||||
# @revanced/discord-bot [1.0.0-dev.21](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.20...@revanced/discord-bot@1.0.0-dev.21) (2024-08-04)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** correct sticky messages logic ([de8bef6](https://github.com/revanced/revanced-helper/commit/de8bef6520d53a1299f0478458320a7eb75c5e1d))
|
||||
* **bots/discord:** make `/eval` work ([eaa25f2](https://github.com/revanced/revanced-helper/commit/eaa25f2eb58a9e2d25bb98633ad668485e099714))
|
||||
* **bots/discord:** some configuration values not applying after running `/reload` ([a976dd2](https://github.com/revanced/revanced-helper/commit/a976dd2accc4b74914651245acde0979c30c92f5))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.20](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.19...@revanced/discord-bot@1.0.0-dev.20) (2024-08-03)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** await when putting entries into db ([4da6175](https://github.com/revanced/revanced-helper/commit/4da6175cf58b1fa6144bdc71ec806766d32c1025))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.19](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.18...@revanced/discord-bot@1.0.0-dev.19) (2024-08-03)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** correct whitelist logic ([49c29be](https://github.com/revanced/revanced-helper/commit/49c29bebfbe348ae4e2cc1b3a83bfa41eb26ccd1))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.18](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.17...@revanced/discord-bot@1.0.0-dev.18) (2024-08-03)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** set the `label` property correctly for message scans ([6d463df](https://github.com/revanced/revanced-helper/commit/6d463df586dee5dd8fe8d6cff1c5316f7809b32a))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.17](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.16...@revanced/discord-bot@1.0.0-dev.17) (2024-08-02)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord/commands/eval:** evaluate in current context ([5925d90](https://github.com/revanced/revanced-helper/commit/5925d902095acef5f6396ca03583a9cbb0862498))
|
||||
* **bots/discord:** send right response for after regexes ([a7688fa](https://github.com/revanced/revanced-helper/commit/a7688fa9b91919a87f74071b502cd0a87cd1c1fa))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** update example config file ([bc9951c](https://github.com/revanced/revanced-helper/commit/bc9951c9b5e007c3e1b3076aa0966ccf29bb18bc))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.16](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.15...@revanced/discord-bot@1.0.0-dev.16) (2024-08-02)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** open database as read-write ([c366840](https://github.com/revanced/revanced-helper/commit/c36684091dddf67880505dc459e4334a8a5492f4))
|
||||
* **bots/discord:** remove bad text channel checks ([f5939e2](https://github.com/revanced/revanced-helper/commit/f5939e25288fea2022fdeec9085ecb9ffada6111))
|
||||
* **bots/discord:** remove redundant footer for response embeds ([412e003](https://github.com/revanced/revanced-helper/commit/412e00317d1eaca23e9c1375e16f94a5f2fa8d86))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord/commands:** add `reload` command ([6875b32](https://github.com/revanced/revanced-helper/commit/6875b32fd0c6ce3034da9dc6c704d425afb26f2e))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.15](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.14...@revanced/discord-bot@1.0.0-dev.15) (2024-07-31)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** import `config` from context ([763ef25](https://github.com/revanced/revanced-helper/commit/763ef253f9d4ff70a8b79969a7f4f41cba7f3c59))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** add sticky messages ([bf66155](https://github.com/revanced/revanced-helper/commit/bf661556e131bf0ef24e47f658fbcd701960e312))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.14](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.13...@revanced/discord-bot@1.0.0-dev.14) (2024-07-31)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** always true check causing no messages to be scanned ([98ec37b](https://github.com/revanced/revanced-helper/commit/98ec37b5d18cade85270ab83b0ed0abe41244dd9))
|
||||
* other small issues ([bc437a5](https://github.com/revanced/revanced-helper/commit/bc437a5ec7ce1d339094d608e2a61ac5f460c163))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** add more options for curing, fix default regex ([1a4ec1e](https://github.com/revanced/revanced-helper/commit/1a4ec1ece80becd9156582cc490f6681cb2a1f39))
|
||||
* **bots/discord:** allow admins to bypass permission checks ([620f933](https://github.com/revanced/revanced-helper/commit/620f9339f0737b79d72c66d90ffa42ea3f987710))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.13](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.12...@revanced/discord-bot@1.0.0-dev.13) (2024-07-30)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** broken regex when prefix set to special characters ([ab62e55](https://github.com/revanced/revanced-helper/commit/ab62e55e76005f5999d7413d1158e54053f28d1f))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.12](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.11...@revanced/discord-bot@1.0.0-dev.12) (2024-07-30)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** deployment runtime errors due to minification ([a60c60c](https://github.com/revanced/revanced-helper/commit/a60c60c0f994a4c256b7d0582e99a1731209cf49))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.11](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.10...@revanced/discord-bot@1.0.0-dev.11) (2024-07-30)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** reset counter when reconnected to api, redo message scan filter logic ([d234d79](https://github.com/revanced/revanced-helper/commit/d234d79310caed9c43e14a905f9ef46a110e071d))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.10](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.9...@revanced/discord-bot@1.0.0-dev.10) (2024-07-30)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** hanging process when disconnecting from API too many times ([d31616e](https://github.com/revanced/revanced-helper/commit/d31616ebcba6f1dcd8bde183bcb8d1adb1501b61))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.9](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.8...@revanced/discord-bot@1.0.0-dev.9) (2024-07-30)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** framework changes and new features ([646ec8d](https://github.com/revanced/revanced-helper/commit/646ec8da87617e6c8f48a89e8054e2cba91da549))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.8](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.7...@revanced/discord-bot@1.0.0-dev.8) (2024-07-28)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** cross-device link build errors ([38c0699](https://github.com/revanced/revanced-helper/commit/38c06997b4d0f7bb3f1e62618a5e3f088c522e30))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** blacklist and whitelist for filters ([cdb6001](https://github.com/revanced/revanced-helper/commit/cdb600195520dba33110c40841629259e317055e))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.7](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.6...@revanced/discord-bot@1.0.0-dev.7) (2024-07-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bot/discord:** start remove preset timeout for `role-preset` command ([cbf9116](https://github.com/revanced/revanced-helper/commit/cbf91162e27dd4c1ecb976927ab708f1d882abca))
|
||||
* **bots/discord:** only check for member permissions when specified while correcting responses ([b79a1c7](https://github.com/revanced/revanced-helper/commit/b79a1c7575e94c3e62654c87775cac497be4a50a))
|
||||
* **bots/discord:** set timeout for eligible mutes to unmute faster ([1f5c5a9](https://github.com/revanced/revanced-helper/commit/1f5c5a92a639973b83a1204355538936e69a4454))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** add `replyToReplied` option in response config ([27662ed](https://github.com/revanced/revanced-helper/commit/27662ed91a79bfac7d3f091834e859a7b57366ce))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.6](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.5...@revanced/discord-bot@1.0.0-dev.6) (2024-07-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** ci issues causing database to not be auto generated ([673aa18](https://github.com/revanced/revanced-helper/commit/673aa189bef1009a3e32ba3b1291a5ee84f2def3))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.5](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.4...@revanced/discord-bot@1.0.0-dev.5) (2024-07-23)
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.4](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.3...@revanced/discord-bot@1.0.0-dev.4) (2024-07-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** wrong database schema path ([875bd20](https://github.com/revanced/revanced-helper/commit/875bd209b252566414bf89349839cabc01697e1c))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.3](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.2...@revanced/discord-bot@1.0.0-dev.3) (2024-07-23)
|
||||
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ FROM base AS build
|
||||
WORKDIR /build
|
||||
COPY . .
|
||||
RUN bun install --frozen-lockfile
|
||||
RUN cd bots/discord && bun --bun run build
|
||||
RUN cd bots/discord && bun run build
|
||||
|
||||
FROM base AS release
|
||||
|
||||
|
||||
@@ -4,10 +4,28 @@
|
||||
* @type {import('./config.schema').Config}
|
||||
*/
|
||||
export default {
|
||||
owners: ['USER_ID_HERE'],
|
||||
guilds: ['GUILD_ID_HERE'],
|
||||
prefix: '!',
|
||||
admin: {
|
||||
users: ['USER_ID_HERE'],
|
||||
roles: {
|
||||
GUILD_ID_HERE: ['ROLE_ID_HERE'],
|
||||
},
|
||||
},
|
||||
stickyMessages: {
|
||||
GUILD_ID_HERE: {
|
||||
CHANNEL_ID_HERE: {
|
||||
message: {
|
||||
content: 'This is a sticky message!',
|
||||
},
|
||||
timeout: 60000,
|
||||
forceSendTimeout: 300000,
|
||||
}
|
||||
}
|
||||
},
|
||||
moderation: {
|
||||
cure: {
|
||||
minimumNameLength: 3,
|
||||
removeCharactersRegex: /[^a-zA-Z0-9 \-_]/g,
|
||||
defaultName: 'Server member',
|
||||
},
|
||||
roles: ['ROLE_ID_HERE'],
|
||||
@@ -33,11 +51,19 @@ export default {
|
||||
checkExpiredEvery: 3600,
|
||||
},
|
||||
messageScan: {
|
||||
scanBots: false,
|
||||
scanOutsideGuilds: false,
|
||||
filter: {
|
||||
channels: ['CHANNEL_ID_HERE'],
|
||||
roles: ['ROLE_ID_HERE'],
|
||||
users: ['USER_ID_HERE'],
|
||||
whitelist: false,
|
||||
whitelist: {
|
||||
channels: ['CHANNEL_ID_HERE'],
|
||||
roles: ['ROLE_ID_HERE'],
|
||||
users: ['USER_ID_HERE'],
|
||||
},
|
||||
blacklist: {
|
||||
channels: ['CHANNEL_ID_HERE'],
|
||||
roles: ['ROLE_ID_HERE'],
|
||||
users: ['USER_ID_HERE'],
|
||||
},
|
||||
},
|
||||
humanCorrections: {
|
||||
falsePositiveLabel: 'false_positive',
|
||||
@@ -48,19 +74,39 @@ export default {
|
||||
},
|
||||
},
|
||||
},
|
||||
allowedAttachmentMimeTypes: ['image/jpeg', 'image/png', 'image/webp'],
|
||||
attachments: {
|
||||
scanAttachments: true,
|
||||
allowedMimeTypes: ['image/jpeg', 'image/png', 'image/webp', 'text/plain'],
|
||||
maxTextFileSize: 512000
|
||||
},
|
||||
responses: [
|
||||
{
|
||||
filterOverride: {
|
||||
whitelist: {
|
||||
channels: ['CHANNEL_ID_HERE'],
|
||||
roles: ['ROLE_ID_HERE'],
|
||||
users: ['USER_ID_HERE'],
|
||||
},
|
||||
blacklist: {
|
||||
channels: ['CHANNEL_ID_HERE'],
|
||||
roles: ['ROLE_ID_HERE'],
|
||||
users: ['USER_ID_HERE'],
|
||||
},
|
||||
},
|
||||
triggers: {
|
||||
text: [/^regexp?$/, { label: 'label', threshold: 0.85 }],
|
||||
},
|
||||
response: {
|
||||
title: 'Embed title',
|
||||
description: 'Embed description',
|
||||
fields: [
|
||||
embeds: [
|
||||
{
|
||||
name: 'Field name',
|
||||
value: 'Field value',
|
||||
title: 'Embed title',
|
||||
description: 'Embed description',
|
||||
fields: [
|
||||
{
|
||||
name: 'Field name',
|
||||
value: 'Field value',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
|
||||
@@ -1,11 +1,17 @@
|
||||
import type { APIEmbed } from 'discord.js'
|
||||
import type { BaseMessageOptions } from 'discord.js'
|
||||
|
||||
export type Config = {
|
||||
owners: string[]
|
||||
guilds: string[]
|
||||
prefix?: string
|
||||
admin?: {
|
||||
users?: string[]
|
||||
roles?: Record<string, string[]>
|
||||
}
|
||||
stickyMessages?: Record<string, Record<string, StickyMessageConfig>>
|
||||
moderation?: {
|
||||
roles: string[]
|
||||
cure?: {
|
||||
minimumNameLength?: number
|
||||
removeCharactersRegex?: RegExp
|
||||
defaultName: string
|
||||
}
|
||||
log?: {
|
||||
@@ -18,12 +24,16 @@ export type Config = {
|
||||
guilds: Record<string, Record<string, RolePresetConfig>>
|
||||
}
|
||||
messageScan?: {
|
||||
allowedAttachmentMimeTypes: string[]
|
||||
filter: {
|
||||
roles?: string[]
|
||||
users?: string[]
|
||||
channels?: string[]
|
||||
whitelist: boolean
|
||||
scanBots?: boolean
|
||||
scanOutsideGuilds?: boolean
|
||||
attachments?: {
|
||||
scanAttachments?: boolean
|
||||
allowedMimeTypes?: string[]
|
||||
maxTextFileSize?: number
|
||||
}
|
||||
filter?: {
|
||||
whitelist?: Filter
|
||||
blacklist?: Filter
|
||||
}
|
||||
humanCorrections: {
|
||||
falsePositiveLabel: string
|
||||
@@ -45,6 +55,12 @@ export type Config = {
|
||||
}
|
||||
}
|
||||
|
||||
export type StickyMessageConfig = {
|
||||
timeout: number
|
||||
forceSendTimeout?: number
|
||||
message: BaseMessageOptions
|
||||
}
|
||||
|
||||
export type RolePresetConfig = {
|
||||
give: string[]
|
||||
take: string[]
|
||||
@@ -57,6 +73,7 @@ export type ConfigMessageScanResponse = {
|
||||
}
|
||||
filterOverride?: NonNullable<Config['messageScan']>['filter']
|
||||
response: ConfigMessageScanResponseMessage | null
|
||||
respondToReply?: boolean
|
||||
}
|
||||
|
||||
export type ConfigMessageScanResponseLabelConfig = {
|
||||
@@ -70,4 +87,10 @@ export type ConfigMessageScanResponseLabelConfig = {
|
||||
threshold: number
|
||||
}
|
||||
|
||||
export type ConfigMessageScanResponseMessage = APIEmbed
|
||||
export type Filter = {
|
||||
roles?: string[]
|
||||
users?: string[]
|
||||
channels?: string[]
|
||||
}
|
||||
|
||||
export type ConfigMessageScanResponseMessage = BaseMessageOptions
|
||||
|
||||
@@ -35,8 +35,6 @@ export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName("my-command")
|
||||
.setDescription("My cool command")
|
||||
// Allowing this command to be used in DMs
|
||||
.setDMPermission(true)
|
||||
// DO NOT forget this line!
|
||||
.toJSON(),
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@revanced/discord-bot",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"version": "1.0.0-dev.3",
|
||||
"version": "1.0.0-dev.21",
|
||||
"description": "🤖 Discord bot assisting ReVanced",
|
||||
"main": "src/index.ts",
|
||||
"scripts": {
|
||||
@@ -11,7 +11,7 @@
|
||||
"dev": "bun prepare && bun --watch src/index.ts",
|
||||
"build": "bun prepare && bun run scripts/build.ts",
|
||||
"watch": "bun dev",
|
||||
"prepare": "bun run scripts/generate-indexes.ts && drizzle-kit generate --name=schema"
|
||||
"prepare": "bun run scripts/generate-indexes.ts && bunx drizzle-kit generate --name=schema"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { createLogger } from '@revanced/bot-shared'
|
||||
import { cp, rename, rm } from 'fs/promises'
|
||||
import { cp, rm } from 'fs/promises'
|
||||
|
||||
const logger = createLogger()
|
||||
|
||||
@@ -12,12 +12,12 @@ await Bun.build({
|
||||
outdir: './dist/src',
|
||||
target: 'bun',
|
||||
external: ['./config.js'],
|
||||
minify: true,
|
||||
sourcemap: 'external',
|
||||
})
|
||||
|
||||
logger.info('Copying config...')
|
||||
await cp('config.js', 'dist/config.js')
|
||||
await cp('./config.js', './dist/config.js')
|
||||
|
||||
logger.info('Copying database schema...')
|
||||
await rename('.drizzle', 'dist/.drizzle')
|
||||
await cp('./.drizzle', './dist/.drizzle', { recursive: true })
|
||||
await rm('./.drizzle', { recursive: true })
|
||||
|
||||
@@ -1,50 +0,0 @@
|
||||
import { REST } from '@discordjs/rest'
|
||||
import { getMissingEnvironmentVariables } from '@revanced/bot-shared'
|
||||
import { Routes } from 'discord-api-types/v9'
|
||||
import type {
|
||||
RESTGetCurrentApplicationResult,
|
||||
RESTPutAPIApplicationCommandsResult,
|
||||
RESTPutAPIApplicationGuildCommandsResult,
|
||||
} from 'discord.js'
|
||||
import { config, discord, logger } from '../src/context'
|
||||
|
||||
// Check if token exists
|
||||
|
||||
const missingEnvs = getMissingEnvironmentVariables(['DISCORD_TOKEN'])
|
||||
if (missingEnvs.length) {
|
||||
for (const env of missingEnvs) logger.fatal(`${env} is not defined in environment variables`)
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// Group commands by global and guild
|
||||
|
||||
const { global: globalCommands = [], guild: guildCommands = [] } = Object.groupBy(Object.values(discord.commands), c =>
|
||||
c.global ? 'global' : 'guild',
|
||||
)
|
||||
|
||||
// Set commands
|
||||
|
||||
const rest = new REST({ version: '10' }).setToken(process.env['DISCORD_TOKEN']!)
|
||||
|
||||
try {
|
||||
const app = (await rest.get(Routes.currentApplication())) as RESTGetCurrentApplicationResult
|
||||
const data = (await rest.put(Routes.applicationCommands(app.id), {
|
||||
body: globalCommands.map(({ data }) => {
|
||||
if (!data.dm_permission) data.dm_permission = true
|
||||
logger.warn(`Command ${data.name} has no dm_permission set, forcing to true as it is a global command`)
|
||||
return data
|
||||
}),
|
||||
})) as RESTPutAPIApplicationCommandsResult
|
||||
|
||||
logger.info(`Reloaded ${data.length} global commands`)
|
||||
|
||||
for (const guildId of config.guilds) {
|
||||
const data = (await rest.put(Routes.applicationGuildCommands(app.id, guildId), {
|
||||
body: guildCommands.map(x => x.data),
|
||||
})) as RESTPutAPIApplicationGuildCommandsResult
|
||||
|
||||
logger.info(`Reloaded ${data.length} guild commands for guild ${guildId}`)
|
||||
}
|
||||
} catch (e) {
|
||||
logger.fatal(e)
|
||||
}
|
||||
594
bots/discord/src/classes/Command.ts
Normal file
594
bots/discord/src/classes/Command.ts
Normal file
@@ -0,0 +1,594 @@
|
||||
import { ApplicationCommandOptionType } from 'discord.js'
|
||||
|
||||
import { createErrorEmbed } from '$/utils/discord/embeds'
|
||||
import { isAdmin } from '$/utils/discord/permissions'
|
||||
|
||||
import { config } from '../context'
|
||||
import CommandError, { CommandErrorType } from './CommandError'
|
||||
|
||||
import type { Filter } from 'config.schema'
|
||||
import type {
|
||||
APIApplicationCommandChannelOption,
|
||||
CacheType,
|
||||
Channel,
|
||||
ChatInputCommandInteraction,
|
||||
CommandInteractionOption,
|
||||
GuildMember,
|
||||
Message,
|
||||
RESTPostAPIChatInputApplicationCommandsJSONBody,
|
||||
Role,
|
||||
User,
|
||||
} from 'discord.js'
|
||||
|
||||
export default class Command<
|
||||
Global extends boolean = false,
|
||||
Options extends CommandOptionsOptions | undefined = undefined,
|
||||
AllowMessageCommand extends boolean = false,
|
||||
> {
|
||||
name: string
|
||||
description: string
|
||||
requirements?: CommandRequirements
|
||||
options?: Options
|
||||
global?: Global
|
||||
#execute: CommandExecuteFunction<Global, Options, AllowMessageCommand>
|
||||
|
||||
static OptionType = ApplicationCommandOptionType
|
||||
|
||||
constructor({
|
||||
name,
|
||||
description,
|
||||
requirements,
|
||||
options,
|
||||
global,
|
||||
execute,
|
||||
}: CommandOptions<Global, Options, AllowMessageCommand>) {
|
||||
this.name = name
|
||||
this.description = description
|
||||
this.requirements = requirements
|
||||
this.options = options
|
||||
this.global = global
|
||||
this.#execute = execute
|
||||
}
|
||||
|
||||
async onMessage(
|
||||
context: typeof import('../context'),
|
||||
msg: Message<If<Global, false, true>>,
|
||||
args: CommandArguments,
|
||||
): Promise<unknown> {
|
||||
if (!this.global && !msg.inGuild())
|
||||
return await msg.reply({
|
||||
embeds: [createErrorEmbed('Cannot run this command', 'This command can only be used in a server.')],
|
||||
})
|
||||
|
||||
const executor = this.global ? msg.author : await msg.guild?.members.fetch(msg.author.id)!
|
||||
|
||||
if (!(await this.canExecute(executor, msg.channelId)))
|
||||
return await msg.reply({
|
||||
embeds: [
|
||||
createErrorEmbed(
|
||||
'Cannot run this command',
|
||||
'You do not meet the requirements to run this command.',
|
||||
),
|
||||
],
|
||||
})
|
||||
|
||||
const options = this.options
|
||||
? ((await this.#resolveMessageOptions(msg, this.options, args)) as CommandExecuteFunctionOptionsParameter<
|
||||
NonNullable<Options>
|
||||
>)
|
||||
: undefined
|
||||
|
||||
// @ts-expect-error: Type mismatch (again!) because TypeScript is not smart enough
|
||||
return await this.#execute({ ...context, executor }, msg, options)
|
||||
}
|
||||
|
||||
async #resolveMessageOptions(msg: Message, options: CommandOptionsOptions, args: CommandArguments) {
|
||||
const iterableOptions = Object.entries(options)
|
||||
const _options = {} as unknown
|
||||
|
||||
for (let i = 0; i < iterableOptions.length; i++) {
|
||||
const [name, option] = iterableOptions[i]!
|
||||
const { type, required, description } = option
|
||||
const isSubcommandLikeOption =
|
||||
type === ApplicationCommandOptionType.Subcommand ||
|
||||
type === ApplicationCommandOptionType.SubcommandGroup
|
||||
|
||||
const arg = args[i]
|
||||
|
||||
const expectedType = `${ApplicationCommandOptionType[type]}${required ? '' : '?'}`
|
||||
const argExplainationString = `\n-# **${name}**: ${description}`
|
||||
const choicesString =
|
||||
'choices' in option && option.choices
|
||||
? `\n\n-# **AVAILABLE CHOICES**\n${option.choices.map(({ value }) => `- ${value}`).join('\n')}`
|
||||
: ''
|
||||
|
||||
if (isSubcommandLikeOption && !arg)
|
||||
throw new CommandError(
|
||||
CommandErrorType.MissingArgument,
|
||||
`Missing required subcommand.\n\n-# **AVAILABLE SUBCOMMANDS**\n${iterableOptions.map(([name, { description }]) => `- **${name}**: ${description}`).join('\n')}`,
|
||||
)
|
||||
|
||||
if (required && !arg)
|
||||
throw new CommandError(
|
||||
CommandErrorType.MissingArgument,
|
||||
`Missing required argument **${name}** with type **${expectedType}**.${argExplainationString}${choicesString}`,
|
||||
)
|
||||
|
||||
if (typeof arg === 'object' && arg.type !== type)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Invalid type for argument **${name}**.${argExplainationString}\n\nExpected type: **${expectedType}**\nGot type: **${ApplicationCommandOptionType[arg.type]}**${choicesString}`,
|
||||
)
|
||||
|
||||
if ('choices' in option && option.choices && !option.choices.some(({ value }) => value === arg))
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Invalid choice for argument **${name}**.\n${argExplainationString}\n\n${choicesString}\n`,
|
||||
)
|
||||
|
||||
const argValue = typeof arg === 'string' ? arg : arg?.id
|
||||
|
||||
if (argValue && arg) {
|
||||
if (isSubcommandLikeOption) {
|
||||
const [subcommandName, subcommandOption] = iterableOptions.find(([name]) => name === argValue)!
|
||||
|
||||
// @ts-expect-error: Not smart enough, TypeScript :(
|
||||
_options[subcommandName] = await this.#resolveMessageOptions(
|
||||
msg,
|
||||
(subcommandOption as CommandSubcommandLikeOption).options,
|
||||
args.slice(i + 1),
|
||||
)
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
if (
|
||||
(type === ApplicationCommandOptionType.Channel ||
|
||||
type === ApplicationCommandOptionType.User ||
|
||||
type === ApplicationCommandOptionType.Role) &&
|
||||
Number.isNaN(Number(argValue))
|
||||
)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Malformed ID for argument **${name}**.${argExplainationString}`,
|
||||
)
|
||||
|
||||
if (
|
||||
(type === ApplicationCommandOptionType.Number || type === ApplicationCommandOptionType.Integer) &&
|
||||
Number.isNaN(Number(argValue))
|
||||
) {
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Invalid number for argument **${name}**.${argExplainationString}`,
|
||||
)
|
||||
}
|
||||
|
||||
if (
|
||||
type === ApplicationCommandOptionType.Boolean &&
|
||||
!['true', 'false', 'yes', 'no', 'y', 'n', 't', 'f'].includes(argValue)
|
||||
)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Invalid boolean for argument **${name}**.${argExplainationString}`,
|
||||
)
|
||||
|
||||
// @ts-expect-error: Not smart enough, TypeScript :(
|
||||
_options[name] =
|
||||
type === ApplicationCommandOptionType.Number || type === ApplicationCommandOptionType.Integer
|
||||
? Number(argValue)
|
||||
: type === ApplicationCommandOptionType.Boolean
|
||||
? argValue[0] === 't' || argValue[0] === 'y'
|
||||
: type === ApplicationCommandOptionType.Channel
|
||||
? await msg.client.channels.fetch(argValue)
|
||||
: type === ApplicationCommandOptionType.User
|
||||
? await msg.client.users.fetch(argValue)
|
||||
: type === ApplicationCommandOptionType.Role
|
||||
? await msg.guild?.roles.fetch(argValue)
|
||||
: argValue
|
||||
}
|
||||
}
|
||||
|
||||
return _options
|
||||
}
|
||||
|
||||
async onInteraction(
|
||||
context: typeof import('../context'),
|
||||
interaction: ChatInputCommandInteraction,
|
||||
): Promise<unknown> {
|
||||
const { logger } = context
|
||||
|
||||
if (interaction.commandName !== this.name) {
|
||||
logger.warn(`Command name mismatch, expected ${this.name}, but got ${interaction.commandName}!`)
|
||||
return await interaction.reply({
|
||||
embeds: [
|
||||
createErrorEmbed(
|
||||
'Internal command name mismatch',
|
||||
'The interaction command name does not match the expected command name.',
|
||||
),
|
||||
],
|
||||
})
|
||||
}
|
||||
|
||||
if (!this.global && !interaction.inGuild()) {
|
||||
logger.error(`Command ${this.name} cannot be run in DMs, but was registered as global`)
|
||||
return await interaction.reply({
|
||||
embeds: [createErrorEmbed('Cannot run this command', 'This command can only be used in a server.')],
|
||||
ephemeral: true,
|
||||
})
|
||||
}
|
||||
|
||||
const executor = this.global ? interaction.user : await interaction.guild?.members.fetch(interaction.user.id)!
|
||||
|
||||
if (!(await this.canExecute(executor, interaction.channelId)))
|
||||
return await interaction.reply({
|
||||
embeds: [
|
||||
createErrorEmbed(
|
||||
'Cannot run this command',
|
||||
'You do not meet the requirements to run this command.',
|
||||
),
|
||||
],
|
||||
ephemeral: true,
|
||||
})
|
||||
|
||||
const options = this.options
|
||||
? ((await this.#resolveInteractionOptions(interaction)) as CommandExecuteFunctionOptionsParameter<
|
||||
NonNullable<Options>
|
||||
>)
|
||||
: undefined
|
||||
|
||||
if (options === null)
|
||||
return await interaction.reply({
|
||||
embeds: [
|
||||
createErrorEmbed(
|
||||
'Internal command option type mismatch',
|
||||
'The interaction command option type does not match the expected command option type.',
|
||||
),
|
||||
],
|
||||
})
|
||||
|
||||
// @ts-expect-error: Type mismatch (again!) because TypeScript is not smart enough
|
||||
return await this.#execute({ ...context, executor }, interaction, options)
|
||||
}
|
||||
|
||||
async #resolveInteractionOptions(
|
||||
interaction: ChatInputCommandInteraction,
|
||||
options: readonly CommandInteractionOption[] = interaction.options.data,
|
||||
) {
|
||||
const _options = {} as unknown
|
||||
|
||||
if (this.options)
|
||||
for (const { name, type, value } of options) {
|
||||
if (this.options[name]?.type !== type) return null
|
||||
|
||||
if (
|
||||
type === ApplicationCommandOptionType.Subcommand ||
|
||||
type === ApplicationCommandOptionType.SubcommandGroup
|
||||
) {
|
||||
const subOptions = Object.entries((this.options[name] as CommandSubcommandLikeOption).options)
|
||||
|
||||
// @ts-expect-error: Not smart enough, TypeScript :(
|
||||
_options[name] = await this.#resolveInteractionOptions(interaction, subOptions)
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
if (!value) continue
|
||||
|
||||
// @ts-expect-error: Not smart enough, TypeScript :(
|
||||
_options[name] =
|
||||
type === ApplicationCommandOptionType.Channel
|
||||
? await interaction.client.channels.fetch(value as string)
|
||||
: type === ApplicationCommandOptionType.User
|
||||
? await interaction.client.users.fetch(value as string)
|
||||
: type === ApplicationCommandOptionType.Role
|
||||
? await interaction.guild?.roles.fetch(value as string)
|
||||
: value
|
||||
}
|
||||
|
||||
return _options
|
||||
}
|
||||
|
||||
async canExecute(executor: User | GuildMember, channelId: string): Promise<boolean> {
|
||||
if (!this.requirements) return false
|
||||
|
||||
const isExecutorAdmin = isAdmin(executor)
|
||||
if (isExecutorAdmin) return true
|
||||
|
||||
const {
|
||||
adminOnly,
|
||||
channels,
|
||||
roles,
|
||||
permissions,
|
||||
users,
|
||||
mode = 'all',
|
||||
defaultCondition = 'fail',
|
||||
memberRequirementsForUsers = 'pass',
|
||||
} = this.requirements
|
||||
|
||||
const member = this.global ? null : (executor as GuildMember)
|
||||
const bDefCond = defaultCondition !== 'fail'
|
||||
const bMemReqForUsers = memberRequirementsForUsers !== 'fail'
|
||||
|
||||
const conditions = [
|
||||
adminOnly ? isExecutorAdmin : bDefCond,
|
||||
channels ? channels.includes(channelId) : bDefCond,
|
||||
member ? (roles ? roles.some(role => member.roles.cache.has(role)) : bDefCond) : bMemReqForUsers,
|
||||
member ? (permissions ? member.permissions.has(permissions) : bDefCond) : bMemReqForUsers,
|
||||
users ? users.includes(executor.id) : bDefCond,
|
||||
]
|
||||
|
||||
if (mode === 'all' && conditions.some(condition => !condition)) return false
|
||||
if (mode === 'any' && conditions.every(condition => !condition)) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
get json(): RESTPostAPIChatInputApplicationCommandsJSONBody & { contexts: Array<0 | 1 | 2> } {
|
||||
return {
|
||||
name: this.name,
|
||||
description: this.description,
|
||||
options: this.options ? this.#transformOptions(this.options) : undefined,
|
||||
// https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-context-types
|
||||
contexts: this.global ? [0] : [0, 1],
|
||||
}
|
||||
}
|
||||
|
||||
#transformOptions(optionsObject: Record<string, CommandOption>) {
|
||||
const options: RESTPostAPIChatInputApplicationCommandsJSONBody['options'] = []
|
||||
|
||||
for (const [name, option] of Object.entries(optionsObject)) {
|
||||
options.push({
|
||||
// biome-ignore lint/suspicious/noExplicitAny: Good enough work here
|
||||
type: option.type as any,
|
||||
name,
|
||||
description: option.description,
|
||||
required: option.required,
|
||||
...(option.type === ApplicationCommandOptionType.Subcommand ||
|
||||
option.type === ApplicationCommandOptionType.SubcommandGroup
|
||||
? {
|
||||
options: this.#transformOptions((option as CommandSubcommandLikeOption).options),
|
||||
}
|
||||
: {}),
|
||||
...(option.type === ApplicationCommandOptionType.Channel ? { channel_types: option.types } : {}),
|
||||
...(option.type === ApplicationCommandOptionType.Integer ||
|
||||
option.type === ApplicationCommandOptionType.Number
|
||||
? {
|
||||
min_value: option.min,
|
||||
max_value: option.max,
|
||||
choices: option.choices,
|
||||
autocomplete: option.autocomplete,
|
||||
}
|
||||
: {}),
|
||||
...(option.type === ApplicationCommandOptionType.String
|
||||
? {
|
||||
min_length: option.minLength,
|
||||
max_length: option.maxLength,
|
||||
choices: option.choices,
|
||||
autocomplete: option.autocomplete,
|
||||
}
|
||||
: {}),
|
||||
})
|
||||
}
|
||||
|
||||
return options
|
||||
}
|
||||
}
|
||||
|
||||
export class ModerationCommand<
|
||||
Options extends CommandOptionsOptions,
|
||||
AllowMessageCommand extends boolean = true,
|
||||
> extends Command<false, Options, AllowMessageCommand> {
|
||||
constructor(options: ExtendedCommandOptions<false, Options, AllowMessageCommand>) {
|
||||
super({
|
||||
...options,
|
||||
requirements: {
|
||||
...options.requirements,
|
||||
defaultCondition: 'pass',
|
||||
roles: (config.moderation?.roles ?? []).concat(options.requirements?.roles ?? []),
|
||||
},
|
||||
// @ts-expect-error: No thanks
|
||||
allowMessageCommand: options.allowMessageCommand ?? true,
|
||||
global: false,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export class AdminCommand<Options extends CommandOptionsOptions, AllowMessageCommand extends boolean> extends Command<
|
||||
true,
|
||||
Options,
|
||||
AllowMessageCommand
|
||||
> {
|
||||
constructor(options: ExtendedCommandOptions<true, Options, AllowMessageCommand>) {
|
||||
super({
|
||||
...options,
|
||||
requirements: {
|
||||
...options.requirements,
|
||||
adminOnly: true,
|
||||
defaultCondition: 'pass',
|
||||
},
|
||||
global: true,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/* TODO:
|
||||
APIApplicationCommandAttachmentOption
|
||||
APIApplicationCommandMentionableOption
|
||||
APIApplicationCommandRoleOption
|
||||
*/
|
||||
|
||||
export interface CommandOptions<
|
||||
Global extends boolean,
|
||||
Options extends CommandOptionsOptions | undefined,
|
||||
AllowMessageCommand extends boolean,
|
||||
> {
|
||||
name: string
|
||||
description: string
|
||||
requirements?: CommandRequirements
|
||||
options?: Options
|
||||
execute: CommandExecuteFunction<Global, Options, AllowMessageCommand>
|
||||
global?: Global
|
||||
allowMessageCommand?: AllowMessageCommand
|
||||
}
|
||||
|
||||
export type CommandArguments = Array<string | CommandSpecialArgument>
|
||||
|
||||
export type CommandSpecialArgument = {
|
||||
type: (typeof CommandSpecialArgumentType)[keyof typeof CommandSpecialArgumentType]
|
||||
id: string
|
||||
}
|
||||
|
||||
export const CommandSpecialArgumentType = {
|
||||
Channel: ApplicationCommandOptionType.Channel,
|
||||
Role: ApplicationCommandOptionType.Role,
|
||||
User: ApplicationCommandOptionType.User,
|
||||
}
|
||||
|
||||
type ExtendedCommandOptions<
|
||||
Global extends boolean,
|
||||
Options extends CommandOptionsOptions,
|
||||
AllowMessageCommand extends boolean,
|
||||
> = Omit<CommandOptions<Global, Options, AllowMessageCommand>, 'global'> & {
|
||||
requirements?: Omit<CommandOptions<false, Options, AllowMessageCommand>['requirements'], 'defaultCondition'>
|
||||
}
|
||||
|
||||
export type CommandOptionsOptions = Record<string, CommandOption>
|
||||
|
||||
type CommandExecuteFunction<
|
||||
Global extends boolean,
|
||||
Options extends CommandOptionsOptions | undefined,
|
||||
AllowMessageCommand extends boolean,
|
||||
> = (
|
||||
context: CommandContext<Global>,
|
||||
trigger: If<
|
||||
AllowMessageCommand,
|
||||
Message<InvertBoolean<Global>> | ChatInputCommandInteraction<If<Global, CacheType, 'raw' | 'cached'>>,
|
||||
ChatInputCommandInteraction<If<Global, CacheType, 'raw' | 'cached'>>
|
||||
>,
|
||||
options: Options extends CommandOptionsOptions ? CommandExecuteFunctionOptionsParameter<Options> : never,
|
||||
) => Promise<unknown> | unknown
|
||||
|
||||
type If<T extends boolean | undefined, U, V> = T extends true ? U : V
|
||||
type InvertBoolean<T extends boolean> = If<T, false, true>
|
||||
|
||||
type CommandExecuteFunctionOptionsParameter<Options extends CommandOptionsOptions> = {
|
||||
[K in keyof Options]: Options[K]['type'] extends
|
||||
| ApplicationCommandOptionType.Subcommand
|
||||
| ApplicationCommandOptionType.SubcommandGroup
|
||||
? // @ts-expect-error: Shut up, it works
|
||||
CommandExecuteFunctionOptionsParameter<Options[K]['options']> | undefined
|
||||
: If<
|
||||
Options[K]['required'],
|
||||
CommandOptionValueMap[Options[K]['type']],
|
||||
CommandOptionValueMap[Options[K]['type']] | undefined
|
||||
>
|
||||
}
|
||||
|
||||
type CommandContext<Global extends boolean> = typeof import('../context') & {
|
||||
executor: CommandExecutor<Global>
|
||||
}
|
||||
|
||||
type CommandOptionValueMap = {
|
||||
[ApplicationCommandOptionType.Boolean]: boolean
|
||||
[ApplicationCommandOptionType.Channel]: Channel
|
||||
[ApplicationCommandOptionType.Integer]: number
|
||||
[ApplicationCommandOptionType.Number]: number
|
||||
[ApplicationCommandOptionType.String]: string
|
||||
[ApplicationCommandOptionType.User]: User
|
||||
[ApplicationCommandOptionType.Role]: Role
|
||||
[ApplicationCommandOptionType.Subcommand]: never
|
||||
[ApplicationCommandOptionType.SubcommandGroup]: never
|
||||
}
|
||||
|
||||
type CommandOption =
|
||||
| CommandBooleanOption
|
||||
| CommandChannelOption
|
||||
| CommandIntegerOption
|
||||
| CommandNumberOption
|
||||
| CommandStringOption
|
||||
| CommandUserOption
|
||||
| CommandRoleOption
|
||||
| CommandSubcommandOption
|
||||
| CommandSubcommandGroupOption
|
||||
|
||||
type CommandExecutor<Global extends boolean> = If<Global, User, GuildMember>
|
||||
|
||||
type CommandOptionBase<Type extends ApplicationCommandOptionType> = {
|
||||
type: Type
|
||||
description: string
|
||||
required?: boolean
|
||||
}
|
||||
|
||||
type CommandBooleanOption = CommandOptionBase<ApplicationCommandOptionType.Boolean>
|
||||
|
||||
type CommandChannelOption = CommandOptionBase<ApplicationCommandOptionType.Channel> & {
|
||||
types: APIApplicationCommandChannelOption['channel_types']
|
||||
}
|
||||
|
||||
interface CommandOptionChoice<ValueType = number | string> {
|
||||
name: string
|
||||
value: ValueType
|
||||
}
|
||||
|
||||
type CommandOptionWithAutocompleteOrChoicesWrapper<
|
||||
Base extends CommandOptionBase<ApplicationCommandOptionType>,
|
||||
ChoiceType extends CommandOptionChoice,
|
||||
> =
|
||||
| (Base & {
|
||||
autocomplete: true
|
||||
choices?: never
|
||||
})
|
||||
| (Base & {
|
||||
autocomplete?: false
|
||||
choices?: ChoiceType[] | readonly ChoiceType[]
|
||||
})
|
||||
|
||||
type CommandIntegerOption = CommandOptionWithAutocompleteOrChoicesWrapper<
|
||||
CommandOptionBase<ApplicationCommandOptionType.Integer>,
|
||||
CommandOptionChoice<number>
|
||||
> & {
|
||||
min?: number
|
||||
max?: number
|
||||
}
|
||||
|
||||
type CommandNumberOption = CommandOptionWithAutocompleteOrChoicesWrapper<
|
||||
CommandOptionBase<ApplicationCommandOptionType.Number>,
|
||||
CommandOptionChoice<number>
|
||||
> & {
|
||||
min?: number
|
||||
max?: number
|
||||
}
|
||||
|
||||
type CommandStringOption = CommandOptionWithAutocompleteOrChoicesWrapper<
|
||||
CommandOptionBase<ApplicationCommandOptionType.String>,
|
||||
CommandOptionChoice<string>
|
||||
> & {
|
||||
minLength?: number
|
||||
maxLength?: number
|
||||
}
|
||||
|
||||
type CommandUserOption = CommandOptionBase<ApplicationCommandOptionType.User>
|
||||
|
||||
type CommandRoleOption = CommandOptionBase<ApplicationCommandOptionType.Role>
|
||||
|
||||
type SubcommandLikeApplicationCommandOptionType =
|
||||
| ApplicationCommandOptionType.Subcommand
|
||||
| ApplicationCommandOptionType.SubcommandGroup
|
||||
|
||||
interface CommandSubcommandLikeOption<
|
||||
Type extends SubcommandLikeApplicationCommandOptionType = SubcommandLikeApplicationCommandOptionType,
|
||||
> extends CommandOptionBase<Type> {
|
||||
options: CommandOptionsOptions
|
||||
required?: never
|
||||
}
|
||||
|
||||
type CommandSubcommandOption = CommandSubcommandLikeOption<ApplicationCommandOptionType.Subcommand>
|
||||
type CommandSubcommandGroupOption = CommandSubcommandLikeOption<ApplicationCommandOptionType.SubcommandGroup>
|
||||
|
||||
export type CommandRequirements = Filter & {
|
||||
mode?: 'all' | 'any'
|
||||
adminOnly?: boolean
|
||||
permissions?: bigint
|
||||
defaultCondition?: 'fail' | 'pass'
|
||||
memberRequirementsForUsers?: 'pass' | 'fail'
|
||||
}
|
||||
@@ -17,6 +17,7 @@ export default class CommandError extends Error {
|
||||
export enum CommandErrorType {
|
||||
Generic,
|
||||
MissingArgument,
|
||||
InvalidArgument,
|
||||
InvalidUser,
|
||||
InvalidChannel,
|
||||
InvalidDuration,
|
||||
@@ -25,6 +26,7 @@ export enum CommandErrorType {
|
||||
const ErrorTitleMap: Record<CommandErrorType, string> = {
|
||||
[CommandErrorType.Generic]: 'An exception was thrown',
|
||||
[CommandErrorType.MissingArgument]: 'Missing argument',
|
||||
[CommandErrorType.InvalidArgument]: 'Invalid argument',
|
||||
[CommandErrorType.InvalidUser]: 'Invalid user',
|
||||
[CommandErrorType.InvalidChannel]: 'Invalid channel',
|
||||
[CommandErrorType.InvalidDuration]: 'Invalid duration',
|
||||
|
||||
40
bots/discord/src/commands/admin/eval.ts
Normal file
40
bots/discord/src/commands/admin/eval.ts
Normal file
@@ -0,0 +1,40 @@
|
||||
import { inspect } from 'util'
|
||||
import { ApplicationCommandOptionType } from 'discord.js'
|
||||
|
||||
import { AdminCommand } from '$/classes/Command'
|
||||
import { createSuccessEmbed } from '$/utils/discord/embeds'
|
||||
|
||||
export default new AdminCommand({
|
||||
name: 'eval',
|
||||
description: 'Make the bot less sentient by evaluating code',
|
||||
options: {
|
||||
code: {
|
||||
description: 'The code to evaluate',
|
||||
type: ApplicationCommandOptionType.String,
|
||||
required: true,
|
||||
},
|
||||
['show-hidden']: {
|
||||
description: 'Show hidden properties',
|
||||
type: ApplicationCommandOptionType.Boolean,
|
||||
required: false,
|
||||
},
|
||||
},
|
||||
async execute(_, trigger, { code, 'show-hidden': showHidden }) {
|
||||
await trigger.reply({
|
||||
ephemeral: true,
|
||||
embeds: [
|
||||
createSuccessEmbed('Evaluate', `\`\`\`js\n${code}\`\`\``).addFields({
|
||||
name: 'Result',
|
||||
// biome-ignore lint/security/noGlobalEval: This is fine as it's an admin command
|
||||
value: `\`\`\`js\n${inspect(eval(code), {
|
||||
depth: 1,
|
||||
showHidden,
|
||||
getters: true,
|
||||
numericSeparator: true,
|
||||
showProxy: true,
|
||||
})}\`\`\``,
|
||||
}),
|
||||
],
|
||||
})
|
||||
},
|
||||
})
|
||||
21
bots/discord/src/commands/admin/exception-test.ts
Normal file
21
bots/discord/src/commands/admin/exception-test.ts
Normal file
@@ -0,0 +1,21 @@
|
||||
import { ApplicationCommandOptionType } from 'discord.js'
|
||||
|
||||
import { AdminCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
|
||||
export default new AdminCommand({
|
||||
name: 'exception-test',
|
||||
description: 'Makes the bot intentionally hate you by throwing an exception',
|
||||
options: {
|
||||
type: {
|
||||
description: 'The type of exception to throw',
|
||||
type: ApplicationCommandOptionType.String,
|
||||
required: true,
|
||||
choices: Object.keys(CommandErrorType).map(k => ({ name: k, value: k })),
|
||||
},
|
||||
},
|
||||
async execute(_, __, { type }) {
|
||||
if (type === 'Process') throw new Error('Intentional process exception')
|
||||
throw new CommandError(CommandErrorType[type as keyof typeof CommandErrorType], 'Intentional bot design') // ;)
|
||||
},
|
||||
})
|
||||
35
bots/discord/src/commands/admin/reload.ts
Normal file
35
bots/discord/src/commands/admin/reload.ts
Normal file
@@ -0,0 +1,35 @@
|
||||
import { AdminCommand } from '$/classes/Command'
|
||||
import { join, dirname } from 'path'
|
||||
|
||||
import type { Config } from 'config.schema'
|
||||
|
||||
export default new AdminCommand({
|
||||
name: 'reload',
|
||||
description: 'Reload configuration',
|
||||
async execute(context, trigger) {
|
||||
const { api, logger, discord } = context
|
||||
context.config = ((await import(join(dirname(Bun.main), '..', 'config.js'))) as { default: Config }).default
|
||||
|
||||
if ('deferReply' in trigger) await trigger.deferReply({ ephemeral: true })
|
||||
|
||||
logger.info('Reinitializing API client to reload configuration...')
|
||||
await api.client.ws.setOptions(
|
||||
{
|
||||
url: context.config.api.url,
|
||||
},
|
||||
false,
|
||||
)
|
||||
api.intentionallyDisconnecting = true
|
||||
api.client.disconnect(true)
|
||||
api.disconnectCount = 0
|
||||
api.intentionallyDisconnecting = false
|
||||
await api.client.connect()
|
||||
|
||||
logger.info('Reinitializing Discord client to reload configuration...')
|
||||
await discord.client.destroy()
|
||||
await discord.client.login()
|
||||
|
||||
// @ts-expect-error: TypeScript dum
|
||||
await trigger[('deferReply' in trigger ? 'editReply' : 'reply')]({ content: 'Reloaded configuration' })
|
||||
},
|
||||
})
|
||||
93
bots/discord/src/commands/admin/slash-commands.ts
Normal file
93
bots/discord/src/commands/admin/slash-commands.ts
Normal file
@@ -0,0 +1,93 @@
|
||||
import { ApplicationCommandOptionType, Routes } from 'discord.js'
|
||||
|
||||
import { AdminCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
|
||||
import { createSuccessEmbed } from '$/utils/discord/embeds'
|
||||
|
||||
const SubcommandOptions = {
|
||||
where: {
|
||||
description: 'Where to register the commands',
|
||||
type: ApplicationCommandOptionType.String,
|
||||
choices: [
|
||||
{ name: 'globally', value: 'global' },
|
||||
{ name: 'this server', value: 'server' },
|
||||
],
|
||||
required: true,
|
||||
},
|
||||
} as const
|
||||
|
||||
export default new AdminCommand({
|
||||
name: 'slash-commands',
|
||||
description: 'Register or delete slash commands',
|
||||
options: {
|
||||
register: {
|
||||
description: 'Register slash commands',
|
||||
type: ApplicationCommandOptionType.Subcommand,
|
||||
options: SubcommandOptions,
|
||||
},
|
||||
delete: {
|
||||
description: 'Delete slash commands',
|
||||
type: ApplicationCommandOptionType.Subcommand,
|
||||
options: SubcommandOptions,
|
||||
},
|
||||
},
|
||||
allowMessageCommand: true,
|
||||
async execute(context, trigger, { delete: deleteOption, register }) {
|
||||
const action = register ? 'register' : 'delete'
|
||||
const { where } = (deleteOption ?? register)!
|
||||
|
||||
if (!trigger.inGuild())
|
||||
throw new CommandError(CommandErrorType.Generic, 'This command can only be used in a server.')
|
||||
|
||||
const { global: globalCommands, guild: guildCommands } = Object.groupBy(
|
||||
Object.values(context.discord.commands),
|
||||
cmd => (cmd.global ? 'global' : 'guild'),
|
||||
)
|
||||
|
||||
const {
|
||||
client,
|
||||
client: { rest },
|
||||
} = trigger
|
||||
|
||||
let response: string | undefined
|
||||
|
||||
switch (action) {
|
||||
case 'register':
|
||||
if (where === 'global') {
|
||||
response = 'Registered global slash commands'
|
||||
|
||||
await rest.put(Routes.applicationCommands(client.application.id), {
|
||||
body: globalCommands?.map(c => c.json),
|
||||
})
|
||||
} else {
|
||||
response = 'Registered slash commands on this server'
|
||||
|
||||
await rest.put(Routes.applicationGuildCommands(client.application.id, trigger.guildId), {
|
||||
body: guildCommands?.map(c => c.json),
|
||||
})
|
||||
}
|
||||
|
||||
break
|
||||
|
||||
case 'delete':
|
||||
if (where === 'global') {
|
||||
response = 'Deleted global slash commands'
|
||||
|
||||
await rest.put(Routes.applicationCommands(client.application.id), {
|
||||
body: [],
|
||||
})
|
||||
} else {
|
||||
response = 'Deleted slash commands on this server'
|
||||
|
||||
await rest.put(Routes.applicationGuildCommands(client.application.id, trigger.guildId), {
|
||||
body: [],
|
||||
})
|
||||
}
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
await trigger.reply({ embeds: [createSuccessEmbed(response!)] })
|
||||
},
|
||||
})
|
||||
24
bots/discord/src/commands/admin/stop.ts
Normal file
24
bots/discord/src/commands/admin/stop.ts
Normal file
@@ -0,0 +1,24 @@
|
||||
import { AdminCommand } from '$/classes/Command'
|
||||
|
||||
export default new AdminCommand({
|
||||
name: 'stop',
|
||||
description: "You don't want to run this unless the bot starts to go insane, and like, you really need to stop it.",
|
||||
async execute({ api, logger, executor }, trigger) {
|
||||
api.intentionallyDisconnecting = true
|
||||
|
||||
logger.fatal('Stopping bot...')
|
||||
trigger.reply({
|
||||
content: 'Stopping... (I will go offline once done)',
|
||||
ephemeral: true,
|
||||
})
|
||||
|
||||
if (!api.client.disconnected) api.client.disconnect()
|
||||
logger.warn('Disconnected from API')
|
||||
|
||||
trigger.client.destroy()
|
||||
logger.warn('Disconnected from Discord API')
|
||||
|
||||
logger.info(`Bot stopped, requested by ${executor.id}`)
|
||||
process.exit(0)
|
||||
},
|
||||
})
|
||||
@@ -1,32 +0,0 @@
|
||||
import { inspect } from 'util'
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import { createSuccessEmbed } from '$/utils/discord/embeds'
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('eval')
|
||||
.setDescription('Make the bot less sentient by evaluating code')
|
||||
.addStringOption(option => option.setName('code').setDescription('The code to evaluate').setRequired(true))
|
||||
.setDMPermission(true)
|
||||
.toJSON(),
|
||||
|
||||
ownerOnly: true,
|
||||
global: true,
|
||||
|
||||
async execute(_, interaction) {
|
||||
const code = interaction.options.getString('code', true)
|
||||
|
||||
await interaction.reply({
|
||||
ephemeral: true,
|
||||
embeds: [
|
||||
createSuccessEmbed('Evaluate', `\`\`\`js\n${code}\`\`\``).addFields({
|
||||
name: 'Result',
|
||||
// biome-ignore lint/security/noGlobalEval: Deal with it
|
||||
value: `\`\`\`js\n${inspect(eval(code), { depth: 1 })}\`\`\``,
|
||||
}),
|
||||
],
|
||||
})
|
||||
},
|
||||
} satisfies Command
|
||||
@@ -1,36 +0,0 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('exception-test')
|
||||
.setDescription('Makes the bot intentionally hate you by throwing an exception')
|
||||
.addStringOption(option =>
|
||||
option
|
||||
.setName('type')
|
||||
.setDescription('The type of exception to throw')
|
||||
.setRequired(true)
|
||||
.addChoices(
|
||||
Object.keys(CommandErrorType).map(
|
||||
k =>
|
||||
({
|
||||
name: k,
|
||||
value: k,
|
||||
}) as const,
|
||||
),
|
||||
),
|
||||
)
|
||||
.setDMPermission(true)
|
||||
.toJSON(),
|
||||
|
||||
ownerOnly: true,
|
||||
global: true,
|
||||
|
||||
async execute(_, interaction) {
|
||||
const type = interaction.options.getString('type', true)
|
||||
if (type === 'Process') throw new Error('Intentional process exception')
|
||||
throw new CommandError(CommandErrorType[type as keyof typeof CommandErrorType], 'Intentional bot design') // ;)
|
||||
},
|
||||
} satisfies Command
|
||||
@@ -1,35 +0,0 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('stop')
|
||||
.setDescription(
|
||||
"You don't want to run this unless the bot starts to go insane, and like, you really need to stop it.",
|
||||
)
|
||||
.setDMPermission(true)
|
||||
.toJSON(),
|
||||
|
||||
ownerOnly: true,
|
||||
global: true,
|
||||
|
||||
async execute({ api, logger }, interaction) {
|
||||
api.isStopping = true
|
||||
|
||||
logger.fatal('Stopping bot...')
|
||||
await interaction.reply({
|
||||
content: 'Stopping... (I will go offline once done)',
|
||||
ephemeral: true,
|
||||
})
|
||||
|
||||
api.client.disconnect()
|
||||
logger.warn('Disconnected from API')
|
||||
|
||||
await interaction.client.destroy()
|
||||
logger.warn('Disconnected from Discord API')
|
||||
|
||||
logger.info(`Bot stopped, requested by ${interaction.user.id}`)
|
||||
process.exit(0)
|
||||
},
|
||||
} satisfies Command
|
||||
@@ -1,32 +1,37 @@
|
||||
import { EmbedBuilder } from 'discord.js'
|
||||
|
||||
import Command from '$/classes/Command'
|
||||
import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
|
||||
|
||||
import { EmbedBuilder, SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder().setName('coinflip').setDescription('Do a coinflip!').setDMPermission(true).toJSON(),
|
||||
export default new Command({
|
||||
name: 'coinflip',
|
||||
description: 'Do a coinflip!',
|
||||
global: true,
|
||||
|
||||
async execute(_, interaction) {
|
||||
requirements: {
|
||||
defaultCondition: 'pass',
|
||||
},
|
||||
allowMessageCommand: true,
|
||||
async execute(_, trigger) {
|
||||
const result = Math.random() < 0.5 ? ('heads' as const) : ('tails' as const)
|
||||
const embed = applyCommonEmbedStyles(new EmbedBuilder().setTitle('Flipping... 🪙'), true, false, false)
|
||||
const embed = applyCommonEmbedStyles(new EmbedBuilder().setTitle('Flipping... 🪙'), false, false, true)
|
||||
|
||||
await interaction.reply({
|
||||
embeds: [embed.toJSON()],
|
||||
})
|
||||
const reply = await trigger
|
||||
.reply({
|
||||
embeds: [embed.toJSON()],
|
||||
})
|
||||
.then(it => it.fetch())
|
||||
|
||||
embed.setTitle(`The coin landed on... **${result.toUpperCase()}**! ${EmojiMap[result]}`)
|
||||
|
||||
setTimeout(
|
||||
() =>
|
||||
interaction.editReply({
|
||||
reply.edit({
|
||||
embeds: [embed.toJSON()],
|
||||
}),
|
||||
1500,
|
||||
)
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
const EmojiMap: Record<'heads' | 'tails', string> = {
|
||||
heads: '🤯',
|
||||
|
||||
@@ -1,44 +1,46 @@
|
||||
import { SlashCommandBuilder, type TextBasedChannel } from 'discord.js'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { ApplicationCommandOptionType, Message } from 'discord.js'
|
||||
import { ModerationCommand } from '../../classes/Command'
|
||||
|
||||
import { config } from '$/context'
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('reply')
|
||||
.setDescription('Send a message as the bot')
|
||||
.addStringOption(option => option.setName('message').setDescription('The message to send').setRequired(true))
|
||||
.addStringOption(option =>
|
||||
option
|
||||
.setName('reference')
|
||||
.setDescription('The message ID to reply to (use `latest` to reply to the latest message)')
|
||||
.setRequired(false),
|
||||
)
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'reply',
|
||||
description: 'Send a message as the bot',
|
||||
options: {
|
||||
message: {
|
||||
description: 'The message to send',
|
||||
required: true,
|
||||
type: ApplicationCommandOptionType.String,
|
||||
},
|
||||
reference: {
|
||||
description: 'The message ID to reply to (use `latest` to reply to the latest message)',
|
||||
required: false,
|
||||
type: ApplicationCommandOptionType.String,
|
||||
},
|
||||
},
|
||||
allowMessageCommand: false,
|
||||
async execute({ logger, executor }, trigger, { reference: ref, message: msg }) {
|
||||
if (trigger instanceof Message) return
|
||||
|
||||
global: false,
|
||||
|
||||
async execute({ logger }, interaction) {
|
||||
const msg = interaction.options.getString('message', true)
|
||||
const ref = interaction.options.getString('reference')
|
||||
|
||||
const channel = (await interaction.guild!.channels.fetch(interaction.channelId)) as TextBasedChannel
|
||||
const refMsg = ref?.startsWith('latest') ? (await channel.messages.fetch({ limit: 1 })).at(0)?.id : ref
|
||||
const channel = await trigger.guild!.channels.fetch(trigger.channelId)
|
||||
if (!channel?.isTextBased())
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
'This command can only be used in or on text channels',
|
||||
)
|
||||
const refMsg = ref?.startsWith('latest')
|
||||
? await channel.messages.fetch({ limit: 1 }).then(it => it.first())
|
||||
: ref
|
||||
|
||||
await channel.send({
|
||||
content: msg,
|
||||
reply: refMsg ? { messageReference: refMsg, failIfNotExists: true } : undefined,
|
||||
})
|
||||
|
||||
logger.info(`User ${interaction.user.tag} made the bot say: ${msg}`)
|
||||
logger.info(`User ${executor.user.tag} made the bot say: ${msg}`)
|
||||
|
||||
await interaction.reply({
|
||||
await trigger.reply({
|
||||
content: 'OK!',
|
||||
ephemeral: true,
|
||||
})
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,58 +1,58 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import type { Command } from '../types'
|
||||
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { config } from '$/context'
|
||||
import { createModerationActionEmbed } from '$/utils/discord/embeds'
|
||||
import { sendModerationReplyAndLogs } from '$/utils/discord/moderation'
|
||||
import { parseDuration } from '$/utils/duration'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('ban')
|
||||
.setDescription('Ban a user')
|
||||
.addUserOption(option => option.setName('user').setRequired(true).setDescription('The user to ban'))
|
||||
.addStringOption(option => option.setName('reason').setDescription('The reason for banning the user'))
|
||||
.addStringOption(option =>
|
||||
option.setName('dmd').setDescription('Duration to delete messages (must be from 0 to 7 days)'),
|
||||
)
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'ban',
|
||||
description: 'Ban a user',
|
||||
options: {
|
||||
user: {
|
||||
description: 'The user to ban',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
reason: {
|
||||
description: 'The reason for banning the user',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
dmd: {
|
||||
description: 'Duration to delete messages (must be from 0 to 7 days)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
},
|
||||
async execute({ logger, executor }, interaction, { user, reason, dmd }) {
|
||||
const guild = await interaction.client.guilds.fetch(interaction.guildId)
|
||||
const member = await guild.members.fetch(user).catch(() => {})
|
||||
const moderator = await guild.members.fetch(executor.user)
|
||||
|
||||
global: false,
|
||||
if (member) {
|
||||
if (!member.bannable)
|
||||
throw new CommandError(CommandErrorType.Generic, 'This user cannot be banned by the bot.')
|
||||
|
||||
async execute({ logger }, interaction) {
|
||||
const user = interaction.options.getUser('user', true)
|
||||
const reason = interaction.options.getString('reason') ?? 'No reason provided'
|
||||
const dmd = interaction.options.getString('dmd')
|
||||
|
||||
const member = await interaction.guild!.members.fetch(user.id)
|
||||
const moderator = await interaction.guild!.members.fetch(interaction.user.id)
|
||||
|
||||
if (member.bannable) throw new CommandError(CommandErrorType.Generic, 'This user cannot be banned by the bot.')
|
||||
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
'You cannot ban a user with a role equal to or higher than yours.',
|
||||
)
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
'You cannot ban a user with a role equal to or higher than yours.',
|
||||
)
|
||||
}
|
||||
|
||||
const dms = Math.floor(dmd ? parseDuration(dmd) : 0 / 1000)
|
||||
await interaction.guild!.members.ban(user, {
|
||||
reason: `Banned by moderator ${interaction.user.tag} (${interaction.user.id}): ${reason}`,
|
||||
reason: `Banned by moderator ${executor.user.tag} (${executor.id}): ${reason}`,
|
||||
deleteMessageSeconds: dms,
|
||||
})
|
||||
|
||||
await sendModerationReplyAndLogs(
|
||||
interaction,
|
||||
createModerationActionEmbed('Banned', user, interaction.user, reason),
|
||||
createModerationActionEmbed('Banned', user, executor.user, reason),
|
||||
)
|
||||
|
||||
logger.info(
|
||||
`${interaction.user.tag} (${interaction.user.id}) banned ${user.tag} (${user.id}) because ${reason}, deleting their messages sent in the previous ${dms}s`,
|
||||
`${executor.user.tag} (${executor.id}) banned ${user.tag} (${user.id}) because ${reason}, deleting their messages sent in the previous ${dms}s`,
|
||||
)
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,31 +1,24 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import type { Command } from '../types'
|
||||
|
||||
import { config } from '$/context'
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import { createSuccessEmbed } from '$/utils/discord/embeds'
|
||||
import { cureNickname } from '$/utils/discord/moderation'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('cure')
|
||||
.setDescription("Cure a member's nickname")
|
||||
.addUserOption(option => option.setName('member').setRequired(true).setDescription('The member to cure'))
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'cure',
|
||||
description: "Cure a member's nickname",
|
||||
options: {
|
||||
member: {
|
||||
description: 'The member to cure',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
},
|
||||
|
||||
global: false,
|
||||
|
||||
async execute(_, interaction) {
|
||||
const user = interaction.options.getUser('member', true)
|
||||
const member = await interaction.guild!.members.fetch(user.id)
|
||||
async execute(_, interaction, { member: user }) {
|
||||
const guild = await interaction.client.guilds.fetch(interaction.guildId)
|
||||
const member = await guild.members.fetch(user)
|
||||
await cureNickname(member)
|
||||
await interaction.reply({
|
||||
embeds: [createSuccessEmbed(null, `Cured nickname for ${member.toString()}`)],
|
||||
ephemeral: true,
|
||||
})
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,44 +1,47 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { applyRolePreset } from '$/utils/discord/rolePresets'
|
||||
import type { Command } from '../types'
|
||||
|
||||
import { config } from '$/context'
|
||||
import { createModerationActionEmbed } from '$/utils/discord/embeds'
|
||||
import { sendModerationReplyAndLogs } from '$/utils/discord/moderation'
|
||||
import { applyRolePreset, removeRolePreset } from '$/utils/discord/rolePresets'
|
||||
import { parseDuration } from '$/utils/duration'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('mute')
|
||||
.setDescription('Mute a member')
|
||||
.addUserOption(option => option.setName('member').setRequired(true).setDescription('The member to mute'))
|
||||
.addStringOption(option => option.setName('reason').setDescription('The reason for muting the member'))
|
||||
.addStringOption(option => option.setName('duration').setDescription('The duration of the mute'))
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'mute',
|
||||
description: 'Mute a member',
|
||||
options: {
|
||||
member: {
|
||||
description: 'The member to mute',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
reason: {
|
||||
description: 'The reason for muting the member',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
duration: {
|
||||
description: 'The duration of the mute',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
},
|
||||
async execute(
|
||||
{ logger, executor },
|
||||
interaction,
|
||||
{ member: user, reason = 'No reason provided', duration: durationInput },
|
||||
) {
|
||||
const guild = await interaction.client.guilds.fetch(interaction.guildId)
|
||||
const member = await guild.members.fetch(user.id)
|
||||
const moderator = await guild.members.fetch(executor.id)
|
||||
const duration = durationInput ? parseDuration(durationInput) : Infinity
|
||||
|
||||
global: false,
|
||||
|
||||
async execute({ logger }, interaction, { userIsOwner }) {
|
||||
const user = interaction.options.getUser('member', true)
|
||||
const reason = interaction.options.getString('reason') ?? 'No reason provided'
|
||||
const duration = interaction.options.getString('duration')
|
||||
const durationMs = duration ? parseDuration(duration) : null
|
||||
|
||||
if (Number.isInteger(durationMs) && durationMs! < 1)
|
||||
if (Number.isInteger(duration) && duration! < 1)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidDuration,
|
||||
'The duration must be at least 1 millisecond long.',
|
||||
)
|
||||
|
||||
const expires = durationMs ? Date.now() + durationMs : null
|
||||
const moderator = await interaction.guild!.members.fetch(interaction.user.id)
|
||||
const member = await interaction.guild!.members.fetch(user.id)
|
||||
const expires = Math.max(duration, Date.now() + duration)
|
||||
if (!member)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
@@ -48,20 +51,25 @@ export default {
|
||||
if (!member.manageable)
|
||||
throw new CommandError(CommandErrorType.Generic, 'This user cannot be managed by the bot.')
|
||||
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0 && !userIsOwner)
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
'You cannot mute a user with a role equal to or higher than yours.',
|
||||
)
|
||||
|
||||
await applyRolePreset(member, 'mute', durationMs ? Date.now() + durationMs : null)
|
||||
await applyRolePreset(member, 'mute', expires)
|
||||
await sendModerationReplyAndLogs(
|
||||
interaction,
|
||||
createModerationActionEmbed('Muted', user, interaction.user, reason, durationMs),
|
||||
createModerationActionEmbed('Muted', user, executor.user, reason, duration),
|
||||
)
|
||||
|
||||
if (duration)
|
||||
setTimeout(() => {
|
||||
removeRolePreset(member, 'mute')
|
||||
}, duration)
|
||||
|
||||
logger.info(
|
||||
`Moderator ${interaction.user.tag} (${interaction.user.id}) muted ${user.tag} (${user.id}) until ${expires} because ${reason}`,
|
||||
`Moderator ${executor.user.tag} (${executor.user.id}) muted ${user.tag} (${user.id}) until ${expires} because ${reason}`,
|
||||
)
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,42 +1,37 @@
|
||||
import { EmbedBuilder, GuildChannel, SlashCommandBuilder } from 'discord.js'
|
||||
import { EmbedBuilder } from 'discord.js'
|
||||
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { config } from '$/context'
|
||||
import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
|
||||
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('purge')
|
||||
.setDescription('Purge messages from a channel')
|
||||
.addIntegerOption(option =>
|
||||
option.setName('amount').setDescription('The amount of messages to remove').setMaxValue(100).setMinValue(1),
|
||||
)
|
||||
.addUserOption(option =>
|
||||
option.setName('user').setDescription('The user to remove messages from (needs `until`)'),
|
||||
)
|
||||
.addStringOption(option =>
|
||||
option.setName('until').setDescription('The message ID to remove messages until (overrides `amount`)'),
|
||||
)
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'purge',
|
||||
description: 'Purge messages from a channel',
|
||||
options: {
|
||||
amount: {
|
||||
description: 'The amount of messages to remove',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.Integer,
|
||||
min: 1,
|
||||
max: 100,
|
||||
},
|
||||
user: {
|
||||
description: 'The user to remove messages from (needs `until`)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
until: {
|
||||
description: 'The message ID to remove messages until (overrides `amount`)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
},
|
||||
|
||||
global: false,
|
||||
|
||||
async execute({ logger }, interaction) {
|
||||
const amount = interaction.options.getInteger('amount')
|
||||
const user = interaction.options.getUser('user')
|
||||
const until = interaction.options.getString('until')
|
||||
|
||||
async execute({ logger, executor }, interaction, { amount, user, until }) {
|
||||
if (!amount && !until)
|
||||
throw new CommandError(CommandErrorType.MissingArgument, 'Either `amount` or `until` must be provided.')
|
||||
|
||||
const channel = interaction.channel!
|
||||
if (!(channel.isTextBased() && channel instanceof GuildChannel))
|
||||
if (!channel.isTextBased())
|
||||
throw new CommandError(CommandErrorType.InvalidChannel, 'The supplied channel is not a text channel.')
|
||||
|
||||
const embed = applyCommonEmbedStyles(
|
||||
@@ -59,8 +54,9 @@ export default {
|
||||
await channel.bulkDelete(messages, true)
|
||||
|
||||
logger.info(
|
||||
`Moderator ${interaction.user.tag} (${interaction.user.id}) purged ${messages.size} messages in #${channel.name} (${channel.id})`,
|
||||
`Moderator ${executor.user.tag} (${executor.id}) purged ${messages.size} messages in #${channel.name} (${channel.id})`,
|
||||
)
|
||||
|
||||
await reply.edit({
|
||||
embeds: [
|
||||
embed.setTitle('Purged messages').setDescription(null).addFields({
|
||||
@@ -70,4 +66,4 @@ export default {
|
||||
],
|
||||
})
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,49 +1,48 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { sendPresetReplyAndLogs } from '$/utils/discord/moderation'
|
||||
import { applyRolePreset, removeRolePreset } from '$/utils/discord/rolePresets'
|
||||
import { parseDuration } from '$/utils/duration'
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('role-preset')
|
||||
.setDescription('Manage role presets for a member')
|
||||
.addStringOption(option =>
|
||||
option
|
||||
.setName('action')
|
||||
.setRequired(true)
|
||||
.setDescription('The action to perform')
|
||||
.addChoices([
|
||||
{ name: 'apply', value: 'apply' },
|
||||
{ name: 'remove', value: 'remove' },
|
||||
]),
|
||||
)
|
||||
.addUserOption(option => option.setName('member').setRequired(true).setDescription('The member to manage'))
|
||||
.addStringOption(option =>
|
||||
option.setName('preset').setRequired(true).setDescription('The preset to apply or remove'),
|
||||
)
|
||||
.addStringOption(option =>
|
||||
option.setName('duration').setDescription('The duration to apply the preset for (only for apply action)'),
|
||||
)
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: ['955220417969262612', '973886585294704640'],
|
||||
const SubcommandOptions = {
|
||||
member: {
|
||||
description: 'The member to manage',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
preset: {
|
||||
description: 'The preset to apply or remove',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
duration: {
|
||||
description: 'The duration to apply the preset for (only for apply action)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
} as const
|
||||
|
||||
global: false,
|
||||
export default new ModerationCommand({
|
||||
name: 'role-preset',
|
||||
description: 'Manage role presets for a member',
|
||||
options: {
|
||||
apply: {
|
||||
description: 'Apply a role preset to a member',
|
||||
type: ModerationCommand.OptionType.Subcommand,
|
||||
options: SubcommandOptions,
|
||||
},
|
||||
remove: {
|
||||
description: 'Remove a role preset from a member',
|
||||
type: ModerationCommand.OptionType.Subcommand,
|
||||
options: SubcommandOptions,
|
||||
},
|
||||
},
|
||||
async execute({ logger, executor }, trigger, { apply, remove }) {
|
||||
let expires: number | undefined
|
||||
const { member: user, duration: durationInput, preset } = (apply ?? remove)!
|
||||
const moderator = await trigger.guild!.members.fetch(executor.user.id)
|
||||
const member = await trigger.guild!.members.fetch(user.id)
|
||||
|
||||
async execute({ logger }, interaction, { userIsOwner }) {
|
||||
const action = interaction.options.getString('action', true) as 'apply' | 'remove'
|
||||
const user = interaction.options.getUser('member', true)
|
||||
const preset = interaction.options.getString('preset', true)
|
||||
const duration = interaction.options.getString('duration')
|
||||
|
||||
let expires: number | null | undefined = undefined
|
||||
const moderator = await interaction.guild!.members.fetch(interaction.user.id)
|
||||
const member = await interaction.guild!.members.fetch(user.id)
|
||||
if (!member)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
@@ -53,32 +52,37 @@ export default {
|
||||
if (!member.manageable)
|
||||
throw new CommandError(CommandErrorType.Generic, 'This user cannot be managed by the bot.')
|
||||
|
||||
if (action === 'apply') {
|
||||
const durationMs = duration ? parseDuration(duration) : null
|
||||
if (Number.isInteger(durationMs) && durationMs! < 1)
|
||||
if (apply) {
|
||||
const duration = durationInput ? parseDuration(durationInput) : Infinity
|
||||
if (Number.isInteger(duration) && duration! < 1)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidDuration,
|
||||
'The duration must be at least 1 millisecond long.',
|
||||
)
|
||||
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0 && !userIsOwner)
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
'You cannot apply a role preset to a user with a role equal to or higher than yours.',
|
||||
)
|
||||
|
||||
expires = durationMs ? Date.now() + durationMs : null
|
||||
expires = Math.max(duration, Date.now() + duration)
|
||||
await applyRolePreset(member, preset, expires)
|
||||
logger.info(
|
||||
`Moderator ${interaction.user.tag} (${interaction.user.id}) applied role preset ${preset} to ${user.id} until ${expires}`,
|
||||
`Moderator ${executor.user.tag} (${executor.user.id}) applied role preset ${preset} to ${user.id} until ${expires}`,
|
||||
)
|
||||
} else if (action === 'remove') {
|
||||
} else if (remove) {
|
||||
await removeRolePreset(member, preset)
|
||||
logger.info(
|
||||
`Moderator ${interaction.user.tag} (${interaction.user.id}) removed role preset ${preset} from ${user.id}`,
|
||||
`Moderator ${executor.user.tag} (${executor.user.id}) removed role preset ${preset} from ${user.id}`,
|
||||
)
|
||||
}
|
||||
|
||||
await sendPresetReplyAndLogs(action, interaction, user, preset, expires)
|
||||
if (expires)
|
||||
setTimeout(() => {
|
||||
removeRolePreset(member, preset)
|
||||
}, expires)
|
||||
|
||||
await sendPresetReplyAndLogs(apply ? 'apply' : 'remove', trigger, executor, user, preset, expires)
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,42 +1,34 @@
|
||||
import { createSuccessEmbed } from '$/utils/discord/embeds'
|
||||
import { durationToString, parseDuration } from '$/utils/duration'
|
||||
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { config } from '$/context'
|
||||
import type { Command } from '../types'
|
||||
import { ChannelType } from 'discord.js'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('slowmode')
|
||||
.setDescription('Set a slowmode for the current channel')
|
||||
.addStringOption(option => option.setName('duration').setDescription('The duration to set').setRequired(true))
|
||||
.addStringOption(option =>
|
||||
option
|
||||
.setName('channel')
|
||||
.setDescription('The channel to set the slowmode on (defaults to current channel)')
|
||||
.setRequired(false),
|
||||
)
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'slowmode',
|
||||
description: 'Set a slowmode for a channel',
|
||||
options: {
|
||||
duration: {
|
||||
description: 'The duration to set',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
channel: {
|
||||
description: 'The channel to set the slowmode on (defaults to current channel)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.Channel,
|
||||
types: [ChannelType.GuildText],
|
||||
},
|
||||
},
|
||||
async execute({ logger, executor }, interaction, { duration: durationInput, channel: channelInput }) {
|
||||
const channel = channelInput ?? (await interaction.guild!.channels.fetch(interaction.channelId))
|
||||
const duration = parseDuration(durationInput)
|
||||
|
||||
global: false,
|
||||
|
||||
async execute({ logger }, interaction) {
|
||||
const durationStr = interaction.options.getString('duration', true)
|
||||
const id = interaction.options.getChannel('channel')?.id ?? interaction.channelId
|
||||
|
||||
const duration = parseDuration(durationStr)
|
||||
const channel = await interaction.guild!.channels.fetch(id)
|
||||
|
||||
if (!channel?.isTextBased())
|
||||
if (!channel?.isTextBased() || channel.isDMBased())
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidChannel,
|
||||
'The supplied channel is not a text channel or does not exist.',
|
||||
'The supplied channel is not a text channel.',
|
||||
)
|
||||
|
||||
if (Number.isNaN(duration)) throw new CommandError(CommandErrorType.InvalidDuration, 'Invalid duration.')
|
||||
@@ -46,10 +38,7 @@ export default {
|
||||
'Duration out of range, must be between 0s and 6h.',
|
||||
)
|
||||
|
||||
logger.info(`Setting slowmode to ${duration}ms on ${channel.id}`)
|
||||
|
||||
await channel.setRateLimitPerUser(duration / 1000, `Set by ${interaction.user.tag} (${interaction.user.id})`)
|
||||
|
||||
await channel.setRateLimitPerUser(duration / 1000, `Set by ${executor.user.tag} (${executor.id})`)
|
||||
await interaction.reply({
|
||||
embeds: [
|
||||
createSuccessEmbed(
|
||||
@@ -59,7 +48,7 @@ export default {
|
||||
})
|
||||
|
||||
logger.info(
|
||||
`${interaction.user.tag} (${interaction.user.id}) set the slowmode on ${channel.name} (${channel.id}) to ${duration}ms`,
|
||||
`${executor.user.tag} (${executor.id}) set the slowmode on ${channel.name} (${channel.id}) to ${duration}ms`,
|
||||
)
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,33 +1,21 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import type { Command } from '../types'
|
||||
|
||||
import { config } from '$/context'
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import { createModerationActionEmbed } from '$/utils/discord/embeds'
|
||||
import { sendModerationReplyAndLogs } from '$/utils/discord/moderation'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('unban')
|
||||
.setDescription('Unban a user')
|
||||
.addUserOption(option => option.setName('user').setRequired(true).setDescription('The user to unban'))
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'unban',
|
||||
description: 'Unban a user',
|
||||
options: {
|
||||
user: {
|
||||
description: 'The user to unban',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
},
|
||||
async execute({ logger, executor }, interaction, { user }) {
|
||||
await interaction.guild!.members.unban(user, `Unbanned by moderator ${executor.user.tag} (${executor.id})`)
|
||||
|
||||
global: false,
|
||||
|
||||
async execute({ logger }, interaction) {
|
||||
const user = interaction.options.getUser('user', true)
|
||||
|
||||
await interaction.guild!.members.unban(
|
||||
user,
|
||||
`Unbanned by moderator ${interaction.user.tag} (${interaction.user.id})`,
|
||||
)
|
||||
|
||||
await sendModerationReplyAndLogs(interaction, createModerationActionEmbed('Unbanned', user, interaction.user))
|
||||
logger.info(`${interaction.user.tag} (${interaction.user.id}) unbanned ${user.tag} (${user.id})`)
|
||||
await sendModerationReplyAndLogs(interaction, createModerationActionEmbed('Unbanned', user, executor.user))
|
||||
logger.info(`${executor.user.tag} (${executor.id}) unbanned ${user.tag} (${user.id})`)
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,29 +1,22 @@
|
||||
import { SlashCommandBuilder } from 'discord.js'
|
||||
|
||||
import { ModerationCommand } from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { config } from '$/context'
|
||||
import { appliedPresets } from '$/database/schemas'
|
||||
import { createModerationActionEmbed } from '$/utils/discord/embeds'
|
||||
import { sendModerationReplyAndLogs } from '$/utils/discord/moderation'
|
||||
import { removeRolePreset } from '$/utils/discord/rolePresets'
|
||||
import { and, eq } from 'drizzle-orm'
|
||||
import type { Command } from '../types'
|
||||
|
||||
export default {
|
||||
data: new SlashCommandBuilder()
|
||||
.setName('unmute')
|
||||
.setDescription('Unmute a member')
|
||||
.addUserOption(option => option.setName('member').setRequired(true).setDescription('The member to unmute'))
|
||||
.toJSON(),
|
||||
|
||||
memberRequirements: {
|
||||
roles: config.moderation?.roles ?? [],
|
||||
export default new ModerationCommand({
|
||||
name: 'unmute',
|
||||
description: 'Unmute a member',
|
||||
options: {
|
||||
member: {
|
||||
description: 'The member to unmute',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
},
|
||||
|
||||
global: false,
|
||||
|
||||
async execute({ logger, database }, interaction) {
|
||||
const user = interaction.options.getUser('member', true)
|
||||
async execute({ logger, database, executor }, interaction, { member: user }) {
|
||||
const member = await interaction.guild!.members.fetch(user.id)
|
||||
if (!member)
|
||||
throw new CommandError(
|
||||
@@ -39,8 +32,8 @@ export default {
|
||||
throw new CommandError(CommandErrorType.Generic, 'This user is not muted.')
|
||||
|
||||
await removeRolePreset(member, 'mute')
|
||||
await sendModerationReplyAndLogs(interaction, createModerationActionEmbed('Unmuted', user, interaction.user))
|
||||
await sendModerationReplyAndLogs(interaction, createModerationActionEmbed('Unmuted', user, executor.user))
|
||||
|
||||
logger.info(`Moderator ${interaction.user.tag} (${interaction.user.id}) unmuted ${user.tag} (${user.id})`)
|
||||
logger.info(`Moderator ${executor.user.tag} (${executor.id}) unmuted ${user.tag} (${user.id})`)
|
||||
},
|
||||
} satisfies Command
|
||||
})
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
import type { SlashCommandBuilder } from '@discordjs/builders'
|
||||
import type { ChatInputCommandInteraction } from 'discord.js'
|
||||
|
||||
// Temporary system
|
||||
export type Command = {
|
||||
data: ReturnType<SlashCommandBuilder['toJSON']>
|
||||
// The function has to return void or Promise<void>
|
||||
// because TS may complain about some code paths not returning a value
|
||||
/**
|
||||
* The function to execute when this command is triggered
|
||||
* @param interaction The interaction that triggered this command
|
||||
*/
|
||||
execute: (
|
||||
context: typeof import('../context'),
|
||||
interaction: ChatInputCommandInteraction,
|
||||
info: Info,
|
||||
) => Promise<void> | void
|
||||
memberRequirements?: {
|
||||
/**
|
||||
* The mode to use when checking for requirements.
|
||||
* - `all` means that the user needs meet all requirements specified.
|
||||
* - `any` means that the user needs to meet any of the requirements specified.
|
||||
*
|
||||
* @default "all"
|
||||
*/
|
||||
mode?: 'all' | 'any'
|
||||
/**
|
||||
* The permissions required to use this command (in BitFields).
|
||||
*
|
||||
* - **0n** means that everyone can use this command.
|
||||
* - **-1n** means that only bot owners can use this command.
|
||||
* @default -1n
|
||||
*/
|
||||
permissions?: bigint
|
||||
/**
|
||||
* The roles required to use this command.
|
||||
* By default, this is set to `[]`.
|
||||
*/
|
||||
roles?: string[]
|
||||
}
|
||||
/**
|
||||
* Whether this command can only be used by bot owners.
|
||||
* @default false
|
||||
*/
|
||||
ownerOnly?: boolean
|
||||
/**
|
||||
* Whether to register this command as a global slash command.
|
||||
* This is set to `false` and commands will be registered in allowed guilds only by default.
|
||||
* @default false
|
||||
*/
|
||||
global?: boolean
|
||||
}
|
||||
|
||||
export interface Info {
|
||||
userIsOwner: boolean
|
||||
}
|
||||
@@ -4,12 +4,6 @@ export const MessageScanLabeledResponseReactions = {
|
||||
delete: '❌',
|
||||
} as const
|
||||
|
||||
export const MessageScanHumanizedMode = {
|
||||
ocr: 'image recognition',
|
||||
nlp: 'text analysis',
|
||||
match: 'pattern matching',
|
||||
} as const
|
||||
|
||||
export const DefaultEmbedColor = '#4E98F0'
|
||||
export const ReVancedLogoURL =
|
||||
'https://media.discordapp.net/attachments/1095487869923119144/1115436493050224660/revanced-logo.png'
|
||||
|
||||
@@ -3,22 +3,22 @@ import { existsSync, readFileSync, readdirSync } from 'fs'
|
||||
import { join } from 'path'
|
||||
import { Client as APIClient } from '@revanced/bot-api'
|
||||
import { createLogger } from '@revanced/bot-shared'
|
||||
import { ActivityType, Client as DiscordClient, Partials } from 'discord.js'
|
||||
import { Client as DiscordClient, type Message, Partials } from 'discord.js'
|
||||
import { drizzle } from 'drizzle-orm/bun-sqlite'
|
||||
|
||||
// Export config first, as commands require them
|
||||
// Export some things first, as commands require them
|
||||
import config from '../config.js'
|
||||
export { config }
|
||||
|
||||
import * as commands from './commands'
|
||||
import * as schemas from './database/schemas'
|
||||
|
||||
import type { Command } from './commands/types'
|
||||
|
||||
export const logger = createLogger({
|
||||
level: config.logLevel === 'none' ? Number.MAX_SAFE_INTEGER : config.logLevel,
|
||||
})
|
||||
|
||||
import * as commands from './commands'
|
||||
import * as schemas from './database/schemas'
|
||||
|
||||
import type { default as Command, CommandOptionsOptions } from './classes/Command'
|
||||
|
||||
export const api = {
|
||||
client: new APIClient({
|
||||
api: {
|
||||
@@ -27,12 +27,12 @@ export const api = {
|
||||
},
|
||||
},
|
||||
}),
|
||||
isStopping: false,
|
||||
intentionallyDisconnecting: false,
|
||||
disconnectCount: 0,
|
||||
}
|
||||
|
||||
const DatabasePath = process.env['DATABASE_PATH']
|
||||
const DatabaseSchemaDir = join(import.meta.dir, '.drizzle')
|
||||
const DatabaseSchemaDir = join(import.meta.dir, '..', '.drizzle')
|
||||
|
||||
let dbSchemaFileName: string | undefined
|
||||
|
||||
@@ -56,7 +56,7 @@ if (DatabasePath && !existsSync(DatabasePath)) {
|
||||
}
|
||||
}
|
||||
|
||||
const db = new Database(DatabasePath)
|
||||
const db = new Database(DatabasePath, { readwrite: true, create: true })
|
||||
if (dbSchemaFileName) db.run(readFileSync(join(DatabaseSchemaDir, dbSchemaFileName)).toString())
|
||||
|
||||
export const database = drizzle(db, {
|
||||
@@ -80,17 +80,31 @@ export const discord = {
|
||||
repliedUser: true,
|
||||
},
|
||||
partials: [Partials.Message, Partials.Reaction],
|
||||
presence: {
|
||||
activities: [
|
||||
{
|
||||
type: ActivityType.Watching,
|
||||
name: 'cat videos',
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
commands: Object.fromEntries(Object.values<Command>(commands).map(cmd => [cmd.data.name, cmd])) as Record<
|
||||
commands: Object.fromEntries(Object.values(commands).map(cmd => [cmd.name, cmd])) as Record<
|
||||
string,
|
||||
Command
|
||||
Command<boolean, CommandOptionsOptions | undefined, boolean>
|
||||
>,
|
||||
stickyMessages: {} as Record<
|
||||
string,
|
||||
Record<
|
||||
string,
|
||||
{
|
||||
/**
|
||||
* Chat is active, so force send timer is also active
|
||||
*/
|
||||
forceTimerActive: boolean
|
||||
/**
|
||||
* There was a message sent, so the timer is active
|
||||
*/
|
||||
timerActive: boolean
|
||||
timerMs: number
|
||||
forceTimerMs?: number
|
||||
send: (forced?: boolean) => Promise<void>
|
||||
currentMessage?: Message<true>
|
||||
timer?: NodeJS.Timeout
|
||||
forceTimer?: NodeJS.Timeout
|
||||
}
|
||||
>
|
||||
>,
|
||||
} as const
|
||||
|
||||
@@ -2,7 +2,7 @@ import { on, withContext } from '$utils/api/events'
|
||||
import { DisconnectReason, HumanizedDisconnectReason } from '@revanced/bot-shared'
|
||||
|
||||
withContext(on, 'disconnect', ({ api, config, logger }, reason, msg) => {
|
||||
if (reason === DisconnectReason.PlannedDisconnect && api.isStopping) return
|
||||
if (reason === DisconnectReason.PlannedDisconnect && api.intentionallyDisconnecting) return
|
||||
|
||||
const ws = api.client.ws
|
||||
if (!ws.disconnected) ws.disconnect()
|
||||
@@ -16,7 +16,7 @@ withContext(on, 'disconnect', ({ api, config, logger }, reason, msg) => {
|
||||
)
|
||||
|
||||
if (api.disconnectCount >= (config.api.disconnectLimit ?? 3)) {
|
||||
console.error('Disconnected from bot API too many times')
|
||||
logger.fatal('Disconnected from bot API too many times')
|
||||
// We don't want the process hanging
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
import { on, withContext } from '$utils/api/events'
|
||||
|
||||
withContext(on, 'ready', ({ logger }) => void logger.info('Connected to the bot API'))
|
||||
withContext(on, 'ready', ({ api, logger }) => {
|
||||
// Reset disconnect count, so it doesn't meet the threshold for an accidental disconnect
|
||||
api.disconnectCount = 0
|
||||
logger.info('Connected to the bot API')
|
||||
})
|
||||
|
||||
@@ -1,77 +1,23 @@
|
||||
import CommandError from '$/classes/CommandError'
|
||||
import { createErrorEmbed, createStackTraceEmbed } from '$utils/discord/embeds'
|
||||
import { createStackTraceEmbed } from '$utils/discord/embeds'
|
||||
import { on, withContext } from '$utils/discord/events'
|
||||
|
||||
withContext(on, 'interactionCreate', async (context, interaction) => {
|
||||
if (!interaction.isChatInputCommand()) return
|
||||
|
||||
const { logger, discord, config } = context
|
||||
const { logger, discord } = context
|
||||
const command = discord.commands[interaction.commandName]
|
||||
|
||||
logger.debug(`Command ${interaction.commandName} being invoked by ${interaction.user.tag}`)
|
||||
if (!command) return void logger.error(`Command ${interaction.commandName} not implemented but registered!!!`)
|
||||
|
||||
const isOwner = config.owners.includes(interaction.user.id)
|
||||
|
||||
/**
|
||||
* Owner check
|
||||
*/
|
||||
if (command.ownerOnly && !isOwner)
|
||||
return void (await interaction.reply({
|
||||
embeds: [createErrorEmbed('Massive skill issue', 'This command can only be used by the bot owners.')],
|
||||
ephemeral: true,
|
||||
}))
|
||||
|
||||
/**
|
||||
* Sanity check
|
||||
*/
|
||||
if (!command.global && !interaction.inGuild()) {
|
||||
logger.error(`Command ${interaction.commandName} cannot be run in DMs, but was registered as global`)
|
||||
await interaction.reply({
|
||||
embeds: [createErrorEmbed('Cannot run that here', 'This command can only be used in a server.')],
|
||||
ephemeral: true,
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
/**
|
||||
* Permission checks
|
||||
*/
|
||||
if (interaction.inGuild()) {
|
||||
// Bot owners get bypass
|
||||
if (command.memberRequirements && !isOwner) {
|
||||
const { permissions = 0n, roles = [], mode } = command.memberRequirements
|
||||
|
||||
const member = await interaction.guild!.members.fetch(interaction.user.id)
|
||||
|
||||
const [missingPermissions, missingRoles] = [
|
||||
// This command is an owner-only command (the user is not an owner, checked above)
|
||||
permissions <= 0n ||
|
||||
// or the user doesn't have the required permissions
|
||||
(permissions > 0n && !interaction.memberPermissions.has(permissions)),
|
||||
|
||||
// If not:
|
||||
!roles.some(x => member.roles.cache.has(x)),
|
||||
]
|
||||
|
||||
if ((mode === 'any' && missingPermissions && missingRoles) || missingPermissions || missingRoles)
|
||||
return void interaction.reply({
|
||||
embeds: [
|
||||
createErrorEmbed(
|
||||
'Missing roles or permissions',
|
||||
"You don't have the required roles or permissions to use this command.",
|
||||
),
|
||||
],
|
||||
ephemeral: true,
|
||||
})
|
||||
}
|
||||
}
|
||||
if (!command)
|
||||
return void logger.error(`Interaction command ${interaction.commandName} not implemented but registered!!!`)
|
||||
|
||||
try {
|
||||
logger.debug(`Command ${interaction.commandName} being executed`)
|
||||
await command.execute(context, interaction, { userIsOwner: isOwner })
|
||||
await command.onInteraction(context, interaction)
|
||||
} catch (err) {
|
||||
logger.error(`Error while executing command ${interaction.commandName}:`, err)
|
||||
if (!(err instanceof CommandError))
|
||||
logger.error(`Error while executing command ${interaction.commandName}:`, err)
|
||||
await interaction[interaction.replied ? 'followUp' : 'reply']({
|
||||
embeds: [err instanceof CommandError ? err.toEmbed() : createStackTraceEmbed(err)],
|
||||
ephemeral: true,
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
import { type CommandArguments, CommandSpecialArgumentType } from '$/classes/Command'
|
||||
import CommandError from '$/classes/CommandError'
|
||||
import { createStackTraceEmbed } from '$utils/discord/embeds'
|
||||
import { on, withContext } from '$utils/discord/events'
|
||||
|
||||
withContext(on, 'messageCreate', async (context, msg) => {
|
||||
const { logger, discord, config } = context
|
||||
|
||||
if (msg.author.bot) return
|
||||
|
||||
const regex = new RegExp(
|
||||
`^(?:${config.prefix ? `${escapeRegexSpecials(config.prefix)}|` : ''}${msg.client.user.toString()}\\s*)([a-zA-Z-_]+)(?:\\s+)?(.+)?`,
|
||||
)
|
||||
const matches = msg.content.match(regex)
|
||||
|
||||
if (!matches) return
|
||||
const [, commandName, argsString] = matches
|
||||
if (!commandName) return
|
||||
|
||||
const command = discord.commands[commandName]
|
||||
logger.debug(`Command ${commandName} being invoked by ${msg.author.id}`)
|
||||
if (!command) return void logger.debug(`Message command ${commandName} not implemented`)
|
||||
|
||||
const argsRegex: RegExp = /[^\s"]+|"([^"]*)"/g
|
||||
const args: CommandArguments = []
|
||||
let match: RegExpExecArray | null
|
||||
|
||||
// biome-ignore lint/suspicious/noAssignInExpressions: nuh uh
|
||||
while ((match = argsRegex.exec(argsString ?? '')) !== null) {
|
||||
const arg = match[1] ? match[1] : match[0]
|
||||
const mentionMatch = arg.match(/<(@(?:!|&)?|#)(.+?)>/)
|
||||
|
||||
if (mentionMatch) {
|
||||
const [, prefix, id] = mentionMatch
|
||||
|
||||
if (!id || !prefix) {
|
||||
args.push('')
|
||||
continue
|
||||
}
|
||||
|
||||
args.push({
|
||||
type: CommandSpecialArgumentType[prefix[1] === '&' ? 'Role' : prefix[0] === '#' ? 'Channel' : 'User'],
|
||||
id,
|
||||
})
|
||||
} else args.push(arg)
|
||||
}
|
||||
|
||||
try {
|
||||
logger.debug(`Command ${commandName} being executed`)
|
||||
await command.onMessage(context, msg, args)
|
||||
} catch (err) {
|
||||
if (!(err instanceof CommandError)) logger.error(`Error while executing command ${commandName}:`, err)
|
||||
await msg.reply({ embeds: [err instanceof CommandError ? err.toEmbed() : createStackTraceEmbed(err)] })
|
||||
}
|
||||
})
|
||||
|
||||
const escapeRegexSpecials = (str: string): string => {
|
||||
let escapedStr = ''
|
||||
for (const char of str) {
|
||||
if (['.', '+', '*', '?', '$', '(', ')', '[', ']', '{', '}', '|', '\\'].includes(char)) escapedStr += `\\${char}`
|
||||
else escapedStr += char
|
||||
}
|
||||
return escapedStr
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { MessageScanLabeledResponseReactions } from '$/constants'
|
||||
import { responses } from '$/database/schemas'
|
||||
import { getResponseFromText, shouldScanMessage } from '$/utils/discord/messageScan'
|
||||
import { getResponseFromText, messageMatchesFilter } from '$/utils/discord/messageScan'
|
||||
import { createMessageScanResponseEmbed } from '$utils/discord/embeds'
|
||||
import { on, withContext } from '$utils/discord/events'
|
||||
|
||||
@@ -13,25 +13,34 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
} = context
|
||||
|
||||
if (!config || !config.responses) return
|
||||
if (msg.author.bot && !config.scanBots) return
|
||||
if (!msg.inGuild() && !config.scanOutsideGuilds) return
|
||||
if (msg.inGuild() && msg.member?.partial) await msg.member.fetch()
|
||||
|
||||
const filteredResponses = config.responses.filter(x => shouldScanMessage(msg, x.filterOverride ?? config.filter))
|
||||
const filteredResponses = config.responses.filter(x => messageMatchesFilter(msg, x.filterOverride ?? config.filter))
|
||||
if (!filteredResponses.length) return
|
||||
|
||||
if (msg.content.length) {
|
||||
try {
|
||||
logger.debug(`Classifying message ${msg.id}`)
|
||||
|
||||
const { response, label } = await getResponseFromText(msg.content, filteredResponses, context)
|
||||
const { response, label, respondToReply } = await getResponseFromText(
|
||||
msg.content,
|
||||
filteredResponses,
|
||||
context,
|
||||
)
|
||||
|
||||
if (response) {
|
||||
logger.debug('Response found')
|
||||
|
||||
const reply = await msg.reply({
|
||||
embeds: [createMessageScanResponseEmbed(response, label ? 'nlp' : 'match')],
|
||||
const toReply = respondToReply ? (msg.reference?.messageId ? await msg.fetchReference() : msg) : msg
|
||||
const reply = await toReply.reply({
|
||||
...response,
|
||||
embeds: response.embeds?.map(createMessageScanResponseEmbed),
|
||||
})
|
||||
|
||||
if (label)
|
||||
db.insert(responses).values({
|
||||
if (label) {
|
||||
await db.insert(responses).values({
|
||||
replyId: reply.id,
|
||||
channelId: reply.channel.id,
|
||||
guildId: reply.guild!.id,
|
||||
@@ -40,7 +49,6 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
content: msg.content,
|
||||
})
|
||||
|
||||
if (label) {
|
||||
for (const reaction of Object.values(MessageScanLabeledResponseReactions)) {
|
||||
await reply.react(reaction)
|
||||
}
|
||||
@@ -51,11 +59,22 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
}
|
||||
}
|
||||
|
||||
if (msg.attachments.size > 0) {
|
||||
if (msg.attachments.size > 0 && config.attachments?.scanAttachments) {
|
||||
logger.debug(`Classifying message attachments for ${msg.id}`)
|
||||
|
||||
for (const attachment of msg.attachments.values()) {
|
||||
if (attachment.contentType && !config.allowedAttachmentMimeTypes.includes(attachment.contentType)) continue
|
||||
if (
|
||||
config.attachments.allowedMimeTypes &&
|
||||
!config.attachments.allowedMimeTypes.includes(attachment.contentType!)
|
||||
) {
|
||||
logger.debug(`Disallowed MIME type for attachment: ${attachment.url}, ${attachment.contentType}`)
|
||||
continue
|
||||
}
|
||||
|
||||
if (attachment.contentType?.startsWith('text/') && attachment.size > (config.attachments.maxTextFileSize ?? 512 * 1000)) {
|
||||
logger.debug(`Attachment ${attachment.url} is too large be to scanned, size is ${attachment.size}`)
|
||||
continue
|
||||
}
|
||||
|
||||
try {
|
||||
const { text: content } = await api.client.parseImage(attachment.url)
|
||||
@@ -64,7 +83,8 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
if (response) {
|
||||
logger.debug(`Response found for attachment: ${attachment.url}`)
|
||||
await msg.reply({
|
||||
embeds: [createMessageScanResponseEmbed(response, 'ocr')],
|
||||
...response,
|
||||
embeds: response.embeds?.map(createMessageScanResponseEmbed),
|
||||
})
|
||||
|
||||
break
|
||||
@@ -0,0 +1,37 @@
|
||||
import { on, withContext } from '$utils/discord/events'
|
||||
|
||||
withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
|
||||
if (!msg.inGuild()) return
|
||||
if (msg.author.id === msg.client.user.id) return
|
||||
|
||||
const store = discord.stickyMessages[msg.guildId]?.[msg.channelId]
|
||||
if (!store) return
|
||||
|
||||
// If there isn't a timer, start it up
|
||||
store.timerActive = true
|
||||
if (!store.timer) store.timer = setTimeout(store.send, store.timerMs) as NodeJS.Timeout
|
||||
else {
|
||||
// If there is a timer, but it isn't active, restart it
|
||||
if (!store.timerActive) store.timer.refresh()
|
||||
// If there is a timer and it is active, but the force timer isn't active...
|
||||
else if (!store.forceTimerActive && store.forceTimerMs) {
|
||||
logger.debug(`Channel ${msg.channelId} in guild ${msg.guildId} is active, starting force send timer and clearing existing timer`)
|
||||
|
||||
// Clear the timer
|
||||
clearTimeout(store.timer)
|
||||
store.timerActive = false
|
||||
store.forceTimerActive = true
|
||||
|
||||
// (Re)start the force timer
|
||||
if (!store.forceTimer)
|
||||
store.forceTimer = setTimeout(
|
||||
() =>
|
||||
store.send(true).then(() => {
|
||||
store.forceTimerActive = false
|
||||
}),
|
||||
store.forceTimerMs,
|
||||
) as NodeJS.Timeout
|
||||
else store.forceTimer.refresh()
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -13,13 +13,15 @@ import {
|
||||
import type { ConfigMessageScanResponseLabelConfig } from '$/../config.schema'
|
||||
import { responses } from '$/database/schemas'
|
||||
import { handleUserResponseCorrection } from '$/utils/discord/messageScan'
|
||||
import { isAdmin } from '$/utils/discord/permissions'
|
||||
import { eq } from 'drizzle-orm'
|
||||
|
||||
const PossibleReactions = Object.values(Reactions) as string[]
|
||||
|
||||
withContext(on, 'messageReactionAdd', async (context, rct, user) => {
|
||||
if (user.bot) return
|
||||
|
||||
await rct.users.remove(user.id)
|
||||
|
||||
const { database: db, logger, config } = context
|
||||
const { messageScan: msConfig } = config
|
||||
|
||||
@@ -32,12 +34,9 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => {
|
||||
if (reactionMessage.author.id !== reaction.client.user!.id) return
|
||||
if (!PossibleReactions.includes(reaction.emoji.name!)) return
|
||||
|
||||
if (!config.owners.includes(user.id)) {
|
||||
if (!isAdmin(reactionMessage.member || reactionMessage.author)) {
|
||||
// User is in guild, and config has member requirements
|
||||
if (
|
||||
reactionMessage.inGuild() &&
|
||||
(msConfig.humanCorrections.allow?.members || msConfig.humanCorrections.allow?.users)
|
||||
) {
|
||||
if (reactionMessage.inGuild() && msConfig.humanCorrections.allow) {
|
||||
const {
|
||||
allow: { users: allowedUsers, members: allowedMembers },
|
||||
} = msConfig.humanCorrections
|
||||
@@ -46,22 +45,26 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => {
|
||||
const member = await reactionMessage.guild.members.fetch(user.id)
|
||||
const { permissions, roles } = allowedMembers
|
||||
|
||||
if (!(member.permissions.has(permissions ?? 0n) || roles?.some(role => member.roles.cache.has(role))))
|
||||
return
|
||||
} else if (allowedUsers) {
|
||||
if (!allowedUsers.includes(user.id)) return
|
||||
} else {
|
||||
return void logger.warn(
|
||||
'No member or user requirements set for human corrections, all requests will be ignored',
|
||||
if (
|
||||
!(
|
||||
(permissions ? member.permissions.has(permissions) : false) ||
|
||||
roles?.some(role => member.roles.cache.has(role))
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
return
|
||||
} else if (!allowedUsers?.includes(user.id)) return
|
||||
} else
|
||||
return void logger.warn(
|
||||
'No member or user requirements set for human corrections, all requests will be ignored',
|
||||
)
|
||||
}
|
||||
|
||||
// Sanity check
|
||||
const response = await db.query.responses.findFirst({ where: eq(responses.replyId, rct.message.id) })
|
||||
if (!response || response.correctedById) return
|
||||
|
||||
logger.debug(`User ${user.id} is trying to correct the response ${rct.message.id}`)
|
||||
|
||||
const handleCorrection = (label: string) =>
|
||||
handleUserResponseCorrection(context, response, reactionMessage, label, user)
|
||||
|
||||
|
||||
@@ -1,15 +1,81 @@
|
||||
import { database, logger } from '$/context'
|
||||
import { appliedPresets } from '$/database/schemas'
|
||||
import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
|
||||
import { on, withContext } from '$/utils/discord/events'
|
||||
import { removeRolePreset } from '$/utils/discord/rolePresets'
|
||||
import type { Client } from 'discord.js'
|
||||
import { lt } from 'drizzle-orm'
|
||||
import { on, withContext } from 'src/utils/discord/events'
|
||||
|
||||
export default withContext(on, 'ready', ({ config, logger }, client) => {
|
||||
import type { Client } from 'discord.js'
|
||||
|
||||
export default withContext(on, 'ready', async ({ config, discord, logger }, client) => {
|
||||
logger.info(`Connected to Discord API, logged in as ${client.user.displayName} (@${client.user.tag})!`)
|
||||
logger.info(
|
||||
`Bot is in ${client.guilds.cache.size} guilds, if this is not expected, please run the /leave-unknowns command`,
|
||||
)
|
||||
logger.info(`Bot is in ${client.guilds.cache.size} guilds`)
|
||||
|
||||
if (config.stickyMessages)
|
||||
for (const [guildId, channels] of Object.entries(config.stickyMessages)) {
|
||||
const guild = await client.guilds.fetch(guildId)
|
||||
// In case of configuration refresh, this will not be nullable
|
||||
const oldStore = discord.stickyMessages[guildId]
|
||||
discord.stickyMessages[guildId] = {}
|
||||
|
||||
for (const [channelId, { message, timeout, forceSendTimeout }] of Object.entries(channels)) {
|
||||
const channel = await guild.channels.fetch(channelId)
|
||||
if (!channel?.isTextBased())
|
||||
return void logger.warn(
|
||||
`Channel ${channelId} in guild ${guildId} is not a text channel, sticky messages will not be sent`,
|
||||
)
|
||||
|
||||
const send = async (forced = false) => {
|
||||
try {
|
||||
const msg = await channel.send({
|
||||
...message,
|
||||
embeds: message.embeds?.map(it => applyCommonEmbedStyles(it, true, true, true)),
|
||||
})
|
||||
|
||||
const store = discord.stickyMessages[guildId]![channelId]
|
||||
if (!store) return
|
||||
|
||||
await store.currentMessage?.delete().catch()
|
||||
store.currentMessage = msg
|
||||
|
||||
// Clear any remaining timers
|
||||
clearTimeout(store.timer)
|
||||
clearTimeout(store.forceTimer)
|
||||
store.forceTimerActive = store.timerActive = false
|
||||
|
||||
if (!forced)
|
||||
logger.debug(
|
||||
`Timeout ended for sticky message in channel ${channelId} in guild ${guildId}, channel is inactive`,
|
||||
)
|
||||
else
|
||||
logger.debug(
|
||||
`Forced send timeout for sticky message in channel ${channelId} in guild ${guildId} ended, channel is too active`,
|
||||
)
|
||||
|
||||
logger.debug(`Sent sticky message to channel ${channelId} in guild ${guildId}`)
|
||||
} catch (e) {
|
||||
logger.error(
|
||||
`Error while sending sticky message to channel ${channelId} in guild ${guildId}:`,
|
||||
e,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Set up the store
|
||||
discord.stickyMessages[guildId]![channelId] = {
|
||||
forceTimerActive: false,
|
||||
timerActive: false,
|
||||
forceTimerMs: forceSendTimeout,
|
||||
timerMs: timeout,
|
||||
send,
|
||||
// If the store exists before the configuration refresh, take its current message
|
||||
currentMessage: oldStore?.[channelId]?.currentMessage
|
||||
}
|
||||
|
||||
// Send a new sticky message immediately, as well as deleting the old/outdated message, if it exists
|
||||
await send()
|
||||
}
|
||||
}
|
||||
|
||||
if (config.rolePresets) {
|
||||
removeExpiredPresets(client)
|
||||
|
||||
@@ -10,5 +10,10 @@ if (missingEnvs.length) {
|
||||
process.exit(1)
|
||||
}
|
||||
|
||||
// Handle uncaught exceptions
|
||||
|
||||
process.on('uncaughtException', error => console.error('Uncaught exception:', error))
|
||||
process.on('unhandledRejection', reason => console.error('Unhandled rejection:', reason))
|
||||
|
||||
api.client.connect()
|
||||
discord.client.login()
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
import type { Command } from '$commands/types'
|
||||
import { listAllFilesRecursive } from '$utils/fs'
|
||||
|
||||
export const loadCommands = async (dir: string) => {
|
||||
const commandsMap: Record<string, Command> = {}
|
||||
const files = listAllFilesRecursive(dir)
|
||||
const commands = await Promise.all(
|
||||
files.map(async file => {
|
||||
const command = await import(file)
|
||||
return command.default
|
||||
}),
|
||||
)
|
||||
|
||||
for (const command of commands) {
|
||||
if (command) commandsMap[command.data.name] = command
|
||||
}
|
||||
|
||||
return commandsMap
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import { DefaultEmbedColor, MessageScanHumanizedMode, ReVancedLogoURL } from '$/constants'
|
||||
import { EmbedBuilder, type EmbedField, type User } from 'discord.js'
|
||||
import { DefaultEmbedColor, ReVancedLogoURL } from '$/constants'
|
||||
import { type APIEmbed, EmbedBuilder, type EmbedField, type JSONEncodable, type User } from 'discord.js'
|
||||
import type { ConfigMessageScanResponseMessage } from '../../../config.schema'
|
||||
|
||||
export const createErrorEmbed = (title: string | null, description?: string) =>
|
||||
@@ -24,21 +24,8 @@ export const createSuccessEmbed = (title: string | null, description?: string) =
|
||||
)
|
||||
|
||||
export const createMessageScanResponseEmbed = (
|
||||
response: ConfigMessageScanResponseMessage,
|
||||
mode: 'ocr' | 'nlp' | 'match',
|
||||
) => {
|
||||
const embed = new EmbedBuilder().setTitle(response.title ?? null)
|
||||
|
||||
if (response.description) embed.setDescription(response.description)
|
||||
if (response.fields) embed.addFields(response.fields)
|
||||
|
||||
embed.setFooter({
|
||||
text: `ReVanced • Done via ${MessageScanHumanizedMode[mode]}`,
|
||||
iconURL: ReVancedLogoURL,
|
||||
})
|
||||
|
||||
return applyCommonEmbedStyles(embed, true, true, true)
|
||||
}
|
||||
response: NonNullable<ConfigMessageScanResponseMessage['embeds']>[number],
|
||||
) => applyCommonEmbedStyles(response, true, true, true)
|
||||
|
||||
export const createModerationActionEmbed = (
|
||||
action: string,
|
||||
@@ -74,19 +61,23 @@ export const applyReferenceToModerationActionEmbed = (embed: EmbedBuilder, refer
|
||||
}
|
||||
|
||||
export const applyCommonEmbedStyles = (
|
||||
embed: EmbedBuilder,
|
||||
embed: EmbedBuilder | JSONEncodable<APIEmbed> | APIEmbed,
|
||||
setThumbnail = false,
|
||||
setFooter = false,
|
||||
setColor = false,
|
||||
) => {
|
||||
// biome-ignore lint/style/noParameterAssign: While this is confusing, it is fine for this purpose
|
||||
if ('toJSON' in embed) embed = embed.toJSON()
|
||||
const builder = new EmbedBuilder(embed)
|
||||
|
||||
if (setFooter)
|
||||
embed.setFooter({
|
||||
builder.setFooter({
|
||||
text: 'ReVanced',
|
||||
iconURL: ReVancedLogoURL,
|
||||
})
|
||||
|
||||
if (setColor) embed.setColor(DefaultEmbedColor)
|
||||
if (setThumbnail) embed.setThumbnail(ReVancedLogoURL)
|
||||
if (setColor) builder.setColor(DefaultEmbedColor)
|
||||
if (setThumbnail) builder.setThumbnail(ReVancedLogoURL)
|
||||
|
||||
return embed
|
||||
return builder
|
||||
}
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
import { type Response, responses } from '$/database/schemas'
|
||||
import type {
|
||||
Config,
|
||||
ConfigMessageScanResponse,
|
||||
ConfigMessageScanResponseLabelConfig,
|
||||
ConfigMessageScanResponseMessage,
|
||||
} from 'config.schema'
|
||||
import type { Config, ConfigMessageScanResponse, ConfigMessageScanResponseLabelConfig } from 'config.schema'
|
||||
import type { Message, PartialUser, User } from 'discord.js'
|
||||
import { eq } from 'drizzle-orm'
|
||||
import { createMessageScanResponseEmbed } from './embeds'
|
||||
@@ -15,9 +10,15 @@ export const getResponseFromText = async (
|
||||
// Just to be safe that we will never use data from the context parameter
|
||||
{ api, logger }: Omit<typeof import('src/context'), 'config'>,
|
||||
ocrMode = false,
|
||||
) => {
|
||||
let label: string | undefined
|
||||
let response: ConfigMessageScanResponseMessage | undefined | null
|
||||
): Promise<
|
||||
Omit<ConfigMessageScanResponse, 'triggers'> & { label?: string; triggers?: ConfigMessageScanResponse['triggers'] }
|
||||
> => {
|
||||
type ResponseConfig = Awaited<ReturnType<typeof getResponseFromText>>
|
||||
let responseConfig: Omit<ResponseConfig, 'triggers'> & { triggers?: ResponseConfig['triggers'] } = {
|
||||
triggers: undefined,
|
||||
response: null,
|
||||
}
|
||||
|
||||
const firstLabelIndexes: number[] = []
|
||||
|
||||
// Test if all regexes before a label trigger is matched
|
||||
@@ -25,29 +26,27 @@ export const getResponseFromText = async (
|
||||
const trigger = responses[i]!
|
||||
|
||||
// Filter override check is not neccessary here, we are already passing responses that match the filter
|
||||
// from the messageCreate handler
|
||||
// from the messageCreate handler, see line 17 of messageCreate handler
|
||||
const {
|
||||
triggers: { text: textTriggers, image: imageTriggers },
|
||||
response: resp,
|
||||
} = trigger
|
||||
if (response) break
|
||||
|
||||
if (ocrMode) {
|
||||
if (imageTriggers)
|
||||
for (const regex of imageTriggers)
|
||||
if (regex.test(content)) {
|
||||
logger.debug(`Message matched regex (OCR mode): ${regex.source}`)
|
||||
response = resp
|
||||
responseConfig = trigger
|
||||
break
|
||||
}
|
||||
} else
|
||||
for (let j = 0; j < textTriggers!.length; j++) {
|
||||
const trigger = textTriggers![j]!
|
||||
const regex = textTriggers![j]!
|
||||
|
||||
if (trigger instanceof RegExp) {
|
||||
if (trigger.test(content)) {
|
||||
logger.debug(`Message matched regex (before mode): ${trigger.source}`)
|
||||
response = resp
|
||||
if (regex instanceof RegExp) {
|
||||
if (regex.test(content)) {
|
||||
logger.debug(`Message matched regex (before mode): ${regex.source}`)
|
||||
responseConfig = trigger
|
||||
break
|
||||
}
|
||||
} else {
|
||||
@@ -58,52 +57,51 @@ export const getResponseFromText = async (
|
||||
}
|
||||
|
||||
// If none of the regexes match, we can search for labels immediately
|
||||
if (!response && !ocrMode) {
|
||||
if (!responseConfig.triggers && !ocrMode) {
|
||||
logger.debug('No match from before regexes, doing NLP')
|
||||
const scan = await api.client.parseText(content)
|
||||
if (scan.labels.length) {
|
||||
const matchedLabel = scan.labels[0]!
|
||||
logger.debug(`Message matched label with confidence: ${matchedLabel.name}, ${matchedLabel.confidence}`)
|
||||
|
||||
let triggerConfig: ConfigMessageScanResponseLabelConfig | undefined
|
||||
const labelConfig = responses.find(x => {
|
||||
let trigger: ConfigMessageScanResponseLabelConfig | undefined
|
||||
const response = responses.find(x => {
|
||||
const config = x.triggers.text!.find(
|
||||
(x): x is ConfigMessageScanResponseLabelConfig => 'label' in x && x.label === matchedLabel.name,
|
||||
)
|
||||
if (config) triggerConfig = config
|
||||
if (config) trigger = config
|
||||
return config
|
||||
})
|
||||
|
||||
if (!labelConfig) {
|
||||
logger.warn(`No label config found for label ${matchedLabel.name}`)
|
||||
return { response: null, label: undefined }
|
||||
if (!response) {
|
||||
logger.warn(`No response config found for label ${matchedLabel.name}`)
|
||||
// This returns the default value set in line 17, which means no response matched
|
||||
return responseConfig
|
||||
}
|
||||
|
||||
if (matchedLabel.confidence >= triggerConfig!.threshold) {
|
||||
if (matchedLabel.confidence >= trigger!.threshold) {
|
||||
logger.debug('Label confidence is enough')
|
||||
label = matchedLabel.name
|
||||
response = labelConfig.response
|
||||
responseConfig = { ...responseConfig, ...response, label: trigger!.label }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If we still don't have a label, we can match all regexes after the initial label trigger
|
||||
if (!response) {
|
||||
// If we still don't have a response config, we can match all regexes after the initial label trigger
|
||||
if (!responseConfig.triggers && ocrMode) {
|
||||
logger.debug('No match from NLP, doing after regexes')
|
||||
for (let i = 0; i < responses.length; i++) {
|
||||
const {
|
||||
triggers: { text: textTriggers },
|
||||
response: resp,
|
||||
} = responses[i]!
|
||||
const firstLabelIndex = firstLabelIndexes[i] ?? -1
|
||||
|
||||
for (let i = firstLabelIndex + 1; i < textTriggers!.length; i++) {
|
||||
const trigger = textTriggers![i]!
|
||||
for (let j = firstLabelIndex + 1; j < textTriggers!.length; j++) {
|
||||
const trigger = textTriggers![j]!
|
||||
|
||||
if (trigger instanceof RegExp) {
|
||||
if (trigger.test(content)) {
|
||||
logger.debug(`Message matched regex (after mode): ${trigger.source}`)
|
||||
response = resp
|
||||
responseConfig = responses[i]!
|
||||
break
|
||||
}
|
||||
}
|
||||
@@ -111,30 +109,32 @@ export const getResponseFromText = async (
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
response,
|
||||
label,
|
||||
}
|
||||
return responseConfig
|
||||
}
|
||||
|
||||
export const shouldScanMessage = (
|
||||
message: Message,
|
||||
filter: NonNullable<Config['messageScan']>['filter'],
|
||||
): message is Message<true> => {
|
||||
if (message.author.bot) return false
|
||||
if (!message.guild) return false
|
||||
export const messageMatchesFilter = (message: Message, filter: NonNullable<Config['messageScan']>['filter']) => {
|
||||
if (!filter) return true
|
||||
|
||||
const filters = [
|
||||
filter.users?.includes(message.author.id),
|
||||
message.member?.roles.cache.some(x => filter.roles?.includes(x.id)),
|
||||
filter.channels?.includes(message.channel.id),
|
||||
]
|
||||
const memberRoles = new Set(message.member?.roles.cache.keys())
|
||||
const { blacklist, whitelist } = filter
|
||||
|
||||
if (filter.whitelist && filters.every(x => !x)) return false
|
||||
if (!filter.whitelist && filters.some(x => x)) return false
|
||||
|
||||
return true
|
||||
// If matches only blacklist, will return false
|
||||
// If matches whitelist but also matches blacklist, will return false
|
||||
// If matches only whitelist, will return true
|
||||
// If matches neither, will return true
|
||||
return (
|
||||
(whitelist
|
||||
? whitelist.channels?.includes(message.channelId) ||
|
||||
whitelist.roles?.some(role => memberRoles.has(role)) ||
|
||||
whitelist.users?.includes(message.author.id)
|
||||
: true) &&
|
||||
!(
|
||||
blacklist &&
|
||||
(blacklist.channels?.includes(message.channelId) ||
|
||||
blacklist.roles?.some(role => memberRoles.has(role)) ||
|
||||
blacklist.users?.includes(message.author.id))
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
export const handleUserResponseCorrection = async (
|
||||
@@ -158,8 +158,10 @@ export const handleUserResponseCorrection = async (
|
||||
correctedById: user.id,
|
||||
})
|
||||
.where(eq(responses.replyId, response.replyId))
|
||||
|
||||
await reply.edit({
|
||||
embeds: [createMessageScanResponseEmbed(correctLabelResponse.response, 'nlp')],
|
||||
...correctLabelResponse.response,
|
||||
embeds: correctLabelResponse.response.embeds?.map(createMessageScanResponseEmbed),
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { config, logger } from '$/context'
|
||||
import decancer from 'decancer'
|
||||
import type { ChatInputCommandInteraction, EmbedBuilder, Guild, GuildMember, User } from 'discord.js'
|
||||
import type { ChatInputCommandInteraction, EmbedBuilder, Guild, GuildMember, Message, User } from 'discord.js'
|
||||
import { applyReferenceToModerationActionEmbed, createModerationActionEmbed } from './embeds'
|
||||
|
||||
const PresetLogAction = {
|
||||
@@ -10,19 +10,23 @@ const PresetLogAction = {
|
||||
|
||||
export const sendPresetReplyAndLogs = (
|
||||
action: keyof typeof PresetLogAction,
|
||||
interaction: ChatInputCommandInteraction,
|
||||
interaction: ChatInputCommandInteraction | Message,
|
||||
executor: GuildMember,
|
||||
user: User,
|
||||
preset: string,
|
||||
expires?: number | null,
|
||||
) =>
|
||||
sendModerationReplyAndLogs(
|
||||
interaction,
|
||||
createModerationActionEmbed(PresetLogAction[action], user, interaction.user, undefined, expires, [
|
||||
createModerationActionEmbed(PresetLogAction[action], user, executor.user, undefined, expires, [
|
||||
[{ name: 'Preset', value: preset, inline: true }],
|
||||
]),
|
||||
)
|
||||
|
||||
export const sendModerationReplyAndLogs = async (interaction: ChatInputCommandInteraction, embed: EmbedBuilder) => {
|
||||
export const sendModerationReplyAndLogs = async (
|
||||
interaction: ChatInputCommandInteraction | Message,
|
||||
embed: EmbedBuilder,
|
||||
) => {
|
||||
const reply = await interaction.reply({ embeds: [embed] }).then(it => it.fetch())
|
||||
const logChannel = await getLogChannel(interaction.guild!)
|
||||
await logChannel?.send({ embeds: [applyReferenceToModerationActionEmbed(embed, reply.url)] })
|
||||
@@ -34,7 +38,7 @@ export const getLogChannel = async (guild: Guild) => {
|
||||
|
||||
try {
|
||||
const channel = await guild.channels.fetch(logConfig.thread ?? logConfig.channel)
|
||||
if (!channel || !channel.isTextBased())
|
||||
if (!channel?.isTextBased())
|
||||
return void logger.warn('The moderation log channel does not exist, skipping logging')
|
||||
|
||||
return channel
|
||||
@@ -46,13 +50,13 @@ export const getLogChannel = async (guild: Guild) => {
|
||||
}
|
||||
|
||||
export const cureNickname = async (member: GuildMember) => {
|
||||
if (!member.manageable) throw new Error('Member is not manageable')
|
||||
if (!member.manageable) return
|
||||
const name = member.displayName
|
||||
let cured = decancer(name)
|
||||
.toString()
|
||||
.replace(/[^a-zA-Z0-9]/g, '')
|
||||
.replace(new RegExp(config.moderation?.cure?.removeCharactersRegex ?? '[^a-zA-Z0-9 \\-_]', 'g'), '')
|
||||
|
||||
if (cured.length < 3 || !/^[a-zA-Z]/.test(cured))
|
||||
if (cured.length < (config?.moderation?.cure?.minimumNameLength ?? 3))
|
||||
cured =
|
||||
member.user.username.length >= 3
|
||||
? member.user.username
|
||||
|
||||
14
bots/discord/src/utils/discord/permissions.ts
Normal file
14
bots/discord/src/utils/discord/permissions.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { GuildMember, type User } from 'discord.js'
|
||||
import { config } from '../../context'
|
||||
|
||||
export const isAdmin = (userOrMember: User | GuildMember) => {
|
||||
return (
|
||||
config.admin?.users?.includes(userOrMember.id) ||
|
||||
(userOrMember instanceof GuildMember && isMemberAdmin(userOrMember))
|
||||
)
|
||||
}
|
||||
|
||||
export const isMemberAdmin = (member: GuildMember) => {
|
||||
const roles = new Set(member.roles.cache.keys())
|
||||
return Boolean(config?.admin?.roles?.[member.guild.id]?.some(role => roles.has(role)))
|
||||
}
|
||||
@@ -6,9 +6,9 @@ import { and, eq } from 'drizzle-orm'
|
||||
// TODO: Fix this type
|
||||
type PresetKey = string
|
||||
|
||||
export const applyRolePreset = async (member: GuildMember, presetName: PresetKey, untilMs: number | null) => {
|
||||
export const applyRolePreset = async (member: GuildMember, presetName: PresetKey, untilMs: number) => {
|
||||
const afterInsert = await applyRolesUsingPreset(presetName, member, true)
|
||||
const until = untilMs ? Math.ceil(untilMs / 1000) : null
|
||||
const until = untilMs === Infinity ? null : Math.ceil(untilMs / 1000)
|
||||
|
||||
await database
|
||||
.insert(appliedPresets)
|
||||
|
||||
@@ -7,17 +7,27 @@ export const listAllFilesRecursive = (dir: string): string[] =>
|
||||
.filter(x => x.isFile())
|
||||
.map(x => join(x.parentPath, x.name).replaceAll(pathSep, posixPathSep))
|
||||
|
||||
export const generateCommandsIndex = (dirPath: string) => generateIndexes(dirPath, x => !x.endsWith('types.ts'))
|
||||
export const generateCommandsIndex = (dirPath: string) =>
|
||||
generateIndexes(dirPath, (x, i) => `export { default as C${i} } from './${x}'`)
|
||||
|
||||
export const generateEventsIndex = (dirPath: string) => generateIndexes(dirPath)
|
||||
|
||||
const generateIndexes = async (dirPath: string, pathFilter?: (path: string) => boolean) => {
|
||||
const generateIndexes = async (
|
||||
dirPath: string,
|
||||
customMap?: (path: string, index: number) => string,
|
||||
pathFilter?: (path: string) => boolean,
|
||||
) => {
|
||||
const files = listAllFilesRecursive(dirPath)
|
||||
.filter(x => (x.endsWith('.ts') && !x.endsWith('index.ts') && pathFilter ? pathFilter(x) : true))
|
||||
.filter(x => x.endsWith('.ts') && !x.endsWith('index.ts') && (pathFilter ? pathFilter(x) : true))
|
||||
.map(x => relative(dirPath, x).replaceAll(pathSep, posixPathSep))
|
||||
|
||||
writeFileSync(
|
||||
join(dirPath, 'index.ts'),
|
||||
`// AUTO-GENERATED BY A SCRIPT, DON'T TOUCH\n\n${files.map(c => `import './${c.split('.').at(-2)}'`).join('\n')}`,
|
||||
`// AUTO-GENERATED BY A SCRIPT, DON'T TOUCH\n\n${files
|
||||
.map((c, i) => {
|
||||
const path = c.split('.').at(-2)!
|
||||
return customMap ? customMap(path, i) : `import './${path}'`
|
||||
})
|
||||
.join('\n')}`,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -54,6 +54,8 @@
|
||||
"lefthook"
|
||||
],
|
||||
"patchedDependencies": {
|
||||
"@semantic-release/npm@12.0.1": "patches/@semantic-release%2Fnpm@12.0.1.patch"
|
||||
"@semantic-release/npm@12.0.1": "patches/@semantic-release%2Fnpm@12.0.1.patch",
|
||||
"drizzle-kit@0.22.8": "patches/drizzle-kit@0.22.8.patch",
|
||||
"decancer@3.2.3": "patches/decancer@3.2.3.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,17 +52,20 @@ export default class Client {
|
||||
// But if we add anything similar, this will cause another race condition
|
||||
// To fix this, we can try adding a instanced function that would return the currentSequence
|
||||
// and it would be updated every time a "heartbeat ack" packet is received
|
||||
return Promise.race([
|
||||
const packet = await Promise.race([
|
||||
this.#awaiter.await(ServerOperation.ParsedText, this.ws.currentSequence),
|
||||
this.#awaiter.await(ServerOperation.ParseTextFailed, this.ws.timeout + 5000),
|
||||
this.#awaiter.await(ServerOperation.ParseTextFailed, this.ws.currentSequence, this.ws.timeout + 5000),
|
||||
])
|
||||
.then(pkt => {
|
||||
if (pkt.op === ServerOperation.ParsedText) return pkt.d
|
||||
throw new Error('Failed to parse text, the API encountered an error')
|
||||
return null
|
||||
})
|
||||
.catch(() => {
|
||||
throw new Error('Failed to parse text, the API did not respond in time')
|
||||
})
|
||||
|
||||
if (!packet) throw new Error('Failed to parse text, the API encountered an error')
|
||||
return packet
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -82,17 +85,20 @@ export default class Client {
|
||||
|
||||
// See line 50
|
||||
|
||||
return Promise.race([
|
||||
const packet = await Promise.race([
|
||||
this.#awaiter.await(ServerOperation.ParsedImage, this.ws.currentSequence),
|
||||
this.#awaiter.await(ServerOperation.ParseImageFailed, this.ws.timeout + 5000),
|
||||
this.#awaiter.await(ServerOperation.ParseImageFailed, this.ws.currentSequence, this.ws.timeout + 5000),
|
||||
])
|
||||
.then(pkt => {
|
||||
if (pkt.op === ServerOperation.ParsedImage) return pkt.d
|
||||
throw new Error('Failed to parse image, the API encountered an error')
|
||||
return null
|
||||
})
|
||||
.catch(() => {
|
||||
throw new Error('Failed to parse image, the API did not respond in time')
|
||||
})
|
||||
|
||||
if (!packet) throw new Error('Failed to parse image, the API encountered an error')
|
||||
return packet
|
||||
}
|
||||
|
||||
async trainMessage(text: string, label: string) {
|
||||
@@ -107,17 +113,20 @@ export default class Client {
|
||||
})
|
||||
|
||||
// See line 50
|
||||
return Promise.race([
|
||||
const packet = await Promise.race([
|
||||
this.#awaiter.await(ServerOperation.TrainedMessage, this.ws.currentSequence),
|
||||
this.#awaiter.await(ServerOperation.TrainMessageFailed, this.ws.timeout + 5000),
|
||||
this.#awaiter.await(ServerOperation.TrainMessageFailed, this.ws.currentSequence, this.ws.timeout + 5000),
|
||||
])
|
||||
.then(pkt => {
|
||||
if (pkt.op === ServerOperation.TrainedMessage) return pkt.d
|
||||
throw new Error('Failed to train message, the API encountered an error')
|
||||
return null
|
||||
})
|
||||
.catch(() => {
|
||||
throw new Error('Failed to train message, the API did not respond in time')
|
||||
})
|
||||
|
||||
if (!packet) throw new Error('Failed to train message, the API encountered an error')
|
||||
return packet
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -163,13 +172,17 @@ export default class Client {
|
||||
/**
|
||||
* Disconnects the client from the API
|
||||
*/
|
||||
disconnect() {
|
||||
this.ws.disconnect()
|
||||
disconnect(force?: boolean) {
|
||||
this.ws.disconnect(force)
|
||||
}
|
||||
|
||||
#throwIfNotReady() {
|
||||
if (!this.isReady()) throw new Error('Client is not ready')
|
||||
}
|
||||
|
||||
get disconnected() {
|
||||
return this.ws.disconnected
|
||||
}
|
||||
}
|
||||
|
||||
export class ClientWebSocketPacketAwaiter {
|
||||
|
||||
@@ -17,7 +17,7 @@ import { type RawData, WebSocket } from 'ws'
|
||||
* This is the only relevant class for the time being. But in the future, there may be more classes to handle different protocols of the API.
|
||||
*/
|
||||
export class ClientWebSocketManager {
|
||||
readonly url: string
|
||||
url: string
|
||||
timeout: number
|
||||
|
||||
connecting = false
|
||||
@@ -33,6 +33,21 @@ export class ClientWebSocketManager {
|
||||
this.timeout = options.timeout ?? 10000
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the URL to connect to
|
||||
*
|
||||
* **Requires a reconnect to take effect**
|
||||
*/
|
||||
async setOptions({ url, timeout }: Partial<ClientWebSocketManagerOptions>, autoReconnect = true) {
|
||||
if (url) this.url = url
|
||||
this.timeout = timeout ?? this.timeout
|
||||
|
||||
if (autoReconnect) {
|
||||
this.disconnect(true)
|
||||
await this.connect()
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Connects to the WebSocket API
|
||||
* @returns A promise that resolves when the client is ready
|
||||
@@ -49,19 +64,13 @@ export class ClientWebSocketManager {
|
||||
const timeout = setTimeout(() => {
|
||||
if (!this.ready) {
|
||||
this.#socket?.close(DisconnectReason.TooSlow)
|
||||
throw new Error('WebSocket connection was not readied in time')
|
||||
this._handleDisconnect(DisconnectReason.TooSlow, 'WebSocket connection was not readied in time')
|
||||
}
|
||||
}, this.timeout)
|
||||
|
||||
const errorBeforeReadyHandler = (err: Error) => {
|
||||
cleanup()
|
||||
throw err
|
||||
}
|
||||
|
||||
const closeBeforeReadyHandler = (code: number, reason: Buffer) => {
|
||||
clearTimeout(timeout)
|
||||
this._handleDisconnect(code, reason.toString())
|
||||
throw new Error('WebSocket connection closed before ready')
|
||||
cleanup()
|
||||
}
|
||||
|
||||
const readyHandler = () => {
|
||||
@@ -71,22 +80,25 @@ export class ClientWebSocketManager {
|
||||
rs()
|
||||
}
|
||||
|
||||
const socket = this.#socket
|
||||
const cleanup = () => {
|
||||
this.#socket.off('open', readyHandler)
|
||||
this.#socket.off('close', closeBeforeReadyHandler)
|
||||
this.#socket.off('error', errorBeforeReadyHandler)
|
||||
socket.off('open', readyHandler)
|
||||
socket.off('close', closeBeforeReadyHandler)
|
||||
clearTimeout(timeout)
|
||||
}
|
||||
|
||||
this.#socket.on('open', readyHandler)
|
||||
this.#socket.on('error', errorBeforeReadyHandler)
|
||||
this.#socket.on('close', closeBeforeReadyHandler)
|
||||
} catch (e) {
|
||||
rj(e)
|
||||
}
|
||||
}).finally(() => {
|
||||
this.connecting = false
|
||||
})
|
||||
.then(() => {
|
||||
this.#socket.on('close', (code, reason) => this._handleDisconnect(code, reason.toString()))
|
||||
})
|
||||
.finally(() => {
|
||||
this.connecting = false
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -130,15 +142,15 @@ export class ClientWebSocketManager {
|
||||
this.currentSequence++
|
||||
|
||||
this.#socket.send(serializePacket(packet), err => {
|
||||
throw err
|
||||
if (err) throw err
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Disconnects from the WebSocket API
|
||||
*/
|
||||
disconnect() {
|
||||
this.#throwIfDisconnected('Cannot disconnect when already disconnected from the server')
|
||||
disconnect(force?: boolean) {
|
||||
if (!force) this.#throwIfDisconnected('Cannot disconnect when already disconnected from the server')
|
||||
this._handleDisconnect(DisconnectReason.PlannedDisconnect)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import {
|
||||
url,
|
||||
type AnySchema,
|
||||
type NullSchema,
|
||||
type ObjectSchema,
|
||||
type Output,
|
||||
type BooleanSchema,
|
||||
array,
|
||||
enum_,
|
||||
null_,
|
||||
@@ -11,6 +11,8 @@ import {
|
||||
parse,
|
||||
special,
|
||||
string,
|
||||
boolean,
|
||||
url,
|
||||
// merge
|
||||
} from 'valibot'
|
||||
import DisconnectReason from '../constants/DisconnectReason'
|
||||
@@ -26,8 +28,7 @@ export const PacketSchema = special<Packet>(input => {
|
||||
'op' in input &&
|
||||
typeof input.op === 'number' &&
|
||||
input.op in Operation &&
|
||||
'd' in input &&
|
||||
typeof input.d === 'object'
|
||||
'd' in input
|
||||
) {
|
||||
if (input.op in ServerOperation && !('s' in input && typeof input.s === 'number')) return false
|
||||
|
||||
@@ -62,7 +63,7 @@ export const PacketDataSchemas = {
|
||||
[ServerOperation.Disconnect]: object({
|
||||
reason: enum_(DisconnectReason),
|
||||
}),
|
||||
[ServerOperation.TrainedMessage]: null_(),
|
||||
[ServerOperation.TrainedMessage]: boolean(),
|
||||
[ServerOperation.TrainMessageFailed]: null_(),
|
||||
|
||||
[ClientOperation.ParseText]: object({
|
||||
@@ -78,7 +79,7 @@ export const PacketDataSchemas = {
|
||||
} as const satisfies Record<
|
||||
Operation,
|
||||
// biome-ignore lint/suspicious/noExplicitAny: This is a schema, it's not possible to type it
|
||||
ObjectSchema<any> | AnySchema | NullSchema
|
||||
ObjectSchema<any> | AnySchema | NullSchema | BooleanSchema
|
||||
>
|
||||
|
||||
export type Packet<TOp extends Operation = Operation> = TOp extends ServerOperation
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
diff --git a/node_modules/@semantic-release/npm/.bun-tag-3853154e196b7721 b/.bun-tag-3853154e196b7721
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
|
||||
diff --git a/node_modules/@semantic-release/npm/.bun-tag-550461f23a8ec245 b/.bun-tag-550461f23a8ec245
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
|
||||
diff --git a/node_modules/@semantic-release/npm/.bun-tag-c9c8130945517add b/.bun-tag-c9c8130945517add
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
|
||||
diff --git a/lib/prepare.js b/lib/prepare.js
|
||||
index 3e76bec44cf595a1b4141728336bed904d4d518d..c6baf4e8de9bdf7536f9ad2e9eb9c360e031c7b5 100644
|
||||
index 3e76bec44cf595a1b4141728336bed904d4d518d..4b25ca64879bbee2a600f2b23b738c86136ad9c6 100644
|
||||
--- a/lib/prepare.js
|
||||
+++ b/lib/prepare.js
|
||||
@@ -1,6 +1,7 @@
|
||||
@@ -14,7 +20,7 @@ index 3e76bec44cf595a1b4141728336bed904d4d518d..c6baf4e8de9bdf7536f9ad2e9eb9c360
|
||||
|
||||
export default async function (
|
||||
npmrc,
|
||||
@@ -11,19 +12,12 @@ export default async function (
|
||||
@@ -11,19 +12,13 @@ export default async function (
|
||||
|
||||
logger.log("Write version %s to package.json in %s", version, basePath);
|
||||
|
||||
@@ -36,10 +42,11 @@ index 3e76bec44cf595a1b4141728336bed904d4d518d..c6baf4e8de9bdf7536f9ad2e9eb9c360
|
||||
|
||||
- await versionResult;
|
||||
+ await writeFile(pkgJsonPath, JSON.stringify(pkgJson, null, detectIndent(pkgJsonRaw).indent))
|
||||
+ await execa("bun", ["install"]);
|
||||
|
||||
if (tarballDir) {
|
||||
logger.log("Creating npm package version %s", version);
|
||||
@@ -38,7 +32,7 @@ export default async function (
|
||||
@@ -38,7 +33,7 @@ export default async function (
|
||||
// Only move the tarball if we need to
|
||||
// Fixes: https://github.com/semantic-release/npm/issues/169
|
||||
if (tarballSource !== tarballDestination) {
|
||||
|
||||
13
patches/decancer@3.2.3.patch
Normal file
13
patches/decancer@3.2.3.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/lib.js b/src/lib.js
|
||||
index de45d7dbe82975b09eff3742d0718accae2107fc..0575daa03dfabdd5c96928458ff4270cb8f7188a 100644
|
||||
--- a/src/lib.js
|
||||
+++ b/src/lib.js
|
||||
@@ -42,7 +42,7 @@ function isMusl() {
|
||||
}
|
||||
|
||||
function getBinding(name) {
|
||||
- const path = join(__dirname, '..', `decancer.${name}.node`)
|
||||
+ const path = join(import.meta.dir, '..', `decancer.${name}.node`)
|
||||
|
||||
return require(existsSync(path) ? path : `@vierofernando/decancer-${name}`)
|
||||
}
|
||||
21
patches/drizzle-kit@0.22.8.patch
Normal file
21
patches/drizzle-kit@0.22.8.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
diff --git a/bin.cjs b/bin.cjs
|
||||
index 142ed9c20f28dc1080bebfb52325fa308c6cb771..9d3bea0787f6c05df11567c6821bc85743286340 100644
|
||||
--- a/bin.cjs
|
||||
+++ b/bin.cjs
|
||||
@@ -22053,7 +22053,7 @@ var init_sqliteImports = __esm({
|
||||
const { unregister } = await safeRegister();
|
||||
for (let i2 = 0; i2 < imports.length; i2++) {
|
||||
const it = imports[i2];
|
||||
- const i0 = require(`${it}`);
|
||||
+ const i0 = await import(`${it}`);
|
||||
const prepared = prepareFromExports3(i0);
|
||||
tables.push(...prepared.tables);
|
||||
}
|
||||
@@ -129572,6 +129572,7 @@ var generateCommand = new Command("generate").option("--dialect <dialect>", "Dat
|
||||
} else {
|
||||
assertUnreachable(dialect7);
|
||||
}
|
||||
+ process.exit(0);
|
||||
});
|
||||
var migrateCommand = new Command("migrate").option(
|
||||
"--config <config>",
|
||||
@@ -25,13 +25,13 @@ const Options = {
|
||||
[
|
||||
'@semantic-release/npm',
|
||||
{
|
||||
npmPublish: false,
|
||||
}
|
||||
npmPublish: false,
|
||||
},
|
||||
],
|
||||
[
|
||||
'@semantic-release/git',
|
||||
{
|
||||
assets: ['CHANGELOG.md', 'package.json'],
|
||||
assets: ['CHANGELOG.md', 'package.json', '../../bun.lockb'],
|
||||
},
|
||||
],
|
||||
[
|
||||
|
||||
Reference in New Issue
Block a user