From cc642708aadfa9770ec752ea360876ba3c871a18 Mon Sep 17 00:00:00 2001 From: smyalygames Date: Fri, 17 Feb 2023 00:57:29 +0000 Subject: [PATCH] build(arabot): update @sapphire/plugin-scheduled-tasks --- package-lock.json | 60 +++++++------------ package.json | 6 +- .../{ => messages}/diversityMon.ts | 4 +- .../{ => messages}/diversityWed.ts | 4 +- .../{ => messages}/restrictedMessage.ts | 4 +- src/scheduled-tasks/{ => messages}/standup.ts | 4 +- .../{ => messages}/verifyReminder.ts | 4 +- 7 files changed, 34 insertions(+), 52 deletions(-) rename src/scheduled-tasks/{ => messages}/diversityMon.ts (98%) rename src/scheduled-tasks/{ => messages}/diversityWed.ts (98%) rename src/scheduled-tasks/{ => messages}/restrictedMessage.ts (97%) rename src/scheduled-tasks/{ => messages}/standup.ts (97%) rename src/scheduled-tasks/{ => messages}/verifyReminder.ts (97%) diff --git a/package-lock.json b/package-lock.json index 0e9fb78..7865267 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,13 +13,13 @@ "@sapphire/discord.js-utilities": "^6.0.0", "@sapphire/framework": "^4.1.0", "@sapphire/plugin-logger": "^3.0.1", - "@sapphire/plugin-scheduled-tasks": "^4.0.0", + "@sapphire/plugin-scheduled-tasks": "^6.0.0", "@sapphire/plugin-subcommands": "^4.0.0", - "@sapphire/stopwatch": "^1.4.1", + "@sapphire/stopwatch": "^1.5.0", "@sapphire/time-utilities": "^1.7.8", "@sapphire/utilities": "^3.9.2", "@types/node": "^18.0.3", - "bullmq": "^1.89.1", + "bullmq": "^3.6.6", "discord.js": "^14.7.1", "dotenv": "^16.0.1", "ts-node": "^10.8.2", @@ -456,12 +456,12 @@ } }, "node_modules/@sapphire/plugin-scheduled-tasks": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@sapphire/plugin-scheduled-tasks/-/plugin-scheduled-tasks-4.0.1.tgz", - "integrity": "sha512-vLxfHBu2vKaJZ9v2f4z+VDZaPeDqS8bm+Sc2minRwJPw1hWAHiPqmxCBPIONY7eOQ9qKayvhKYTIwwruxgO/Mg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sapphire/plugin-scheduled-tasks/-/plugin-scheduled-tasks-6.0.0.tgz", + "integrity": "sha512-R9rga1aZk3GSXkmGfBMQR8Ng4ou36l5WGWoDvPaq1xNb56wZJ2zPZPsQHV6lxNoyOT++M8GFhVhh9OUB+xwEXg==", "dependencies": { - "@sapphire/stopwatch": "^1.4.1", - "@sapphire/utilities": "^3.9.3", + "@sapphire/stopwatch": "^1.5.0", + "@sapphire/utilities": "^3.11.0", "tslib": "^2.4.0" }, "engines": { @@ -1029,14 +1029,13 @@ } }, "node_modules/bullmq": { - "version": "1.91.1", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-1.91.1.tgz", - "integrity": "sha512-u7dat9I8ZwouZ651AMZkBSvB6NVUPpnAjd4iokd9DM41whqIBnDjuL11h7+kEjcpiDKj6E+wxZiER00FqirZQg==", + "version": "3.6.6", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-3.6.6.tgz", + "integrity": "sha512-W71jXrcTdcT3Y5tzMyTx22Cd8O3dTML7vl6KG3YdGVGrO3+UmKRLYfGLn1QwIhIoTQJVvIrSB4qfGs1hgqYRVw==", "dependencies": { "cron-parser": "^4.6.0", - "get-port": "6.1.2", "glob": "^8.0.3", - "ioredis": "^5.2.2", + "ioredis": "^5.3.0", "lodash": "^4.17.21", "msgpackr": "^1.6.2", "semver": "^7.3.7", @@ -2004,17 +2003,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-port": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz", - "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==", - "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/get-symbol-description": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", @@ -4157,12 +4145,12 @@ } }, "@sapphire/plugin-scheduled-tasks": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@sapphire/plugin-scheduled-tasks/-/plugin-scheduled-tasks-4.0.1.tgz", - "integrity": "sha512-vLxfHBu2vKaJZ9v2f4z+VDZaPeDqS8bm+Sc2minRwJPw1hWAHiPqmxCBPIONY7eOQ9qKayvhKYTIwwruxgO/Mg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@sapphire/plugin-scheduled-tasks/-/plugin-scheduled-tasks-6.0.0.tgz", + "integrity": "sha512-R9rga1aZk3GSXkmGfBMQR8Ng4ou36l5WGWoDvPaq1xNb56wZJ2zPZPsQHV6lxNoyOT++M8GFhVhh9OUB+xwEXg==", "requires": { - "@sapphire/stopwatch": "^1.4.1", - "@sapphire/utilities": "^3.9.3", + "@sapphire/stopwatch": "^1.5.0", + "@sapphire/utilities": "^3.11.0", "tslib": "^2.4.0" } }, @@ -4539,14 +4527,13 @@ } }, "bullmq": { - "version": "1.91.1", - "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-1.91.1.tgz", - "integrity": "sha512-u7dat9I8ZwouZ651AMZkBSvB6NVUPpnAjd4iokd9DM41whqIBnDjuL11h7+kEjcpiDKj6E+wxZiER00FqirZQg==", + "version": "3.6.6", + "resolved": "https://registry.npmjs.org/bullmq/-/bullmq-3.6.6.tgz", + "integrity": "sha512-W71jXrcTdcT3Y5tzMyTx22Cd8O3dTML7vl6KG3YdGVGrO3+UmKRLYfGLn1QwIhIoTQJVvIrSB4qfGs1hgqYRVw==", "requires": { "cron-parser": "^4.6.0", - "get-port": "6.1.2", "glob": "^8.0.3", - "ioredis": "^5.2.2", + "ioredis": "^5.3.0", "lodash": "^4.17.21", "msgpackr": "^1.6.2", "semver": "^7.3.7", @@ -5294,11 +5281,6 @@ "has-symbols": "^1.0.3" } }, - "get-port": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz", - "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==" - }, "get-symbol-description": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", diff --git a/package.json b/package.json index 45f8879..0ec585a 100644 --- a/package.json +++ b/package.json @@ -33,13 +33,13 @@ "@sapphire/discord.js-utilities": "^6.0.0", "@sapphire/framework": "^4.1.0", "@sapphire/plugin-logger": "^3.0.1", - "@sapphire/plugin-scheduled-tasks": "^4.0.0", + "@sapphire/plugin-scheduled-tasks": "^6.0.0", "@sapphire/plugin-subcommands": "^4.0.0", - "@sapphire/stopwatch": "^1.4.1", + "@sapphire/stopwatch": "^1.5.0", "@sapphire/time-utilities": "^1.7.8", "@sapphire/utilities": "^3.9.2", "@types/node": "^18.0.3", - "bullmq": "^1.89.1", + "bullmq": "^3.6.6", "discord.js": "^14.7.1", "dotenv": "^16.0.1", "ts-node": "^10.8.2", diff --git a/src/scheduled-tasks/diversityMon.ts b/src/scheduled-tasks/messages/diversityMon.ts similarity index 98% rename from src/scheduled-tasks/diversityMon.ts rename to src/scheduled-tasks/messages/diversityMon.ts index 1755b65..53e0c8b 100644 --- a/src/scheduled-tasks/diversityMon.ts +++ b/src/scheduled-tasks/messages/diversityMon.ts @@ -26,7 +26,7 @@ export class DiversityMonMessageTask extends ScheduledTask { public constructor(context: ScheduledTask.Context, options: ScheduledTask.Options) { super(context, { ...options, - cron: '0 15 * * 1', + pattern: '0 15 * * 1', }); } @@ -53,6 +53,6 @@ export class DiversityMonMessageTask extends ScheduledTask { declare module '@sapphire/plugin-scheduled-tasks' { interface ScheduledTasks { - cron: never; + pattern: never; } } diff --git a/src/scheduled-tasks/diversityWed.ts b/src/scheduled-tasks/messages/diversityWed.ts similarity index 98% rename from src/scheduled-tasks/diversityWed.ts rename to src/scheduled-tasks/messages/diversityWed.ts index 9e5e597..f40ee0b 100644 --- a/src/scheduled-tasks/diversityWed.ts +++ b/src/scheduled-tasks/messages/diversityWed.ts @@ -26,7 +26,7 @@ export class DiversityWedMessageTask extends ScheduledTask { public constructor(context: ScheduledTask.Context, options: ScheduledTask.Options) { super(context, { ...options, - cron: '0 15 * * 3', + pattern: '0 15 * * 3', }); } @@ -54,6 +54,6 @@ export class DiversityWedMessageTask extends ScheduledTask { declare module '@sapphire/plugin-scheduled-tasks' { interface ScheduledTasks { - cron: never; + pattern: never; } } diff --git a/src/scheduled-tasks/restrictedMessage.ts b/src/scheduled-tasks/messages/restrictedMessage.ts similarity index 97% rename from src/scheduled-tasks/restrictedMessage.ts rename to src/scheduled-tasks/messages/restrictedMessage.ts index 2840f4c..d24f1a0 100644 --- a/src/scheduled-tasks/restrictedMessage.ts +++ b/src/scheduled-tasks/messages/restrictedMessage.ts @@ -26,7 +26,7 @@ export class RestrictedMessageTask extends ScheduledTask { public constructor(context: ScheduledTask.Context, options: ScheduledTask.Options) { super(context, { ...options, - cron: '0 17 * * *', + pattern: '0 17 * * *', }); } @@ -49,6 +49,6 @@ export class RestrictedMessageTask extends ScheduledTask { declare module '@sapphire/plugin-scheduled-tasks' { interface ScheduledTasks { - cron: never; + pattern: never; } } diff --git a/src/scheduled-tasks/standup.ts b/src/scheduled-tasks/messages/standup.ts similarity index 97% rename from src/scheduled-tasks/standup.ts rename to src/scheduled-tasks/messages/standup.ts index 5f49584..6731464 100644 --- a/src/scheduled-tasks/standup.ts +++ b/src/scheduled-tasks/messages/standup.ts @@ -26,7 +26,7 @@ export class StandupTask extends ScheduledTask { public constructor(context: ScheduledTask.Context, options: ScheduledTask.Options) { super(context, { ...options, - cron: '0 12 * * 1', + pattern: '0 12 * * 1', }); } @@ -42,6 +42,6 @@ export class StandupTask extends ScheduledTask { declare module '@sapphire/plugin-scheduled-tasks' { interface ScheduledTasks { - cron: never; + pattern: never; } } diff --git a/src/scheduled-tasks/verifyReminder.ts b/src/scheduled-tasks/messages/verifyReminder.ts similarity index 97% rename from src/scheduled-tasks/verifyReminder.ts rename to src/scheduled-tasks/messages/verifyReminder.ts index 5fc6228..9054c52 100644 --- a/src/scheduled-tasks/verifyReminder.ts +++ b/src/scheduled-tasks/messages/verifyReminder.ts @@ -26,7 +26,7 @@ export class VerifyReminder extends ScheduledTask { public constructor(context: ScheduledTask.Context, options: ScheduledTask.Options) { super(context, { ...options, - cron: '0 */1 * * *', + pattern: '0 */1 * * *', }); } @@ -43,6 +43,6 @@ export class VerifyReminder extends ScheduledTask { declare module '@sapphire/plugin-scheduled-tasks' { interface VerifyReminder { - cron: never; + pattern: never; } }