fix(tasks): remove bull prefix as unsupported & fix task cache usage

.env.example

@@ -1,6 +1,9 @@
 DISCORD_TOKEN=
 
-REDIS_URL=redis://127.0.0.1:6379
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASSWORD=
+REDIS_DATABASE=0
 
 FIREBASE_CREDENTIALS_PATH=
 

package.json

@@ -31,27 +31,21 @@
         "@sapphire/plugin-editable-commands": "^4.0.2",
         "@sapphire/plugin-hmr": "^3.0.1",
         "@sapphire/plugin-logger": "^4.0.2",
-        "@sapphire/plugin-pattern-commands": "^6.0.2",
         "@sapphire/plugin-scheduled-tasks": "^10.0.1",
         "@sapphire/plugin-subcommands": "^6.0.3",
-        "@sapphire/ratelimits": "^2.4.9",
         "@sapphire/result": "^2.6.6",
-        "@sapphire/stopwatch": "^1.5.2",
-        "@sapphire/utilities": "^3.15.3",
         "@twurple/api": "^7.0.10",
         "@twurple/auth": "^7.0.10",
         "@twurple/eventsub-http": "^7.0.10",
         "any-date-parser": "^1.5.4",
         "bufferutil": "^4.0.8",
-        "bullmq": "^5.2.1",
         "common-tags": "^1.8.2",
         "dayjs": "^1.11.10",
         "discord.js": "^14.14.1",
         "dotenv": "^16.4.5",
         "erlpack": "github:discord/erlpack",
         "firebase-admin": "^12.0.0",
         "firelord": "^2.7.1",
-        "ioredis": "^5.3.2",
         "ms": "^2.1.3",
         "protobufjs": "^7.2.6",
         "ts-proto": "^1.167.8",

src/bot.ts

@@ -3,10 +3,9 @@ import 'dotenv/config';
 import './lib/setup';
 
 import { subscribeTwitchEvents } from './services/twitch-events.service';
-import { container, LogLevel, SapphireClient } from '@sapphire/framework';
+import { LogLevel, SapphireClient } from '@sapphire/framework';
 import { GatewayIntentBits } from 'discord.js';
 
