diff --git a/.eslintignore b/.eslintignore
index 1f2ae53f..f47503b7 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,3 @@
 public/
 coverage/
+src/dist/
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index b6cf89e4..6249e49a 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,3 +1,5 @@
+const projects = ["./tsconfig.json", "./client/tsconfig.json", "./src/tsconfig.json"];
+
 module.exports = {
 	root: true,
 	overrides: [
@@ -10,7 +12,8 @@ module.exports = {
 			parserOptions: {
 				tsconfigRootDir: __dirname,
 				project: ["./tsconfig.json", "./client/tsconfig.json", "./src/tsconfig.json"],
-				// extraFileExtensions: [".vue"],
+				extraFileExtensions: [".vue"],
+				projects: projects,
 			},
 			plugins: ["@typescript-eslint"],
 			extends: [
@@ -58,7 +61,7 @@ module.exports = {
 					"<template>": "espree",
 				},
 				tsconfigRootDir: __dirname,
-				project: ["./tsconfig.json", "./client/tsconfig.json", "./src/tsconfig.json"],
+				project: projects,
 			},
 			plugins: ["vue"],
 			extends: [
diff --git a/.prettierignore b/.prettierignore
index aa316e17..3f173ad3 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,7 +3,7 @@ public/
 test/fixtures/.thelounge/logs/
 test/fixtures/.thelounge/certificates/
 test/fixtures/.thelounge/storage/
-
+src/dist/
 *.log
 *.png
 *.svg
diff --git a/babel.config.cjs b/babel.config.cjs
index bf1687cc..ccd80266 100644
--- a/babel.config.cjs
+++ b/babel.config.cjs
@@ -6,5 +6,4 @@ module.exports = {
 		// "@vue/babel-preset-jsx",
 	],
 	targets: "> 0.25%, not dead",
-	// plugins: [["@babel/transform-typescript", {allowNamespaces: true}]],
 };
diff --git a/client/components/MessageTypes/index.js b/client/components/MessageTypes/index.ts
similarity index 84%
rename from client/components/MessageTypes/index.js
rename to client/components/MessageTypes/index.ts
index 4d873bd6..1c03f86f 100644
--- a/client/components/MessageTypes/index.js
+++ b/client/components/MessageTypes/index.ts
@@ -6,7 +6,7 @@
 // Second argument says it's recursive, third makes sure we only load templates.
 const requireViews = require.context(".", false, /\.vue$/);
 
-export default requireViews.keys().reduce((acc, path) => {
+export default requireViews.keys().reduce((acc: Record<string, any>, path) => {
 	acc["message-" + path.substring(2, path.length - 4)] = requireViews(path).default;
 
 	return acc;
diff --git a/client/components/NetworkList.vue b/client/components/NetworkList.vue
index 4cd2fe11..67efc352 100644
--- a/client/components/NetworkList.vue
+++ b/client/components/NetworkList.vue
@@ -195,7 +195,7 @@
 }
 </style>
 
-<script>
+<script lang="ts">
 import Mousetrap from "mousetrap";
 import Draggable from "vuedraggable";
 import {filter as fuzzyFilter} from "fuzzy";
@@ -209,6 +209,9 @@ import isIgnoredKeybind from "../js/helpers/isIgnoredKeybind";
 import distance from "../js/helpers/distance";
 import eventbus from "../js/eventbus";
 
+import NetworkModel from "../../src/models/network";
+import ChannelMode from "../../src/models/chan";
+
 export default {
 	name: "NetworkList",
 	components: {
diff --git a/client/js/auth.ts b/client/js/auth.ts
index 308031fd..5a764f86 100644
--- a/client/js/auth.ts
+++ b/client/js/auth.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import storage from "./localStorage";
 import location from "./location";
 
diff --git a/client/js/autocompletion.ts b/client/js/autocompletion.ts
index ad04d530..d67a3743 100644
--- a/client/js/autocompletion.ts
+++ b/client/js/autocompletion.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import constants from "./constants";
 
 import Mousetrap from "mousetrap";
diff --git a/client/js/clipboard.ts b/client/js/clipboard.ts
index fccf31b8..460738f0 100644
--- a/client/js/clipboard.ts
+++ b/client/js/clipboard.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 export default function (chat) {
 	// Disable in Firefox as it already copies flex text correctly
 	if (typeof window.InstallTrigger !== "undefined") {
diff --git a/client/js/commands/collapse.ts b/client/js/commands/collapse.ts
index e8b4a7b8..7c8cf6d7 100644
--- a/client/js/commands/collapse.ts
+++ b/client/js/commands/collapse.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/commands/expand.ts b/client/js/commands/expand.ts
index 8922a9ca..6942d795 100644
--- a/client/js/commands/expand.ts
+++ b/client/js/commands/expand.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/commands/index.ts b/client/js/commands/index.ts
index 554c7ab0..05dbafda 100644
--- a/client/js/commands/index.ts
+++ b/client/js/commands/index.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // Taken from views/index.js
 
 // This creates a version of `require()` in the context of the current
diff --git a/client/js/commands/join.ts b/client/js/commands/join.ts
index dd62994e..c35df24f 100644
--- a/client/js/commands/join.ts
+++ b/client/js/commands/join.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";
diff --git a/client/js/commands/search.ts b/client/js/commands/search.ts
index f02deb3b..e21f14b9 100644
--- a/client/js/commands/search.ts
+++ b/client/js/commands/search.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import store from "../store";
 import {router} from "../router";
 
diff --git a/client/js/constants.ts b/client/js/constants.ts
index 19ed2188..ccbb4465 100644
--- a/client/js/constants.ts
+++ b/client/js/constants.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 const colorCodeMap = [
 	["00", "White"],
 	["01", "Black"],
diff --git a/client/js/eventbus.ts b/client/js/eventbus.ts
index dade7851..7b59eda1 100644
--- a/client/js/eventbus.ts
+++ b/client/js/eventbus.ts
@@ -3,11 +3,8 @@ const events = new Map();
 class EventBus {
 	/**
 	 * Register an event handler for the given type.
-	 *
-	 * @param  {String} type    Type of event to listen for.
-	 * @param  {Function} handler Function to call in response to given event.
 	 */
-	on(type, handler) {
+	on(type: string, handler: Function) {
 		if (events.has(type)) {
 			events.get(type).push(handler);
 		} else {
@@ -21,11 +18,11 @@ class EventBus {
 	 * @param  {String} type    Type of event to unregister `handler` from.
 	 * @param  {Function} handler Handler function to remove.
 	 */
-	off(type, handler) {
+	off(type: string, handler: Function) {
 		if (events.has(type)) {
 			events.set(
 				type,
-				events.get(type).filter((item) => item !== handler)
+				events.get(type).filter((item: Function) => item !== handler)
 			);
 		}
 	}
@@ -36,12 +33,12 @@ class EventBus {
 	 * @param {String} type  The event type to invoke.
 	 * @param {Any} [evt]  Any value (object is recommended and powerful), passed to each handler.
 	 */
-	emit(type, ...evt) {
+	emit(type: string, ...evt: any) {
 		if (events.has(type)) {
 			events
 				.get(type)
 				.slice()
-				.map((handler) => {
+				.map((handler: (...evt: any[]) => void) => {
 					handler(...evt);
 				});
 		}
diff --git a/client/js/helpers/collapseNetwork.ts b/client/js/helpers/collapseNetwork.ts
index 4fe31420..dd598e92 100644
--- a/client/js/helpers/collapseNetwork.ts
+++ b/client/js/helpers/collapseNetwork.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import storage from "../localStorage";
 
 export default (network, isCollapsed) => {
diff --git a/client/js/helpers/colorClass.ts b/client/js/helpers/colorClass.ts
index c327c0e3..9cd4dbf4 100644
--- a/client/js/helpers/colorClass.ts
+++ b/client/js/helpers/colorClass.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // Generates a string from "color-1" to "color-32" based on an input string
 export default (str) => {
 	let hash = 0;
diff --git a/client/js/helpers/contextMenu.ts b/client/js/helpers/contextMenu.ts
index 6e5b229d..637267fc 100644
--- a/client/js/helpers/contextMenu.ts
+++ b/client/js/helpers/contextMenu.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import eventbus from "../eventbus";
 
diff --git a/client/js/helpers/friendlysize.ts b/client/js/helpers/friendlysize.ts
index b3634276..d29ba73f 100644
--- a/client/js/helpers/friendlysize.ts
+++ b/client/js/helpers/friendlysize.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 const sizes = ["Bytes", "KiB", "MiB", "GiB", "TiB", "PiB"];
 
 export default (size: number) => {
diff --git a/client/js/helpers/ircmessageparser/anyIntersection.ts b/client/js/helpers/ircmessageparser/anyIntersection.ts
index 4307c1a2..8d773ae7 100644
--- a/client/js/helpers/ircmessageparser/anyIntersection.ts
+++ b/client/js/helpers/ircmessageparser/anyIntersection.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {ParsedStyle} from "./parseStyle";
 
 // Return true if any section of "a" or "b" parts (defined by their start/end
diff --git a/client/js/helpers/ircmessageparser/cleanIrcMessage.ts b/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
index 68f4aa03..7e4fdf35 100644
--- a/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
+++ b/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 const matchFormatting =
 	/\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;
 
diff --git a/client/js/helpers/ircmessageparser/fill.ts b/client/js/helpers/ircmessageparser/fill.ts
index b9dcd5e4..a36262ac 100644
--- a/client/js/helpers/ircmessageparser/fill.ts
+++ b/client/js/helpers/ircmessageparser/fill.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {ParsedStyle} from "./parseStyle";
 
 // Create plain text entries corresponding to areas of the text that match no
diff --git a/client/js/helpers/ircmessageparser/findChannels.ts b/client/js/helpers/ircmessageparser/findChannels.ts
index 044dfcb9..809863d6 100644
--- a/client/js/helpers/ircmessageparser/findChannels.ts
+++ b/client/js/helpers/ircmessageparser/findChannels.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // Escapes the RegExp special characters "^", "$", "", ".", "*", "+", "?", "(",
 // ")", "[", "]", "{", "}", and "|" in string.
 // See https://lodash.com/docs/#escapeRegExp
diff --git a/client/js/helpers/ircmessageparser/findEmoji.ts b/client/js/helpers/ircmessageparser/findEmoji.ts
index 4559c96f..14e8caa9 100644
--- a/client/js/helpers/ircmessageparser/findEmoji.ts
+++ b/client/js/helpers/ircmessageparser/findEmoji.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 const emojiRegExp = require("emoji-regex")();
 
 function findEmoji(text) {
diff --git a/client/js/helpers/ircmessageparser/findLinks.ts b/client/js/helpers/ircmessageparser/findLinks.ts
index 3a6ddf79..9adb0627 100644
--- a/client/js/helpers/ircmessageparser/findLinks.ts
+++ b/client/js/helpers/ircmessageparser/findLinks.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import LinkifyIt, {Match} from "linkify-it";
 
 type OurMatch = Match & {
diff --git a/client/js/helpers/ircmessageparser/findNames.ts b/client/js/helpers/ircmessageparser/findNames.ts
index 58fee254..5c683150 100644
--- a/client/js/helpers/ircmessageparser/findNames.ts
+++ b/client/js/helpers/ircmessageparser/findNames.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 const nickRegExp = /([\w[\]\\`^{|}-]+)/g;
 
 function findNames(text, users) {
diff --git a/client/js/helpers/ircmessageparser/merge.ts b/client/js/helpers/ircmessageparser/merge.ts
index 5d22930b..8f83763a 100644
--- a/client/js/helpers/ircmessageparser/merge.ts
+++ b/client/js/helpers/ircmessageparser/merge.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import anyIntersection from "./anyIntersection";
 import fill from "./fill";
 
diff --git a/client/js/helpers/ircmessageparser/parseStyle.ts b/client/js/helpers/ircmessageparser/parseStyle.ts
index 9848739c..ea4d4bd3 100644
--- a/client/js/helpers/ircmessageparser/parseStyle.ts
+++ b/client/js/helpers/ircmessageparser/parseStyle.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // Styling control codes
 const BOLD = "\x02";
 const COLOR = "\x03";
diff --git a/client/js/helpers/isChannelCollapsed.ts b/client/js/helpers/isChannelCollapsed.ts
index 5c49da1b..412dd173 100644
--- a/client/js/helpers/isChannelCollapsed.ts
+++ b/client/js/helpers/isChannelCollapsed.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import store from "../store";
 
 export default (network, channel) => {
diff --git a/client/js/helpers/isIgnoredKeybind.ts b/client/js/helpers/isIgnoredKeybind.ts
index e259b7cd..0f0ab513 100644
--- a/client/js/helpers/isIgnoredKeybind.ts
+++ b/client/js/helpers/isIgnoredKeybind.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 export default (event: MouseEvent | Mousetrap.ExtendedKeyboardEvent) => {
 	if (
 		(event.target as HTMLElement).tagName !== "TEXTAREA" &&
diff --git a/client/js/helpers/listenForTwoFingerSwipes.ts b/client/js/helpers/listenForTwoFingerSwipes.ts
index cc9b4976..de920e21 100644
--- a/client/js/helpers/listenForTwoFingerSwipes.ts
+++ b/client/js/helpers/listenForTwoFingerSwipes.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import distance from "./distance";
 
 // onTwoFingerSwipe will be called with a cardinal direction ("n", "e", "s" or
diff --git a/client/js/helpers/localetime.ts b/client/js/helpers/localetime.ts
index c13f172b..91924f93 100644
--- a/client/js/helpers/localetime.ts
+++ b/client/js/helpers/localetime.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import dayjs from "dayjs";
 
 export default (time: Date | number) => dayjs(time).format("D MMMM YYYY, HH:mm:ss");
diff --git a/client/js/helpers/parse.ts b/client/js/helpers/parse.ts
index 675dd0b0..c604c570 100644
--- a/client/js/helpers/parse.ts
+++ b/client/js/helpers/parse.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import parseStyle from "./ircmessageparser/parseStyle";
 import findChannels from "./ircmessageparser/findChannels";
 import {findLinks} from "./ircmessageparser/findLinks";
diff --git a/client/js/helpers/parseIrcUri.ts b/client/js/helpers/parseIrcUri.ts
index 9ed09073..8066651c 100644
--- a/client/js/helpers/parseIrcUri.ts
+++ b/client/js/helpers/parseIrcUri.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 export default (stringUri) => {
 	const data = {};
 
diff --git a/client/js/helpers/roundBadgeNumber.ts b/client/js/helpers/roundBadgeNumber.ts
index 77cdb6e5..74a777f7 100644
--- a/client/js/helpers/roundBadgeNumber.ts
+++ b/client/js/helpers/roundBadgeNumber.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 export default (count) => {
 	if (count < 1000) {
 		return count.toString();
diff --git a/client/js/keybinds.ts b/client/js/keybinds.ts
index 2fbb3311..e2c7c174 100644
--- a/client/js/keybinds.ts
+++ b/client/js/keybinds.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Mousetrap from "mousetrap";
 
 import store from "./store";
diff --git a/client/js/loading-error-handlers.js b/client/js/loading-error-handlers.js
index b85b41ae..6e82e69d 100644
--- a/client/js/loading-error-handlers.js
+++ b/client/js/loading-error-handlers.js
@@ -10,11 +10,12 @@
 
 (function () {
 	const msg = document.getElementById("loading-page-message");
-	msg.textContent = "Loading the app…";
 
-	document
-		.getElementById("loading-reload")
-		.addEventListener("click", () => location.reload(true));
+	if (msg) {
+		msg.textContent = "Loading the app…";
+	}
+
+	document.getElementById("loading-reload")?.addEventListener("click", () => location.reload());
 
 	const displayReload = () => {
 		const loadingReload = document.getElementById("loading-reload");
@@ -26,7 +27,11 @@
 
 	const loadingSlowTimeout = setTimeout(() => {
 		const loadingSlow = document.getElementById("loading-slow");
-		loadingSlow.style.visibility = "visible";
+
+		if (loadingSlow) {
+			loadingSlow.style.visibility = "visible";
+		}
+
 		displayReload();
 	}, 5000);
 
diff --git a/client/js/localStorage.ts b/client/js/localStorage.ts
index 0e94b981..07984740 100644
--- a/client/js/localStorage.ts
+++ b/client/js/localStorage.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // This is a simple localStorage wrapper because browser can throw errors
 // in different situations, including:
 // - Unable to store data if storage is full
diff --git a/client/js/location.ts b/client/js/location.ts
index cf490ee5..7b2faaf0 100644
--- a/client/js/location.ts
+++ b/client/js/location.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // This is a thin wrapper around `window.location`, in order to contain the
 // side-effects. Do not add logic to it as it cannot be tested, only mocked.
 export default {
diff --git a/client/js/router.ts b/client/js/router.ts
index c4dcaa37..db811faa 100644
--- a/client/js/router.ts
+++ b/client/js/router.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import constants from "./constants";
 
 import Vue from "vue";
diff --git a/client/js/socket-events/auth.ts b/client/js/socket-events/auth.ts
index 58bbb46c..0d0037dd 100644
--- a/client/js/socket-events/auth.ts
+++ b/client/js/socket-events/auth.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import storage from "../localStorage";
 import {router, navigate} from "../router";
diff --git a/client/js/socket-events/changelog.ts b/client/js/socket-events/changelog.ts
index 30195451..6ea016f1 100644
--- a/client/js/socket-events/changelog.ts
+++ b/client/js/socket-events/changelog.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/configuration.ts b/client/js/socket-events/configuration.ts
index 88417978..8cd3a04d 100644
--- a/client/js/socket-events/configuration.ts
+++ b/client/js/socket-events/configuration.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import upload from "../upload";
 import store from "../store";
diff --git a/client/js/socket-events/history_clear.ts b/client/js/socket-events/history_clear.ts
index 0f212a93..e391c9a8 100644
--- a/client/js/socket-events/history_clear.ts
+++ b/client/js/socket-events/history_clear.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/index.ts b/client/js/socket-events/index.ts
index 5f4f5624..f3ef8dd2 100644
--- a/client/js/socket-events/index.ts
+++ b/client/js/socket-events/index.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import "./connection";
 import "./auth";
 import "./commands";
diff --git a/client/js/socket-events/init.ts b/client/js/socket-events/init.ts
index fd0451d9..79d5d38a 100644
--- a/client/js/socket-events/init.ts
+++ b/client/js/socket-events/init.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 import socket from "../socket";
 import storage from "../localStorage";
diff --git a/client/js/socket-events/join.ts b/client/js/socket-events/join.ts
index f7159dcb..98da6a61 100644
--- a/client/js/socket-events/join.ts
+++ b/client/js/socket-events/join.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";
diff --git a/client/js/socket-events/mentions.ts b/client/js/socket-events/mentions.ts
index b70ade0b..e8f7a56e 100644
--- a/client/js/socket-events/mentions.ts
+++ b/client/js/socket-events/mentions.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/more.ts b/client/js/socket-events/more.ts
index 34abf2c5..b56ef7ea 100644
--- a/client/js/socket-events/more.ts
+++ b/client/js/socket-events/more.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 
 import socket from "../socket";
diff --git a/client/js/socket-events/msg.ts b/client/js/socket-events/msg.ts
index cbcfd650..d8fa06a3 100644
--- a/client/js/socket-events/msg.ts
+++ b/client/js/socket-events/msg.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import cleanIrcMessage from "../helpers/ircmessageparser/cleanIrcMessage";
 import store from "../store";
diff --git a/client/js/socket-events/msg_preview.ts b/client/js/socket-events/msg_preview.ts
index 310dcd51..182a2e08 100644
--- a/client/js/socket-events/msg_preview.ts
+++ b/client/js/socket-events/msg_preview.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 
 import socket from "../socket";
diff --git a/client/js/socket-events/msg_special.ts b/client/js/socket-events/msg_special.ts
index b0d15692..fa94414b 100644
--- a/client/js/socket-events/msg_special.ts
+++ b/client/js/socket-events/msg_special.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";
diff --git a/client/js/socket-events/names.ts b/client/js/socket-events/names.ts
index bfd1c6c4..3cf0ac60 100644
--- a/client/js/socket-events/names.ts
+++ b/client/js/socket-events/names.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/network.ts b/client/js/socket-events/network.ts
index 9f248657..eabc632a 100644
--- a/client/js/socket-events/network.ts
+++ b/client/js/socket-events/network.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Vue from "vue";
 
 import socket from "../socket";
diff --git a/client/js/socket-events/nick.ts b/client/js/socket-events/nick.ts
index 08211451..fd05b5e5 100644
--- a/client/js/socket-events/nick.ts
+++ b/client/js/socket-events/nick.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/open.ts b/client/js/socket-events/open.ts
index 18bcf24c..40d15030 100644
--- a/client/js/socket-events/open.ts
+++ b/client/js/socket-events/open.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/part.ts b/client/js/socket-events/part.ts
index 7706f41c..c2f15a4f 100644
--- a/client/js/socket-events/part.ts
+++ b/client/js/socket-events/part.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 import {switchToChannel} from "../router";
diff --git a/client/js/socket-events/quit.ts b/client/js/socket-events/quit.ts
index ed3da8d4..22f2cc26 100644
--- a/client/js/socket-events/quit.ts
+++ b/client/js/socket-events/quit.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import {switchToChannel, navigate} from "../router";
 import store from "../store";
diff --git a/client/js/socket-events/sessions_list.ts b/client/js/socket-events/sessions_list.ts
index 98cf777f..b8e94d94 100644
--- a/client/js/socket-events/sessions_list.ts
+++ b/client/js/socket-events/sessions_list.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/setting.ts b/client/js/socket-events/setting.ts
index 62ae6735..cfce1703 100644
--- a/client/js/socket-events/setting.ts
+++ b/client/js/socket-events/setting.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/sign_out.ts b/client/js/socket-events/sign_out.ts
index be37cef4..0588e4f8 100644
--- a/client/js/socket-events/sign_out.ts
+++ b/client/js/socket-events/sign_out.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import Auth from "../auth";
 
diff --git a/client/js/socket-events/sync_sort.ts b/client/js/socket-events/sync_sort.ts
index abb0a256..26f315da 100644
--- a/client/js/socket-events/sync_sort.ts
+++ b/client/js/socket-events/sync_sort.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/topic.ts b/client/js/socket-events/topic.ts
index f14dcee5..c566b19f 100644
--- a/client/js/socket-events/topic.ts
+++ b/client/js/socket-events/topic.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket-events/users.ts b/client/js/socket-events/users.ts
index 3d040f1f..d3c0d8a1 100644
--- a/client/js/socket-events/users.ts
+++ b/client/js/socket-events/users.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "../socket";
 import store from "../store";
 
diff --git a/client/js/socket.ts b/client/js/socket.ts
index 509ba31f..7c6068ed 100644
--- a/client/js/socket.ts
+++ b/client/js/socket.ts
@@ -1,9 +1,7 @@
-"use strict";
-
-import io from "socket.io-client";
+import io, {Socket} from "socket.io-client";
 
 const socket = io({
-	transports: JSON.parse(document.body.dataset.transports),
+	transports: JSON.parse(document.body.dataset.transports || "['polling', 'websocket']"),
 	path: window.location.pathname + "socket.io/",
 	autoConnect: false,
 	reconnection: !document.body.classList.contains("public"),
@@ -14,4 +12,10 @@ if (process.env.NODE_ENV === "development") {
 	window.socket = socket;
 }
 
+declare global {
+	interface Window {
+		socket: Socket;
+	}
+}
+
 export default socket;
diff --git a/client/js/upload.ts b/client/js/upload.ts
index 2b42ed73..eb67dfde 100644
--- a/client/js/upload.ts
+++ b/client/js/upload.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {update as updateCursor} from "undate";
 
 import socket from "./socket";
diff --git a/client/js/vue.ts b/client/js/vue.ts
index 83b96cbf..9713ef22 100644
--- a/client/js/vue.ts
+++ b/client/js/vue.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import constants from "./constants";
 
 import "../css/style.css";
diff --git a/client/js/webpush.ts b/client/js/webpush.ts
index 6f3f8ab7..41532bcc 100644
--- a/client/js/webpush.ts
+++ b/client/js/webpush.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import socket from "./socket";
 import store from "./store";
 
diff --git a/package.json b/package.json
index 445a9ff6..7dcac93a 100644
--- a/package.json
+++ b/package.json
@@ -19,13 +19,13 @@
     "dev": "NODE_ENV=development ts-node --project src/tsconfig.json src/index.ts start --dev",
     "format:prettier": "prettier --write \"**/*.*\"",
     "lint:check-eslint": "eslint-config-prettier .eslintrc.cjs",
-    "lint:eslint": "eslint . --report-unused-disable-directives --color",
+    "lint:eslint": "eslint . --ext .js,.ts,.vue --report-unused-disable-directives --color",
     "lint:prettier": "prettier --list-different \"**/*.*\"",
     "lint:stylelint": "stylelint --color \"client/**/*.css\"",
     "lint:tsc": "tsc --noEmit",
     "start": "node src/dist/src/index start",
     "test": "run-p --aggregate-output --continue-on-error lint:* test:*",
-    "test:mocha": "webpack --mode=development && nyc --nycrc-path=test/.nycrc-mocha.json mocha --colors --config=test/.mocharc.yml",
+    "test:mocha": "NODE_ENV=test webpack --mode=development && nyc --nycrc-path=test/.nycrc-mocha.json mocha --colors --config=test/.mocharc.yml",
     "watch": "webpack --watch"
   },
   "keywords": [
diff --git a/src/client.ts b/src/client.ts
index 1ddfd287..c45f3c0b 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import UAParser from "ua-parser-js";
 import {v4 as uuidv4} from "uuid";
diff --git a/src/clientManager.ts b/src/clientManager.ts
index 9e6155d8..f52fabed 100644
--- a/src/clientManager.ts
+++ b/src/clientManager.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import colors from "chalk";
 import crypto from "crypto";
diff --git a/src/command-line/index.ts b/src/command-line/index.ts
index 216375c0..b9e65611 100644
--- a/src/command-line/index.ts
+++ b/src/command-line/index.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import fs from "fs";
 import path from "path";
diff --git a/src/command-line/install.ts b/src/command-line/install.ts
index a7077a1f..a04e3d6a 100644
--- a/src/command-line/install.ts
+++ b/src/command-line/install.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import semver from "semver";
diff --git a/src/command-line/outdated.ts b/src/command-line/outdated.ts
index e8ca4906..5da8a30e 100644
--- a/src/command-line/outdated.ts
+++ b/src/command-line/outdated.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {Command} from "commander";
 import Utils from "./utils";
 import packageManager from "../plugins/packages";
diff --git a/src/command-line/start.ts b/src/command-line/start.ts
index c9408ed9..b3f4302d 100644
--- a/src/command-line/start.ts
+++ b/src/command-line/start.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import fs from "fs";
diff --git a/src/command-line/uninstall.ts b/src/command-line/uninstall.ts
index 0cb0d1bf..04c88ca6 100644
--- a/src/command-line/uninstall.ts
+++ b/src/command-line/uninstall.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import {Command} from "commander";
diff --git a/src/command-line/upgrade.ts b/src/command-line/upgrade.ts
index e6cf2948..4852a74f 100644
--- a/src/command-line/upgrade.ts
+++ b/src/command-line/upgrade.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import colors from "chalk";
 import {Command} from "commander";
diff --git a/src/command-line/users/add.ts b/src/command-line/users/add.ts
index 35bcf762..794f9a56 100644
--- a/src/command-line/users/add.ts
+++ b/src/command-line/users/add.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";
diff --git a/src/command-line/users/edit.ts b/src/command-line/users/edit.ts
index 2372b482..59841095 100644
--- a/src/command-line/users/edit.ts
+++ b/src/command-line/users/edit.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import {Command} from "commander";
 import child from "child_process";
diff --git a/src/command-line/users/index.ts b/src/command-line/users/index.ts
index a8643b55..6f46d126 100644
--- a/src/command-line/users/index.ts
+++ b/src/command-line/users/index.ts
@@ -1,17 +1,22 @@
-"use strict";
-
 import config from "../../config";
 import list from "./list";
 import remove from "./remove";
 import edit from "./edit";
+import log from "../../log";
 
 let add, reset;
 
-(async () => {
-	if (config.values.ldap.enable) {
+const importAddAndReest = async (): Promise<void> => {
+	if (!config.values.ldap.enable) {
 		add = (await import("./add")).default;
 		reset = (await import("./reset")).default;
 	}
-})();
+};
+
+(async () => {
+	await importAddAndReest();
+})().catch((e: any) => {
+	log.error("Unable to load plugins all command-line plugins:", e);
+});
 
 export default [list, remove, edit, add, reset];
diff --git a/src/command-line/users/list.ts b/src/command-line/users/list.ts
index f13dadd4..a7941726 100644
--- a/src/command-line/users/list.ts
+++ b/src/command-line/users/list.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";
diff --git a/src/command-line/users/remove.ts b/src/command-line/users/remove.ts
index 60695362..a0d6659c 100644
--- a/src/command-line/users/remove.ts
+++ b/src/command-line/users/remove.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";
diff --git a/src/command-line/users/reset.ts b/src/command-line/users/reset.ts
index de64227b..b95044b8 100644
--- a/src/command-line/users/reset.ts
+++ b/src/command-line/users/reset.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../../log";
 import colors from "chalk";
 import {Command} from "commander";
diff --git a/src/command-line/utils.ts b/src/command-line/utils.ts
index 0def7ff5..f9dfd322 100644
--- a/src/command-line/utils.ts
+++ b/src/command-line/utils.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import log from "../log";
 import colors from "chalk";
diff --git a/src/config.ts b/src/config.ts
index 4b0a3c0b..9ecaf4c9 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import path from "path";
 import fs, {Stats} from "fs";
 import os from "os";
diff --git a/src/helper.ts b/src/helper.ts
index 319715bf..f1e50c09 100644
--- a/src/helper.ts
+++ b/src/helper.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import pkg from "../package.json";
 import _ from "lodash";
 import path from "path";
diff --git a/src/identification.ts b/src/identification.ts
index 4930972a..291feafb 100644
--- a/src/identification.ts
+++ b/src/identification.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "./log";
 import fs from "fs";
 import net, {Socket} from "net";
diff --git a/src/index.ts b/src/index.ts
index 2ac0dea6..6486f63e 100755
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,7 +1,5 @@
 #!/usr/bin/env ts-node
 
-"use strict";
-
 process.chdir(__dirname);
 
 // Perform node version check before loading any other files or modules
diff --git a/src/log.ts b/src/log.ts
index 3808aa29..cff64105 100644
--- a/src/log.ts
+++ b/src/log.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import colors from "chalk";
 import read from "read";
 
diff --git a/src/models/chan.ts b/src/models/chan.ts
index 968aba92..77579e91 100644
--- a/src/models/chan.ts
+++ b/src/models/chan.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import log from "../log";
 import Config from "../config";
diff --git a/src/models/msg.ts b/src/models/msg.ts
index 99a8db88..e239287d 100644
--- a/src/models/msg.ts
+++ b/src/models/msg.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import User from "./user";
 
diff --git a/src/models/network.ts b/src/models/network.ts
index 072b1448..99b42ba2 100644
--- a/src/models/network.ts
+++ b/src/models/network.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import {v4 as uuidv4} from "uuid";
 import IrcFramework, {Client as IRCClient} from "irc-framework";
diff --git a/src/models/prefix.ts b/src/models/prefix.ts
index 263157a8..85445d26 100644
--- a/src/models/prefix.ts
+++ b/src/models/prefix.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 type PrefixSymbol = string;
 
 type PrefixObject = {
diff --git a/src/models/user.ts b/src/models/user.ts
index ee699982..cd6cde8f 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import Prefix from "./prefix";
 
diff --git a/src/plugins/auth.ts b/src/plugins/auth.ts
index e2e9c12b..8c1d2d39 100644
--- a/src/plugins/auth.ts
+++ b/src/plugins/auth.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import colors from "chalk";
 import Client from "../client";
 import ClientManager from "../clientManager";
diff --git a/src/plugins/auth/ldap.ts b/src/plugins/auth/ldap.ts
index e03edeef..4d5c8edc 100644
--- a/src/plugins/auth/ldap.ts
+++ b/src/plugins/auth/ldap.ts
@@ -1,4 +1,3 @@
-"use strict";
 import ldap, {SearchOptions} from "ldapjs";
 import colors from "chalk";
 
diff --git a/src/plugins/auth/local.ts b/src/plugins/auth/local.ts
index ec3f1e07..c061b528 100644
--- a/src/plugins/auth/local.ts
+++ b/src/plugins/auth/local.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import colors from "chalk";
 import log from "../../log";
 import Helper from "../../helper";
diff --git a/src/plugins/changelog.ts b/src/plugins/changelog.ts
index 8909a612..6c6ed069 100644
--- a/src/plugins/changelog.ts
+++ b/src/plugins/changelog.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import got, {Response} from "got";
 import colors from "chalk";
 import log from "../log";
diff --git a/src/plugins/clientCertificate.ts b/src/plugins/clientCertificate.ts
index 7368d868..ec87d21e 100644
--- a/src/plugins/clientCertificate.ts
+++ b/src/plugins/clientCertificate.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import path from "path";
 import fs from "fs";
 import crypto from "crypto";
diff --git a/src/plugins/dev-server.ts b/src/plugins/dev-server.ts
index fdf3e0f7..3aa073c0 100644
--- a/src/plugins/dev-server.ts
+++ b/src/plugins/dev-server.ts
@@ -1,4 +1,3 @@
-"use strict";
 import webpackDevMiddleware from "webpack-dev-middleware";
 import webpackHotMiddleware from "webpack-hot-middleware";
 import express from "express";
diff --git a/src/plugins/inputs/action.ts b/src/plugins/inputs/action.ts
index 22134e93..a85bc28d 100644
--- a/src/plugins/inputs/action.ts
+++ b/src/plugins/inputs/action.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {PluginInputHandler} from "./index";
 import Msg, {MessageType} from "../../models/msg";
 import {ChanType} from "../../models/chan";
diff --git a/src/plugins/inputs/away.ts b/src/plugins/inputs/away.ts
index ad5cc46d..c9e3b398 100644
--- a/src/plugins/inputs/away.ts
+++ b/src/plugins/inputs/away.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 const commands = ["away", "back"];
 import {PluginInputHandler} from "./index";
 
diff --git a/src/plugins/inputs/ban.ts b/src/plugins/inputs/ban.ts
index 47280ea2..b8a752b4 100644
--- a/src/plugins/inputs/ban.ts
+++ b/src/plugins/inputs/ban.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {ChanType} from "../../models/chan";
 import Msg, {MessageType} from "../../models/msg";
 import {PluginInputHandler} from "./index";
diff --git a/src/plugins/inputs/connect.ts b/src/plugins/inputs/connect.ts
index d99af205..8ba60c20 100644
--- a/src/plugins/inputs/connect.ts
+++ b/src/plugins/inputs/connect.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Msg, {MessageType} from "../../models/msg";
 import {PluginInputHandler} from "./index";
 
diff --git a/src/plugins/inputs/ctcp.ts b/src/plugins/inputs/ctcp.ts
index 4201ff36..0a453f22 100644
--- a/src/plugins/inputs/ctcp.ts
+++ b/src/plugins/inputs/ctcp.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Msg, {MessageType} from "../../models/msg";
 import {PluginInputHandler} from "./index";
 
diff --git a/src/plugins/inputs/disconnect.ts b/src/plugins/inputs/disconnect.ts
index 7cb8a17e..4014fcae 100644
--- a/src/plugins/inputs/disconnect.ts
+++ b/src/plugins/inputs/disconnect.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 const commands = ["disconnect"];
diff --git a/src/plugins/inputs/ignore.ts b/src/plugins/inputs/ignore.ts
index a9c49143..a55e6030 100644
--- a/src/plugins/inputs/ignore.ts
+++ b/src/plugins/inputs/ignore.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Msg, {MessageType} from "../../models/msg";
 import Helper from "../../helper";
 import {PluginInputHandler} from "./index";
diff --git a/src/plugins/inputs/invite.ts b/src/plugins/inputs/invite.ts
index 5b0592b8..ebe221a1 100644
--- a/src/plugins/inputs/invite.ts
+++ b/src/plugins/inputs/invite.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {PluginInputHandler} from "./index";
 import Msg, {MessageType} from "../../models/msg";
 import {ChanType} from "../../models/chan";
diff --git a/src/plugins/inputs/kick.ts b/src/plugins/inputs/kick.ts
index 47715875..7bfcfe06 100644
--- a/src/plugins/inputs/kick.ts
+++ b/src/plugins/inputs/kick.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 import Msg, {MessageType} from "../../models/msg";
 import {ChanType} from "../../models/chan";
diff --git a/src/plugins/inputs/kill.ts b/src/plugins/inputs/kill.ts
index 65936ef9..60de3576 100644
--- a/src/plugins/inputs/kill.ts
+++ b/src/plugins/inputs/kill.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 const commands = ["kill"];
diff --git a/src/plugins/inputs/list.ts b/src/plugins/inputs/list.ts
index 4cb374fe..48c797ce 100644
--- a/src/plugins/inputs/list.ts
+++ b/src/plugins/inputs/list.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 const commands = ["list"];
diff --git a/src/plugins/inputs/mode.ts b/src/plugins/inputs/mode.ts
index afb92ec7..4e427682 100644
--- a/src/plugins/inputs/mode.ts
+++ b/src/plugins/inputs/mode.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/inputs/msg.ts b/src/plugins/inputs/msg.ts
index 5962d346..c1171dc2 100644
--- a/src/plugins/inputs/msg.ts
+++ b/src/plugins/inputs/msg.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 import Msg, {MessageType} from "../../models/msg";
 import {ChanType} from "../../models/chan";
diff --git a/src/plugins/inputs/mute.ts b/src/plugins/inputs/mute.ts
index 795bf584..bf553549 100644
--- a/src/plugins/inputs/mute.ts
+++ b/src/plugins/inputs/mute.ts
@@ -1,4 +1,3 @@
-"use strict";
 import Chan from "../../models/chan";
 import Network from "../../models/network";
 import {PluginInputHandler} from "./index";
diff --git a/src/plugins/inputs/nick.ts b/src/plugins/inputs/nick.ts
index 64cca99d..abccf723 100644
--- a/src/plugins/inputs/nick.ts
+++ b/src/plugins/inputs/nick.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/inputs/notice.ts b/src/plugins/inputs/notice.ts
index ac716226..5275833f 100644
--- a/src/plugins/inputs/notice.ts
+++ b/src/plugins/inputs/notice.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 const commands = ["notice"];
diff --git a/src/plugins/inputs/part.ts b/src/plugins/inputs/part.ts
index ac20f255..bf352ce6 100644
--- a/src/plugins/inputs/part.ts
+++ b/src/plugins/inputs/part.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/inputs/quit.ts b/src/plugins/inputs/quit.ts
index 4fcf0a89..ca5f5970 100644
--- a/src/plugins/inputs/quit.ts
+++ b/src/plugins/inputs/quit.ts
@@ -1,4 +1,3 @@
-"use strict";
 import _ from "lodash";
 
 import {PluginInputHandler} from "./index";
diff --git a/src/plugins/inputs/raw.ts b/src/plugins/inputs/raw.ts
index ee213794..b682255c 100644
--- a/src/plugins/inputs/raw.ts
+++ b/src/plugins/inputs/raw.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 const commands = ["raw", "send", "quote"];
diff --git a/src/plugins/inputs/rejoin.ts b/src/plugins/inputs/rejoin.ts
index eacde406..866ce3d0 100644
--- a/src/plugins/inputs/rejoin.ts
+++ b/src/plugins/inputs/rejoin.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/inputs/topic.ts b/src/plugins/inputs/topic.ts
index c00bee8d..843c64b1 100644
--- a/src/plugins/inputs/topic.ts
+++ b/src/plugins/inputs/topic.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/inputs/whois.ts b/src/plugins/inputs/whois.ts
index 52cf4b76..e4ed953d 100644
--- a/src/plugins/inputs/whois.ts
+++ b/src/plugins/inputs/whois.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {PluginInputHandler} from "./index";
 
 const commands = ["whois"];
diff --git a/src/plugins/irc-events/away.ts b/src/plugins/irc-events/away.ts
index f8c36600..a2af0715 100644
--- a/src/plugins/irc-events/away.ts
+++ b/src/plugins/irc-events/away.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {IrcEventHandler} from "../../client";
 import {ChanType} from "../../models/chan";
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/cap.ts b/src/plugins/irc-events/cap.ts
index 37fc30a4..d98dedce 100644
--- a/src/plugins/irc-events/cap.ts
+++ b/src/plugins/irc-events/cap.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {IrcEventHandler} from "../../client";
 
 import Msg from "../../models/msg";
diff --git a/src/plugins/irc-events/chghost.ts b/src/plugins/irc-events/chghost.ts
index 4ad4a4c4..04bea483 100644
--- a/src/plugins/irc-events/chghost.ts
+++ b/src/plugins/irc-events/chghost.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/connection.ts b/src/plugins/irc-events/connection.ts
index 8b399919..bffa77af 100644
--- a/src/plugins/irc-events/connection.ts
+++ b/src/plugins/irc-events/connection.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import {IrcEventHandler} from "../../client";
 
diff --git a/src/plugins/irc-events/ctcp.ts b/src/plugins/irc-events/ctcp.ts
index 163830ec..0afe296b 100644
--- a/src/plugins/irc-events/ctcp.ts
+++ b/src/plugins/irc-events/ctcp.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import {IrcEventHandler} from "../../client";
 import Helper from "../../helper";
diff --git a/src/plugins/irc-events/error.ts b/src/plugins/irc-events/error.ts
index 1a13601c..dbbbc976 100644
--- a/src/plugins/irc-events/error.ts
+++ b/src/plugins/irc-events/error.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/help.ts b/src/plugins/irc-events/help.ts
index 740dc838..2f0b790c 100644
--- a/src/plugins/irc-events/help.ts
+++ b/src/plugins/irc-events/help.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Msg, {MessageType} from "../../models/msg";
 import {IrcEventHandler} from "../../client";
 
diff --git a/src/plugins/irc-events/info.ts b/src/plugins/irc-events/info.ts
index 6ce32938..9bfa47e8 100644
--- a/src/plugins/irc-events/info.ts
+++ b/src/plugins/irc-events/info.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Msg, {MessageType} from "../../models/msg";
 import {IrcEventHandler} from "../../client";
 
diff --git a/src/plugins/irc-events/invite.ts b/src/plugins/irc-events/invite.ts
index 05d97938..64e04793 100644
--- a/src/plugins/irc-events/invite.ts
+++ b/src/plugins/irc-events/invite.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/join.ts b/src/plugins/irc-events/join.ts
index 32722b00..0c758f12 100644
--- a/src/plugins/irc-events/join.ts
+++ b/src/plugins/irc-events/join.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Msg, {MessageType} from "../../models/msg";
 import User from "../../models/user";
 import type {IrcEventHandler} from "../../client";
diff --git a/src/plugins/irc-events/kick.ts b/src/plugins/irc-events/kick.ts
index c9cdfe16..44579b63 100644
--- a/src/plugins/irc-events/kick.ts
+++ b/src/plugins/irc-events/kick.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {IrcEventHandler} from "../../client";
 import {ChanState} from "../../models/chan";
 
diff --git a/src/plugins/irc-events/link.ts b/src/plugins/irc-events/link.ts
index 1aba0148..47c62045 100644
--- a/src/plugins/irc-events/link.ts
+++ b/src/plugins/irc-events/link.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import * as cheerio from "cheerio";
 import got from "got";
 import {URL} from "url";
diff --git a/src/plugins/irc-events/list.ts b/src/plugins/irc-events/list.ts
index e22c1a3f..25473ebf 100644
--- a/src/plugins/irc-events/list.ts
+++ b/src/plugins/irc-events/list.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Chan, {ChanType, SpecialChanType} from "../../models/chan";
diff --git a/src/plugins/irc-events/message.ts b/src/plugins/irc-events/message.ts
index 063c2aea..2db8add2 100644
--- a/src/plugins/irc-events/message.ts
+++ b/src/plugins/irc-events/message.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Msg, {MessageType} from "../../models/msg";
 import LinkPrefetch from "./link";
 import cleanIrcMessage from "../../../client/js/helpers/ircmessageparser/cleanIrcMessage";
diff --git a/src/plugins/irc-events/mode.ts b/src/plugins/irc-events/mode.ts
index 513bba71..d7498379 100644
--- a/src/plugins/irc-events/mode.ts
+++ b/src/plugins/irc-events/mode.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import {IrcEventHandler} from "../../client";
 
diff --git a/src/plugins/irc-events/modelist.ts b/src/plugins/irc-events/modelist.ts
index ccd20e44..69d42818 100644
--- a/src/plugins/irc-events/modelist.ts
+++ b/src/plugins/irc-events/modelist.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 import {SpecialChanType, ChanType} from "../../models/chan";
 
diff --git a/src/plugins/irc-events/motd.ts b/src/plugins/irc-events/motd.ts
index 832b7a2a..2f138975 100644
--- a/src/plugins/irc-events/motd.ts
+++ b/src/plugins/irc-events/motd.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/names.ts b/src/plugins/irc-events/names.ts
index af622f5e..13dff8ad 100644
--- a/src/plugins/irc-events/names.ts
+++ b/src/plugins/irc-events/names.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 export default <IrcEventHandler>function (irc, network) {
diff --git a/src/plugins/irc-events/nick.ts b/src/plugins/irc-events/nick.ts
index 75aa0e4f..f4b9f3d3 100644
--- a/src/plugins/irc-events/nick.ts
+++ b/src/plugins/irc-events/nick.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/part.ts b/src/plugins/irc-events/part.ts
index b4d2de81..6323ad05 100644
--- a/src/plugins/irc-events/part.ts
+++ b/src/plugins/irc-events/part.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/quit.ts b/src/plugins/irc-events/quit.ts
index 9ea053f0..7fd637d7 100644
--- a/src/plugins/irc-events/quit.ts
+++ b/src/plugins/irc-events/quit.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/sasl.ts b/src/plugins/irc-events/sasl.ts
index 546afe72..4f4ed183 100644
--- a/src/plugins/irc-events/sasl.ts
+++ b/src/plugins/irc-events/sasl.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/topic.ts b/src/plugins/irc-events/topic.ts
index 23582e3b..c5bc6d5b 100644
--- a/src/plugins/irc-events/topic.ts
+++ b/src/plugins/irc-events/topic.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/unhandled.ts b/src/plugins/irc-events/unhandled.ts
index 587f0165..da7d7634 100644
--- a/src/plugins/irc-events/unhandled.ts
+++ b/src/plugins/irc-events/unhandled.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 
 import Msg, {MessageType} from "../../models/msg";
diff --git a/src/plugins/irc-events/welcome.ts b/src/plugins/irc-events/welcome.ts
index b16767ce..279fe4cf 100644
--- a/src/plugins/irc-events/welcome.ts
+++ b/src/plugins/irc-events/welcome.ts
@@ -1,4 +1,3 @@
-"use strict";
 import {IrcEventHandler} from "../../client";
 
 import Msg from "../../models/msg";
diff --git a/src/plugins/irc-events/whois.ts b/src/plugins/irc-events/whois.ts
index 51e2d6c0..5ccacfa2 100644
--- a/src/plugins/irc-events/whois.ts
+++ b/src/plugins/irc-events/whois.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {IrcEventHandler} from "../../client";
 import {ChanType} from "../../models/chan";
 
diff --git a/src/plugins/messageStorage/sqlite.ts b/src/plugins/messageStorage/sqlite.ts
index 2c4cfa9b..cd20cc64 100644
--- a/src/plugins/messageStorage/sqlite.ts
+++ b/src/plugins/messageStorage/sqlite.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import type {Database} from "sqlite3";
 
 import log from "../../log";
@@ -118,7 +116,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 
 		this.database.close((err) => {
 			if (err) {
-				log.error(`Failed to close sqlite database: ${err}`);
+				log.error(`Failed to close sqlite database: ${err.message}`);
 			}
 
 			if (callback) {
@@ -211,7 +209,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 		}) as Promise<Message[]>;
 	}
 
-	search(query) {
+	search(query: {searchTerm: string; networkUuid: string; channelName: string; offset: string}) {
 		if (!this.isEnabled) {
 			return Promise.resolve([]);
 		}
@@ -237,7 +235,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 
 		select += " ORDER BY time DESC LIMIT ? OFFSET ? ";
 		params.push(maxResults.toString());
-		query.offset = parseInt(query.offset, 10) || 0;
+		const offset = parseInt(query.offset, 10) || 0;
 		params.push(query.offset);
 
 		return new Promise((resolve, reject) => {
@@ -249,7 +247,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 						searchTerm: query.searchTerm,
 						target: query.channelName,
 						networkUuid: query.networkUuid,
-						offset: query.offset,
+						offset: offset,
 						results: parseSearchRowsToMessages(query.offset, rows).reverse(),
 					};
 					resolve(response);
diff --git a/src/plugins/messageStorage/text.ts b/src/plugins/messageStorage/text.ts
index d775cea0..2010aebf 100644
--- a/src/plugins/messageStorage/text.ts
+++ b/src/plugins/messageStorage/text.ts
@@ -1,4 +1,3 @@
-"use strict";
 import fs from "fs";
 import path from "path";
 import filenamify from "filenamify";
diff --git a/src/plugins/packages/index.ts b/src/plugins/packages/index.ts
index fcc186e8..d01edc92 100644
--- a/src/plugins/packages/index.ts
+++ b/src/plugins/packages/index.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import log from "../../log";
 import colors from "chalk";
diff --git a/src/plugins/packages/themes.ts b/src/plugins/packages/themes.ts
index 56b50682..3645d722 100644
--- a/src/plugins/packages/themes.ts
+++ b/src/plugins/packages/themes.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import fs from "fs";
 import path from "path";
 import _ from "lodash";
diff --git a/src/plugins/storage.ts b/src/plugins/storage.ts
index 49a61675..2422962c 100644
--- a/src/plugins/storage.ts
+++ b/src/plugins/storage.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import log from "../log";
 import fs from "fs";
 import path from "path";
diff --git a/src/plugins/sts.ts b/src/plugins/sts.ts
index 29989f2b..5d055ec9 100644
--- a/src/plugins/sts.ts
+++ b/src/plugins/sts.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import fs from "fs";
 import path from "path";
diff --git a/src/plugins/uploader.ts b/src/plugins/uploader.ts
index 52550418..3312fa19 100644
--- a/src/plugins/uploader.ts
+++ b/src/plugins/uploader.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import Config from "../config";
 import busboy, {BusboyHeaders} from "@fastify/busboy";
 import {v4 as uuidv4} from "uuid";
diff --git a/src/plugins/webpush.ts b/src/plugins/webpush.ts
index bc418a6d..352a3b7b 100644
--- a/src/plugins/webpush.ts
+++ b/src/plugins/webpush.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import log from "../log";
 import fs from "fs";
diff --git a/src/server.ts b/src/server.ts
index 94747b52..5638cf5f 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import _ from "lodash";
 import {Server as wsServer} from "ws";
 import express from "express";
diff --git a/test/client/index.ts b/test/client/index.ts
index f73da8d0..7ea13839 100644
--- a/test/client/index.ts
+++ b/test/client/index.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 // Recursively load all JS files (test files) in the `js` folder
 // @ts-expect-error ts-migrate(2339) FIXME: Property 'context' does not exist on type 'NodeReq... Remove this comment to see the full error message
 const context = require.context("./js", true, /.+\.js$/);
diff --git a/test/client/js/authTest.ts b/test/client/js/authTest.ts
index 5bc3f89a..c4c57620 100644
--- a/test/client/js/authTest.ts
+++ b/test/client/js/authTest.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import {stub} from "sinon";
 import Auth from "../../../client/js/auth";
diff --git a/test/client/js/constantsTest.ts b/test/client/js/constantsTest.ts
index 5b5f2178..04daa314 100644
--- a/test/client/js/constantsTest.ts
+++ b/test/client/js/constantsTest.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import constants from "../../../client/js/constants";
 import {describe} from "mocha";
diff --git a/test/client/js/helpers/friendlysizeTest.ts b/test/client/js/helpers/friendlysizeTest.ts
index f692b9c5..52d43e88 100644
--- a/test/client/js/helpers/friendlysizeTest.ts
+++ b/test/client/js/helpers/friendlysizeTest.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import friendlysize from "../../../../client/js/helpers/friendlysize";
 
diff --git a/test/client/js/helpers/ircmessageparser/anyIntersection.ts b/test/client/js/helpers/ircmessageparser/anyIntersection.ts
index 10b70395..15cb054f 100644
--- a/test/client/js/helpers/ircmessageparser/anyIntersection.ts
+++ b/test/client/js/helpers/ircmessageparser/anyIntersection.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import anyIntersection from "../../../../../client/js/helpers/ircmessageparser/anyIntersection";
 
diff --git a/test/client/js/helpers/ircmessageparser/cleanIrcMessage.ts b/test/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
index f6709b7d..4abe23a2 100644
--- a/test/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
+++ b/test/client/js/helpers/ircmessageparser/cleanIrcMessage.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import cleanIrcMessage from "../../../../../client/js/helpers/ircmessageparser/cleanIrcMessage";
 
diff --git a/test/client/js/helpers/ircmessageparser/fill.ts b/test/client/js/helpers/ircmessageparser/fill.ts
index 75a90cbd..57c90b53 100644
--- a/test/client/js/helpers/ircmessageparser/fill.ts
+++ b/test/client/js/helpers/ircmessageparser/fill.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import fill from "../../../../../client/js/helpers/ircmessageparser/fill";
 
diff --git a/test/client/js/helpers/ircmessageparser/findChannels.ts b/test/client/js/helpers/ircmessageparser/findChannels.ts
index dd1903c7..7fed830b 100644
--- a/test/client/js/helpers/ircmessageparser/findChannels.ts
+++ b/test/client/js/helpers/ircmessageparser/findChannels.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import findChannels from "../../../../../client/js/helpers/ircmessageparser/findChannels";
 
diff --git a/test/client/js/helpers/ircmessageparser/findEmoji.ts b/test/client/js/helpers/ircmessageparser/findEmoji.ts
index 90398a9c..f37f9519 100644
--- a/test/client/js/helpers/ircmessageparser/findEmoji.ts
+++ b/test/client/js/helpers/ircmessageparser/findEmoji.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import findEmoji from "../../../../../client/js/helpers/ircmessageparser/findEmoji";
 
diff --git a/test/client/js/helpers/ircmessageparser/findLinks.ts b/test/client/js/helpers/ircmessageparser/findLinks.ts
index 283bcb81..2d46f142 100644
--- a/test/client/js/helpers/ircmessageparser/findLinks.ts
+++ b/test/client/js/helpers/ircmessageparser/findLinks.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import {
 	findLinks,
diff --git a/test/client/js/helpers/ircmessageparser/findNames.ts b/test/client/js/helpers/ircmessageparser/findNames.ts
index caf2a1d1..d000407c 100644
--- a/test/client/js/helpers/ircmessageparser/findNames.ts
+++ b/test/client/js/helpers/ircmessageparser/findNames.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import findNames from "../../../../../client/js/helpers/ircmessageparser/findNames";
 
diff --git a/test/client/js/helpers/ircmessageparser/merge.ts b/test/client/js/helpers/ircmessageparser/merge.ts
index 765b36f8..e70a7a26 100644
--- a/test/client/js/helpers/ircmessageparser/merge.ts
+++ b/test/client/js/helpers/ircmessageparser/merge.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import merge from "../../../../../client/js/helpers/ircmessageparser/merge";
 
diff --git a/test/client/js/helpers/ircmessageparser/parseStyle.ts b/test/client/js/helpers/ircmessageparser/parseStyle.ts
index 3480e71f..a79a1e6f 100644
--- a/test/client/js/helpers/ircmessageparser/parseStyle.ts
+++ b/test/client/js/helpers/ircmessageparser/parseStyle.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import parseStyle from "../../../../../client/js/helpers/ircmessageparser/parseStyle";
 
diff --git a/test/client/js/helpers/localetimeTest.ts b/test/client/js/helpers/localetimeTest.ts
index 447139a5..c4e90335 100644
--- a/test/client/js/helpers/localetimeTest.ts
+++ b/test/client/js/helpers/localetimeTest.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import localetime from "../../../../client/js/helpers/localetime";
 
diff --git a/test/client/js/helpers/parse.ts b/test/client/js/helpers/parse.ts
index 08a4f739..eccdc448 100644
--- a/test/client/js/helpers/parse.ts
+++ b/test/client/js/helpers/parse.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 
 import {renderToString} from "@vue/server-test-utils";
diff --git a/test/client/js/helpers/parseIrcUri.ts b/test/client/js/helpers/parseIrcUri.ts
index 3ff8e9dd..5f977d9d 100644
--- a/test/client/js/helpers/parseIrcUri.ts
+++ b/test/client/js/helpers/parseIrcUri.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import parseIrcUri from "../../../../client/js/helpers/parseIrcUri";
 
diff --git a/test/client/js/helpers/roundBadgeNumberTest.ts b/test/client/js/helpers/roundBadgeNumberTest.ts
index 18e84ca5..1b26ee91 100644
--- a/test/client/js/helpers/roundBadgeNumberTest.ts
+++ b/test/client/js/helpers/roundBadgeNumberTest.ts
@@ -1,5 +1,3 @@
-"use strict";
-
 import {expect} from "chai";
 import roundBadgeNumber from "../../../../client/js/helpers/roundBadgeNumber";
 
diff --git a/test/models/network.ts b/test/models/network.ts
index 5415e006..7ceee340 100644
--- a/test/models/network.ts
+++ b/test/models/network.ts
@@ -1,13 +1,14 @@
 "use strict";
 
 import {expect} from "chai";
-import Chan from "../../src/models/chan";
+import Chan, {ChanType} from "../../src/models/chan";
 import Msg from "../../src/models/msg";
 import User from "../../src/models/user";
-import Network from "../../src/models/network";
+import Network, {NetworkWithIrcFramework} from "../../src/models/network";
 import Config from "../../src/config";
 import STSPolicies from "../../src/plugins/sts";
 import ClientCertificate from "../../src/plugins/clientCertificate";
+import Client from "../../src/client";
 
 describe("Network", function () {
 	describe("Network(attr)", function () {
@@ -132,7 +133,7 @@ describe("Network", function () {
 				host: "localhost",
 			});
 
-			expect(network.validate()).to.be.true;
+			expect(network.validate({} as any)).to.be.true;
 			expect(network.nick).to.equal("thelounge");
 			expect(network.username).to.equal("thelounge");
 			expect(network.realname).to.equal("The Lounge User");
@@ -142,7 +143,7 @@ describe("Network", function () {
 				host: "localhost",
 				nick: "@Invalid Nick?",
 			});
-			expect(network2.validate()).to.be.true;
+			expect(network2.validate({} as any)).to.be.true;
 			expect(network2.username).to.equal("InvalidNick");
 		});
 
@@ -158,7 +159,7 @@ describe("Network", function () {
 				tls: false,
 				rejectUnauthorized: false,
 			});
-			expect(network.validate()).to.be.true;
+			expect(network.validate({} as any)).to.be.true;
 			expect(network.host).to.equal("irc.example.com");
 			expect(network.port).to.equal(6697);
 			expect(network.tls).to.be.true;
@@ -170,14 +171,14 @@ describe("Network", function () {
 			const network2 = new Network({
 				host: "some.fake.tld",
 			});
-			expect(network2.validate()).to.be.true;
+			expect(network2.validate({} as any)).to.be.true;
 			expect(network2.host).to.equal("irc.example.com");
 
 			Config.values.lockNetwork = false;
 		});
 
 		it("should apply STS policies iff they match", function () {
-			const client = {idMsg: 1, emit() {}};
+			const client = {idMsg: 1, emit() {}} as any;
 			STSPolicies.update("irc.example.com", 7000, 3600);
 
 			let network = new Network({
@@ -209,7 +210,7 @@ describe("Network", function () {
 			const client = {idMsg: 1, emit() {}, messageStorage: []};
 
 			const network = new Network({host: "irc.example.com", sasl: "external"});
-			network.createIrcFramework(client);
+			(network as any).createIrcFramework(client);
 			expect(network.irc).to.not.be.null;
 
 			const client_cert = network.irc.options.client_certificate;
@@ -231,14 +232,14 @@ describe("Network", function () {
 			STSPolicies.update("irc.example.com", 7000, 3600);
 
 			const network = new Network({host: "irc.example.com", sasl: "external"});
-			network.createIrcFramework(client);
+			(network as any).createIrcFramework(client);
 			expect(network.irc).to.not.be.null;
 
 			const client_cert = network.irc.options.client_certificate;
 			expect(client_cert).to.not.be.null;
 			expect(ClientCertificate.get(network.uuid)).to.deep.equal(client_cert);
 
-			expect(network.validate(client)).to.be.true;
+			expect(network.validate(client as any)).to.be.true;
 
 			expect(ClientCertificate.get(network.uuid)).to.deep.equal(client_cert); // Should be unchanged
 
@@ -254,7 +255,7 @@ describe("Network", function () {
 			const client = {idMsg: 1, emit() {}};
 			STSPolicies.update("irc.example.com", 7000, 3600);
 
-			let network = new Network({host: "irc.example.com"});
+			let network: any = new Network({host: "irc.example.com"});
 			network.createIrcFramework(client);
 			expect(network.irc).to.not.be.null;
 			expect(network.irc.options.client_certificate).to.be.null;
@@ -275,7 +276,7 @@ describe("Network", function () {
 			let nameEmitCalled = false;
 
 			const network = new Network();
-			network.edit(
+			(network as any).edit(
 				{
 					emit(name, data) {
 						if (name === "network:name") {
diff --git a/webpack.config.ts b/webpack.config.ts
index 7041ed89..f980a7ac 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -164,7 +164,7 @@ export default (env: any, argv: any) => {
 		config.devtool = "eval";
 		config.stats = "errors-only";
 		config.output!.path = path.resolve(__dirname, "test/public");
-		config.entry!["testclient.js"] = [path.resolve(__dirname, "test/client/index.js")];
+		config.entry!["testclient.js"] = [path.resolve(__dirname, "test/client/index.ts")];
 
 		// Add the istanbul plugin to babel-loader options
 		for (const rule of config.module!.rules!) {