Merge pull request #2 from liteless/dev

v1.0.1 - minor changes to how fics are compared

Author: ericsbytes

.env.vault

@@ -4,8 +4,8 @@
 #/--------------------------------------------------/
 
 # development
-DOTENV_VAULT_DEVELOPMENT="7zsgl0/F07jfHjNk34P39MzfyKi/1nYJJWR7ulq2actCgUt0t0rNGH7LZ4DUVc0iAhv/N0q4aX836WOr0KEgaDW7IInGke/jIDUOypqyQAuwZss3CbN7myQHbPVnrKmfAu2xJbJE/7jLZ2fMaZ1G1YOUMMkVTK8g21OZUCKfxF5UJlu6pzH1Hb67LIpkEk4ZzJxf4BqGDLXCaShzy3Hfk03U9aFY+gf3bY/k6j7jZ8PYdklxcdPRG4AFsa8jg0YVYOBQ4PCtczlgoxIZsZfqWqJVogJ39M2U3XMLfvhsLcQyMBQtBVipfGXTPzfTYjQIiLgtUtL14uDWyROvm/+/53I4uDMaUvVl6cfMhHlkY6wi2hhwe48jeCEYMXrxizEndpB+4aUHo48fP3Z3xJFE8lY8a1ZboMDDKFhJ61+SwmdnqWs8ir9eLb9AMsdxDEBUol+Tl0bxXiKy66c6wRZcTxZgFn6U71a1aABbuHSMzfH12O5sonK7AW+eOgJpILwvaQgkjBNQIY8z/joXASJDt4KLJL7Qw9G5cr4GVUvELcYutY3nA3aim9Ys5rWj3zyHxbEIS5Wh5tGO96lTDeu2GSmNZoT9VIsLAHltaGBerb15wpjveQWPmjlffkH0K96F2dSUvHWJo17gMDXfKwS4mwRCudw3HlVmJqjw3lKYwaORaQNJpdyl3b6PUdjnnKYkMFBMzc+VCE4Wa8VX3fw/cFUH5T1I2+XuvbGWZRpHQVZdOlI4SAIngZFMsXuKOpZ8hfAj/gjbYPoqHda26EVrreJ2a7HSYAjSDUDO0vSLUyzPu0gZvml38Co45Wwc8HvaMOGsV4Reew5WZTvZY/lo4BsheShSP9pGr2pf84sB+Ib8qubkw9hCXi1pb/FOkJ873YqeEkDJDI8Y0wbhPkGvB1Z5LBV50wxdJzfUM98rvbdoG6sWGd6uQesGtIOnaVDVdPcPgBEqsahLAcxlfjqsLBnrOZCL62H/D6gUHomz3/scHT/A/F7UwkSKIygNDKrFawwz5JF8Ga6V74NEXwDBLVOptbBmBsiGW+yjb/BxZahy"
-DOTENV_VAULT_DEVELOPMENT_VERSION=2
+DOTENV_VAULT_DEVELOPMENT="XSrp7ITz2JptDK5jTcOuIBBTO4NjMyakpibgFVEIQLpa6mVYfkEkTiyESVs8ofuG7Z9yF5LRawOeHV77z4FgdqgJceFJ9VpNQHajJqoVr3RcJ38kruWXoQfxXHGJIZhGKO3ocPvFoBbEJsOj4e6SyCGi8RQc115p3jiLvPaGXnMBQrQBdTbHwf0K5CTNEkMmfa+Goe/uqB4ssN7VKpsgnfuF77fIzX0b6SEip3Wp4aRnwNl244v+tiRfGrGIxRCcjdxTiKa4Ic2hE51GSt1V7V6oli4fdWQ766kY4ekIUMyC5D4PzGDVtvLnoVYCHcEM0DKMMgyL2Iypm7ViOpN7YCwf/eRWot0XmO8zy+Ui6F0sEDeTBAa3+OO5b+9uzGxuvcJsb1v5QSHpR3fN1U7Eye6jFSV+5zrJQ1hb6bm2N2risQfoedwlKBhwhnTFb+6tR/xY6gQejZ5UfVjEr6zWRhWN9ZO9GOhgJU5XQV/xslIjkAhTGhUSRdEvXz3USOCZHvEGv/7wVP57vHUtAC5P5qepBvt44M+jXyXBq+CAcpqzNnjTg5t96Ef1slaXYeESyrmDbYnjfdTjGiB2ndW3mqR7NlltoQOUvYOddOHM/TfkhxEgaivwVBU7nYr7M/RlCLY7xcrlMpSq6Q2Rzq9eo2qOUZUxBI+YqpUO0Rx3ynJVhPlnwbYDJpPK61K/0FsZniKcXy1VWmfL4kt5P8L0M7N2SqMtxdRxceVvnlEswfL6zdBaBjnh4be/cn4p8bgfmY5QcI3mfWsFPXkZeOtONYjwl1Zh8ZX82NyX6ksmhXj/63d8Rvyl4ADG92SJOHS8f/wWR4Wcy/7xlHHHv9lvYxepzHo3HrAorfIuNiuWZBmXrT3C9AdD+aiWxEVifUZmS1q97LwTSH2F1gjGXOKqH8K8iYtlgs7O3yxj849vva8tMNrrIauM+VzhwGyg/7KTC7th/cV9T8yGFI5mmHpBhXY81tZ9UJfWOxQAhPfue8fZkQy7OWZ4Y1HmtSYB0bVC+2Tbxo2YtQS+MRV+fF3dQDJY+lw2YNYZE+uCaUJ+2OmM0bmv"
+DOTENV_VAULT_DEVELOPMENT_VERSION=3
 
 # ci
 DOTENV_VAULT_CI="CVcgOI7SE17ikq+lZ9ZpYRIzmG1q/BicO5JrK0Ug8A2UCIx3e+UJT1N8AYC1o7TP0Ju04iGKsS/enQB4gFpqqXtk7i2cXyIUAX7ad2wRvDF3jytQfzKO1GQ/vItviBlW11cIpINuuyM8fw=="
