Skip to content

Commit 7c087e8

Browse files
ljosberinnljosberinn
committed
chore: linting, deps
1 parent 1a30170 commit 7c087e8

36 files changed

+445
-894
lines changed

‎.eslintrc.js ‎.eslintrc.cjs

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ const {
99
const tsOverride = createTSOverride({
1010
...getDependencies(),
1111
rules: {
12-
'inclusive-language/use-inclusive-words': 0,
1312
'@typescript-eslint/no-floating-promises': 0,
13+
'@typescript-eslint/no-misused-promises': 0,
14+
},
15+
});
16+
17+
module.exports = createConfig({
18+
overrides: [tsOverride],
19+
root: true,
20+
rules: {
1421
'no-empty': 0,
1522
'no-void': 0,
16-
'@typescript-eslint/no-misused-promises': 0,
1723
// this shit isn't properly supported in TS or node, its too early
1824
'unicorn/prefer-string-replace-all': 0,
1925
'no-eq-null': 0,
2026
eqeqeq: ['error', 'always', { null: 'ignore' }],
2127
'no-bitwise': 0,
2228
// stuff
29+
'unicorn/import-index': 'off',
2330
},
2431
});
25-
26-
module.exports = {
27-
...createConfig({
28-
overrides: [tsOverride],
29-
}),
30-
ignorePatterns: ['src/v1/*.ts'],
31-
};

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
safe-exact=true

‎package.json

+16-15
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"main": "index.js",
66
"type": "module",
77
"engines": {
8-
"node": "16.13.0"
8+
"node": "16.13.0 || ^17.0.0"
99
},
1010
"scripts": {
1111
"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 @@
1616
"test:watch": "jest --watch",
1717
"test:ci": "jest --ci",
1818
"lint:fix": "eslint --fix src && prettier --write src",
19-
"lint:types": "tsc --noEmit"
19+
"lint:types": "tsc --noEmit",
20+
"install:clean": "rm -rf node_modules && rm yarn.lock && yarn"
2021
},
2122
"keywords": [],
2223
"author": "",
2324
"license": "ISC",
2425
"dependencies": {
25-
"@mdn/browser-compat-data": "^4.0.9",
26+
"@mdn/browser-compat-data": "4.0.10",
2627
"@sentry/node": "6.14.1",
2728
"compare-versions": "4.0.1",
2829
"date-fns": "2.25.0",
29-
"discord.js": "^13.3.1",
30+
"discord.js": "13.3.1",
3031
"dom-parser": "0.1.6",
31-
"domyno": "^1.0.1",
32-
"fuse.js": "^6.4.6",
32+
"domyno": "1.0.1",
33+
"fuse.js": "6.4.6",
3334
"html-entities": "2.3.2",
35+
"lodash-es": "4.17.21",
3436
"mongoose": "6.0.12",
3537
"node-cache": "5.1.2",
3638
"node-fetch": "3.1.0",
37-
"node-html-parser": "^5.1.0",
38-
"ts-node": "^10.4.0",
39-
"lodash-es": "^4.17.21",
39+
"node-html-parser": "5.1.0",
40+
"ts-node": "10.4.0",
4041
"typescript": "4.4.4"
4142
},
4243
"devDependencies": {
4344
"@sentry/types": "6.14.1",
44-
"@types/dom-parser": "^0.1.1",
45-
"@types/html-entities": "^1.3.3",
45+
"@types/dom-parser": "0.1.1",
46+
"@types/html-entities": "1.3.4",
4647
"@types/jest": "27.0.2",
47-
"@types/mongoose": "5.11.96",
48+
"@types/mongoose": "^5.11.97",
4849
"@types/node": "16.11.7",
49-
"@types/node-fetch": "3.0.2",
50+
"@types/node-fetch": "3.0.3",
5051
"dotenv": "10.0.0",
5152
"eslint": "8.2.0",
52-
"eslint-config-galex": "3.2.1",
53+
"eslint-config-galex": "3.3.3",
5354
"husky": "7.0.4",
5455
"jest": "27.3.1",
5556
"lint-staged": "11.2.6",
56-
"nodemon": "2.0.14",
57+
"nodemon": "2.0.15",
5758
"prettier": "2.4.1",
5859
"ts-jest": "27.0.7"
5960
},

‎src/v2/autorespond/code_parsing/hasVarInSource.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// eslint-disable-next-line import/no-namespace
1+
22
import ts from 'typescript';
33

44
export function hasVarInSource(source: string): boolean {

‎src/v2/autorespond/html_parsing/hasDeprecated.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { parse } from 'node-html-parser';
2+
23
import { mapʹ } from '../../utils/map.js';
34

45
const deprecatedElementsMap = new Map([
@@ -124,7 +125,7 @@ export function hasDeprecatedHTMLElementInSource(str: string) {
124125
const deprecatedElements = root.querySelectorAll(deprecatedElSelector)
125126

126127
const uniqueElements = new Set(deprecatedElements.map(item => item.rawTagName.toLowerCase()))
127-
if(uniqueElements.size) {
128+
if(uniqueElements.size > 0) {
128129
return [...mapʹ(item => [item, deprecatedElementsMap.get(item)], uniqueElements)]
129130
}
130131
return false

‎src/v2/autorespond/html_parsing/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function detectDeprecatedHTML(msg: Message): boolean {
3131
const { content, channel, author } = msg;
3232

3333
const deprecated = [...getDeprecatedElements(content)].flat(1);
34-
if (deprecated.length) {
34+
if (deprecated.length > 0) {
3535
const deprecatedTags = deprecated.map(([item]) => `\`<${item}>\``);
3636
const template = _`Hey <@!${author.id}>, I've noticed you're using ${
3737
_.n

‎src/v2/autorespond/thanks/createResponse.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
import { MessageButton, User } from 'discord.js';
1+
import { MessageButton } from 'discord.js';
22
import { MessageActionRow, MessageSelectMenu } from 'discord.js';
3-
import { EmbedField, Collection } from 'discord.js';
3+
import type { User } from 'discord.js';
4+
import type { EmbedField, Collection } from 'discord.js';
5+
46
import { clampLength } from '../../utils/clampStr.js';
57
import { createEmbed } from '../../utils/discordTools.js';
68

‎src/v2/autorespond/thanks/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import { stripMarkdownQuote } from '../../utils/content_format.js';
99
import { createEmbed } from '../../utils/discordTools.js';
1010
import { mapʹ } from '../../utils/map.js';
1111
import { difference } from '../../utils/sets.js';
12+
import { createResponse } from './createResponse.js';
1213
import type { ThanksInteractionType } from './db_model.js';
1314
import { ThanksInteraction } from './db_model.js';
1415
import { handleThreadThanks } from './threadThanks.js';
15-
import { createResponse } from './createResponse.js';
1616

1717
type CooldownUser = {
1818
id: string;
@@ -62,7 +62,7 @@ const handleThanks = async (msg: Message): Promise<void> => {
6262
await ThanksInteraction.find({
6363
thanker: msg.author.id,
6464
createdAt: {
65-
$gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60000,
65+
$gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60_000,
6666
},
6767
}).exec();
6868

‎src/v2/autorespond/thanks/threadThanks.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ import {
1212
Collection,
1313
MessageSelectMenu,
1414
} from 'discord.js';
15+
16+
import { POINT_LIMITER_IN_MINUTES } from '../../env.js';
1517
import { asyncCatch } from '../../utils/asyncCatch.js';
16-
import { createResponse } from './createResponse.js';
17-
import { ThanksInteraction, ThanksInteractionType } from './db_model.js';
1818
import { _ } from '../../utils/pluralize.js';
19-
import { POINT_LIMITER_IN_MINUTES } from '../../env.js';
19+
import { createResponse } from './createResponse.js';
20+
import type { ThanksInteractionType } from './db_model.js';
21+
import { ThanksInteraction } from './db_model.js';
2022

2123
const memoryCache = new Map<string, Message>();
2224

@@ -28,7 +30,7 @@ export async function handleThreadThanks(msg: Message): Promise<void> {
2830

2931
const oldResponseId = [msg.author.id, msg.channel.id].join('|');
3032
if (memoryCache.has(oldResponseId)) {
31-
await memoryCache.get(oldResponseId).delete().catch(e => console.error("message already deleted")).finally(() => { memoryCache.delete(oldResponseId) });
33+
await memoryCache.get(oldResponseId).delete().catch(error => { console.error("message already deleted"); }).finally(() => { memoryCache.delete(oldResponseId) });
3234
}
3335
// channel.members.fetch should return a collection
3436
const [members, previousInteractions]: [
@@ -41,7 +43,7 @@ export async function handleThreadThanks(msg: Message): Promise<void> {
4143
ThanksInteraction.find({
4244
thanker: msg.author.id,
4345
createdAt: {
44-
$gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60000,
46+
$gte: Date.now() - Number.parseInt(POINT_LIMITER_IN_MINUTES) * 60_000,
4547
},
4648
}),
4749
]);
@@ -69,7 +71,7 @@ export async function handleThreadThanks(msg: Message): Promise<void> {
6971
const response = await msg.reply({
7072
content: [
7173
"Hey, it looks like you're trying to thank one or many users, but haven't specified who. Who would you like to thank?",
72-
alreadyThanked.length
74+
alreadyThanked.length > 0
7375
? _`There ${_.mapper({ 1: 'is' }, 'are')} **${_.n} user${
7476
_.s
7577
} 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 {
113115
if (!(interaction.isSelectMenu() || interaction.isButton())) {
114116
return;
115117
}
116-
const channel = interaction.channel;
118+
const {channel} = interaction;
117119
const [category, msgId, type, userId] = interaction.customId.split('🤔');
118120

119121
if (category !== 'threadThanks') {
@@ -219,7 +221,7 @@ export function attachThreadClose(client: Client) {
219221

220222
const channel = activeThreads.threads.get(channelId);
221223

222-
if (!channel || channel.archived === true) {
224+
if (!channel || channel.archived) {
223225
interaction.reply({ content: '' });
224226
}
225227

‎src/v2/commands/index.ts

+8-12
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import type {
1111
import { Collection } from 'discord.js';
1212
import { filter } from 'domyno';
1313
import { isEqual } from 'lodash-es';
14+
1415
import type { CommandDataWithHandler } from '../../types';
1516
import { asyncCatch } from '../utils/asyncCatch.js';
16-
1717
import { map, mapʹ } from '../utils/map.js';
1818
import { merge } from '../utils/merge.js';
1919
import { normalizeApplicationCommandData } from '../utils/normalizeCommand.js';
@@ -111,8 +111,8 @@ export const registerCommands = async (client: Client): Promise<void> => {
111111
content: "Couldn't recognize command.",
112112
});
113113
}
114-
} catch (e) {
115-
console.error(e);
114+
} catch (error) {
115+
console.error(error);
116116
await interaction.reply({
117117
ephemeral: true,
118118
content: 'Something went wrong when trying to execute the command',
@@ -123,13 +123,13 @@ export const registerCommands = async (client: Client): Promise<void> => {
123123

124124
for (const { onAttach } of applicationCommands.values()) {
125125
// We're attaching these so it's fine
126-
// eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
126+
127127
onAttach?.(client);
128128
}
129129

130130
for (const { onAttach } of guildCommands.values()) {
131131
// We're attaching these so it's fine
132-
// eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
132+
133133
onAttach?.(client);
134134
}
135135

@@ -139,8 +139,8 @@ export const registerCommands = async (client: Client): Promise<void> => {
139139
guild = await oauth2Guild.fetch();
140140
const cmds = await (guild as Guild).commands.fetch();
141141
await addCommands(cmds, guildCommands, (guild as Guild).commands);
142-
} catch (e) {
143-
console.error(`Failed to add commands to guild: ${guild.name}`, e);
142+
} catch (error) {
143+
console.error(`Failed to add commands to guild: ${guild.name}`, error);
144144
}
145145
}
146146
console.log('Guild specific commands added');
@@ -219,11 +219,7 @@ async function addCommands(
219219

220220
function getDestination(
221221
commandManager:
222-
| ApplicationCommandManager<
223-
ApplicationCommand<{ guild: GuildResolvable }>,
224-
{ guild: GuildResolvable },
225-
null
226-
>
222+
| ApplicationCommandManager
227223
| GuildApplicationCommandManager
228224
) {
229225
return 'guild' in commandManager

‎src/v2/commands/mdn/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable unicorn/prefer-query-selector */
1+
22
import type {
33
ButtonInteraction,
44
Client,

‎src/v2/commands/npm/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { User } from '@sentry/types';
1+
import type { User } from '@sentry/types';
22
import { formatDistanceToNow } from 'date-fns';
33
import type {
44
EmbedField,

‎src/v2/commands/please/handlers/format/exampleFns.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function formatFn(fn: Function) {
44
return fn
55
.toString()
66
.split(LINE_SEPARATOR)
7-
.map(line => '> ' + line)
7+
.map(line => `> ${ line}`)
88
.join(LINE_SEPARATOR);
99
}
1010

‎src/v2/commands/points/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ const handleDecayRequest = async (interaction: CommandInteraction) => {
133133
const { diff } = getTimeDiffToDecay();
134134
const timer = Number.parseInt(POINT_DECAY_TIMER);
135135

136-
let [hours, minutes]: Array<string | number> = (timer - diff)
136+
let [hours, minutes]: (string | number)[] = (timer - diff)
137137
.toString()
138138
.split('.');
139139

‎src/v2/commands/post/env.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
22
IS_PROD,
3-
MOD_CHANNEL,
4-
JOB_POSTINGS_CHANNEL,
5-
MINIMAL_COMPENSATION,
3+
4+
5+
66
POST_LIMITER_IN_HOURS, // Used for informing the user about the limiter
77
AWAIT_MESSAGE_TIMEOUT as AMT, // Renamed for shadowing
88
MINIMAL_AMOUNT_OF_WORDS as MAOW, // Renamed for shadowing as well
@@ -20,11 +20,13 @@ const POST_LIMITER = IS_PROD
2020
const MINIMAL_AMOUNT_OF_WORDS = Number.parseInt(MAOW);
2121

2222
export {
23-
MOD_CHANNEL,
24-
JOB_POSTINGS_CHANNEL,
25-
MINIMAL_COMPENSATION,
23+
24+
25+
2626
MINIMAL_AMOUNT_OF_WORDS,
2727
POST_LIMITER,
28-
POST_LIMITER_IN_HOURS,
28+
2929
AWAIT_MESSAGE_TIMEOUT,
3030
};
31+
32+
export {MOD_CHANNEL, JOB_POSTINGS_CHANNEL, MINIMAL_COMPENSATION, POST_LIMITER_IN_HOURS} from '../../env.js';

‎src/v2/commands/post/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable no-await-in-loop */
1+
22
import type {
33
Message,
44
CollectorFilter,
@@ -17,8 +17,10 @@ import {
1717
import { filter } from 'domyno';
1818

1919
import type { CommandDataWithHandler } from '../../../types';
20+
import { SERVER_ID } from '../../env.js';
2021
import { cache } from '../../spam_filter/index.js';
2122
import { MultistepForm } from '../../utils/MultistepForm.js';
23+
import { asyncCatch } from '../../utils/asyncCatch.js';
2224
import { createEmbed, createMarkdownCodeBlock } from '../../utils/discordTools.js';
2325
import { map } from '../../utils/map.js';
2426
import { pipe } from '../../utils/pipe.js';
@@ -30,8 +32,6 @@ import {
3032
POST_LIMITER_IN_HOURS,
3133
} from './env.js';
3234
import { questions } from './questions.v2.js';
33-
import { asyncCatch } from '../../utils/asyncCatch.js';
34-
import { SERVER_ID } from '../../env.js';
3535

3636
const dateFormatter = new Intl.DateTimeFormat('en-US', {
3737
month: 'long',

‎src/v2/commands/post/questions.v2.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const isNotTooLong = length => (str:string) => {
1717
const and = <T,K>(...fns:((input:T) => K)[]) => (input:T):K | true=> {
1818
for (const fn of fns) {
1919
const item: unknown = fn(input)
20-
if(item !== true) return item as K
20+
if(item !== true) {return item as K}
2121
}
2222
return true
2323
}

0 commit comments

Comments
 (0)