mirror of
https://github.com/ReVanced/revanced-bots.git
synced 2026-01-11 21:56:17 +00:00
Compare commits
54 Commits
@revanced/
...
@revanced/
| Author | SHA1 | Date | |
|---|---|---|---|
|
c97fffb32f | ||
|
d138af46d1 | ||
|
|
75a57b0e16 | ||
|
|
c06033e573 | ||
|
|
d290417ff3 | ||
|
|
a21aa348d7 | ||
|
|
479812e199 | ||
|
|
f6119946f8 | ||
|
|
5d1af3c31c | ||
|
|
14c98e87df | ||
|
|
8e3946a666 | ||
|
|
c2009ca6d4 | ||
|
|
22d3eea88d | ||
|
|
14d301eeb4 | ||
|
|
8efb549453 | ||
|
|
79fea8b286 | ||
|
|
e798a9ef32 | ||
|
|
7b5d4fa1a2 | ||
|
|
11582d5034 | ||
|
|
488d37e65b | ||
|
|
3ed5bd11ac | ||
|
|
8ff6086028 | ||
|
|
27d3b39209 | ||
|
|
6e181c0e7f | ||
|
|
b5f4097538 | ||
|
|
f6d2e25130 | ||
|
|
062735f6d5 | ||
|
|
8aefcdb2e8 | ||
|
|
5b4965dcc7 | ||
|
|
37e64a2eb8 | ||
|
|
59dd803529 | ||
|
|
2ef66fbc87 | ||
|
|
0346741188 | ||
|
|
e0e40237fa | ||
|
|
d3c56222be | ||
|
|
3261294822 | ||
|
|
f035994f9e | ||
|
|
4abac0c890 | ||
|
|
8c0dd67d03 | ||
|
|
7a379a2cae | ||
|
dd8872c027 | ||
|
|
33a0e18e7b | ||
|
|
522ad28fd8 | ||
|
|
94c4fedc06 | ||
|
|
e3dcbab508 | ||
|
|
96065ff175 | ||
|
|
845dd5d914 | ||
|
|
99f65f07f5 | ||
|
|
51f877f321 | ||
|
|
031fd26b26 | ||
|
|
ef07039083 | ||
|
|
6dc7f0211e | ||
|
|
ee90ef247b | ||
|
|
97f2795df4 |
@@ -1,3 +1,11 @@
|
||||
# @revanced/bot-websocket-api [1.0.0-dev.10](https://github.com/revanced/revanced-bots/compare/@revanced/bot-websocket-api@1.0.0-dev.9...@revanced/bot-websocket-api@1.0.0-dev.10) (2025-03-03)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* fix typings and formatting ([479812e](https://github.com/revanced/revanced-bots/commit/479812e199b52cdb295a5746e0767306afab3413))
|
||||
* update repo url ([a21aa34](https://github.com/revanced/revanced-bots/commit/a21aa348d7f32cd0ee65b371e9594520c0a9d3f1))
|
||||
|
||||
# @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)
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "@revanced/bot-websocket-api",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"version": "1.0.0-dev.9",
|
||||
"version": "1.0.0-dev.10",
|
||||
"description": "🧦 WebSocket API server for bots assisting ReVanced",
|
||||
"main": "dist/index.js",
|
||||
"scripts": {
|
||||
@@ -13,7 +13,7 @@
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/revanced/revanced-helper.git",
|
||||
"url": "git+https://github.com/revanced/revanced-bots.git",
|
||||
"directory": "apis/websocket"
|
||||
},
|
||||
"author": "Palm <contact@palmdevs.me> (https://palmdevs.me)",
|
||||
@@ -23,18 +23,18 @@
|
||||
],
|
||||
"license": "GPL-3.0-or-later",
|
||||
"bugs": {
|
||||
"url": "https://github.com/revanced/revanced-helper/issues"
|
||||
"url": "https://github.com/revanced/revanced-bots/issues"
|
||||
},
|
||||
"homepage": "https://github.com/revanced/revanced-helper#readme",
|
||||
"homepage": "https://github.com/revanced/revanced-bots#readme",
|
||||
"dependencies": {
|
||||
"@revanced/bot-shared": "workspace:*",
|
||||
"@sapphire/async-queue": "^1.5.2",
|
||||
"@sapphire/async-queue": "^1.5.3",
|
||||
"chalk": "^5.3.0",
|
||||
"tesseract.js": "^5.1.0",
|
||||
"ws": "^8.17.1"
|
||||
"tesseract.js": "^5.1.1",
|
||||
"ws": "^8.18.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/ws": "^8.5.10",
|
||||
"@types/ws": "^8.5.12",
|
||||
"typed-emitter": "^2.1.0"
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
import { createLogger } from '@revanced/bot-shared'
|
||||
import { cp, rm } from 'fs/promises'
|
||||
import { cp, exists, rm } from 'fs/promises'
|
||||
|
||||
const logger = createLogger()
|
||||
|
||||
logger.info('Cleaning previous build...')
|
||||
await rm('./dist', { recursive: true })
|
||||
if (await exists('./dist')) await rm('./dist', { recursive: true })
|
||||
|
||||
logger.info('Building WebSocket API...')
|
||||
await Bun.build({
|
||||
|
||||
@@ -110,7 +110,7 @@ export default class Client {
|
||||
protected _toBuffer(data: RawData) {
|
||||
if (data instanceof Buffer) return data
|
||||
if (data instanceof ArrayBuffer) return Buffer.from(data)
|
||||
return Buffer.concat(data)
|
||||
return Buffer.concat(data as Uint8Array[])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,138 @@
|
||||
# @revanced/discord-bot [1.0.0-dev.37](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.0-dev.36...@revanced/discord-bot@1.0.0-dev.37) (2025-03-08)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord/utils/duration:** fix specified default unit not working ([d138af4](https://github.com/revanced/revanced-bots/commit/d138af46d1f25a11b6f8ab3790ecaa70b1d716a9))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.36](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.0-dev.35...@revanced/discord-bot@1.0.0-dev.36) (2025-03-03)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord/scripts/build:** check if dist dir exists before cleaning ([c06033e](https://github.com/revanced/revanced-bots/commit/c06033e5730f82438e8052b9b519a8f8e2d25437))
|
||||
* **bots/discord/utils/duration:** make second the default unit ([5d1af3c](https://github.com/revanced/revanced-bots/commit/5d1af3c31c3379b6a13684dfb07583737908c8aa))
|
||||
* **bots/discord:** add GuildMember partial ([8e3946a](https://github.com/revanced/revanced-bots/commit/8e3946a66602838715787090008c7bfaf72b67e9))
|
||||
* **bots/discord:** decrease length of an option in `ban` command ([22d3eea](https://github.com/revanced/revanced-bots/commit/22d3eea88d532792c1237d1a1ab18bc02e57816a))
|
||||
* **bots/discord:** delete expired appliedPresets entries after unapplying ([14c98e8](https://github.com/revanced/revanced-bots/commit/14c98e87df1ec4fd762bbc48ca4c06470cb110a2))
|
||||
* fix typings and formatting ([479812e](https://github.com/revanced/revanced-bots/commit/479812e199b52cdb295a5746e0767306afab3413))
|
||||
* update repo url ([a21aa34](https://github.com/revanced/revanced-bots/commit/a21aa348d7f32cd0ee65b371e9594520c0a9d3f1))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** add more month aliases to duration parser ([c2009ca](https://github.com/revanced/revanced-bots/commit/c2009ca6d42e4387bc5f375d76ecf72991b7fe32))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.35](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.34...@revanced/discord-bot@1.0.0-dev.35) (2024-10-17)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** fix freeze on prod builds ([8efb549](https://github.com/revanced/revanced-helper/commit/8efb549453a04fab1ac6414a7f7f8bf702df3c93))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.34](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.33...@revanced/discord-bot@1.0.0-dev.34) (2024-10-17)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** attempt to fix stuck sticky message timeouts ([3ed5bd1](https://github.com/revanced/revanced-helper/commit/3ed5bd11acc3b4fbd57b0d632c68eb9f77365b8a))
|
||||
* **bots/discord:** fix reload not working ([11582d5](https://github.com/revanced/revanced-helper/commit/11582d50345cae9fb645a65ca4e621596de6a408))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** add default durations for moderation commands ([27d3b39](https://github.com/revanced/revanced-helper/commit/27d3b392092141a1e3b4b0298131ff7817458dc1))
|
||||
* **bots/discord:** cure on every event ([8ff6086](https://github.com/revanced/revanced-helper/commit/8ff6086028132cc4b49ee60846e8d6ef909f5a89))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.33](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.32...@revanced/discord-bot@1.0.0-dev.33) (2024-09-25)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** add trigger to context for eval ([b5f4097](https://github.com/revanced/revanced-helper/commit/b5f40975386677ffff343c42f8ffac21f847a0b7))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.32](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.31...@revanced/discord-bot@1.0.0-dev.32) (2024-09-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** contextify object before sandboxing ([062735f](https://github.com/revanced/revanced-helper/commit/062735f6d552890404d6192244c51a11b0709580))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.31](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.30...@revanced/discord-bot@1.0.0-dev.31) (2024-09-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** persist changes in context for eval command ([5b4965d](https://github.com/revanced/revanced-helper/commit/5b4965dcc7285676b2b3b6756c249bd56eaf8485))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.30](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.29...@revanced/discord-bot@1.0.0-dev.30) (2024-09-24)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** improve admin commands ([0346741](https://github.com/revanced/revanced-helper/commit/03467411882b8598e2c06f389a09ef2e201bb43f))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.29](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.28...@revanced/discord-bot@1.0.0-dev.29) (2024-09-21)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** fix get response logic ([3261294](https://github.com/revanced/revanced-helper/commit/3261294822b0a9faec094536ed5be2d3e1d5e17b))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.28](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.27...@revanced/discord-bot@1.0.0-dev.28) (2024-09-20)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** don't refresh timer if force timer is active for sticky messages ([4abac0c](https://github.com/revanced/revanced-helper/commit/4abac0c890c0548e14cb56723cae919353a8e726))
|
||||
* **bots/discord:** filter out text triggers correctly from image-only scans ([8c0dd67](https://github.com/revanced/revanced-helper/commit/8c0dd67d03d5a1747993da08a5bf82a39de43789))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.27](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.26...@revanced/discord-bot@1.0.0-dev.27) (2024-09-05)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** correct permission check logic ([dd8872c](https://github.com/revanced/revanced-helper/commit/dd8872c027c7e7e1a00f38d659b4d6e79274238c))
|
||||
* **bots/discord:** give only removed roles for role presets ([522ad28](https://github.com/revanced/revanced-helper/commit/522ad28fd83565e9ca411dbce86c8447574288fd))
|
||||
* **bots/discord:** replace duration parser with a library ([94c4fed](https://github.com/revanced/revanced-helper/commit/94c4fedc06e20051e4123508e3134b97eb84782a))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.27](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.26...@revanced/discord-bot@1.0.0-dev.27) (2024-08-23)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** give only removed roles for role presets ([522ad28](https://github.com/revanced/revanced-helper/commit/522ad28fd83565e9ca411dbce86c8447574288fd))
|
||||
* **bots/discord:** replace duration parser with a library ([94c4fed](https://github.com/revanced/revanced-helper/commit/94c4fedc06e20051e4123508e3134b97eb84782a))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.26](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.25...@revanced/discord-bot@1.0.0-dev.26) (2024-08-15)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** correct timer active condition for sticky messages ([96065ff](https://github.com/revanced/revanced-helper/commit/96065ff17584ff99a56ca5008327863ca5a7852b))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.25](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.24...@revanced/discord-bot@1.0.0-dev.25) (2024-08-15)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** allow access to `context` in `/eval` and await result ([99f65f0](https://github.com/revanced/revanced-helper/commit/99f65f07f5f8830c6e8ea4ae171e986af4d3f1f6))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.24](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.23...@revanced/discord-bot@1.0.0-dev.24) (2024-08-14)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **bots/discord:** do not remove unrelated reactions ([031fd26](https://github.com/revanced/revanced-helper/commit/031fd26b2619ecafeff3964e50accacb87de6108))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.23](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.22...@revanced/discord-bot@1.0.0-dev.23) (2024-08-13)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **bots/discord:** add `train` commands ([ee90ef2](https://github.com/revanced/revanced-helper/commit/ee90ef247b4bf2b3c0698606b947116f2dc1b868))
|
||||
* **bots/discord:** update to newer command definition framework ([97f2795](https://github.com/revanced/revanced-helper/commit/97f2795df4ede4d12a08193dba453c1bc765a4c2))
|
||||
|
||||
# @revanced/discord-bot [1.0.0-dev.22](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.21...@revanced/discord-bot@1.0.0-dev.22) (2024-08-10)
|
||||
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ export default {
|
||||
},
|
||||
timeout: 60000,
|
||||
forceSendTimeout: 300000,
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
moderation: {
|
||||
cure: {
|
||||
@@ -77,7 +77,7 @@ export default {
|
||||
attachments: {
|
||||
scanAttachments: true,
|
||||
allowedMimeTypes: ['image/jpeg', 'image/png', 'image/webp', 'text/plain'],
|
||||
maxTextFileSize: 512000
|
||||
maxTextFileSize: 512000,
|
||||
},
|
||||
responses: [
|
||||
{
|
||||
|
||||
@@ -2,20 +2,19 @@
|
||||
"name": "@revanced/discord-bot",
|
||||
"type": "module",
|
||||
"private": true,
|
||||
"version": "1.0.0-dev.22",
|
||||
"version": "1.0.0-dev.37",
|
||||
"description": "🤖 Discord bot assisting ReVanced",
|
||||
"main": "src/index.ts",
|
||||
"scripts": {
|
||||
"register": "bun run scripts/reload-slash-commands.ts",
|
||||
"start": "bun prepare && bun run src/index.ts",
|
||||
"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 && bunx drizzle-kit generate --name=schema"
|
||||
"prepare": "bun run scripts/generate-indexes.ts && bunx --bun drizzle-kit generate --name=schema"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/revanced/revanced-helper.git",
|
||||
"url": "git+https://github.com/revanced/revanced-bots.git",
|
||||
"directory": "bots/discord"
|
||||
},
|
||||
"author": "Palm <contact@palmdevs.me> (https://palmdevs.me)",
|
||||
@@ -25,22 +24,23 @@
|
||||
],
|
||||
"license": "GPL-3.0-or-later",
|
||||
"bugs": {
|
||||
"url": "https://github.com/revanced/revanced-helper/issues"
|
||||
"url": "https://github.com/revanced/revanced-bots/issues"
|
||||
},
|
||||
"homepage": "https://github.com/revanced/revanced-helper#readme",
|
||||
"homepage": "https://github.com/revanced/revanced-bots#readme",
|
||||
"dependencies": {
|
||||
"@discordjs/builders": "^1.8.2",
|
||||
"@discordjs/rest": "^2.3.0",
|
||||
"@discordjs/builders": "^1.9.0",
|
||||
"@discordjs/rest": "^2.4.0",
|
||||
"@revanced/bot-api": "workspace:*",
|
||||
"@revanced/bot-shared": "workspace:*",
|
||||
"chalk": "^5.3.0",
|
||||
"decancer": "^3.2.3",
|
||||
"discord.js": "^14.15.3",
|
||||
"drizzle-orm": "^0.31.4"
|
||||
"decancer": "^3.2.4",
|
||||
"discord.js": "^14.16.3",
|
||||
"drizzle-orm": "^0.31.4",
|
||||
"parse-duration": "^1.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@libsql/client": "^0.7.0",
|
||||
"discord-api-types": "^0.37.92",
|
||||
"discord-api-types": "^0.37.102",
|
||||
"drizzle-kit": "^0.22.8"
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
import { createLogger } from '@revanced/bot-shared'
|
||||
import { cp, rm } from 'fs/promises'
|
||||
import { cp, exists, rm } from 'fs/promises'
|
||||
|
||||
const logger = createLogger()
|
||||
|
||||
logger.warn('Cleaning previous build...')
|
||||
await rm('./dist', { recursive: true })
|
||||
if (await exists('./dist')) await rm('./dist', { recursive: true })
|
||||
|
||||
logger.info('Building bot...')
|
||||
await Bun.build({
|
||||
|
||||
@@ -1,76 +1,145 @@
|
||||
import { ApplicationCommandOptionType } from 'discord.js'
|
||||
import { ApplicationCommandOptionType, ApplicationCommandType } from 'discord.js'
|
||||
import { isAdmin } from '../utils/discord/permissions'
|
||||
|
||||
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,
|
||||
CommandInteraction,
|
||||
CommandInteractionOption,
|
||||
GuildMember,
|
||||
Message,
|
||||
MessageContextMenuCommandInteraction,
|
||||
RESTPostAPIApplicationCommandsJSONBody,
|
||||
RESTPostAPIChatInputApplicationCommandsJSONBody,
|
||||
Role,
|
||||
User,
|
||||
UserContextMenuCommandInteraction,
|
||||
UserResolvable,
|
||||
} from 'discord.js'
|
||||
import { config } from '../context'
|
||||
|
||||
export enum CommandType {
|
||||
ChatGlobal = 1,
|
||||
ChatGuild,
|
||||
ContextMenuUser,
|
||||
ContextMenuMessage,
|
||||
ContextMenuGuildMessage,
|
||||
ContextMenuGuildMember,
|
||||
}
|
||||
|
||||
export default class Command<
|
||||
Global extends boolean = false,
|
||||
Options extends CommandOptionsOptions | undefined = undefined,
|
||||
AllowMessageCommand extends boolean = false,
|
||||
const Type extends CommandType = CommandType.ChatGuild,
|
||||
const Options extends If<IsContextMenu<Type>, undefined, CommandOptionsOptions | undefined> = undefined,
|
||||
const AllowMessageCommand extends If<IsContextMenu<Type>, false, boolean> = false,
|
||||
> {
|
||||
name: string
|
||||
description: string
|
||||
requirements?: CommandRequirements
|
||||
options?: Options
|
||||
global?: Global
|
||||
#execute: CommandExecuteFunction<Global, Options, AllowMessageCommand>
|
||||
type: Type
|
||||
allowMessageCommand: AllowMessageCommand
|
||||
#execute: CommandExecuteFunction<Type, Options, AllowMessageCommand>
|
||||
|
||||
static OptionType = ApplicationCommandOptionType
|
||||
static Type = CommandType
|
||||
|
||||
constructor({
|
||||
name,
|
||||
description,
|
||||
requirements,
|
||||
options,
|
||||
global,
|
||||
type,
|
||||
allowMessageCommand,
|
||||
execute,
|
||||
}: CommandOptions<Global, Options, AllowMessageCommand>) {
|
||||
}: CommandOptions<Type, Options, AllowMessageCommand>) {
|
||||
this.name = name
|
||||
this.description = description
|
||||
this.description = description!
|
||||
this.requirements = requirements
|
||||
this.options = options
|
||||
this.global = global
|
||||
// @ts-expect-error: Default is `CommandType.GuildOnly`, it makes sense
|
||||
this.type = type ?? CommandType.ChatGuild
|
||||
// @ts-expect-error: Default is `false`, it makes sense
|
||||
this.allowMessageCommand = allowMessageCommand ?? false
|
||||
this.#execute = execute
|
||||
}
|
||||
|
||||
isGuildSpecific(): this is Command<
|
||||
CommandType.ChatGuild | CommandType.ContextMenuGuildMember | CommandType.ContextMenuGuildMessage,
|
||||
Options,
|
||||
AllowMessageCommand
|
||||
> {
|
||||
return [
|
||||
CommandType.ChatGuild,
|
||||
CommandType.ContextMenuGuildMessage,
|
||||
CommandType.ContextMenuGuildMember,
|
||||
].includes(this.type)
|
||||
}
|
||||
|
||||
isContextMenuSpecific(): this is Command<
|
||||
| CommandType.ContextMenuGuildMessage
|
||||
| CommandType.ContextMenuGuildMember
|
||||
| CommandType.ContextMenuUser
|
||||
| CommandType.ContextMenuMessage,
|
||||
undefined,
|
||||
false
|
||||
> {
|
||||
return [
|
||||
CommandType.ContextMenuMessage,
|
||||
CommandType.ContextMenuUser,
|
||||
CommandType.ContextMenuGuildMessage,
|
||||
CommandType.ContextMenuGuildMember,
|
||||
].includes(this.type)
|
||||
}
|
||||
|
||||
isGuildContextMenuSpecific(): this is Command<
|
||||
CommandType.ContextMenuGuildMessage | CommandType.ContextMenuGuildMember,
|
||||
undefined,
|
||||
false
|
||||
> {
|
||||
return [CommandType.ContextMenuGuildMessage, CommandType.ContextMenuGuildMember].includes(this.type)
|
||||
}
|
||||
|
||||
async onContextMenuInteraction(
|
||||
context: typeof import('../context'),
|
||||
interaction: If<
|
||||
Extends<Type, CommandType.ContextMenuGuildMessage>,
|
||||
MessageContextMenuCommandInteraction<ToCacheType<Type>>,
|
||||
UserContextMenuCommandInteraction<ToCacheType<Type>>
|
||||
>,
|
||||
): Promise<unknown> {
|
||||
if (!this.isGuildSpecific() && !interaction.inGuild())
|
||||
throw new CommandError(CommandErrorType.InteractionNotInGuild)
|
||||
|
||||
const executor = await this.#fetchInteractionExecutor(interaction)
|
||||
const target =
|
||||
this.type === CommandType.ContextMenuGuildMember
|
||||
? this.isGuildSpecific()
|
||||
? fetchMember(interaction as CommandInteraction<'raw' | 'cached'>, interaction.targetId)
|
||||
: interaction.client.users.fetch(interaction.targetId)
|
||||
: interaction.channel?.messages.fetch(interaction.targetId)
|
||||
|
||||
if (!target) throw new CommandError(CommandErrorType.FetchManagerNotFound)
|
||||
|
||||
// @ts-expect-error: Type mismatch (again!) because TypeScript is not smart enough
|
||||
return await this.#execute({ ...context, executor, target }, interaction, undefined)
|
||||
}
|
||||
|
||||
async onMessage(
|
||||
context: typeof import('../context'),
|
||||
msg: Message<If<Global, false, true>>,
|
||||
msg: Message<IsGuildSpecific<Type>>,
|
||||
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.')],
|
||||
})
|
||||
if (!this.allowMessageCommand) return
|
||||
if (!this.isGuildSpecific() && !msg.guildId) throw new CommandError(CommandErrorType.InteractionNotInGuild)
|
||||
|
||||
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 executor = this.isGuildSpecific()
|
||||
? await msg.guild?.members.fetch(msg.author)!
|
||||
: await msg.client.users.fetch(msg.author)
|
||||
if (!(await this.canExecute(executor))) throw new CommandError(CommandErrorType.RequirementsNotMet)
|
||||
|
||||
const options = this.options
|
||||
? ((await this.#resolveMessageOptions(msg, this.options, args)) as CommandExecuteFunctionOptionsParameter<
|
||||
@@ -120,14 +189,18 @@ export default class Command<
|
||||
`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))
|
||||
const argValue = typeof arg === 'string' ? arg : arg?.id
|
||||
|
||||
if (
|
||||
'choices' in option &&
|
||||
option.choices &&
|
||||
!option.choices.some(({ value }) => value === (typeof value === 'number' ? Number(argValue) : argValue))
|
||||
)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Invalid choice for argument **${name}**.\n${argExplainationString}\n\n${choicesString}\n`,
|
||||
`Invalid choice for argument **${name}**.\n${argExplainationString}${choicesString}\n`,
|
||||
)
|
||||
|
||||
const argValue = typeof arg === 'string' ? arg : arg?.id
|
||||
|
||||
if (argValue && arg) {
|
||||
if (isSubcommandLikeOption) {
|
||||
const [subcommandName, subcommandOption] = iterableOptions.find(([name]) => name === argValue)!
|
||||
@@ -142,6 +215,16 @@ export default class Command<
|
||||
break
|
||||
}
|
||||
|
||||
if (
|
||||
type === ApplicationCommandOptionType.String &&
|
||||
((typeof option.minLength === 'number' && argValue.length < option.minLength) ||
|
||||
(typeof option.maxLength === 'number' && argValue.length > option.maxLength))
|
||||
)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Invalid string length for argument **${name}**.\nLengths allowed: ${option.minLength ?? '(any)'} - ${option.maxLength ?? '(any)'}.${argExplainationString}`,
|
||||
)
|
||||
|
||||
if (
|
||||
(type === ApplicationCommandOptionType.Channel ||
|
||||
type === ApplicationCommandOptionType.User ||
|
||||
@@ -153,14 +236,21 @@ export default class Command<
|
||||
`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.Number || type === ApplicationCommandOptionType.Integer) {
|
||||
if (Number.isNaN(Number(argValue)))
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Invalid number for argument **${name}**.${argExplainationString}`,
|
||||
)
|
||||
|
||||
if (
|
||||
(typeof option.min === 'number' && Number(argValue) < option.min) ||
|
||||
(typeof option.max === 'number' && Number(argValue) > option.max)
|
||||
)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`Number out of range for argument **${name}**.\nRange allowed: ${option.min ?? '(any)'} - ${option.max ?? '(any)'}.${argExplainationString}`,
|
||||
)
|
||||
}
|
||||
|
||||
if (
|
||||
@@ -177,7 +267,7 @@ export default class Command<
|
||||
type === ApplicationCommandOptionType.Number || type === ApplicationCommandOptionType.Integer
|
||||
? Number(argValue)
|
||||
: type === ApplicationCommandOptionType.Boolean
|
||||
? argValue[0] === 't' || argValue[0] === 'y'
|
||||
? ['t', 'y', 'yes', 'true'].some(value => value === argValue.toLowerCase())
|
||||
: type === ApplicationCommandOptionType.Channel
|
||||
? await msg.client.channels.fetch(argValue)
|
||||
: type === ApplicationCommandOptionType.User
|
||||
@@ -191,44 +281,27 @@ export default class Command<
|
||||
return _options
|
||||
}
|
||||
|
||||
#fetchInteractionExecutor(interaction: CommandInteraction) {
|
||||
return this.isGuildSpecific()
|
||||
? fetchMember(interaction as CommandInteraction<'raw' | 'cached'>)
|
||||
: fetchUser(interaction)
|
||||
}
|
||||
|
||||
async onInteraction(
|
||||
context: typeof import('../context'),
|
||||
interaction: ChatInputCommandInteraction,
|
||||
): Promise<unknown> {
|
||||
const { logger } = context
|
||||
if (interaction.commandName !== this.name)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InteractionDataMismatch,
|
||||
'The interaction command name does not match the expected command name.',
|
||||
)
|
||||
|
||||
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.isGuildSpecific() && !interaction.inGuild())
|
||||
throw new CommandError(CommandErrorType.InteractionNotInGuild)
|
||||
|
||||
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 executor = await this.#fetchInteractionExecutor(interaction)
|
||||
if (!(await this.canExecute(executor))) throw new CommandError(CommandErrorType.RequirementsNotMet)
|
||||
|
||||
const options = this.options
|
||||
? ((await this.#resolveInteractionOptions(interaction)) as CommandExecuteFunctionOptionsParameter<
|
||||
@@ -237,14 +310,10 @@ export default class Command<
|
||||
: 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.',
|
||||
),
|
||||
],
|
||||
})
|
||||
throw new CommandError(
|
||||
CommandErrorType.InteractionDataMismatch,
|
||||
'The registered 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)
|
||||
@@ -288,7 +357,7 @@ export default class Command<
|
||||
return _options
|
||||
}
|
||||
|
||||
async canExecute(executor: User | GuildMember, channelId: string): Promise<boolean> {
|
||||
async canExecute(executor: User | GuildMember): Promise<boolean> {
|
||||
if (!this.requirements) return false
|
||||
|
||||
const isExecutorAdmin = isAdmin(executor)
|
||||
@@ -296,7 +365,6 @@ export default class Command<
|
||||
|
||||
const {
|
||||
adminOnly,
|
||||
channels,
|
||||
roles,
|
||||
permissions,
|
||||
users,
|
||||
@@ -305,16 +373,23 @@ export default class Command<
|
||||
memberRequirementsForUsers = 'pass',
|
||||
} = this.requirements
|
||||
|
||||
const member = this.global ? null : (executor as GuildMember)
|
||||
const bDefCond = defaultCondition !== 'fail'
|
||||
const bMemReqForUsers = memberRequirementsForUsers !== 'fail'
|
||||
const member = this.isGuildSpecific() ? (executor as GuildMember) : null
|
||||
const boolDefaultCondition = defaultCondition !== 'fail'
|
||||
const boolMemberRequirementsForUsers = 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,
|
||||
adminOnly ? isExecutorAdmin : boolDefaultCondition,
|
||||
users ? users.includes(executor.id) : boolDefaultCondition,
|
||||
member
|
||||
? roles
|
||||
? roles.some(role => member.roles.cache.has(role))
|
||||
: boolDefaultCondition
|
||||
: boolMemberRequirementsForUsers,
|
||||
member
|
||||
? permissions
|
||||
? member.permissions.has(permissions)
|
||||
: boolDefaultCondition
|
||||
: boolMemberRequirementsForUsers,
|
||||
]
|
||||
|
||||
if (mode === 'all' && conditions.some(condition => !condition)) return false
|
||||
@@ -323,14 +398,27 @@ export default class Command<
|
||||
return true
|
||||
}
|
||||
|
||||
get json(): RESTPostAPIChatInputApplicationCommandsJSONBody & { contexts: Array<0 | 1 | 2> } {
|
||||
return {
|
||||
get json(): RESTPostAPIApplicationCommandsJSONBody {
|
||||
// @ts-expect-error: I hate union types in TypeScript
|
||||
const base: RESTPostAPIApplicationCommandsJSONBody = {
|
||||
name: this.name,
|
||||
type:
|
||||
this.type === CommandType.ContextMenuGuildMessage || this.type === CommandType.ContextMenuMessage
|
||||
? ApplicationCommandType.Message
|
||||
: this.type === CommandType.ContextMenuGuildMember || this.type === CommandType.ContextMenuUser
|
||||
? ApplicationCommandType.User
|
||||
: ApplicationCommandType.ChatInput,
|
||||
}
|
||||
|
||||
if (this.isContextMenuSpecific()) return base
|
||||
|
||||
return {
|
||||
...base,
|
||||
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],
|
||||
}
|
||||
contexts: this.isGuildSpecific() ? [0] : [0, 1, 2],
|
||||
} as RESTPostAPIChatInputApplicationCommandsJSONBody & { contexts: Array<0 | 1 | 2> }
|
||||
}
|
||||
|
||||
#transformOptions(optionsObject: Record<string, CommandOption>) {
|
||||
@@ -377,8 +465,8 @@ export default class Command<
|
||||
export class ModerationCommand<
|
||||
Options extends CommandOptionsOptions,
|
||||
AllowMessageCommand extends boolean = true,
|
||||
> extends Command<false, Options, AllowMessageCommand> {
|
||||
constructor(options: ExtendedCommandOptions<false, Options, AllowMessageCommand>) {
|
||||
> extends Command<CommandType.ChatGuild, Options, AllowMessageCommand> {
|
||||
constructor(options: ExtendedCommandOptions<CommandType.ChatGuild, Options, AllowMessageCommand>) {
|
||||
super({
|
||||
...options,
|
||||
requirements: {
|
||||
@@ -388,17 +476,16 @@ export class ModerationCommand<
|
||||
},
|
||||
// @ts-expect-error: No thanks
|
||||
allowMessageCommand: options.allowMessageCommand ?? true,
|
||||
global: false,
|
||||
type: CommandType.ChatGuild,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export class AdminCommand<Options extends CommandOptionsOptions, AllowMessageCommand extends boolean> extends Command<
|
||||
true,
|
||||
Options,
|
||||
AllowMessageCommand
|
||||
> {
|
||||
constructor(options: ExtendedCommandOptions<true, Options, AllowMessageCommand>) {
|
||||
export class AdminCommand<
|
||||
Options extends CommandOptionsOptions,
|
||||
AllowMessageCommand extends boolean = true,
|
||||
> extends Command<CommandType.ChatGlobal, Options, AllowMessageCommand> {
|
||||
constructor(options: ExtendedCommandOptions<CommandType.ChatGlobal, Options, AllowMessageCommand>) {
|
||||
super({
|
||||
...options,
|
||||
requirements: {
|
||||
@@ -406,38 +493,52 @@ export class AdminCommand<Options extends CommandOptionsOptions, AllowMessageCom
|
||||
adminOnly: true,
|
||||
defaultCondition: 'pass',
|
||||
},
|
||||
global: true,
|
||||
allowMessageCommand: options.allowMessageCommand ?? (true as AllowMessageCommand),
|
||||
type: CommandType.ChatGlobal,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
const fetchMember = async (
|
||||
interaction: CommandInteraction<'raw' | 'cached'>,
|
||||
source: UserResolvable = interaction.user,
|
||||
manager = interaction.guild?.members,
|
||||
) => {
|
||||
const _manager = manager ?? (await interaction.client.guilds.fetch(interaction.guildId).then(it => it.members))
|
||||
if (!_manager) throw new CommandError(CommandErrorType.FetchManagerNotFound, 'Cannot fetch member.')
|
||||
return await _manager.fetch(source)
|
||||
}
|
||||
|
||||
const fetchUser = (interaction: CommandInteraction, source: UserResolvable = interaction.user) => {
|
||||
return interaction.client.users.fetch(source)
|
||||
}
|
||||
|
||||
/* TODO:
|
||||
APIApplicationCommandAttachmentOption
|
||||
APIApplicationCommandMentionableOption
|
||||
APIApplicationCommandRoleOption
|
||||
*/
|
||||
|
||||
export interface CommandOptions<
|
||||
Global extends boolean,
|
||||
export type CommandOptions<
|
||||
Type extends CommandType,
|
||||
Options extends CommandOptionsOptions | undefined,
|
||||
AllowMessageCommand extends boolean,
|
||||
> {
|
||||
> = {
|
||||
name: string
|
||||
description: string
|
||||
requirements?: CommandRequirements
|
||||
options?: Options
|
||||
execute: CommandExecuteFunction<Global, Options, AllowMessageCommand>
|
||||
global?: Global
|
||||
execute: CommandExecuteFunction<Type, Options, AllowMessageCommand>
|
||||
type?: Type
|
||||
allowMessageCommand?: AllowMessageCommand
|
||||
}
|
||||
} & If<IsContextMenu<Type>, { description?: never }, { description: string }>
|
||||
|
||||
export type CommandArguments = Array<string | CommandSpecialArgument>
|
||||
|
||||
export type CommandSpecialArgument = {
|
||||
type: (typeof CommandSpecialArgumentType)[keyof typeof CommandSpecialArgumentType]
|
||||
id: string
|
||||
}
|
||||
|
||||
//! If things ever get minified, this will most likely break property access via string names
|
||||
export const CommandSpecialArgumentType = {
|
||||
Channel: ApplicationCommandOptionType.Channel,
|
||||
Role: ApplicationCommandOptionType.Role,
|
||||
@@ -445,31 +546,56 @@ export const CommandSpecialArgumentType = {
|
||||
}
|
||||
|
||||
type ExtendedCommandOptions<
|
||||
Global extends boolean,
|
||||
Type extends CommandType,
|
||||
Options extends CommandOptionsOptions,
|
||||
AllowMessageCommand extends boolean,
|
||||
> = Omit<CommandOptions<Global, Options, AllowMessageCommand>, 'global'> & {
|
||||
requirements?: Omit<CommandOptions<false, Options, AllowMessageCommand>['requirements'], 'defaultCondition'>
|
||||
> = Omit<CommandOptions<Type, Options, AllowMessageCommand>, 'type'> & {
|
||||
requirements?: Omit<CommandOptions<Type, Options, AllowMessageCommand>['requirements'], 'defaultCondition'>
|
||||
}
|
||||
|
||||
export type CommandOptionsOptions = Record<string, CommandOption>
|
||||
|
||||
type ToCacheType<Type extends CommandType> = If<IsGuildSpecific<Type>, 'raw' | 'cached', CacheType>
|
||||
|
||||
type CommandExecuteFunction<
|
||||
Global extends boolean,
|
||||
Type extends CommandType,
|
||||
Options extends CommandOptionsOptions | undefined,
|
||||
AllowMessageCommand extends boolean,
|
||||
> = (
|
||||
context: CommandContext<Global>,
|
||||
context: CommandContext<Type>,
|
||||
trigger: If<
|
||||
AllowMessageCommand,
|
||||
Message<InvertBoolean<Global>> | ChatInputCommandInteraction<If<Global, CacheType, 'raw' | 'cached'>>,
|
||||
ChatInputCommandInteraction<If<Global, CacheType, 'raw' | 'cached'>>
|
||||
Message<IsGuildSpecific<Type>> | CommandTypeToInteractionMap<ToCacheType<Type>>[Type],
|
||||
CommandTypeToInteractionMap<ToCacheType<Type>>[Type]
|
||||
>,
|
||||
options: Options extends CommandOptionsOptions ? CommandExecuteFunctionOptionsParameter<Options> : never,
|
||||
) => Promise<unknown> | unknown
|
||||
|
||||
type CommandTypeToInteractionMap<CT extends CacheType> = {
|
||||
[CommandType.ChatGlobal]: ChatInputCommandInteraction<CT>
|
||||
[CommandType.ChatGuild]: ChatInputCommandInteraction<CT>
|
||||
[CommandType.ContextMenuUser]: UserContextMenuCommandInteraction<CT>
|
||||
[CommandType.ContextMenuMessage]: MessageContextMenuCommandInteraction<CT>
|
||||
[CommandType.ContextMenuGuildMessage]: MessageContextMenuCommandInteraction<CT>
|
||||
[CommandType.ContextMenuGuildMember]: MessageContextMenuCommandInteraction<CT>
|
||||
}
|
||||
|
||||
type IsContextMenu<Type extends CommandType> = Extends<
|
||||
Type,
|
||||
| CommandType.ContextMenuGuildMessage
|
||||
| CommandType.ContextMenuGuildMember
|
||||
| CommandType.ContextMenuMessage
|
||||
| CommandType.ContextMenuUser
|
||||
>
|
||||
|
||||
type IsGuildSpecific<Type extends CommandType> = Extends<
|
||||
Type,
|
||||
CommandType.ChatGuild | CommandType.ContextMenuGuildMember | CommandType.ContextMenuGuildMessage
|
||||
>
|
||||
|
||||
type Extends<T, U> = T extends U ? true : false
|
||||
type If<T extends boolean | undefined, U, V> = T extends true ? U : V
|
||||
type InvertBoolean<T extends boolean> = If<T, false, true>
|
||||
// type InvertBoolean<T extends boolean> = If<T, false, true>
|
||||
|
||||
type CommandExecuteFunctionOptionsParameter<Options extends CommandOptionsOptions> = {
|
||||
[K in keyof Options]: Options[K]['type'] extends
|
||||
@@ -484,8 +610,13 @@ type CommandExecuteFunctionOptionsParameter<Options extends CommandOptionsOption
|
||||
>
|
||||
}
|
||||
|
||||
type CommandContext<Global extends boolean> = typeof import('../context') & {
|
||||
executor: CommandExecutor<Global>
|
||||
type CommandContext<Type extends CommandType> = typeof import('../context') & {
|
||||
executor: CommandExecutor<Type>
|
||||
target: If<
|
||||
Extends<Type, CommandType.ContextMenuGuildMember>,
|
||||
GuildMember,
|
||||
If<Extends<Type, CommandType.ContextMenuGuildMessage>, Message<true>, never>
|
||||
>
|
||||
}
|
||||
|
||||
type CommandOptionValueMap = {
|
||||
@@ -511,7 +642,7 @@ type CommandOption =
|
||||
| CommandSubcommandOption
|
||||
| CommandSubcommandGroupOption
|
||||
|
||||
type CommandExecutor<Global extends boolean> = If<Global, User, GuildMember>
|
||||
type CommandExecutor<Type extends CommandType> = If<IsGuildSpecific<Type>, GuildMember, User>
|
||||
|
||||
type CommandOptionBase<Type extends ApplicationCommandOptionType> = {
|
||||
type: Type
|
||||
@@ -585,10 +716,12 @@ interface CommandSubcommandLikeOption<
|
||||
type CommandSubcommandOption = CommandSubcommandLikeOption<ApplicationCommandOptionType.Subcommand>
|
||||
type CommandSubcommandGroupOption = CommandSubcommandLikeOption<ApplicationCommandOptionType.SubcommandGroup>
|
||||
|
||||
export type CommandRequirements = Filter & {
|
||||
mode?: 'all' | 'any'
|
||||
adminOnly?: boolean
|
||||
export type CommandRequirements = {
|
||||
users?: string[]
|
||||
roles?: string[]
|
||||
permissions?: bigint
|
||||
adminOnly?: boolean
|
||||
defaultCondition?: 'fail' | 'pass'
|
||||
memberRequirementsForUsers?: 'pass' | 'fail'
|
||||
memberRequirementsForUsers?: 'fail' | 'pass'
|
||||
mode?: 'all' | 'any'
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { createErrorEmbed } from '$/utils/discord/embeds'
|
||||
import { createErrorEmbed } from '../utils/discord/embeds'
|
||||
|
||||
export default class CommandError extends Error {
|
||||
type: CommandErrorType
|
||||
|
||||
constructor(type: CommandErrorType, message?: string) {
|
||||
constructor(type: CommandErrorType, message: string = ErrorMessageMap[type]) {
|
||||
super(message)
|
||||
this.name = 'CommandError'
|
||||
this.type = type
|
||||
@@ -15,19 +15,34 @@ export default class CommandError extends Error {
|
||||
}
|
||||
|
||||
export enum CommandErrorType {
|
||||
Generic,
|
||||
Generic = 1,
|
||||
InteractionNotInGuild,
|
||||
InteractionDataMismatch,
|
||||
FetchManagerNotFound,
|
||||
FetchNotFound,
|
||||
RequirementsNotMet = 100,
|
||||
MissingArgument,
|
||||
InvalidArgument,
|
||||
InvalidUser,
|
||||
InvalidChannel,
|
||||
InvalidDuration,
|
||||
}
|
||||
|
||||
const ErrorTitleMap: Record<CommandErrorType, string> = {
|
||||
[CommandErrorType.Generic]: 'An exception was thrown',
|
||||
[CommandErrorType.InteractionNotInGuild]: 'This command can only be used in servers',
|
||||
[CommandErrorType.InteractionDataMismatch]: 'Command data mismatch',
|
||||
[CommandErrorType.FetchManagerNotFound]: 'Cannot fetch data (manager not found)',
|
||||
[CommandErrorType.FetchNotFound]: 'Cannot fetch data (source not found)',
|
||||
[CommandErrorType.RequirementsNotMet]: 'Command requirements not met',
|
||||
[CommandErrorType.MissingArgument]: 'Missing argument',
|
||||
[CommandErrorType.InvalidArgument]: 'Invalid argument',
|
||||
[CommandErrorType.InvalidUser]: 'Invalid user',
|
||||
[CommandErrorType.InvalidChannel]: 'Invalid channel',
|
||||
[CommandErrorType.InvalidDuration]: 'Invalid duration',
|
||||
}
|
||||
|
||||
const ErrorMessageMap: Record<CommandErrorType, string> = {
|
||||
[CommandErrorType.Generic]: 'An generic exception was thrown.',
|
||||
[CommandErrorType.InteractionNotInGuild]: 'This command can only be used in servers.',
|
||||
[CommandErrorType.InteractionDataMismatch]: 'Interaction command data does not match the expected command data.',
|
||||
[CommandErrorType.FetchManagerNotFound]: 'Cannot fetch required data.',
|
||||
[CommandErrorType.FetchNotFound]: 'Cannot fetch target.',
|
||||
[CommandErrorType.RequirementsNotMet]: 'You do not meet the requirements to use this command.',
|
||||
[CommandErrorType.MissingArgument]: 'You are missing a required argument.',
|
||||
[CommandErrorType.InvalidArgument]: 'You provided an invalid argument.',
|
||||
}
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
import { unlinkSync, writeFileSync } from 'fs'
|
||||
import { join } from 'path'
|
||||
import { inspect } from 'util'
|
||||
import { createContext, runInContext } from 'vm'
|
||||
import { ApplicationCommandOptionType } from 'discord.js'
|
||||
|
||||
import { AdminCommand } from '$/classes/Command'
|
||||
import { createSuccessEmbed } from '$/utils/discord/embeds'
|
||||
import { parseDuration } from '$/utils/duration'
|
||||
|
||||
export default new AdminCommand({
|
||||
name: 'eval',
|
||||
@@ -18,23 +22,74 @@ export default new AdminCommand({
|
||||
type: ApplicationCommandOptionType.Boolean,
|
||||
required: false,
|
||||
},
|
||||
['inspect-depth']: {
|
||||
description: 'How many times to recurse while formatting the object (default: 1)',
|
||||
type: ApplicationCommandOptionType.Integer,
|
||||
required: false,
|
||||
},
|
||||
timeout: {
|
||||
description: 'Timeout for the evaluation (default: 10s)',
|
||||
type: ApplicationCommandOptionType.String,
|
||||
required: false,
|
||||
},
|
||||
},
|
||||
async execute(_, trigger, { code, 'show-hidden': showHidden }) {
|
||||
async execute(context, trigger, { code, 'show-hidden': showHidden, timeout, ['inspect-depth']: inspectDepth }) {
|
||||
const currentToken = context.discord.client.token
|
||||
const currentEnvToken = process.env['DISCORD_TOKEN']
|
||||
context.discord.client.token = null
|
||||
process.env['DISCORD_TOKEN'] = undefined
|
||||
|
||||
// This allows developers to access and modify the context object to apply changes
|
||||
// to the bot while the bot is running, minus malicious actors getting the token to perform malicious actions
|
||||
const output = await runInContext(
|
||||
code,
|
||||
createContext({
|
||||
...globalThis,
|
||||
context,
|
||||
trigger,
|
||||
}),
|
||||
{
|
||||
timeout: parseDuration(timeout ?? '10s'),
|
||||
filename: 'eval',
|
||||
displayErrors: true,
|
||||
},
|
||||
)
|
||||
|
||||
context.discord.client.token = currentToken
|
||||
process.env['DISCORD_TOKEN'] = currentEnvToken
|
||||
|
||||
const inspectedOutput = inspect(output, {
|
||||
depth: inspectDepth ?? 1,
|
||||
showHidden,
|
||||
getters: showHidden,
|
||||
numericSeparator: true,
|
||||
showProxy: showHidden,
|
||||
})
|
||||
|
||||
const embed = createSuccessEmbed('Evaluate', `\`\`\`js\n${code}\`\`\``)
|
||||
const files: string[] = []
|
||||
const filepath = join(Bun.main, '..', `output-eval-${Date.now()}.js`)
|
||||
|
||||
if (inspectedOutput.length > 1000) {
|
||||
writeFileSync(filepath, inspectedOutput)
|
||||
files.push(filepath)
|
||||
|
||||
embed.addFields({
|
||||
name: 'Result',
|
||||
value: '```js\n// (output too long, file uploaded)```',
|
||||
})
|
||||
} else
|
||||
embed.addFields({
|
||||
name: 'Result',
|
||||
value: `\`\`\`js\n${inspectedOutput}\`\`\``,
|
||||
})
|
||||
|
||||
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,
|
||||
})}\`\`\``,
|
||||
}),
|
||||
],
|
||||
embeds: [embed],
|
||||
files,
|
||||
})
|
||||
|
||||
if (files.length) unlinkSync(filepath)
|
||||
},
|
||||
})
|
||||
|
||||
@@ -11,7 +11,10 @@ export default new AdminCommand({
|
||||
description: 'The type of exception to throw',
|
||||
type: ApplicationCommandOptionType.String,
|
||||
required: true,
|
||||
choices: Object.keys(CommandErrorType).map(k => ({ name: k, value: k })),
|
||||
choices: [
|
||||
{ name: 'Process', value: 'Process' },
|
||||
...Object.keys(CommandErrorType).map(k => ({ name: k, value: k })),
|
||||
],
|
||||
},
|
||||
},
|
||||
async execute(_, __, { type }) {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
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
|
||||
logger.info(`Reload triggered by ${context.executor.tag} (${context.executor.id})`)
|
||||
|
||||
logger.debug('Invalidating previous config...')
|
||||
context.config.invalidate()
|
||||
|
||||
if ('deferReply' in trigger) await trigger.deferReply({ ephemeral: true })
|
||||
|
||||
@@ -23,7 +23,7 @@ export default new AdminCommand({
|
||||
api.client.disconnect(true)
|
||||
api.disconnectCount = 0
|
||||
api.intentionallyDisconnecting = false
|
||||
await api.client.connect()
|
||||
api.client.connect()
|
||||
|
||||
logger.info('Reinitializing Discord client to reload configuration...')
|
||||
await discord.client.destroy()
|
||||
@@ -32,6 +32,6 @@ export default new AdminCommand({
|
||||
await discord.client.login(process.env['DISCORD_TOKEN'])
|
||||
|
||||
// @ts-expect-error: TypeScript dum
|
||||
await trigger[('deferReply' in trigger ? 'editReply' : 'reply')]({ content: 'Reloaded configuration' })
|
||||
await trigger['deferReply' in trigger ? 'editReply' : 'reply']({ content: 'Reloaded configuration' })
|
||||
},
|
||||
})
|
||||
|
||||
@@ -42,7 +42,7 @@ export default new AdminCommand({
|
||||
|
||||
const { global: globalCommands, guild: guildCommands } = Object.groupBy(
|
||||
Object.values(context.discord.commands),
|
||||
cmd => (cmd.global ? 'global' : 'guild'),
|
||||
cmd => (cmd.isGuildSpecific() ? 'guild' : 'global'),
|
||||
)
|
||||
|
||||
const {
|
||||
|
||||
@@ -6,7 +6,7 @@ import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
|
||||
export default new Command({
|
||||
name: 'coinflip',
|
||||
description: 'Do a coinflip!',
|
||||
global: true,
|
||||
type: Command.Type.ChatGlobal,
|
||||
requirements: {
|
||||
defaultCondition: 'pass',
|
||||
},
|
||||
|
||||
@@ -18,13 +18,14 @@ export default new ModerationCommand({
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
dmd: {
|
||||
description: 'Duration to delete messages (must be from 0 to 7 days)',
|
||||
dmt: {
|
||||
description:
|
||||
'Time duration to delete messages (default time unit is days, must be from 0s to 7d, default is 0s)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
},
|
||||
async execute({ logger, executor }, interaction, { user, reason, dmd }) {
|
||||
async execute({ logger, executor }, interaction, { user, reason, dmt }) {
|
||||
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)
|
||||
@@ -35,12 +36,12 @@ export default new ModerationCommand({
|
||||
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'You cannot ban a user with a role equal to or higher than yours.',
|
||||
)
|
||||
}
|
||||
|
||||
const dms = Math.floor(dmd ? parseDuration(dmd) : 0 / 1000)
|
||||
const dms = Math.floor((dmt ? parseDuration(dmt, 'd') : 0) / 1000)
|
||||
await interaction.guild!.members.ban(user, {
|
||||
reason: `Banned by moderator ${executor.user.tag} (${executor.id}): ${reason}`,
|
||||
deleteMessageSeconds: dms,
|
||||
|
||||
@@ -14,13 +14,13 @@ export default new ModerationCommand({
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
reason: {
|
||||
description: 'The reason for muting the member',
|
||||
duration: {
|
||||
description: 'The duration of the mute (default time unit is minutes)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
duration: {
|
||||
description: 'The duration of the mute',
|
||||
reason: {
|
||||
description: 'The reason for muting the member',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
@@ -33,18 +33,18 @@ export default new ModerationCommand({
|
||||
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
|
||||
const duration = durationInput ? parseDuration(durationInput, 'm') : Infinity
|
||||
|
||||
if (Number.isInteger(duration) && duration! < 1)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidDuration,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'The duration must be at least 1 millisecond long.',
|
||||
)
|
||||
|
||||
const expires = Math.max(duration, Date.now() + duration)
|
||||
if (!member)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'The provided member is not in the server or does not exist.',
|
||||
)
|
||||
|
||||
@@ -53,7 +53,7 @@ export default new ModerationCommand({
|
||||
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'You cannot mute a user with a role equal to or higher than yours.',
|
||||
)
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ export default new ModerationCommand({
|
||||
|
||||
const channel = interaction.channel!
|
||||
if (!channel.isTextBased())
|
||||
throw new CommandError(CommandErrorType.InvalidChannel, 'The supplied channel is not a text channel.')
|
||||
throw new CommandError(CommandErrorType.InvalidArgument, 'The supplied channel is not a text channel.')
|
||||
|
||||
const embed = applyCommonEmbedStyles(
|
||||
new EmbedBuilder({
|
||||
|
||||
@@ -11,12 +11,12 @@ const SubcommandOptions = {
|
||||
type: ModerationCommand.OptionType.User,
|
||||
},
|
||||
preset: {
|
||||
description: 'The preset to apply or remove',
|
||||
description: 'The preset to manage',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
duration: {
|
||||
description: 'The duration to apply the preset for (only for apply action)',
|
||||
description: 'The duration to apply the preset for (only for apply action, default time unit is minutes)',
|
||||
required: false,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
@@ -45,7 +45,7 @@ export default new ModerationCommand({
|
||||
|
||||
if (!member)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'The provided member is not in the server or does not exist.',
|
||||
)
|
||||
|
||||
@@ -53,16 +53,16 @@ export default new ModerationCommand({
|
||||
throw new CommandError(CommandErrorType.Generic, 'This user cannot be managed by the bot.')
|
||||
|
||||
if (apply) {
|
||||
const duration = durationInput ? parseDuration(durationInput) : Infinity
|
||||
const duration = durationInput ? parseDuration(durationInput, 'm') : Infinity
|
||||
if (Number.isInteger(duration) && duration! < 1)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidDuration,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'The duration must be at least 1 millisecond long.',
|
||||
)
|
||||
|
||||
if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'You cannot apply a role preset to a user with a role equal to or higher than yours.',
|
||||
)
|
||||
|
||||
@@ -83,6 +83,13 @@ export default new ModerationCommand({
|
||||
removeRolePreset(member, preset)
|
||||
}, expires)
|
||||
|
||||
await sendPresetReplyAndLogs(apply ? 'apply' : 'remove', trigger, executor, user, preset, expires ? Math.ceil(expires / 1000) : undefined)
|
||||
await sendPresetReplyAndLogs(
|
||||
apply ? 'apply' : 'remove',
|
||||
trigger,
|
||||
executor,
|
||||
user,
|
||||
preset,
|
||||
expires ? Math.ceil(expires / 1000) : undefined,
|
||||
)
|
||||
},
|
||||
})
|
||||
|
||||
@@ -10,7 +10,7 @@ export default new ModerationCommand({
|
||||
description: 'Set a slowmode for a channel',
|
||||
options: {
|
||||
duration: {
|
||||
description: 'The duration to set',
|
||||
description: 'The duration to set (default time unit is seconds)',
|
||||
required: true,
|
||||
type: ModerationCommand.OptionType.String,
|
||||
},
|
||||
@@ -23,18 +23,15 @@ export default new ModerationCommand({
|
||||
},
|
||||
async execute({ logger, executor }, interaction, { duration: durationInput, channel: channelInput }) {
|
||||
const channel = channelInput ?? (await interaction.guild!.channels.fetch(interaction.channelId))
|
||||
const duration = parseDuration(durationInput)
|
||||
const duration = parseDuration(durationInput, 's')
|
||||
|
||||
if (!channel?.isTextBased() || channel.isDMBased())
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidChannel,
|
||||
'The supplied channel is not a text channel.',
|
||||
)
|
||||
throw new CommandError(CommandErrorType.InvalidArgument, 'The supplied channel is not a text channel.')
|
||||
|
||||
if (Number.isNaN(duration)) throw new CommandError(CommandErrorType.InvalidDuration, 'Invalid duration.')
|
||||
if (Number.isNaN(duration)) throw new CommandError(CommandErrorType.InvalidArgument, 'Invalid duration.')
|
||||
if (duration < 0 || duration > 36e4)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidDuration,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'Duration out of range, must be between 0s and 6h.',
|
||||
)
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ export default new ModerationCommand({
|
||||
const member = await interaction.guild!.members.fetch(user.id)
|
||||
if (!member)
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidUser,
|
||||
CommandErrorType.InvalidArgument,
|
||||
'The provided member is not in the server or does not exist.',
|
||||
)
|
||||
|
||||
|
||||
76
bots/discord/src/commands/support/train/chat.ts
Normal file
76
bots/discord/src/commands/support/train/chat.ts
Normal file
@@ -0,0 +1,76 @@
|
||||
import Command from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import { createSuccessEmbed } from '$/utils/discord/embeds'
|
||||
import type { ConfigMessageScanResponseLabelConfig } from 'config.schema'
|
||||
import type { FetchMessageOptions, MessageResolvable } from 'discord.js'
|
||||
import { config } from '../../../context'
|
||||
|
||||
const msRcConfig = config.messageScan?.humanCorrections?.allow
|
||||
|
||||
export default new Command({
|
||||
name: 'train',
|
||||
description: 'Train a specific message or text to a specific label',
|
||||
type: Command.Type.ChatGuild,
|
||||
requirements: {
|
||||
users: msRcConfig?.users,
|
||||
roles: msRcConfig?.members?.roles,
|
||||
permissions: msRcConfig?.members?.permissions,
|
||||
mode: 'any',
|
||||
memberRequirementsForUsers: 'fail',
|
||||
defaultCondition: 'fail',
|
||||
},
|
||||
options: {
|
||||
message: {
|
||||
description: 'The message to train (use `latest` to train the latest message)',
|
||||
type: Command.OptionType.String,
|
||||
required: true,
|
||||
},
|
||||
label: {
|
||||
description: 'The label to train the message as',
|
||||
type: Command.OptionType.String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
allowMessageCommand: true,
|
||||
async execute(context, trigger, { label, message: ref }) {
|
||||
const { logger, config } = context
|
||||
const { messageScan: msConfig } = config
|
||||
|
||||
// If there's no config, we can't do anything
|
||||
if (!msConfig?.humanCorrections) throw new CommandError(CommandErrorType.Generic, 'Response correction is off.')
|
||||
const labels = msConfig.responses?.flatMap(r =>
|
||||
r.triggers.text!.filter((t): t is ConfigMessageScanResponseLabelConfig => 'label' in t).map(t => t.label),
|
||||
)
|
||||
|
||||
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',
|
||||
)
|
||||
|
||||
if (!labels.includes(label))
|
||||
throw new CommandError(
|
||||
CommandErrorType.InvalidArgument,
|
||||
`The provided label is invalid.\nValid labels are:${labels.map(l => `\n- \`${l}\``).join('')}`,
|
||||
)
|
||||
|
||||
const refMsg = await channel.messages.fetch(
|
||||
(ref.startsWith('latest') ? { limit: 1 } : ref) as MessageResolvable | FetchMessageOptions,
|
||||
)
|
||||
if (!refMsg) throw new CommandError(CommandErrorType.InvalidArgument, 'The provided message does not exist.')
|
||||
|
||||
logger.debug(`User ${context.executor.id} is training message ${refMsg?.id} as ${label}`)
|
||||
|
||||
await context.api.client.trainMessage(refMsg.content, label)
|
||||
await trigger.reply({
|
||||
embeds: [
|
||||
createSuccessEmbed(
|
||||
'Message trained',
|
||||
`The provided message has been trained as \`${label}\`. Thank you for your contribution!`,
|
||||
),
|
||||
],
|
||||
ephemeral: true,
|
||||
})
|
||||
},
|
||||
})
|
||||
50
bots/discord/src/commands/support/train/context-menu.ts
Normal file
50
bots/discord/src/commands/support/train/context-menu.ts
Normal file
@@ -0,0 +1,50 @@
|
||||
import Command from '$/classes/Command'
|
||||
import CommandError, { CommandErrorType } from '$/classes/CommandError'
|
||||
import type { ConfigMessageScanResponseLabelConfig } from 'config.schema'
|
||||
import { type APIStringSelectComponent, ComponentType } from 'discord.js'
|
||||
import { config } from '../../../context'
|
||||
|
||||
const msRcConfig = config.messageScan?.humanCorrections?.allow
|
||||
|
||||
export default new Command({
|
||||
name: 'Train Message',
|
||||
type: Command.Type.ContextMenuGuildMessage,
|
||||
requirements: {
|
||||
users: msRcConfig?.users,
|
||||
roles: msRcConfig?.members?.roles,
|
||||
permissions: msRcConfig?.members?.permissions,
|
||||
mode: 'any',
|
||||
memberRequirementsForUsers: 'fail',
|
||||
defaultCondition: 'fail',
|
||||
},
|
||||
async execute(context, trigger) {
|
||||
const { logger, config } = context
|
||||
const { messageScan: msConfig } = config
|
||||
|
||||
// If there's no config, we can't do anything
|
||||
if (!msConfig?.humanCorrections) throw new CommandError(CommandErrorType.Generic, 'Response correction is off.')
|
||||
|
||||
logger.debug(`User ${context.executor.id} is training message ${trigger.targetId}`)
|
||||
|
||||
const labels = msConfig.responses.flatMap(r =>
|
||||
r.triggers.text!.filter((t): t is ConfigMessageScanResponseLabelConfig => 'label' in t).map(t => t.label),
|
||||
)
|
||||
|
||||
await trigger.reply({
|
||||
content: 'Select a label to train this message as:',
|
||||
components: [
|
||||
{
|
||||
components: [
|
||||
{
|
||||
custom_id: `tr_${trigger.targetMessage.channelId}_${trigger.targetId}`,
|
||||
options: labels.map(label => ({ label, value: label })),
|
||||
type: ComponentType.StringSelect,
|
||||
} satisfies APIStringSelectComponent,
|
||||
],
|
||||
type: ComponentType.ActionRow,
|
||||
},
|
||||
],
|
||||
ephemeral: true,
|
||||
})
|
||||
},
|
||||
})
|
||||
28
bots/discord/src/config.ts
Normal file
28
bots/discord/src/config.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
import { dirname, join } from 'path'
|
||||
import _firstConfig from '../config.js'
|
||||
|
||||
let currentConfig = _firstConfig
|
||||
|
||||
// Other parts of the code will access properties of this proxy, they don't care what the target looks like
|
||||
export const config = new Proxy(
|
||||
{
|
||||
INSPECTION_WARNING: 'Run `context.__getConfig()` to inspect the latest config.',
|
||||
} as unknown as typeof currentConfig,
|
||||
{
|
||||
get(_, p, receiver) {
|
||||
if (p === 'invalidate')
|
||||
return async () => {
|
||||
const path = join(dirname(Bun.main), '..', 'config.js')
|
||||
Loader.registry.delete(path)
|
||||
currentConfig = (await import(path)).default
|
||||
}
|
||||
|
||||
return Reflect.get(currentConfig, p, receiver)
|
||||
},
|
||||
set(_, p, newValue, receiver) {
|
||||
return Reflect.set(currentConfig, p, newValue, receiver)
|
||||
},
|
||||
},
|
||||
) as typeof _firstConfig & { invalidate(): void }
|
||||
|
||||
export const __getConfig = () => currentConfig
|
||||
@@ -6,18 +6,19 @@ import { createLogger } from '@revanced/bot-shared'
|
||||
import { Client as DiscordClient, type Message, Partials } from 'discord.js'
|
||||
import { drizzle } from 'drizzle-orm/bun-sqlite'
|
||||
|
||||
// Export some things first, as commands require them
|
||||
import config from '../config.js'
|
||||
export { config }
|
||||
import * as schemas from './database/schemas'
|
||||
|
||||
import type { default as Command, CommandOptionsOptions, CommandType } from './classes/Command'
|
||||
|
||||
import { __getConfig, config } from './config'
|
||||
export { config, __getConfig }
|
||||
|
||||
export const logger = createLogger({
|
||||
level: config.logLevel === 'none' ? Number.MAX_SAFE_INTEGER : config.logLevel,
|
||||
})
|
||||
|
||||
// Export a few things before we initialize commands
|
||||
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({
|
||||
@@ -79,11 +80,11 @@ export const discord = {
|
||||
parse: ['users'],
|
||||
repliedUser: true,
|
||||
},
|
||||
partials: [Partials.Message, Partials.Reaction],
|
||||
partials: [Partials.Message, Partials.Reaction, Partials.GuildMember],
|
||||
}),
|
||||
commands: Object.fromEntries(Object.values(commands).map(cmd => [cmd.name, cmd])) as Record<
|
||||
string,
|
||||
Command<boolean, CommandOptionsOptions | undefined, boolean>
|
||||
Command<CommandType, CommandOptionsOptions | undefined, boolean>
|
||||
>,
|
||||
stickyMessages: {} as Record<
|
||||
string,
|
||||
|
||||
@@ -16,6 +16,7 @@ export const appliedPresets = sqliteTable(
|
||||
{
|
||||
memberId: text('member').notNull(),
|
||||
guildId: text('guild').notNull(),
|
||||
removedRoles: text('roles', { mode: 'json' }).notNull().$type<string[]>().default([]),
|
||||
preset: text('preset').notNull(),
|
||||
until: integer('until'),
|
||||
},
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { on } from '$/utils/discord/events'
|
||||
import { cureNickname } from '$/utils/discord/moderation'
|
||||
|
||||
on('guildMemberUpdate', async (oldMember, newMember) => {
|
||||
on('guildMemberUpdate', (_, newMember) => {
|
||||
if (newMember.user.bot) return
|
||||
if (oldMember.displayName !== newMember.displayName) await cureNickname(newMember)
|
||||
cureNickname(newMember)
|
||||
})
|
||||
|
||||
on('guildMemberAdd', member => {
|
||||
@@ -11,7 +11,7 @@ on('guildMemberAdd', member => {
|
||||
cureNickname(member)
|
||||
})
|
||||
|
||||
on('messageCreate', async msg => {
|
||||
on('messageCreate', msg => {
|
||||
if (msg.author.bot || !msg.member) return
|
||||
await cureNickname(msg.member)
|
||||
cureNickname(msg.member)
|
||||
})
|
||||
|
||||
@@ -12,5 +12,5 @@ withContext(on, 'guildMemberAdd', async ({ database }, member) => {
|
||||
),
|
||||
})
|
||||
|
||||
for (const { preset } of applieds) await applyRolesUsingPreset(preset, member, true)
|
||||
for (const { preset } of applieds) await applyRolesUsingPreset(preset, member)
|
||||
})
|
||||
|
||||
@@ -8,19 +8,23 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
|
||||
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(`Interaction command ${interaction.commandName} not implemented but registered!!!`)
|
||||
logger.debug(`Command ${interaction.commandName} being invoked by ${interaction.user.tag} via chat`)
|
||||
if (!command) return void logger.error(`Chat command ${interaction.commandName} not implemented but registered!!!`)
|
||||
|
||||
try {
|
||||
logger.debug(`Command ${interaction.commandName} being executed`)
|
||||
logger.debug(`Command ${interaction.commandName} being executed via chat`)
|
||||
await command.onInteraction(context, interaction)
|
||||
} catch (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,
|
||||
})
|
||||
|
||||
// 100 and up are user errors
|
||||
if (err instanceof CommandError && err.type < 100)
|
||||
logger.error(`Command ${interaction.commandName} internally failed with error:`, err)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
import CommandError from '$/classes/CommandError'
|
||||
import { createStackTraceEmbed } from '$utils/discord/embeds'
|
||||
import { on, withContext } from '$utils/discord/events'
|
||||
|
||||
withContext(on, 'interactionCreate', async (context, interaction) => {
|
||||
if (!interaction.isContextMenuCommand()) return
|
||||
|
||||
const { logger, discord } = context
|
||||
const command = discord.commands[interaction.commandName]
|
||||
|
||||
logger.debug(`Command ${interaction.commandName} being invoked by ${interaction.user.tag} via context menu`)
|
||||
if (!command)
|
||||
return void logger.error(`Context menu command ${interaction.commandName} not implemented but registered!!!`)
|
||||
|
||||
try {
|
||||
logger.debug(`Command ${interaction.commandName} being executed via context menu`)
|
||||
await command.onContextMenuInteraction(context, interaction)
|
||||
} catch (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,
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -18,10 +18,10 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
|
||||
if (!interaction.isStringSelectMenu() && !interaction.isButton()) return
|
||||
if (!interaction.customId.startsWith('cr_')) return
|
||||
|
||||
const [, key, action] = interaction.customId.split('_') as ['cr', string, 'select' | 'cancel' | 'delete']
|
||||
if (!key || !action) return
|
||||
const [, msgId, action] = interaction.customId.split('_') as ['cr', string, 'select' | 'cancel' | 'delete']
|
||||
if (!msgId || !action) return
|
||||
|
||||
const response = await db.query.responses.findFirst({ where: eq(responses.replyId, key) })
|
||||
const response = await db.query.responses.findFirst({ where: eq(responses.replyId, msgId) })
|
||||
// If the message isn't saved in my DB (unrelated message)
|
||||
if (!response)
|
||||
return void (await interaction.reply({
|
||||
@@ -32,11 +32,11 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
|
||||
try {
|
||||
// We're gonna pretend reactionChannel is a text-based channel, but it can be many more
|
||||
// But `messages` should always exist as a property
|
||||
const reactionGuild = await interaction.client.guilds.fetch(response.guildId)
|
||||
const reactionChannel = (await reactionGuild.channels.fetch(response.channelId)) as TextBasedChannel | null
|
||||
const reactionMessage = await reactionChannel?.messages.fetch(key)
|
||||
const guild = await interaction.client.guilds.fetch(response.guildId)
|
||||
const channel = (await guild.channels.fetch(response.channelId)) as TextBasedChannel | null
|
||||
const msg = await channel?.messages.fetch(msgId)
|
||||
|
||||
if (!reactionMessage) {
|
||||
if (!msg) {
|
||||
await interaction.deferUpdate()
|
||||
await interaction.message.edit({
|
||||
content: null,
|
||||
@@ -53,9 +53,9 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
|
||||
}
|
||||
|
||||
const editMessage = (content: string, description?: string) =>
|
||||
editInteractionMessage(interaction, reactionMessage.url, content, description)
|
||||
editInteractionMessage(interaction, msg.url, content, description)
|
||||
const handleCorrection = (label: string) =>
|
||||
handleUserResponseCorrection(context, response, reactionMessage, label, interaction.user)
|
||||
handleUserResponseCorrection(context, response, msg, label, interaction.user)
|
||||
|
||||
if (response.correctedById)
|
||||
return await editMessage(
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
import { createErrorEmbed, createStackTraceEmbed, createSuccessEmbed } from '$utils/discord/embeds'
|
||||
import { on, withContext } from '$utils/discord/events'
|
||||
|
||||
import type { TextBasedChannel } from 'discord.js'
|
||||
|
||||
withContext(on, 'interactionCreate', async (context, interaction) => {
|
||||
const {
|
||||
logger,
|
||||
config: { messageScan: msConfig },
|
||||
} = context
|
||||
|
||||
if (!msConfig?.humanCorrections) return
|
||||
if (!interaction.isStringSelectMenu()) return
|
||||
if (!interaction.customId.startsWith('tr_')) return
|
||||
|
||||
const [, channelId, msgId] = interaction.customId.split('_') as ['tr', string, string]
|
||||
if (!channelId || !msgId) return
|
||||
|
||||
try {
|
||||
const channel = (await interaction.client.channels.fetch(channelId)) as TextBasedChannel | null
|
||||
const msg = await channel?.messages.fetch(msgId)
|
||||
|
||||
if (!msg)
|
||||
return void (await interaction.reply({
|
||||
embeds: [
|
||||
createErrorEmbed(
|
||||
'Message not found',
|
||||
'Thank you for your contribution! Unfortunately, the message could not be found.',
|
||||
),
|
||||
],
|
||||
ephemeral: true,
|
||||
}))
|
||||
|
||||
const selectedLabel = interaction.values[0]!
|
||||
await context.api.client.trainMessage(msg.content, selectedLabel)
|
||||
await interaction.reply({
|
||||
embeds: [
|
||||
createSuccessEmbed(
|
||||
'Message being trained',
|
||||
`Thank you for your contribution! The selected message is being trained as \`${selectedLabel}\`. 🎉`,
|
||||
),
|
||||
],
|
||||
ephemeral: true,
|
||||
})
|
||||
} catch (e) {
|
||||
logger.error('Failed to handle train message interaction:', e)
|
||||
await interaction.reply({
|
||||
embeds: [createStackTraceEmbed(e)],
|
||||
ephemeral: true,
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -18,7 +18,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
if (!commandName) return
|
||||
|
||||
const command = discord.commands[commandName]
|
||||
logger.debug(`Command ${commandName} being invoked by ${msg.author.id}`)
|
||||
logger.debug(`Command ${commandName} being invoked by ${msg.author.id} via message`)
|
||||
if (!command) return void logger.debug(`Message command ${commandName} not implemented`)
|
||||
|
||||
const argsRegex: RegExp = /[^\s"]+|"([^"]*)"/g
|
||||
@@ -46,7 +46,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
}
|
||||
|
||||
try {
|
||||
logger.debug(`Command ${commandName} being executed`)
|
||||
logger.debug(`Command ${commandName} being executed via message`)
|
||||
await command.onMessage(context, msg, args)
|
||||
} catch (err) {
|
||||
if (!(err instanceof CommandError)) logger.error(`Error while executing command ${commandName}:`, err)
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { MessageScanLabeledResponseReactions } from '$/constants'
|
||||
import { responses } from '$/database/schemas'
|
||||
import { getResponseFromText, messageMatchesFilter } from '$/utils/discord/messageScan'
|
||||
import { createMessageScanResponseEmbed } from '$utils/discord/embeds'
|
||||
@@ -22,7 +21,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
|
||||
if (msg.content.length) {
|
||||
try {
|
||||
logger.debug(`Classifying message ${msg.id}`)
|
||||
logger.debug(`Classifying message ${msg.id}, possible responses is ${filteredResponses.length}`)
|
||||
|
||||
const { response, label, respondToReply } = await getResponseFromText(
|
||||
msg.content,
|
||||
@@ -48,10 +47,6 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
label,
|
||||
content: msg.content,
|
||||
})
|
||||
|
||||
for (const reaction of Object.values(MessageScanLabeledResponseReactions)) {
|
||||
await reply.react(reaction)
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
@@ -60,16 +55,13 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
}
|
||||
|
||||
if (msg.attachments.size && config.attachments?.scanAttachments) {
|
||||
logger.debug(`Classifying message attachments for ${msg.id}`)
|
||||
logger.debug(`Classifying message attachments for ${msg.id}, possible responses is ${filteredResponses.length}`)
|
||||
|
||||
for (const attachment of msg.attachments.values()) {
|
||||
const mimeType = attachment.contentType?.split(';')?.[0]
|
||||
if (!mimeType) return void logger.warn(`No MIME type for attachment: ${attachment.url}`)
|
||||
|
||||
if (
|
||||
config.attachments.allowedMimeTypes &&
|
||||
!config.attachments.allowedMimeTypes.includes(mimeType)
|
||||
) {
|
||||
if (config.attachments.allowedMimeTypes && !config.attachments.allowedMimeTypes.includes(mimeType)) {
|
||||
logger.debug(`Disallowed MIME type for attachment: ${attachment.url}, ${mimeType}`)
|
||||
continue
|
||||
}
|
||||
@@ -86,10 +78,14 @@ withContext(on, 'messageCreate', async (context, msg) => {
|
||||
|
||||
if (isTextFile) {
|
||||
const content = await (await fetch(attachment.url)).text()
|
||||
response = await getResponseFromText(content, filteredResponses, context, { skipApiRequest: true }).then(it => it.response)
|
||||
response = await getResponseFromText(content, filteredResponses, context, {
|
||||
textRegexesOnly: true,
|
||||
}).then(it => it.response)
|
||||
} else {
|
||||
const { text: content } = await api.client.parseImage(attachment.url)
|
||||
response = await getResponseFromText(content, filteredResponses, context, { onlyImageTriggers: true }).then(it => it.response)
|
||||
response = await getResponseFromText(content, filteredResponses, context, {
|
||||
imageTriggersOnly: true,
|
||||
}).then(it => it.response)
|
||||
}
|
||||
|
||||
if (response) {
|
||||
|
||||
@@ -7,31 +7,36 @@ withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
|
||||
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`)
|
||||
if (store.timerActive) {
|
||||
// Timer is already active, so we try to start the force timer
|
||||
if (store.forceTimerMs) {
|
||||
// Force timer isn't active, so we start it
|
||||
if (!store.forceTimerActive) {
|
||||
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
|
||||
// Clear the timer
|
||||
clearTimeout(store.timer)
|
||||
store.timerActive = false
|
||||
|
||||
// (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()
|
||||
// (Re)start the force timer
|
||||
store.forceTimerActive = true
|
||||
if (!store.forceTimer)
|
||||
store.forceTimer = setTimeout(
|
||||
() =>
|
||||
store.send(true).then(() => {
|
||||
store.forceTimerActive = false
|
||||
}),
|
||||
store.forceTimerMs,
|
||||
) as NodeJS.Timeout
|
||||
else store.forceTimer.refresh()
|
||||
// Force timer is already active, so we force send
|
||||
} else store.send()
|
||||
}
|
||||
} else if (!store.forceTimerActive) {
|
||||
// Both timers aren't active, so we start the timer
|
||||
store.timerActive = true
|
||||
if (!store.timer) store.timer = setTimeout(store.send, store.timerMs) as NodeJS.Timeout
|
||||
}
|
||||
})
|
||||
|
||||
@@ -20,8 +20,7 @@ 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
|
||||
|
||||
@@ -33,6 +32,7 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => {
|
||||
|
||||
if (reactionMessage.author.id !== reaction.client.user!.id) return
|
||||
if (!PossibleReactions.includes(reaction.emoji.name!)) return
|
||||
await rct.users.remove(user.id)
|
||||
|
||||
if (!isAdmin(reactionMessage.member || reactionMessage.author)) {
|
||||
// User is in guild, and config has member requirements
|
||||
|
||||
@@ -3,7 +3,7 @@ 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 { lt } from 'drizzle-orm'
|
||||
import { and, eq, lt } from 'drizzle-orm'
|
||||
|
||||
import type { Client } from 'discord.js'
|
||||
|
||||
@@ -60,7 +60,7 @@ export default withContext(on, 'ready', async ({ config, discord, logger }, clie
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Set up the store
|
||||
discord.stickyMessages[guildId]![channelId] = {
|
||||
forceTimerActive: false,
|
||||
@@ -69,7 +69,7 @@ export default withContext(on, 'ready', async ({ config, discord, logger }, clie
|
||||
timerMs: timeout,
|
||||
send,
|
||||
// If the store exists before the configuration refresh, take its current message
|
||||
currentMessage: oldStore?.[channelId]?.currentMessage
|
||||
currentMessage: oldStore?.[channelId]?.currentMessage,
|
||||
}
|
||||
|
||||
// Send a new sticky message immediately, as well as deleting the old/outdated message, if it exists
|
||||
@@ -92,11 +92,15 @@ const removeExpiredPresets = async (client: Client) => {
|
||||
|
||||
for (const expired of expireds)
|
||||
try {
|
||||
logger.debug(`Removing role preset for ${expired.memberId} in ${expired.guildId}`)
|
||||
|
||||
const guild = await client.guilds.fetch(expired.guildId)
|
||||
const member = await guild.members.fetch(expired.memberId)
|
||||
|
||||
logger.debug(`Removing role preset for ${expired.memberId} in ${expired.guildId}`)
|
||||
await removeRolePreset(member, expired.preset)
|
||||
await database
|
||||
.delete(appliedPresets)
|
||||
.where(and(eq(appliedPresets.guildId, expired.guildId), eq(appliedPresets.memberId, expired.memberId)))
|
||||
} catch (e) {
|
||||
logger.error(`Error while removing role preset for ${expired.memberId} in ${expired.guildId}: ${e}`)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { type Response, responses } from '$/database/schemas'
|
||||
import type { Config, ConfigMessageScanResponse, ConfigMessageScanResponseLabelConfig } from 'config.schema'
|
||||
import type { Message, PartialUser, User } from 'discord.js'
|
||||
import { ButtonStyle, ComponentType } from 'discord.js'
|
||||
import type { APIActionRowComponent, APIButtonComponent, Message, PartialUser, User } from 'discord.js'
|
||||
import { eq } from 'drizzle-orm'
|
||||
import { createMessageScanResponseEmbed } from './embeds'
|
||||
|
||||
@@ -9,7 +10,7 @@ export const getResponseFromText = async (
|
||||
responses: ConfigMessageScanResponse[],
|
||||
// Just to be safe that we will never use data from the context parameter
|
||||
{ api, logger }: Omit<typeof import('src/context'), 'config'>,
|
||||
flags: { onlyImageTriggers?: boolean; skipApiRequest?: boolean } = {}
|
||||
flags: { imageTriggersOnly?: boolean; textRegexesOnly?: boolean } = {},
|
||||
): Promise<
|
||||
Omit<ConfigMessageScanResponse, 'triggers'> & { label?: string; triggers?: ConfigMessageScanResponse['triggers'] }
|
||||
> => {
|
||||
@@ -31,7 +32,7 @@ export const getResponseFromText = async (
|
||||
triggers: { text: textTriggers, image: imageTriggers },
|
||||
} = trigger
|
||||
|
||||
if (flags.onlyImageTriggers) {
|
||||
if (flags.imageTriggersOnly) {
|
||||
if (imageTriggers)
|
||||
for (const regex of imageTriggers)
|
||||
if (regex.test(content)) {
|
||||
@@ -39,7 +40,7 @@ export const getResponseFromText = async (
|
||||
responseConfig = trigger
|
||||
break
|
||||
}
|
||||
} else
|
||||
} else {
|
||||
for (let j = 0; j < textTriggers!.length; j++) {
|
||||
const regex = textTriggers![j]!
|
||||
|
||||
@@ -54,10 +55,11 @@ export const getResponseFromText = async (
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// If none of the regexes match, we can search for labels immediately
|
||||
if (!responseConfig.triggers && !flags.onlyImageTriggers && !flags.skipApiRequest) {
|
||||
if (!responseConfig.triggers && !flags.textRegexesOnly) {
|
||||
logger.debug('No match from before regexes, doing NLP')
|
||||
const scan = await api.client.parseText(content)
|
||||
if (scan.labels.length) {
|
||||
@@ -87,7 +89,7 @@ export const getResponseFromText = async (
|
||||
}
|
||||
|
||||
// If we still don't have a response config, we can match all regexes after the initial label trigger
|
||||
if (!responseConfig.triggers && flags.onlyImageTriggers) {
|
||||
if (!responseConfig.triggers && !flags.imageTriggersOnly) {
|
||||
logger.debug('No match from NLP, doing after regexes')
|
||||
for (let i = 0; i < responses.length; i++) {
|
||||
const {
|
||||
@@ -159,14 +161,41 @@ export const handleUserResponseCorrection = async (
|
||||
})
|
||||
.where(eq(responses.replyId, response.replyId))
|
||||
|
||||
await reply.edit({
|
||||
return void (await reply.edit({
|
||||
...correctLabelResponse.response,
|
||||
embeds: correctLabelResponse.response.embeds?.map(createMessageScanResponseEmbed),
|
||||
})
|
||||
components: [],
|
||||
}))
|
||||
}
|
||||
|
||||
await api.client.trainMessage(response.content, label)
|
||||
logger.debug(`User ${user.id} trained message ${response.replyId} as ${label} (positive)`)
|
||||
|
||||
await reply.reactions.removeAll()
|
||||
await reply.edit({
|
||||
components: [],
|
||||
})
|
||||
}
|
||||
|
||||
export const createMessageScanResponseComponents = (reply: Message<true>) => [
|
||||
{
|
||||
type: ComponentType.ActionRow,
|
||||
components: [
|
||||
{
|
||||
type: ComponentType.Button,
|
||||
style: ButtonStyle.Secondary,
|
||||
emoji: {
|
||||
id: '👍',
|
||||
},
|
||||
custom_id: `train:${reply.id}`,
|
||||
},
|
||||
{
|
||||
type: ComponentType.Button,
|
||||
style: ButtonStyle.Secondary,
|
||||
emoji: {
|
||||
id: '🔧',
|
||||
},
|
||||
custom_id: `edit:${reply.id}`,
|
||||
},
|
||||
],
|
||||
} as APIActionRowComponent<APIButtonComponent>,
|
||||
]
|
||||
|
||||
@@ -23,10 +23,7 @@ export const sendPresetReplyAndLogs = (
|
||||
]),
|
||||
)
|
||||
|
||||
export const sendModerationReplyAndLogs = async (
|
||||
interaction: CommandInteraction | Message,
|
||||
embed: EmbedBuilder,
|
||||
) => {
|
||||
export const sendModerationReplyAndLogs = async (interaction: CommandInteraction | 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)] })
|
||||
@@ -60,7 +57,7 @@ export const cureNickname = async (member: GuildMember) => {
|
||||
cured =
|
||||
member.user.username.length >= 3
|
||||
? member.user.username
|
||||
: config.moderation?.cure?.defaultName ?? 'Server member'
|
||||
: (config.moderation?.cure?.defaultName ?? 'Server member')
|
||||
|
||||
if (cured.toLowerCase() === name.toLowerCase()) return
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import { and, eq } from 'drizzle-orm'
|
||||
type PresetKey = string
|
||||
|
||||
export const applyRolePreset = async (member: GuildMember, presetName: PresetKey, expires: number) => {
|
||||
const afterInsert = await applyRolesUsingPreset(presetName, member, true)
|
||||
const { removed, callback } = await applyRolesUsingPreset(presetName, member)
|
||||
const until = expires === Infinity ? null : Math.ceil(expires / 1000)
|
||||
|
||||
await database
|
||||
@@ -16,39 +16,60 @@ export const applyRolePreset = async (member: GuildMember, presetName: PresetKey
|
||||
memberId: member.id,
|
||||
guildId: member.guild.id,
|
||||
preset: presetName,
|
||||
removedRoles: removed,
|
||||
until,
|
||||
})
|
||||
.onConflictDoUpdate({
|
||||
target: [appliedPresets.memberId, appliedPresets.preset, appliedPresets.guildId],
|
||||
set: { until },
|
||||
})
|
||||
.then(afterInsert)
|
||||
.then(callback)
|
||||
}
|
||||
|
||||
export const removeRolePreset = async (member: GuildMember, presetName: PresetKey) => {
|
||||
const afterDelete = await applyRolesUsingPreset(presetName, member, false)
|
||||
const where = and(
|
||||
eq(appliedPresets.memberId, member.id),
|
||||
eq(appliedPresets.preset, presetName),
|
||||
eq(appliedPresets.guildId, member.guild.id),
|
||||
)
|
||||
|
||||
await database
|
||||
.delete(appliedPresets)
|
||||
.where(
|
||||
and(
|
||||
eq(appliedPresets.memberId, member.id),
|
||||
eq(appliedPresets.preset, presetName),
|
||||
eq(appliedPresets.guildId, member.guild.id),
|
||||
),
|
||||
)
|
||||
.execute()
|
||||
.then(afterDelete)
|
||||
const data = await database.query.appliedPresets.findFirst({ where })
|
||||
if (!data) return false
|
||||
|
||||
const { callback } = await applyRolesUsingPreset(presetName, member, data.removedRoles)
|
||||
await database.delete(appliedPresets).where(where).execute().then(callback)
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
export const applyRolesUsingPreset = async (presetName: string, member: GuildMember, applying: boolean) => {
|
||||
export const applyRolesUsingPreset = async (
|
||||
presetName: string,
|
||||
member: GuildMember,
|
||||
removePresetGiveRoles?: string[],
|
||||
) => {
|
||||
const preset = config.rolePresets?.guilds[member.guild.id]?.[presetName]
|
||||
if (!preset) throw new Error(`The preset "${presetName}" does not exist for this server`)
|
||||
|
||||
const roles = new Set(member.roles.cache.keys())
|
||||
const removed: string[] = []
|
||||
|
||||
for (const role of preset.give) roles[applying ? 'add' : 'delete'](role)
|
||||
for (const role of preset.take) roles[applying ? 'delete' : 'add'](role)
|
||||
// If removePresetGiveRoles is not provided, we're applying a preset
|
||||
if (!removePresetGiveRoles) {
|
||||
for (const role of preset.give) roles.add(role)
|
||||
for (const role of preset.take) {
|
||||
if (roles.has(role)) {
|
||||
roles.delete(role)
|
||||
removed.push(role)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const guildRoles = await member.guild.roles.fetch()
|
||||
for (const role of preset.give) roles.delete(role)
|
||||
for (const role of removePresetGiveRoles) if (guildRoles.has(role)) roles.add(role)
|
||||
}
|
||||
|
||||
return () => member.roles.set(Array.from(roles))
|
||||
return {
|
||||
removed,
|
||||
callback: () => member.roles.set(Array.from(roles)),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
export const parseDuration = (duration: string) => {
|
||||
if (!duration.length) return Number.NaN
|
||||
const matches = duration.match(/(?:(\d+y)?(\d+M)?(\d+w)?(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s?)/)!
|
||||
import parse from 'parse-duration'
|
||||
|
||||
const [, years, months, weeks, days, hours, minutes, seconds] = matches.map(Number)
|
||||
return (
|
||||
(years || 0) * 290304e5 +
|
||||
(months || 0) * 24192e5 +
|
||||
(weeks || 0) * 6048e5 +
|
||||
(days || 0) * 864e5 +
|
||||
(hours || 0) * 36e5 +
|
||||
(minutes || 0) * 6e4 +
|
||||
(seconds || 0) * 1e3
|
||||
)
|
||||
parse[''] = parse['s']!
|
||||
parse['mo'] = parse['M'] = parse['month']!
|
||||
|
||||
export const parseDuration = (duration: string, defaultUnit?: parse.Units) => {
|
||||
const defaultUnitValue = parse['']!
|
||||
if (defaultUnit) parse[''] = parse[defaultUnit]!
|
||||
const result = parse(duration, 'ms') ?? Number.NaN
|
||||
parse[''] = defaultUnitValue
|
||||
return result
|
||||
}
|
||||
|
||||
export const durationToString = (duration: number) => {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# 🏗️ Setting up the development environment
|
||||
|
||||
> [!IMPORTANT]
|
||||
> **This project uses [Bun](https://bun.sh) to run and bundle the code.**
|
||||
> [!IMPORTANT]
|
||||
> **This project uses [Bun](https://bun.sh) to run and bundle the code.**
|
||||
> Compatibility with other runtimes (Node.js, Deno, ...) are not guaranteed and most package scripts won't work.
|
||||
|
||||
To start developing, you'll need to set up the development environment first.
|
||||
@@ -11,8 +11,8 @@ To start developing, you'll need to set up the development environment first.
|
||||
2. Clone the mono-repository
|
||||
|
||||
```sh
|
||||
git clone https://github.com/revanced/revanced-helper.git &&
|
||||
cd revanced-helper
|
||||
git clone https://github.com/revanced/revanced-bots.git &&
|
||||
cd revanced-bots
|
||||
```
|
||||
|
||||
3. Install dependencies
|
||||
|
||||
30
package.json
30
package.json
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "revanced-helper",
|
||||
"name": "revanced-bots",
|
||||
"description": "🤖 Bots assisting ReVanced on multiple platforms",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
@@ -15,13 +15,13 @@
|
||||
"flint:check": "biome check .",
|
||||
"clint": "commitlint --edit"
|
||||
},
|
||||
"homepage": "https://github.com/revanced/revanced-helper#readme",
|
||||
"homepage": "https://github.com/revanced/revanced-bots#readme",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/revanced/revanced-helper.git"
|
||||
"url": "git+https://github.com/revanced/revanced-bots.git"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/revanced/revanced-helper/issues"
|
||||
"url": "https://github.com/revanced/revanced-bots/issues"
|
||||
},
|
||||
"contributors": [
|
||||
"Palm <contact@palmdevs.me> (https://palmdevs.me)",
|
||||
@@ -29,23 +29,23 @@
|
||||
],
|
||||
"packageManager": "bun@1.1.20",
|
||||
"devDependencies": {
|
||||
"@anolilab/multi-semantic-release": "^1.1.3",
|
||||
"@biomejs/biome": "^1.8.3",
|
||||
"@codedependant/semantic-release-docker": "^5.0.3",
|
||||
"@commitlint/cli": "^19.3.0",
|
||||
"@commitlint/config-conventional": "^19.2.2",
|
||||
"@anolilab/multi-semantic-release": "^1.1.10",
|
||||
"@biomejs/biome": "^1.9.4",
|
||||
"@codedependant/semantic-release-docker": "^5.1.0",
|
||||
"@commitlint/cli": "^19.7.1",
|
||||
"@commitlint/config-conventional": "^19.7.1",
|
||||
"@saithodev/semantic-release-backmerge": "^4.0.1",
|
||||
"@semantic-release/changelog": "^6.0.3",
|
||||
"@semantic-release/exec": "^6.0.3",
|
||||
"@semantic-release/git": "^10.0.1",
|
||||
"@tsconfig/strictest": "^2.0.5",
|
||||
"@types/bun": "^1.1.6",
|
||||
"@types/bun": "^1.2.4",
|
||||
"conventional-changelog-conventionalcommits": "^7.0.2",
|
||||
"lefthook": "^1.7.5",
|
||||
"lefthook": "^1.11.2",
|
||||
"portainer-service-webhook": "https://github.com/newarifrh/portainer-service-webhook#v1",
|
||||
"semantic-release": "^24.0.0",
|
||||
"turbo": "^2.0.9",
|
||||
"typescript": "^5.5.4"
|
||||
"semantic-release": "^24.2.3",
|
||||
"turbo": "^2.4.4",
|
||||
"typescript": "^5.8.2"
|
||||
},
|
||||
"trustedDependencies": [
|
||||
"@biomejs/biome",
|
||||
@@ -56,6 +56,6 @@
|
||||
"patchedDependencies": {
|
||||
"@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"
|
||||
"decancer@3.2.4": "patches/decancer@3.2.4.patch"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/revanced/revanced-helper.git",
|
||||
"url": "git+https://github.com/revanced/revanced-bots.git",
|
||||
"directory": "packages/api"
|
||||
},
|
||||
"author": "Palm <contact@palmdevs.me> (https://palmdevs.me)",
|
||||
@@ -23,15 +23,15 @@
|
||||
],
|
||||
"license": "GPL-3.0-or-later",
|
||||
"bugs": {
|
||||
"url": "https://github.com/revanced/revanced-helper/issues"
|
||||
"url": "https://github.com/revanced/revanced-bots/issues"
|
||||
},
|
||||
"homepage": "https://github.com/revanced/revanced-helper#readme",
|
||||
"homepage": "https://github.com/revanced/revanced-bots#readme",
|
||||
"dependencies": {
|
||||
"@revanced/bot-shared": "workspace:*",
|
||||
"ws": "^8.17.1"
|
||||
"ws": "^8.18.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/ws": "^8.5.10",
|
||||
"@types/ws": "^8.5.12",
|
||||
"typed-emitter": "^2.1.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ export class ClientWebSocketManager {
|
||||
|
||||
/**
|
||||
* Sets the URL to connect to
|
||||
*
|
||||
*
|
||||
* **Requires a reconnect to take effect**
|
||||
*/
|
||||
async setOptions({ url, timeout }: Partial<ClientWebSocketManagerOptions>, autoReconnect = true) {
|
||||
@@ -207,7 +207,7 @@ export class ClientWebSocketManager {
|
||||
protected _toBuffer(data: RawData) {
|
||||
if (data instanceof Buffer) return data
|
||||
if (data instanceof ArrayBuffer) return Buffer.from(data)
|
||||
return Buffer.concat(data)
|
||||
return Buffer.concat(data as Uint8Array[])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git+https://github.com/revanced/revanced-helper.git",
|
||||
"url": "git+https://github.com/revanced/revanced-bots.git",
|
||||
"directory": "packages/shared"
|
||||
},
|
||||
"author": "Palm <contact@palmdevs.me> (https://palmdevs.me)",
|
||||
@@ -26,11 +26,11 @@
|
||||
],
|
||||
"license": "GPL-3.0-or-later",
|
||||
"bugs": {
|
||||
"url": "https://github.com/revanced/revanced-helper/issues"
|
||||
"url": "https://github.com/revanced/revanced-bots/issues"
|
||||
},
|
||||
"homepage": "https://github.com/revanced/revanced-helper#readme",
|
||||
"homepage": "https://github.com/revanced/revanced-bots#readme",
|
||||
"dependencies": {
|
||||
"bson": "^6.7.0",
|
||||
"bson": "^6.8.0",
|
||||
"chalk": "^5.3.0",
|
||||
"tracer": "^1.3.0",
|
||||
"valibot": "^0.30.0"
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
import {
|
||||
url,
|
||||
type AnySchema,
|
||||
type BooleanSchema,
|
||||
type NullSchema,
|
||||
type ObjectSchema,
|
||||
type Output,
|
||||
type BooleanSchema,
|
||||
array,
|
||||
boolean,
|
||||
enum_,
|
||||
null_,
|
||||
object,
|
||||
parse,
|
||||
special,
|
||||
string,
|
||||
boolean,
|
||||
url,
|
||||
// merge
|
||||
} from 'valibot'
|
||||
import DisconnectReason from '../constants/DisconnectReason'
|
||||
|
||||
@@ -18,6 +18,6 @@ export function serializePacket<TOp extends Operation>(packet: Packet<TOp>) {
|
||||
* @returns A packet
|
||||
*/
|
||||
export function deserializePacket(buffer: Buffer) {
|
||||
const data = BSON.deserialize(buffer)
|
||||
const data = BSON.deserialize(buffer as Uint8Array)
|
||||
return parse(PacketSchema, data) as Packet
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user