feature: giveaway refactor

Author: GetUsernameFromDatabase

.env.example

@@ -1,8 +1,4 @@
-DISCORD_TOKEN="XXX"
-OWNERS=XXX
+DISCORD_TOKEN="bot token from https://discord.com/developers/applications"
+OWNERS=put your user id here
 
-GIVEAWAY_DATABASE_NAME=GiveawaysDB
 DEV=true
-
-# DP_SPOTIFY_CLIENT_ID=
-# DP_SPOTIFY_CLIENT_SECRET=

.vscode/launch.json

@@ -9,6 +9,15 @@
       "cwd": "${workspaceRoot}",
       "runtimeExecutable": "yarn",
       "runtimeArgs": ["dev:piece"],
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "dev debug",
+      "protocol": "inspector",
+      "cwd": "${workspaceRoot}",
+      "runtimeExecutable": "yarn",
+      "runtimeArgs": ["dev"],
     }
   ]
 }

@types/discord/messaging.d.ts

@@ -4,18 +4,22 @@
 // --- RECCOMMENDED TO KEEP THESE AT ALL TIMES
 // use logger
 import { ILogger } from '@sapphire/framework';
-globalThis.logger = { ...console, debug: console.info } as unknown as ILogger;
+globalThis.logger = {
+  ...console,
+  debug: console.info,
+  write: console.log,
+} as unknown as ILogger;
 // use environment variables
 import { resolve } from 'node:path';
 import { setup } from '@skyra/env-utilities';
+import { DB } from '@/database/database';
 const DotenvConfigOutput = setup({ path: resolve(__dirname, '..', '.env') });
 console.log('DOTENV_CONFIG_OUTPUT:', DotenvConfigOutput, '\n\n');
 // --- Start custom code
-import { GetGiveaways } from '@/services/giveaway';
 
 async function main() {
-  const a = await GetGiveaways();
-  console.log(a);
+  DB;
+  await new Promise((resolve) => setTimeout(resolve, 10_000));
   return;
 }
 

@types/jobs.d.ts

@@ -1,5 +1,5 @@
 import { getTextBasedChannel } from '#lib/discord-fetch';
-import { FetchAndSendGiveaways } from '@/services/giveaway';
+import { GiveawayService } from '@/services/giveaway/giveaway-service';
 import { GiveawayStatusEnum } from '@/services/giveaway/giveaway-status';
 import { Command } from '@sapphire/framework';
 import { PermissionsBitField } from 'discord.js';