-const { host, port, password, db } = container.redisClient.options;
 const client = new SapphireClient({
     defaultPrefix: '!',
     intents: [
@@ -26,17 +25,22 @@ const client = new SapphireClient({
     tasks: {
         bull: {
             connection: {
-                host: host ?? '',
-                port: port ?? 6379,
-                password: password ?? '',
-                db: db ?? 0,
+                host: process.env.REDIS_HOST ?? 'localhost',
+                port: parseInt(process.env.REDIS_PORT ?? '6379', 10),
+                password: process.env.REDIS_PASSWORD,
+                db: parseInt(process.env.REDIS_DB ?? '0', 10),
+            },
+            defaultJobOptions: {
+                removeOnComplete: true,
+                removeOnFail: true,
             },
-            prefix: 'ddc.queue-',
         },
+        queue: 'ddc-tasks',
     },
     loadMessageCommandListeners: true,
     loadDefaultErrorListeners: true,
     loadSubcommandErrorListeners: true,
+    loadScheduledTaskErrorListeners: true,
 });
 
 const main = async () => {
@@ -58,8 +62,6 @@ const main = async () => {
 
             subscribeTwitchEvents(client).catch(client.logger.error);
         });
-
-        client.logger.info('logged in');
     } catch (error) {
         client.logger.fatal(error);
         client.destroy();

src/database/guild-data.ts

@@ -6,8 +6,16 @@ import { getFirelord } from 'firelord';
 export type CounterId = 'beers' | 'hecheTime' | 'rentschTime';
 
 export type GuildCounters = { [key in CounterId]: number };
+export interface ChannelConfiguration {
+    menus?: Snowflake;
+    stream?: Snowflake;
+}
+
 export type GuildDocument = MetaTypeCreator<
-    { counters: GuildCounters },
+    {
+        counters: GuildCounters;
+        channels: ChannelConfiguration;
+    },
     'guilds',
     Snowflake
 >;

src/lib/setup.ts

@@ -2,15 +2,16 @@ import '@sapphire/plugin-editable-commands/register';
 import '@sapphire/plugin-hmr/register';
 import '@sapphire/plugin-logger/register';
 import '@sapphire/plugin-scheduled-tasks/register';
+import '@sapphire/plugin-subcommands/register';
 
 import dayjsParser from '../utils/dayjs-parser';
 import {
     ApplicationCommandRegistries,
     container,
     RegisterBehavior,
 } from '@sapphire/framework';
-
 import dayjs from 'dayjs';
+
 import 'dayjs/locale/fr-ch';
 import duration from 'dayjs/plugin/duration';
 import localizedFormat from 'dayjs/plugin/localizedFormat';
@@ -23,8 +24,6 @@ import weekday from 'dayjs/plugin/weekday';
 import { cert, initializeApp } from 'firebase-admin/app';
 import { getFirestore } from 'firebase-admin/firestore';
 
-import IORedis from 'ioredis';
-
 dayjs.extend(utc);
 dayjs.extend(weekOfYear);
 dayjs.extend(weekday);
@@ -40,8 +39,6 @@ initializeApp({
 });
 
 container.database = getFirestore();
-container.redisClient = new IORedis(process.env.REDIS_URL ?? '');
-
 ApplicationCommandRegistries.setDefaultBehaviorWhenNotIdentical(
     RegisterBehavior.BulkOverwrite,
 );

src/listeners/stream-online.listener.ts

@@ -1,29 +1,29 @@
+import { guildRef } from '../database/guild-data';
 import { ApplyOptions } from '@sapphire/decorators';
-import { isTextChannel } from '@sapphire/discord.js-utilities';
 import { Listener } from '@sapphire/framework';
 import type { EventSubStreamOnlineEvent } from '@twurple/eventsub-base';
-import { type Snowflake, EmbedBuilder } from 'discord.js';
-
-const GUILDS: { id: Snowflake; channel: Snowflake }[] = [
-    { id: '887670429760749569', channel: '981888025095196702' },
-];
+import { EmbedBuilder, Snowflake } from 'discord.js';
+import { getDocs } from 'firelord';
 
 @ApplyOptions<Listener.Options>({
     event: 'streamOnline',
 })
 export default class StreamOnlineListener extends Listener {
-    async run(event: EventSubStreamOnlineEvent): Promise<unknown> {
-        const { client } = this.container;
+    async run(event: EventSubStreamOnlineEvent) {
+        const guilds = await getDocs(guildRef.collection()).then((docs) =>
+            docs.docs
+                .filter((d) => !!d.data().channels?.stream)
+                .map((doc) => ({
+                    id: doc.id,
+                    channel: doc.data().channels.stream!,
+                })),
+        );
 
         const stream = await event.getStream();
         const game = await stream?.getGame();
 
         const streamUrl = `https://www.twitch.tv/${event.broadcasterName}`;
 
-        const channels = GUILDS.map((sfs) =>
-            client.channels.cache.get(sfs.channel),
-        );
-
         const embed = new EmbedBuilder()
             .setColor('#9146FF')
             .setTitle(
@@ -42,15 +42,37 @@ export default class StreamOnlineListener extends Listener {
 
         embed.setImage(stream?.thumbnailUrl ?? null);
 
-        return channels.map((channel) => {
-            if (channel && isTextChannel(channel)) {
-                return channel.send({
-                    content: '<@&981902175850602566>',
-                    embeds: [embed],
-                });
-            }
+        await Promise.all(
+            guilds.map(async ({ id, channel }) =>
+                this.handleGuildMessage(id, channel, embed),
+            ),
+        );
+    }
+
+    private async handleGuildMessage(
+        guildId: Snowflake,
+        channelId: Snowflake,
+        embed: EmbedBuilder,
+    ) {
+        const { client, logger } = this.container;
+
+        const guild = await client.guilds.fetch(guildId);
+        if (!guild) {
+            logger.debug(`Could not find guild with id ${guildId}`);
+            return;
+        }
+
+        const channel = await guild.channels.fetch(channelId);
+        if (!channel || !channel.isTextBased()) {
+            logger.debug(
+                `Could not find menus channel in guild ${guild.toString()}.`,
+            );
+            return;
+        }
 
-            return Promise.resolve();
+        await channel.send({
+            content: '<@&981902175850602566>',
+            embeds: [embed],
         });
     }
 }