Merge

Author: laquasicinque

package.json

@@ -23,37 +23,37 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@mdn/browser-compat-data": "4.1.2",
+    "@mdn/browser-compat-data": "4.1.3",
     "@sentry/node": "6.16.1",
     "compare-versions": "4.1.2",
-    "date-fns": "2.27.0",
     "discord.js": "13.4.0",
+    "date-fns": "2.28.0",
     "dom-parser": "0.1.6",
     "domyno": "1.0.1",
     "fuse.js": "6.5.0",
     "html-entities": "2.3.2",
     "lodash-es": "4.17.21",
-    "mongoose": "6.1.3",
+    "mongoose": "6.1.5",
     "node-cache": "5.1.2",
     "node-fetch": "3.1.0",
-    "node-html-parser": "5.1.0",
+    "node-html-parser": "5.2.0",
     "ts-node": "10.4.0",
     "typescript": "4.5.4"
   },
   "devDependencies": {
     "@sentry/types": "6.16.1",
     "@types/dom-parser": "0.1.1",
     "@types/html-entities": "1.3.4",
-    "@types/jest": "27.0.3",
+    "@types/jest": "27.4.0",
     "@types/mongoose": "5.11.97",
-    "@types/node": "16.11.17",
+    "@types/node": "16.11.19",
     "@types/node-fetch": "3.0.3",
     "dotenv": "10.0.0",
-    "eslint": "8.5.0",
-    "eslint-config-galex": "3.5.2",
+    "eslint": "8.6.0",
+    "eslint-config-galex": "3.5.5",
     "husky": "7.0.4",
     "jest": "27.4.5",
-    "lint-staged": "12.1.3",
+    "lint-staged": "12.1.6",
     "nodemon": "2.0.15",
     "prettier": "2.5.1",
     "ts-jest": "27.1.2"

src/v2/autorespond/thanks/createResponse.ts

@@ -24,8 +24,8 @@ export function createResponse(thankedUsers: Collection<string, User>, authorId:
   const output = createEmbed({
     description,
     fields,
-    footerText: 'Point Handler',
-    provider: 'spam',
+    footerText: 'Thank a helpful member by replying "thanks @username" or saying "thanks" in a reply or thread.',
+    provider: 'helper',
     title,
   }).embed;
 

src/v2/cache/cacheFns.ts

@@ -1,12 +1,17 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { GenericCache } from './model.js';
 
 export type CacheUpsertOptions = {
   guild: string;
   type: string;
-  expiresIn: number;
   user: string;
   meta?: unknown;
-};
+} & (
+  | {
+      expiresIn: number;
+    }
+  | { expiresAt: number }
+);
 
 export type CacheFindOptions = {
   type: string;
@@ -24,14 +29,13 @@ export async function get({ type, user, guild }: CacheFindOptions) {
   });
 }
 
-export async function upsert({
-  expiresIn,
-  guild,
-  type,
-  user,
-  meta,
-}: CacheUpsertOptions) {
-  const expireTime = Date.now() + expiresIn;
+export async function upsert(options: CacheUpsertOptions) {
+  const { guild, type, user, meta } = options;
+
+  // Cannot use destructuring due to the properties being optional and TS not liking it
+  // eslint-disable-next-line unicorn/consistent-destructuring
+  const expireTime = "expiresAt" in options ? options.expiresAt : Date.now() + options.expiresIn;
+
   const result = await GenericCache.findOneAndUpdate(
     {
       guild,

src/v2/cache/model.ts

@@ -26,12 +26,12 @@ const schema = new Schema({
   },
 });
 
-export const GenericCache = model('GenericCache', schema) as unknown as Model<
-  Document & {
-    guild: string;
-    type: string;
-    timestamp: number;
-    usre: string;
-    meta?: unknown;
-  }
->;
+export const GenericCache = model<GenericCacheType>('GenericCache', schema)
+
+type GenericCacheType = {
+  guild: string;
+  type: string;
+  timestamp: number;
+  user: string;
+  meta?: unknown;
+}

src/v2/commands/points/index.ts

@@ -130,7 +130,7 @@ async function handlePoints(
 }
 
 const handleDecayRequest = async (interaction: CommandInteraction) => {
-  const { diff } = getTimeDiffToDecay();
+  const { diff } = await getTimeDiffToDecay();
   const timer = Number.parseInt(POINT_DECAY_TIMER);
 
   let [hours, minutes]: (string | number)[] = (timer - diff)

src/v2/commands/post/index.ts

@@ -1,4 +1,4 @@
- 
+
 import type {
   Message,
   CollectorFilter,
@@ -211,6 +211,7 @@ const createJobPost = async (
   // const url = generateURL(guild.id, channelID, msgID);
   try {
     const msg = await targetChannel.send({
+      content: `Job Poster: <@${userID}>`,
       embeds: [
         createEmbed({
           author: {
@@ -219,11 +220,6 @@ const createJobPost = async (
           description: `A user has created a new job post!`,
           // Using the spam provider because we only need the color/icon, which it provides anyway
           fields: [
-            {
-              inline: true,
-              name: 'User',
-              value: `<@!${userID}>`,
-            },
             {
               inline: true,
               name: 'Created On',
@@ -245,7 +241,7 @@ const createJobPost = async (
           new MessageButton()
             .setCustomId(`job🤔${userID}🤔response`)
             .setStyle('PRIMARY')
-            .setLabel('DM me the username')
+            .setLabel('DM me the posting')
             .setEmoji('✉️'),
           new MessageButton()
             .setCustomId(`job🤔${userID}🤔delete`)
@@ -286,10 +282,10 @@ const handleJobPostingRequest = async (
 
   const filter: CollectorFilter<[Message]> = m => m.author.id === id;
   const send = (str: string) => author.send(str);
+  // Generate cache entry
+  const entry = generateCacheEntry(id);
 
   try {
-    // Generate cache entry
-    const entry = generateCacheEntry(id);
     // Check if the user has been cached
     const isCached = cache.get(entry.key);
 
@@ -317,8 +313,6 @@ const handleJobPostingRequest = async (
     // Notify the user regarding the rules, and get the channel
     const channel = await author.createDM();
 
-    const { id: channelID } = channel;
-
     const form = new MultistepForm(questions, channel, author);
 
     const answers = (await form.getResult('guidelines')) as unknown as Answers;
@@ -342,9 +336,13 @@ const handleJobPostingRequest = async (
     // Store the job post in the cache
     cache.set(entry.key, entry.value, POST_LIMITER);
   } catch (error) {
+    cache.del(entry.key)
+
     interaction.reply(
       'Please temporarily enable direct messages as the bot cares about your privacy.'
     );
+
+
     // eslint-disable-next-line no-console
     console.error('post.handleJobPostingRequest', error);
   }