fix: fight with linter, win

d0kur0 · Oct 21, 2023 · b9a0f84 · b9a0f84
1 parent dc1407b
commit b9a0f84
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/src/components/FileViewer.tsx b/src/components/FileViewer.tsx
@@ -1,7 +1,7 @@
 import { Box, Button, ButtonGroup, IconButton, Spinner } from "@hope-ui/solid";
 import { useNavigate } from "@solidjs/router";
 import { IoClose } from "solid-icons/io";
-import { createEffect, createMemo, createSignal } from "solid-js";
+import { onMount, createMemo, createSignal, onCleanup } from "solid-js";
 import { ExtendedFile, isFileImage } from "../utils/grabbing";
 
 type FileViewerProps = {
@@ -29,16 +29,14 @@ export function FileViewer(props: FileViewerProps) {
 	const [isLoading, setIsLoading] = createSignal(true);
 	const [isLoadingFailed, setIsLoadingFailed] = createSignal(false);
 
-	createEffect(() => {
-		const listener = (event: KeyboardEvent) => {
-			event.key === "Escape" && props.onClose?.();
-			event.key === "ArrowLeft" && props.onPrev?.();
-			event.key === "ArrowRight" && props.onNext?.();
-		};
+	const listener = (event: KeyboardEvent) => {
+		event.key === "Escape" && props.onClose?.();
+		event.key === "ArrowLeft" && props.onPrev?.();
+		event.key === "ArrowRight" && props.onNext?.();
+	};
 
-		window.addEventListener("keydown", listener);
-		return () => window.removeEventListener("keydown", listener);
-	});
+	onMount(() => window.addEventListener("keydown", listener));
+	onCleanup(() => window.removeEventListener("keydown", listener));
 
 	const navigateToThread = () => {
 		navigate(`/thread/${props.file.rootThread.board}/${props.file.rootThread.id}`);

diff --git a/src/pages/PageListFiles.tsx b/src/pages/PageListFiles.tsx
@@ -54,9 +54,10 @@ export function PageListFiles() {
 	};
 
 	const handleAddToExcludeThreads = () => {
-		if (!thread()) return;
+		const threadInfo = thread();
+		if (!threadInfo) return;
 
-		$excludeRulesMutations.addThread({ id: thread()?.id!, board: thread()?.board! });
+		$excludeRulesMutations.addThread({ id: threadInfo.id, board: threadInfo.board });
 
 		notificationService.show({
 			title: "Добавлено в исключения",
@@ -65,9 +66,17 @@ export function PageListFiles() {
 	};
 
 	const handleAddToExcludeWords = () => {
-		if (!thread()?.subject) return;
+		const threadInfo = thread();
 
-		$excludeRulesMutations.addWord(thread()?.subject!);
+		if (!threadInfo?.subject) {
+			return notificationService.show({
+				title: "Ошибка",
+				status: "danger",
+				description: "Тред невозможно добавить в бан-ворды, нет сабжа, попробуй скрыть по ID",
+			});
+		}
+
+		$excludeRulesMutations.addWord(threadInfo.subject);
 
 		notificationService.show({
 			title: "Добавлено в бан ворды",