diff options
| -rw-r--r-- | package.json | 21 | ||||
| -rw-r--r-- | src/commands/config/levelRoles.ts | 118 | ||||
| -rw-r--r-- | src/lib/utils/BushConstants.ts | 3 | ||||
| -rw-r--r-- | src/listeners/custom/bushLevelUpdate.ts | 30 | ||||
| -rw-r--r-- | yarn.lock | 66 |
5 files changed, 114 insertions, 124 deletions
diff --git a/package.json b/package.json index c5de396..1641722 100644 --- a/package.json +++ b/package.json @@ -36,18 +36,17 @@ }, "devDependencies": { "@types/common-tags": "^1.8.1", - "@types/express": "^4.17.12", + "@types/express": "^4.17.13", "@types/humanize-duration": "^3.25.1", - "@types/lodash": "^4.14.173", + "@types/lodash": "^4.14.175", "@types/module-alias": "^2.0.1", - "@types/node": "^16.9.2", + "@types/node": "^16.10.2", "@types/node-os-utils": "^1.2.0", - "@types/numeral": "^2.0.1", + "@types/numeral": "^2.0.2", "@types/tinycolor2": "^1.4.3", "@types/validator": "^13.6.3", - "@typescript-eslint/eslint-plugin": "^4.31.1", - "@typescript-eslint/parser": "^4.31.1", - "esbuild": "^0.12.28", + "@typescript-eslint/eslint-plugin": "^4.32.0", + "@typescript-eslint/parser": "^4.32.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0" }, @@ -57,9 +56,9 @@ "canvas": "^2.8.0", "chalk": "^4.1.2", "common-tags": "^1.8.0", - "discord-akairo": "NotEnoughUpdates/discord-akairo", + "discord-akairo": "npm:@notenoughupdates/discord-akairo@latest", "discord-api-types": "0.22.0", - "discord.js": "npm:@notenoughupdates/discord.js@13.2.0-dev", + "discord.js": "npm:@notenoughupdates/discord.js@latest", "discord.js-minesweeper": "^1.0.6", "events-intercept": "^2.0.0", "fuse.js": "^6.4.6", @@ -67,10 +66,10 @@ "humanize-duration": "^3.27.0", "json5": "^2.2.0", "lodash": "^4.17.21", - "mathjs": "^9.4.5", + "mathjs": "^9.5.0", "module-alias": "^2.2.2", "moment": "^2.29.1", - "nanoid": "^3.1.25", + "nanoid": "^3.1.28", "node-os-utils": "^1.3.5", "numeral": "^2.0.6", "pg": "^8.7.1", diff --git a/src/commands/config/levelRoles.ts b/src/commands/config/levelRoles.ts index df63914..d27c7a0 100644 --- a/src/commands/config/levelRoles.ts +++ b/src/commands/config/levelRoles.ts @@ -1,61 +1,61 @@ -import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; +// import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; -export default class LevelRolesCommand extends BushCommand { - public constructor() { - super('levelRole', { - aliases: ['levelrole', 'levelroles', 'lr'], - category: 'config', - description: { - content: 'Command description.', - usage: 'levelrole <role> <level>', - examples: ['levelrole 1 2'] - }, - args: [ - { - id: 'role', - type: 'role', - prompt: { - start: 'What would you like to set your first argument to be?', - retry: '{error} Pick a valid argument.', - optional: false - } - }, - { - id: 'level', - type: 'integer', - prompt: { - start: 'What would you like to set your second argument to be?', - retry: '{error} Pick a valid argument.', - optional: false - } - } - ], - slash: true, - slashOptions: [ - { - name: 'role', - description: 'What would you like to set your first argument to be?', - type: 'STRING', - required: true - }, - { - name: 'level', - description: 'What would you like to set your second argument to be?', - type: 'STRING', - required: true - } - ], - channel: 'guild', - clientPermissions: ['SEND_MESSAGES'], - userPermissions: ['SEND_MESSAGES', 'MANAGE_GUILD', 'MANAGE_ROLES'] - }); - } +// export default class LevelRolesCommand extends BushCommand { +// public constructor() { +// super('levelRole', { +// aliases: ['levelrole', 'levelroles', 'lr'], +// category: 'config', +// description: { +// content: 'Command description.', +// usage: 'levelrole <role> <level>', +// examples: ['levelrole 1 2'] +// }, +// args: [ +// { +// id: 'role', +// type: 'role', +// prompt: { +// start: 'What would you like to set your first argument to be?', +// retry: '{error} Pick a valid argument.', +// optional: false +// } +// }, +// { +// id: 'level', +// type: 'integer', +// prompt: { +// start: 'What would you like to set your second argument to be?', +// retry: '{error} Pick a valid argument.', +// optional: false +// } +// } +// ], +// slash: true, +// slashOptions: [ +// { +// name: 'role', +// description: 'What would you like to set your first argument to be?', +// type: 'STRING', +// required: true +// }, +// { +// name: 'level', +// description: 'What would you like to set your second argument to be?', +// type: 'STRING', +// required: true +// } +// ], +// channel: 'guild', +// clientPermissions: ['SEND_MESSAGES'], +// userPermissions: ['SEND_MESSAGES', 'MANAGE_GUILD', 'MANAGE_ROLES'] +// }); +// } - public override async exec( - message: BushMessage | BushSlashMessage, - args: { required_argument: string; optional_argument: string } - ): Promise<unknown> { - return await message.util.reply(`${util.emojis.error} Do not use the template command.`); - args; - } -} +// public override async exec( +// message: BushMessage | BushSlashMessage, +// args: { required_argument: string; optional_argument: string } +// ): Promise<unknown> { +// return await message.util.reply(`${util.emojis.error} Do not use the template command.`); +// args; +// } +// } diff --git a/src/lib/utils/BushConstants.ts b/src/lib/utils/BushConstants.ts index f085d26..68c0951 100644 --- a/src/lib/utils/BushConstants.ts +++ b/src/lib/utils/BushConstants.ts @@ -229,7 +229,8 @@ export class BushConstants { MANAGE_THREADS: { name: 'Manage Threads', important: true }, USE_PUBLIC_THREADS: { name: 'Use public Threads', important: false }, USE_PRIVATE_THREADS: { name: 'Use Private Threads', important: false }, - USE_EXTERNAL_STICKERS: { name: 'Use External Stickers', important: false } + USE_EXTERNAL_STICKERS: { name: 'Use External Stickers', important: false }, + START_EMBEDDED_ACTIVITIES: { name: 'Start Activities', important: false } }, // prettier-ignore diff --git a/src/listeners/custom/bushLevelUpdate.ts b/src/listeners/custom/bushLevelUpdate.ts index 0b7ebfa..0e24309 100644 --- a/src/listeners/custom/bushLevelUpdate.ts +++ b/src/listeners/custom/bushLevelUpdate.ts @@ -1,17 +1,17 @@ -import { BushListener } from '../../lib'; -import { BushClientEvents } from '../../lib/extensions/discord.js/BushClientEvents'; +// import { BushListener } from '../../lib'; +// import { BushClientEvents } from '../../lib/extensions/discord.js/BushClientEvents'; -export default class BushLevelUpdateListener extends BushListener { - public constructor() { - super('bushLevelUpdate', { - emitter: 'client', - event: 'bushLevelUpdate', - category: 'custom' - }); - } +// export default class BushLevelUpdateListener extends BushListener { +// public constructor() { +// super('bushLevelUpdate', { +// emitter: 'client', +// event: 'bushLevelUpdate', +// category: 'custom' +// }); +// } - // eslint-disable-next-line @typescript-eslint/no-unused-vars - public override async exec(...[member, oldLevel, newLevel, currentXp]: BushClientEvents['bushLevelUpdate']) { - // - } -} +// // eslint-disable-next-line @typescript-eslint/no-unused-vars +// public override async exec(...[member, oldLevel, newLevel, currentXp]: BushClientEvents['bushLevelUpdate']) { +// // +// } +// } @@ -285,7 +285,7 @@ __metadata: languageName: node linkType: hard -"@types/express@npm:^4.17.12": +"@types/express@npm:^4.17.13": version: 4.17.13 resolution: "@types/express@npm:4.17.13" dependencies: @@ -327,7 +327,7 @@ __metadata: languageName: node linkType: hard -"@types/lodash@npm:^4.14.173": +"@types/lodash@npm:^4.14.175": version: 4.14.175 resolution: "@types/lodash@npm:4.14.175" checksum: 50721f33faa542f1b9f62f2ba769ed353c6036711e92bd89ce569f2ed247e38fb2a2899f6fd46466b1690fea7ae0239471e6a6093c54e8f2b0613e43e8eac19c @@ -355,14 +355,14 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^16.9.2": +"@types/node@npm:*, @types/node@npm:^16.10.2": version: 16.10.2 resolution: "@types/node@npm:16.10.2" checksum: 83c1c3c68e7500103908c3f16094e458879c840a719c15b6ea577f81fe1f24a1b3473bb6c8e8091fe79a82543ca7639c6b1088fcf80292ec091d1d1c9504a87e languageName: node linkType: hard -"@types/numeral@npm:^2.0.1": +"@types/numeral@npm:^2.0.2": version: 2.0.2 resolution: "@types/numeral@npm:2.0.2" checksum: d8b778ef5d1b20cb5919fb2cf41108b324ccfaeccb0238caaf54bd9d4bffbbd57d7b860844f05831fb356a5dc0115b477891531325180a670076036ee1b4a8ca @@ -425,7 +425,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^4.31.1": +"@typescript-eslint/eslint-plugin@npm:^4.32.0": version: 4.32.0 resolution: "@typescript-eslint/eslint-plugin@npm:4.32.0" dependencies: @@ -463,7 +463,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^4.31.1": +"@typescript-eslint/parser@npm:^4.32.0": version: 4.32.0 resolution: "@typescript-eslint/parser@npm:4.32.0" dependencies: @@ -751,25 +751,24 @@ __metadata: "@discordjs/builders": ^0.6.0 "@discordjs/voice": ^0.6.0 "@types/common-tags": ^1.8.1 - "@types/express": ^4.17.12 + "@types/express": ^4.17.13 "@types/humanize-duration": ^3.25.1 - "@types/lodash": ^4.14.173 + "@types/lodash": ^4.14.175 "@types/module-alias": ^2.0.1 - "@types/node": ^16.9.2 + "@types/node": ^16.10.2 "@types/node-os-utils": ^1.2.0 - "@types/numeral": ^2.0.1 + "@types/numeral": ^2.0.2 "@types/tinycolor2": ^1.4.3 "@types/validator": ^13.6.3 - "@typescript-eslint/eslint-plugin": ^4.31.1 - "@typescript-eslint/parser": ^4.31.1 + "@typescript-eslint/eslint-plugin": ^4.32.0 + "@typescript-eslint/parser": ^4.32.0 canvas: ^2.8.0 chalk: ^4.1.2 common-tags: ^1.8.0 - discord-akairo: NotEnoughUpdates/discord-akairo + discord-akairo: "npm:@notenoughupdates/discord-akairo@latest" discord-api-types: 0.22.0 - discord.js: "npm:@notenoughupdates/discord.js@13.2.0-dev" + discord.js: "npm:@notenoughupdates/discord.js@latest" discord.js-minesweeper: ^1.0.6 - esbuild: ^0.12.28 eslint: ^7.32.0 eslint-config-prettier: ^8.3.0 events-intercept: ^2.0.0 @@ -778,10 +777,10 @@ __metadata: humanize-duration: ^3.27.0 json5: ^2.2.0 lodash: ^4.17.21 - mathjs: ^9.4.5 + mathjs: ^9.5.0 module-alias: ^2.2.2 moment: ^2.29.1 - nanoid: ^3.1.25 + nanoid: ^3.1.28 node-os-utils: ^1.3.5 numeral: ^2.0.6 pg: ^8.7.1 @@ -1100,21 +1099,21 @@ __metadata: languageName: node linkType: hard -discord-akairo-message-util@NotEnoughUpdates/discord-akairo-message-util: +"discord-akairo-message-util@github:NotEnoughUpdates/discord-akairo-message-util": version: 1.0.0 resolution: "discord-akairo-message-util@https://github.com/NotEnoughUpdates/discord-akairo-message-util.git#commit=9831d4f340bc8c3452d3dfef0497f7844dee0f29" checksum: 037722daf405eb7afebc47423e29a54816f5ab245e4aa0b0f99ad4ed32980839e1d1a399c12310acb1cabd6890d929d870223bddba4b6c2d107b5a79c4a37108 languageName: node linkType: hard -discord-akairo@NotEnoughUpdates/discord-akairo: - version: 9.0.0 - resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=5942c3c13accbe48d45d05ecce0516fcf994ef00" +"discord-akairo@npm:@notenoughupdates/discord-akairo@latest": + version: 9.0.1 + resolution: "@notenoughupdates/discord-akairo@npm:9.0.1" dependencies: - discord-akairo-message-util: NotEnoughUpdates/discord-akairo-message-util + discord-akairo-message-util: "github:NotEnoughUpdates/discord-akairo-message-util" lodash: ^4.17.21 source-map-support: ^0.5.19 - checksum: 95606f6e433dcc52c9cf527caf3c59e102176127068052dc8ef217284aa44a9e12ed91ce5c36f68efd2c56f8df10dfe0be92c17c812862093ef573bc9aec5f39 + checksum: 8a629b1e86f81124088ab83f0396f0eafc7f941e9044aee36ed59f9861bd7241c5cf41d08e0b5f88e78cb2121d2aa799c4d800b1b023ad225b96c39d38529ee3 languageName: node linkType: hard @@ -1132,9 +1131,9 @@ discord-akairo@NotEnoughUpdates/discord-akairo: languageName: node linkType: hard -"discord.js@npm:@notenoughupdates/discord.js@13.2.0-dev": - version: 13.2.0-dev - resolution: "@notenoughupdates/discord.js@npm:13.2.0-dev" +"discord.js@npm:@notenoughupdates/discord.js@latest": + version: 13.2.0-dev-909c8596cbb989b811ca50d07a9895e8c9246f7d + resolution: "@notenoughupdates/discord.js@npm:13.2.0-dev-909c8596cbb989b811ca50d07a9895e8c9246f7d" dependencies: "@discordjs/builders": ^0.5.0 "@discordjs/collection": ^0.2.1 @@ -1144,7 +1143,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo: discord-api-types: ^0.22.0 node-fetch: ^2.6.1 ws: ^7.5.1 - checksum: 1212834ad2ad83f012b7c4dacbbed47494cf49b48616ac6b8f5bc90e8b58657d394ec57312f5a6b8dab2570ba3b432a483aa274c28da5ae3b626fc0c6d71b756 + checksum: 7abbc9daeacff716e44473bc5f928949e6d1216471510ecd76c430056ca7a239cd5c36dbe71e34f287d8bbc10ebc54e1d14f061ee13f9dacea4e346a0ae1d800 languageName: node linkType: hard @@ -1221,15 +1220,6 @@ discord-akairo@NotEnoughUpdates/discord-akairo: languageName: node linkType: hard -"esbuild@npm:^0.12.28": - version: 0.12.29 - resolution: "esbuild@npm:0.12.29" - bin: - esbuild: bin/esbuild - checksum: 06a6e84eff02899b45c7d4441199f7bbc824a9f5a2d0332bfe9873963751213c71bcb03b8db96babbc45ef31c140580ff64317ee7600983fc88b84c2d9788bbf - languageName: node - linkType: hard - "escape-latex@npm:^1.2.0": version: 1.2.0 resolution: "escape-latex@npm:1.2.0" @@ -2036,7 +2026,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo: languageName: node linkType: hard -"mathjs@npm:^9.4.5": +"mathjs@npm:^9.5.0": version: 9.5.0 resolution: "mathjs@npm:9.5.0" dependencies: @@ -2250,7 +2240,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo: languageName: node linkType: hard -"nanoid@npm:^3.1.25": +"nanoid@npm:^3.1.28": version: 3.1.28 resolution: "nanoid@npm:3.1.28" bin: |