@@ -20,16 +20,18 @@ export class FetchGiveawaysCommand extends Command {
         .setDescription(this.description)
         .addBooleanOption((option) =>
           option
-            .setName('force')
-            .setDescription('Does not check if previously sent')
+            .setName('unfiltered')
+            .setDescription(
+              'Does not check if giveaways have been previously sent'
+            )
         );
     });
   }
 
   public override async chatInputRun(
     interaction: Command.ChatInputCommandInteraction
   ) {
-    // const force = interaction.options.getBoolean('force') ?? false;
+    const unfiltered = interaction.options.getBoolean('unfiltered') ?? false;
     await interaction.deferReply();
 
     const { channelId } = interaction;
@@ -40,9 +42,13 @@ export class FetchGiveawaysCommand extends Command {
     }
 
     await interaction.editReply('Will search for new giveaways');
-    const giveawayStatus = await FetchAndSendGiveaways(channel);
+    let giveawayService = await new GiveawayService().initialize();
+    if (!unfiltered) {
+      giveawayService = await giveawayService.filterGiveaways(channel);
+    }
 
-    if (giveawayStatus.status === GiveawayStatusEnum.SUCCESS) {
+    const giveawayStatus = await giveawayService.sendGiveaways(channel);
+    if (giveawayStatus.statusCode === GiveawayStatusEnum.SUCCESS) {
       return interaction.followUp('Giveaway fetch finished!');
     }
     return interaction.editReply(giveawayStatus.statusInformation.log_message);

development/index.ts

@@ -1,8 +1,9 @@
-import { getTextBasedChannel } from '#lib/discord-fetch';
+import { getChannelParentID, getTextBasedChannel } from '#lib/discord-fetch';
 import { Command } from '@sapphire/framework';
 import { PermissionsBitField } from 'discord.js';
 import cronstrue from 'cronstrue';
 import { GiveawayNotifier } from '../../jobs/giveaways';
+import { DB } from '@/database/database';
 
 export class SubscribeToGiveawaysCommand extends Command {
   public constructor(context: Command.LoaderContext, options: Command.Options) {
@@ -27,25 +28,27 @@ export class SubscribeToGiveawaysCommand extends Command {
   ) {
     await interaction.deferReply();
 
-    const { channelId } = interaction;
+    const { client, channelId } = interaction;
     const channel =
       interaction.channel ?? (await getTextBasedChannel(channelId));
     if (!channel) {
       return interaction.editReply('Error: Channel not found');
     }
 
-    return interaction.editReply('WIP');
-
-    // const store = client.sqlStores.GiveawayChannel;
-    // await store.saveChannel(channel);
+    const channelParentId = getChannelParentID(channel);
+    const query = DB.replaceInto('channel_purposes').values({
+      channel_container: channelParentId.id,
+      channel_id: channel.id,
+      channel_purpose: 'givaways',
+    });
+    await query.execute();
 
-    // const { discordTime, toUnixTimecode } = client.utils.date;
-    // const nextUnixTimecode = toUnixTimecode(GiveawayNotifier.cron.next());
+    const { discordTime, toUnixTimecode } = client.utils.date;
+    const nextUnixTimecode = toUnixTimecode(GiveawayNotifier.cron.next());
 
-    // await interaction.editReply(
-    //   `${'This channel is subscribed to giveaways'}\nNext fetch will happen at: ${discordTime(
-    //     nextUnixTimecode
-    //   )}`
-    // );
+    return interaction.editReply(
+      `This channel is subscribed to giveaways\n` +
+        `Next fetch will happen at ${discordTime(nextUnixTimecode)}`
+    );
   }
 }

src/commands/giveaways/fetch-giveaways.ts

@@ -1,4 +1,5 @@
-import { getTextBasedChannel } from '#lib/discord-fetch';
+import { getChannelParentID, getTextBasedChannel } from '#lib/discord-fetch';
+import { DB } from '@/database/database';
 import { Command } from '@sapphire/framework';
 import { PermissionsBitField } from 'discord.js';
 
@@ -29,12 +30,15 @@ export class UnsubscribeToGiveawaysCommand extends Command {
       return interaction.editReply('Error: Channel not found');
     }
 
-    return interaction.editReply('WIP');
-    // const store = client.sqlStores.GiveawayChannel;
-    // const result = await store.deleteChannel(channel);
-    // if (!result.changes) {
-    //   return interaction.editReply(`Channel was not subscribed before`);
-    // }
-    // await interaction.editReply(`Successfully unsubscribed`);
+    const channelParentId = getChannelParentID(channel);
+    const query = DB.deleteFrom('channel_purposes')
+      .where('channel_container', '=', channelParentId.id)
+      .where('channel_id', '=', channel.id);
+    const result = await query.executeTakeFirst();
+
+    if (result.numDeletedRows > 0) {
+      return interaction.editReply(`Successfully unsubscribed`);
+    }
+    return interaction.editReply(`Channel was not subscribed before`);
   }
 }

src/commands/giveaways/subscribe-to-giveaways.ts

@@ -6,7 +6,6 @@ import type { APIApplicationCommandOptionChoice } from 'discord.js';
 
 type SupportedBiquadFilters = keyof typeof BiquadFilterType | 'Off';
 
-// TODO: add run `runIn: 'GUILD_TEXT'` to all music commands
 export class BiquadCommand extends Command {
   public constructor(context: Command.LoaderContext, options: Command.Options) {
     super(context, {