From 21b52a99a0bc29a3bb04d3a7f6a9aa1f6a91e8fc Mon Sep 17 00:00:00 2001 From: Max Leiter Date: Tue, 31 May 2022 12:54:21 -0700 Subject: [PATCH] linting --- client/components/Username.vue | 1 + client/js/commands/collapse.ts | 4 ++-- client/js/helpers/ircmessageparser/cleanIrcMessage.ts | 1 - client/js/helpers/ircmessageparser/findLinks.ts | 8 ++++---- client/js/socket-events/setting.ts | 10 +++++----- src/command-line/start.ts | 4 +++- src/command-line/users/add.ts | 1 + src/plugins/messageStorage/text.ts | 3 ++- src/types/modules/irc-framework.d.ts | 2 ++ src/types/socket-events.d.ts | 4 ++++ test/fixtures/.thelounge/sts-policies.json | 2 +- 11 files changed, 25 insertions(+), 15 deletions(-) diff --git a/client/components/Username.vue b/client/components/Username.vue index 65742192..8dce43e8 100644 --- a/client/components/Username.vue +++ b/client/components/Username.vue @@ -53,6 +53,7 @@ export default defineComponent({ const hover = () => { if (props.onHover) { + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return props.onHover(props.user as UserInMessage); } diff --git a/client/js/commands/collapse.ts b/client/js/commands/collapse.ts index 501a10d1..bce6e480 100644 --- a/client/js/commands/collapse.ts +++ b/client/js/commands/collapse.ts @@ -2,9 +2,9 @@ import socket from "../socket"; import {store} from "../store"; function input() { - const messageIds = []; + const messageIds: number[] = []; - for (const message of store.state.activeChannel?.channel.messages) { + for (const message of store.state.activeChannel.channel.messages) { let toggled = false; for (const preview of message.previews) { diff --git a/client/js/helpers/ircmessageparser/cleanIrcMessage.ts b/client/js/helpers/ircmessageparser/cleanIrcMessage.ts index 3b79d2b8..7e4fdf35 100644 --- a/client/js/helpers/ircmessageparser/cleanIrcMessage.ts +++ b/client/js/helpers/ircmessageparser/cleanIrcMessage.ts @@ -1,5 +1,4 @@ const matchFormatting = - // eslint-disable-next-line no-control-regex /\x02|\x1D|\x1F|\x16|\x0F|\x11|\x1E|\x03(?:[0-9]{1,2}(?:,[0-9]{1,2})?)?|\x04(?:[0-9a-f]{6}(?:,[0-9a-f]{6})?)?/gi; export default (message: string) => message.replace(matchFormatting, "").trim(); diff --git a/client/js/helpers/ircmessageparser/findLinks.ts b/client/js/helpers/ircmessageparser/findLinks.ts index 95f94029..3758eaec 100644 --- a/client/js/helpers/ircmessageparser/findLinks.ts +++ b/client/js/helpers/ircmessageparser/findLinks.ts @@ -1,6 +1,10 @@ import LinkifyIt, {Match} from "linkify-it"; import {Part} from "./merge"; +export type LinkPart = Part & { + link: string; +}; + type OurMatch = Match & { noschema?: boolean; }; @@ -78,8 +82,4 @@ function returnUrl(url: OurMatch): LinkPart { }; } -export type LinkPart = Part & { - link: string; -}; - export {findLinks, findLinksWithSchema}; diff --git a/client/js/socket-events/setting.ts b/client/js/socket-events/setting.ts index debb86fa..7f217d5a 100644 --- a/client/js/socket-events/setting.ts +++ b/client/js/socket-events/setting.ts @@ -1,22 +1,22 @@ import socket from "../socket"; import {store} from "../store"; -socket.on("setting:new", function (data) { +socket.on("setting:new", async function (data) { const name = data.name; const value = data.value; - store.dispatch("settings/update", {name, value, sync: false}); + await store.dispatch("settings/update", {name, value, sync: false}); }); -socket.on("setting:all", function (settings) { +socket.on("setting:all", async function (settings) { const serverHasSettings = Object.keys(settings).length > 0; store.commit("serverHasSettings", serverHasSettings); if (serverHasSettings) { for (const name in settings) { - store.dispatch("settings/update", {name, value: settings[name], sync: false}); + await store.dispatch("settings/update", {name, value: settings[name], sync: false}); } } else { - store.dispatch("settings/syncAll"); + await store.dispatch("settings/syncAll"); } }); diff --git a/src/command-line/start.ts b/src/command-line/start.ts index b3f4302d..1cc852c4 100644 --- a/src/command-line/start.ts +++ b/src/command-line/start.ts @@ -15,7 +15,9 @@ program .action(function (options) { initalizeConfig(); - const server = require("../server"); + const newLocal = "../server"; + // eslint-disable-next-line @typescript-eslint/no-var-requires + const server = require(newLocal); server.default(options); }); diff --git a/src/command-line/users/add.ts b/src/command-line/users/add.ts index 794f9a56..813c29cb 100644 --- a/src/command-line/users/add.ts +++ b/src/command-line/users/add.ts @@ -19,6 +19,7 @@ program return; } + // eslint-disable-next-line @typescript-eslint/no-var-requires const ClientManager = require("../../clientManager"); const manager = new ClientManager(); const users = manager.getUsers(); diff --git a/src/plugins/messageStorage/text.ts b/src/plugins/messageStorage/text.ts index b2199ca9..d8c10415 100644 --- a/src/plugins/messageStorage/text.ts +++ b/src/plugins/messageStorage/text.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/restrict-template-expressions */ import fs from "fs"; import path from "path"; import filenamify from "filenamify"; @@ -162,7 +163,7 @@ class TextFileMessageStorage implements MessageStorage { export default TextFileMessageStorage; -function cleanFilename(name) { +function cleanFilename(name: string) { name = filenamify(name, {replacement: "_"}); name = name.toLowerCase(); diff --git a/src/types/modules/irc-framework.d.ts b/src/types/modules/irc-framework.d.ts index 7ad80617..3d5ca447 100644 --- a/src/types/modules/irc-framework.d.ts +++ b/src/types/modules/irc-framework.d.ts @@ -1,4 +1,6 @@ // @ts-nocheck +// @eslint-disable + // https://raw.githubusercontent.com/eternagame/HTML-Chat/vue-rewrite/src/app/types/modules/irc-framework/irc-framework.d.ts // TODO: Fix this declare module "irc-framework" { diff --git a/src/types/socket-events.d.ts b/src/types/socket-events.d.ts index 92004b43..647da190 100644 --- a/src/types/socket-events.d.ts +++ b/src/types/socket-events.d.ts @@ -36,6 +36,10 @@ interface ServerToClientEvents { "mentions:list": (data: Mention[]) => void; + "setting:new": ({name: string, value: any}) => void; + + "setting:all": (settings: {[key: string]: any}) => void; + more: ({ chan, messages, diff --git a/test/fixtures/.thelounge/sts-policies.json b/test/fixtures/.thelounge/sts-policies.json index c94dff48..505bccba 100644 --- a/test/fixtures/.thelounge/sts-policies.json +++ b/test/fixtures/.thelounge/sts-policies.json @@ -3,6 +3,6 @@ "host": "irc.example.com", "port": 7000, "duration": 3600, - "expires": 1654029411770 + "expires": 1654030206992 } ]