chore: linting, deps

Author: ljosberinn

.eslintrc.js renamed to .eslintrc.cjs

@@ -9,23 +9,23 @@ const {
 const tsOverride = createTSOverride({
   ...getDependencies(),
   rules: {
-    'inclusive-language/use-inclusive-words': 0,
     '@typescript-eslint/no-floating-promises': 0,
+    '@typescript-eslint/no-misused-promises': 0,
+  },
+});
+
+module.exports = createConfig({
+  overrides: [tsOverride],
+  root: true,
+  rules: {
     'no-empty': 0,
     'no-void': 0,
-    '@typescript-eslint/no-misused-promises': 0,
     // this shit isn't properly supported in TS or node, its too early
     'unicorn/prefer-string-replace-all': 0,
     'no-eq-null': 0,
     eqeqeq: ['error', 'always', { null: 'ignore' }],
     'no-bitwise': 0,
     // stuff
+    'unicorn/import-index': 'off',
   },
 });
-
-module.exports = {
-  ...createConfig({
-    overrides: [tsOverride],
-  }),
-  ignorePatterns: ['src/v1/*.ts'],
-};

.npmrc

@@ -0,0 +1 @@
+safe-exact=true

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "type": "module",
   "engines": {
-    "node": "16.13.0"
+    "node": "16.13.0 || ^17.0.0"
   },
   "scripts": {
     "dev": "TS_NODE_FILES=true TS_NODE_PROJECT=\"./tsconfig.json\" nodemon -r dotenv/config -x node --experimental-specifier-resolution=node --loader ts-node/esm ./src/index.ts",
@@ -16,44 +16,45 @@
     "test:watch": "jest --watch",
     "test:ci": "jest --ci",
     "lint:fix": "eslint --fix src && prettier --write src",
-    "lint:types": "tsc --noEmit"
+    "lint:types": "tsc --noEmit",
+    "install:clean": "rm -rf node_modules && rm yarn.lock && yarn"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@mdn/browser-compat-data": "^4.0.9",
+    "@mdn/browser-compat-data": "4.0.10",
     "@sentry/node": "6.14.1",
     "compare-versions": "4.0.1",
     "date-fns": "2.25.0",
-    "discord.js": "^13.3.1",
+    "discord.js": "13.3.1",
     "dom-parser": "0.1.6",
-    "domyno": "^1.0.1",
-    "fuse.js": "^6.4.6",
+    "domyno": "1.0.1",
+    "fuse.js": "6.4.6",
     "html-entities": "2.3.2",
+    "lodash-es": "4.17.21",
     "mongoose": "6.0.12",
     "node-cache": "5.1.2",
     "node-fetch": "3.1.0",
-    "node-html-parser": "^5.1.0",
-    "ts-node": "^10.4.0",
-    "lodash-es": "^4.17.21",
+    "node-html-parser": "5.1.0",
+    "ts-node": "10.4.0",
     "typescript": "4.4.4"
   },
   "devDependencies": {
     "@sentry/types": "6.14.1",
-    "@types/dom-parser": "^0.1.1",
-    "@types/html-entities": "^1.3.3",
+    "@types/dom-parser": "0.1.1",
+    "@types/html-entities": "1.3.4",
     "@types/jest": "27.0.2",
-    "@types/mongoose": "5.11.96",
+    "@types/mongoose": "^5.11.97",
     "@types/node": "16.11.7",
-    "@types/node-fetch": "3.0.2",
+    "@types/node-fetch": "3.0.3",
     "dotenv": "10.0.0",
     "eslint": "8.2.0",
-    "eslint-config-galex": "3.2.1",
+    "eslint-config-galex": "3.3.3",
     "husky": "7.0.4",
     "jest": "27.3.1",
     "lint-staged": "11.2.6",
-    "nodemon": "2.0.14",
+    "nodemon": "2.0.15",
     "prettier": "2.4.1",
     "ts-jest": "27.0.7"
   },

src/v2/autorespond/code_parsing/hasVarInSource.ts

@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/no-namespace
+ 
 import ts from 'typescript';
 
 export function hasVarInSource(source: string): boolean {

src/v2/autorespond/html_parsing/hasDeprecated.ts

@@ -1,4 +1,5 @@
 import { parse } from 'node-html-parser';
+
 import { mapʹ } from '../../utils/map.js';
 
 const deprecatedElementsMap = new Map([
@@ -124,7 +125,7 @@ export function hasDeprecatedHTMLElementInSource(str: string) {
   const deprecatedElements = root.querySelectorAll(deprecatedElSelector)
 
   const uniqueElements = new Set(deprecatedElements.map(item => item.rawTagName.toLowerCase()))
-  if(uniqueElements.size) {
+  if(uniqueElements.size > 0) {
     return [...mapʹ(item => [item, deprecatedElementsMap.get(item)], uniqueElements)]
   }
   return false

src/v2/autorespond/html_parsing/index.ts

@@ -31,7 +31,7 @@ export function detectDeprecatedHTML(msg: Message): boolean {
   const { content, channel, author } = msg;
 
   const deprecated = [...getDeprecatedElements(content)].flat(1);
-  if (deprecated.length) {
+  if (deprecated.length > 0) {
     const deprecatedTags = deprecated.map(([item]) => `\`<${item}>\``);
     const template = _`Hey <@!${author.id}>, I've noticed you're using ${
       _.n

src/v2/autorespond/thanks/createResponse.ts

@@ -1,6 +1,8 @@
-import { MessageButton, User } from 'discord.js';
+import { MessageButton } from 'discord.js';
 import { MessageActionRow, MessageSelectMenu } from 'discord.js';
-import { EmbedField, Collection } from 'discord.js';
+import type { User } from 'discord.js';
+import type { EmbedField, Collection } from 'discord.js';
+
 import { clampLength } from '../../utils/clampStr.js';
 import { createEmbed } from '../../utils/discordTools.js';
 

src/v2/autorespond/thanks/index.ts

@@ -9,10 +9,10 @@ import { stripMarkdownQuote } from '../../utils/content_format.js';
 import { createEmbed } from '../../utils/discordTools.js';
 import { mapʹ } from '../../utils/map.js';
 import { difference } from '../../utils/sets.js';
+import { createResponse } from './createResponse.js';
 import type { ThanksInteractionType } from './db_model.js';
 import { ThanksInteraction } from './db_model.js';
 import { handleThreadThanks } from './threadThanks.js';
-import { createResponse } from './createResponse.js';
 
 type CooldownUser = {
   id: string;
@@ -62,7 +62,7 @@ const handleThanks = async (msg: Message): Promise<void> => {
     await ThanksInteraction.find({
       thanker: msg.author.id,
       createdAt: {
-        $gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60000,
+        $gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60_000,
       },
     }).exec();
 

src/v2/autorespond/thanks/threadThanks.ts

@@ -12,11 +12,13 @@ import {
   Collection,
   MessageSelectMenu,
 } from 'discord.js';
+
+import { POINT_LIMITER_IN_MINUTES } from '../../env.js';
 import { asyncCatch } from '../../utils/asyncCatch.js';
-import { createResponse } from './createResponse.js';
-import { ThanksInteraction, ThanksInteractionType } from './db_model.js';
 import { _ } from '../../utils/pluralize.js';
-import { POINT_LIMITER_IN_MINUTES } from '../../env.js';
+import { createResponse } from './createResponse.js';
+import type { ThanksInteractionType } from './db_model.js';
+import { ThanksInteraction } from './db_model.js';
 
 const memoryCache = new Map<string, Message>();
 
@@ -28,7 +30,7 @@ export async function handleThreadThanks(msg: Message): Promise<void> {
 
   const oldResponseId = [msg.author.id, msg.channel.id].join('|');
   if (memoryCache.has(oldResponseId)) {
-    await memoryCache.get(oldResponseId).delete().catch(e => console.error("message already deleted")).finally(() => { memoryCache.delete(oldResponseId) });
+    await memoryCache.get(oldResponseId).delete().catch(error => { console.error("message already deleted"); }).finally(() => { memoryCache.delete(oldResponseId) });
   }
   // channel.members.fetch should return a collection
   const [members, previousInteractions]: [
@@ -41,7 +43,7 @@ export async function handleThreadThanks(msg: Message): Promise<void> {
     ThanksInteraction.find({
       thanker: msg.author.id,
       createdAt: {
-        $gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60000,
+        $gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60_000,
       },
     }),
   ]);
@@ -69,7 +71,7 @@ export async function handleThreadThanks(msg: Message): Promise<void> {
   const response = await msg.reply({
     content: [
       "Hey, it looks like you're trying to thank one or many users, but haven't specified who. Who would you like to thank?",
-      alreadyThanked.length
+      alreadyThanked.length > 0
         ? _`There ${_.mapper({ 1: 'is' }, 'are')} **${_.n} user${
             _.s
           } that you can't thank as you've thanked them recently**, so they won't show up as an option.`(
@@ -113,7 +115,7 @@ export function attachThreadThanksHandler(client: Client): void {
       if (!(interaction.isSelectMenu() || interaction.isButton())) {
         return;
       }
-      const channel = interaction.channel;
+      const {channel} = interaction;
       const [category, msgId, type, userId] = interaction.customId.split('🤔');
 
       if (category !== 'threadThanks') {
@@ -219,7 +221,7 @@ export function attachThreadClose(client: Client) {
 
       const channel = activeThreads.threads.get(channelId);
 
-      if (!channel || channel.archived === true) {
+      if (!channel || channel.archived) {
         interaction.reply({ content: '' });
       }
 

src/v2/commands/index.ts

@@ -11,9 +11,9 @@ import type {
 import { Collection } from 'discord.js';
 import { filter } from 'domyno';
 import { isEqual } from 'lodash-es';
+
 import type { CommandDataWithHandler } from '../../types';
 import { asyncCatch } from '../utils/asyncCatch.js';
-
 import { map, mapʹ } from '../utils/map.js';
 import { merge } from '../utils/merge.js';
 import { normalizeApplicationCommandData } from '../utils/normalizeCommand.js';
@@ -111,8 +111,8 @@ export const registerCommands = async (client: Client): Promise<void> => {
             content: "Couldn't recognize command.",
           });
         }
-      } catch (e) {
-        console.error(e);
+      } catch (error) {
+        console.error(error);
         await interaction.reply({
           ephemeral: true,
           content: 'Something went wrong when trying to execute the command',
@@ -123,13 +123,13 @@ export const registerCommands = async (client: Client): Promise<void> => {
 
   for (const { onAttach } of applicationCommands.values()) {
     // We're attaching these so it's fine
-    // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
+     
     onAttach?.(client);
   }
 
   for (const { onAttach } of guildCommands.values()) {
     // We're attaching these so it's fine
-    // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
+     
     onAttach?.(client);
   }
 
@@ -139,8 +139,8 @@ export const registerCommands = async (client: Client): Promise<void> => {
       guild = await oauth2Guild.fetch();
       const cmds = await (guild as Guild).commands.fetch();
       await addCommands(cmds, guildCommands, (guild as Guild).commands);
-    } catch (e) {
-      console.error(`Failed to add commands to guild: ${guild.name}`, e);
+    } catch (error) {
+      console.error(`Failed to add commands to guild: ${guild.name}`, error);
     }
   }
   console.log('Guild specific commands added');
@@ -219,11 +219,7 @@ async function addCommands(
 
 function getDestination(
   commandManager:
-    | ApplicationCommandManager<
-        ApplicationCommand<{ guild: GuildResolvable }>,
-        { guild: GuildResolvable },
-        null
-      >
+    | ApplicationCommandManager
     | GuildApplicationCommandManager
 ) {
   return 'guild' in commandManager