@@ -16,8 +16,8 @@ DOTENV_VAULT_STAGING="/Ir76mvn7x1JAypiwjNfGdUK5Lfq4x6dUlwJF6pRVNbqhi5nlqobceiWYg
 DOTENV_VAULT_STAGING_VERSION=2
 
 # production
-DOTENV_VAULT_PRODUCTION="2A2FX0HOoj5DwI51hRk+PMvaoTjMD5neA0eULh8zRj3zd3ZbV4ydtonR9crDqsNgI4FVansJzPLHAlThoFaimexowDezBPml82vpDK6/hHc/wRUXiugKxU94j+FvhCK7w6hXOUvR0ThYMg=="
-DOTENV_VAULT_PRODUCTION_VERSION=2
+DOTENV_VAULT_PRODUCTION="U5L6Ym+LsJcp6Xr7V7z6kTIBKAK0iZJOhRoJkBLuZaH+SVSm44XhQArntfru/LqlXQ5vAVOZO1HX/D6DYrEMFy0jeoTmfb+xXlrJ9H/MPFeZi0y7a0nTPAeo83egTRWR52ivFiB1EaQvbrmiOavcAFzikRkTzrKa39pM09QnrGAPXUHQJ4/qhmGJC4M/Yb6a+LW0ASOa4qjk1quTHhUjdayoLV0Tzf+4aUD7qo5SCyhvzwqNinXNmtzHFtcyODtqaZ/DzfB2DM8kcgr7A5018cO0uZCZ0XfygbG1QyUZy/tScKgSlN1YWdqSFDpTrll4xcKLWWeWnu3w2IeqvulP7D27nmppG+G7eiufFL8z+8Fw8/Ks/UXwBeVI+pf6PYilp3GJjy/lvpnLYyT8VRIRIlRXq3pS5jrbG7Li46nx+yw1LK5iIY4xSSfVy9CpQmW7jurg09ApTdA0lfk5WQKfrd2k4b24tkqztYJNu9LDxNupXEuSgC4QBnxei9Pp0ClIiIoUQRdtulEke/LlIbyQ0uCmbL7N0cwqI5F9qwhjxZm0TFQSVthDdbTgMZfmfiTbREyy9Sxq9OJJGVF2bncVZ0xrAYCAmgkq7ELugUc6Uzl6P7mjzAiRaP47tbhnWKIhnfidnHigwVj2WNqeeuuZOI5a2FyXZX4rhKVunqIqrIv0S/aMfT/TpCIkBbJM8aQH/hf732D5Qx5YclRo5QmOehoXniJF64cn0PedIAaPtvapedXUARg2mynSMeWE2RE1AlBH9BGxWiCeBT2EgMDCfi5GMbtJav2bt0yjdV8Kge3k1ZpTVjJYvCYFZ0U0yLTW4L9LfI17wa29c0FfJPjMxn3GhKI6XMQ9VrJ7heBzHSRO6ujho+TOJMUCOYwuZhs/215WbdPHCiJp3Y2/zqe/EcmIo42vz1cbgz5cLGk8BJgfEXypucQcHIurKQUJIVZZuK2BoeOO+z1HfG8ts4MmGHnALtBo2Rxa1mNpEUaTyqOpBoKU9l97s8gULvXnzlRjpEnnG3NLW3lxkU8BjGRbSyvTQyKypq8yVn3GZR4NTgyg"
+DOTENV_VAULT_PRODUCTION_VERSION=3
 
 #/----------------settings/metadata-----------------/
 DOTENV_VAULT="vlt_dfb9dd1fde825ce5fc9bd781258f1f8648449be3a5b1996abcf9faa572b8dc44"

Dockerfile

@@ -5,7 +5,7 @@ RUN corepack enable
 COPY . /app
 WORKDIR /app
 
-FROM base as deps
+FROM base AS deps
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm fetch --frozen-lockfile
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-lockfile
 
@@ -17,5 +17,5 @@ RUN pnpm run build
 FROM base
 COPY --from=deps /app/node_modules /app/node_modules
 COPY --from=build /app/dist /app/dist
-ENV NODE_ENV production
+ENV NODE_ENV="production"
 CMD [ "pnpm", "start" ]

prisma/schema.prisma

@@ -13,12 +13,6 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
-model Tags {
-  id          String   @id @default(auto()) @map("_id") @db.ObjectId
-  url         String
-  lastRefresh DateTime @default(now())
-}
-
 model Ao3Feeds {
   id          String            @id @default(auto()) @map("_id") @db.ObjectId
   feedName    String?
@@ -34,7 +28,7 @@ model Ao3WorkSnapshot {
   index       Int
   workId      String
   chapters    Int
-  lastUpdated DateTime
+  lastUpdated String
   Ao3Feeds    Ao3Feeds? @relation(fields: [ao3FeedsId], references: [id])
   ao3FeedsId  String?   @db.ObjectId
 }

src/commands/purge.ts

@@ -0,0 +1,54 @@
+import {
+	CommandInteraction,
+	MessageFlags,
+	PermissionFlagsBits,
+	SlashCommandBuilder,
+	TextChannel,
+} from 'discord.js';
+import emojis from '../constants/emojis';
+
+export const data = new SlashCommandBuilder()
+	.setName('purge')
+	.setDescription('Purges all messages from the current channel.');
+
+export async function execute(interaction: CommandInteraction) {
+	const channel = interaction.channel;
+	if (!channel || !interaction.guild) {
+		return interaction.reply({
+			content: `${emojis.BOT.LEAF} This command can only be used in a text channel.`,
+			flags: MessageFlags.Ephemeral,
+		});
+	}
+
+	const me = interaction.guild.members.me;
+
+	if (!me) {
+		console.error('Bot is not in the guild.');
+		return;
+	}
+
+	if (
+		!(interaction.channel as TextChannel)
+			.permissionsFor(me)
+			.has(PermissionFlagsBits.ManageMessages)
+	) {
+		return interaction.reply({
+			content: `${emojis.BOT.LEAF} Missing \`Manage Messages\` permission.`,
+			flags: MessageFlags.Ephemeral,
+		});
+	}
+
+	let messages;
+
+	do {
+		messages = await (interaction.channel as TextChannel).bulkDelete(
+			100,
+			true
+		);
+	} while (messages.size > 0);
+
+	return interaction.reply({
+		content: `${emojis.BOT.LEAF} \`Purged all messages from channel.\``,
+		flags: MessageFlags.Ephemeral,
+	});
+}

src/index.ts

@@ -1,7 +1,7 @@
 import { Client } from 'discord.js';
 import { config } from './config';
 import { commands } from './commands';
-import { deployCommands } from './deploy-commands';
+import { deployCommands, deployGlobalCommands } from './utils/deploy-commands';
 import JobService from './services/JobService';
 import jobs from './jobs';
 
@@ -10,7 +10,10 @@ const client = new Client({
 });
 
 client.once('ready', async () => {
-	console.log('Discord bot is ready! 🤖');
+	console.log('Ailurus has started!');
+	console.log(`Logged in as ${client.user?.tag}`);
+
+	await deployGlobalCommands();
 
 	const jobService = new JobService(client, jobs);
 	await jobService.start();

src/jobs/check-feeds.ts

@@ -132,7 +132,7 @@ async function parseFeed(feed: { url: string }) {
 				wordCount: parseInt(wordCount.replace(/,/g, '')),
 				chapters: parseInt(chaptersWritten.replace(/,/g, '')),
 				totalChapters: parseInt(chapters.replace(/,/g, '')),
-				lastUpdated: new Date(lastUpdated),
+				lastUpdated: lastUpdated,
 			};
 
 			return workData;
@@ -202,10 +202,7 @@ export const checkFeeds: Job = {
 					}
 
 					// Work exists in snapshots - check if updated by timestamp
-					if (
-						work.lastUpdated.getTime() !==
-						previousSnapshot.lastUpdated.getTime()
-					) {
+					if (work.lastUpdated !== previousSnapshot.lastUpdated) {
 						console.log(`work date changed: ${work.title}`);
 
 						updatedWorks.push(work);

src/jobs/index.ts

@@ -1,4 +1,3 @@
-import { tagRss } from './tag-rss';
 import { checkFeeds } from './check-feeds';
 
-export default [tagRss, checkFeeds];
+export default [checkFeeds];

src/jobs/tag-rss.ts

@@ -28,5 +28,5 @@ export type Work = {
 	wordCount: Number;
 	chapters: Number;
 	totalChapters: Number;
-	lastUpdated: Date;
+	lastUpdated: String;
 };

src/types/work.ts

@@ -1,10 +1,10 @@
 import { REST, Routes } from 'discord.js';
-import { config } from './config';
-import { commands } from './commands';
+import { config } from '../config';
+import { commands } from '../commands';
 
 const commandsData = Object.values(commands).map(command => command.data);
 
-const rest = new REST({ version: '10' }).setToken(config.bot.token);
+const rest = new REST().setToken(config.bot.token);
 
 type DeployCommandsProps = {
 	guildId: string;
@@ -26,3 +26,17 @@ export async function deployCommands({ guildId }: DeployCommandsProps) {
 		console.error(error);
 	}
 }
+
+export async function deployGlobalCommands() {
+	try {
+		console.log('Started refreshing application (/) commands.');
+
+		await rest.put(Routes.applicationCommands(config.bot.clientId), {
+			body: commandsData,
+		});
+
+		console.log('Successfully reloaded application (/) commands.');
+	} catch (error) {
+		console.error(error);
+	}
+}