fix (backend): apply word mutes in notifications

Co-authored-by: naskya <m@naskya.net>

.gitignore

@@ -58,6 +58,8 @@ packages/backend/assets/LICENSE
 packages/megalodon/lib
 packages/megalodon/.idea
 
+*.traineddata
+
 # blender backups
 *.blend1
 *.blend2

gulpfile.js

@@ -8,7 +8,6 @@ const replace = require("gulp-replace");
 const terser = require("gulp-terser");
 const cssnano = require("gulp-cssnano");
 
-const locales = require("./locales");
 const meta = require("./package.json");
 
 gulp.task("copy:backend:views", () =>
@@ -29,8 +28,9 @@ gulp.task("copy:client:fonts", () =>
 		.pipe(gulp.dest("./built/_client_dist_/fonts/")),
 );
 
-gulp.task("copy:client:locales", (cb) => {
+gulp.task("copy:client:locales", async (cb) => {
 	fs.mkdirSync("./built/_client_dist_/locales", { recursive: true });
+	const { default: locales } = await import("./locales/index.mjs");
 
 	const v = { _version_: meta.version };
 
@@ -45,7 +45,9 @@ gulp.task("copy:client:locales", (cb) => {
 	cb();
 });
 
-gulp.task("build:backend:script", () => {
+gulp.task("build:backend:script", async () => {
+	const { default: locales } = await import("./locales/index.mjs");
+
 	return gulp
 		.src([
 			"./packages/backend/src/server/web/boot.js",

locales/en-US.yml

@@ -1178,6 +1178,7 @@ useCdn: "Get assets from CDN"
 useCdnDescription: "Load some static assets like Twemoji from the JSDelivr CDN instead of this Firefish server."
 suggested: "Suggested"
 noLanguage: "No language"
+searchCwAndAlt: "Include content warnings and alt texts"
 
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing

locales/index.mjs

@@ -2,8 +2,14 @@
  * Languages Loader
  */
 
-const fs = require("fs");
+import fs from "node:fs";
-const yaml = require("js-yaml");
+import yaml from "js-yaml";
+
+import { dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
 const languages = [];
 const languages_custom = [];
 
@@ -66,16 +72,17 @@ const locales_custom = languages_custom.reduce(
 );
 Object.assign(locales, locales_custom);
 
-module.exports = Object.entries(locales).reduce(
+export default Object.entries(locales).reduce(
 	(a, [k, v]) => (
 		(a[k] = (() => {
 			const [lang] = k.split("-");
-			return k === "en-US" ? v :
+			return k === "en-US"
-				merge(
+				? v
-					locales["en-US"],
+				: merge(
-					locales[`${lang}-${primaries[lang]}`] || {},
+						locales["en-US"],
-					v,
+						locales[`${lang}-${primaries[lang]}`] || {},
-				);
+						v,
+					);
 		})()),
 		a
 	),

locales/ja-JP.yml

@@ -2057,3 +2057,4 @@ searchUsersDescription: "投稿検索で投稿者を絞りたい場合、@user@e
 searchRange: "投稿期間（オプション）"
 searchRangeDescription: "投稿検索で投稿期間を絞りたい場合、20220615-20231031 のような形式で投稿期間を入力してください。今年の日付を指定する場合には年の指定を省略できます（0105-0106 や 20231105-0110 のように）。\n\n開始日と終了日のどちらか一方は省略可能です。例えば -0102 とすると今年1月2日までの投稿のみを、20231026- とすると2023年10月26日以降の投稿のみを検索します。"
 searchPostsWithFiles: "添付ファイルのある投稿のみ"
+searchCwAndAlt: "閲覧注意の注釈と添付ファイルの代替テキストも検索する"

locales/zh-TW.yml

@@ -2050,3 +2050,4 @@ searchUsersDescription: "如欲搜尋特定使用者的貼文，請以「@user@e
 searchWords: "搜尋關鍵字 / 查詢ID或URL"
 searchWordsDescription: "如欲搜尋貼文，請在此欄位輸入欲搜尋的關鍵字。以空格分隔關鍵字以進行AND搜尋、在關鍵字之間插入「OR」以進行OR搜尋。\n舉例來說，輸入「早上 晚上」會搜尋包含「早上」和「晚上」的貼文，「早上 OR 晚上」會搜尋包含「早上」或「晚上」（或兩者皆包含）的貼文。\n\n如欲前往特定使用者或貼文的頁面，請在此欄位輸入使用者ID（@user@example.com）或貼文的URL，並點擊「查詢」按鈕。點擊「搜尋」按鈕則會搜尋字面上包含輸入的ID或URL的貼文。"
 suggested: "建議"
+searchCwAndAlt: "包含內容警告及替代文字"

neko/revert.sql

@@ -1,6 +1,7 @@
 BEGIN;
 
 DELETE FROM "migrations" WHERE name IN (
+  'IndexAltTextAndCw1708872574733',
   'SeparateHardMuteWordsAndPatterns1706413792769',
   'RenameMetaColumns1705944717480',
   'RemoveNativeUtilsMigration1705877093218',
@@ -13,6 +14,10 @@ DELETE FROM "migrations" WHERE name IN (
   'EmojiModerator1692825433698'
 );
 
+-- index-alt-text-and-cw
+DROP INDEX "IDX_f4f7b93d05958527300d79ac82";
+DROP INDEX "IDX_8e3bbbeb3df04d1a8105da4c8f";
+
 -- separate-hard-mute-words-and-patterns
 UPDATE "user_profile" SET "mutedWords" = "mutedWords" || array_to_json("mutedPatterns")::jsonb;
 ALTER TABLE "user_profile" DROP "mutedPatterns";

packages/backend-rs/src/util/check_word_mute.rs

@@ -79,7 +79,7 @@ fn check_word_mute_impl(
             let text_lower = text.to_lowercase();
             muted_word_list
                 .iter()
-                .all(|muted_word| text_lower.contains(muted_word))
+                .all(|muted_word| text_lower.contains(&muted_word.to_lowercase()))
         })
     }) || muted_patterns.iter().any(|muted_pattern| {
         Regex::new(convert_regex(muted_pattern).as_str())

packages/backend/migration-neko/1708872574733-index-alt-text-and-cw.js

@@ -0,0 +1,17 @@
+export class IndexAltTextAndCw1708872574733 {
+	name = "IndexAltTextAndCw1708872574733";
+
+	async up(queryRunner) {
+		await queryRunner.query(
+			`CREATE INDEX "IDX_8e3bbbeb3df04d1a8105da4c8f" ON "note" USING "pgroonga" ("cw" pgroonga_varchar_full_text_search_ops_v2)`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "IDX_f4f7b93d05958527300d79ac82" ON "drive_file" USING "pgroonga" ("comment" pgroonga_varchar_full_text_search_ops_v2)`,
+		);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_f4f7b93d05958527300d79ac82"`);
+		await queryRunner.query(`DROP INDEX "IDX_8e3bbbeb3df04d1a8105da4c8f"`);
+	}
+}

packages/backend/src/models/entities/drive-file.ts

@@ -70,6 +70,7 @@ export class DriveFile {
 	})
 	public size: number;
 
+	@Index() // USING pgroonga pgroonga_varchar_full_text_search_ops_v2
 	@Column("varchar", {
 		length: DB_MAX_IMAGE_COMMENT_LENGTH,
 		nullable: true,

packages/backend/src/models/entities/note.ts

@@ -79,6 +79,7 @@ export class Note {
 	})
 	public name: string | null;
 
+	@Index() // USING pgroonga pgroonga_varchar_full_text_search_ops_v2
 	@Column("varchar", {
 		length: 512,
 		nullable: true,

packages/backend/src/server/api/endpoints/latest-version.ts

@@ -14,18 +14,7 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async () => {
-	let tag_name: string;
-	const pattern = /"version": "(.*)",$/m;
-
-	await fetch(
-		"https://code.naskya.net/naskya/firefish/source-by/main/package.json",
-	)
-		.then((response) => response.text())
-		.then((text) => {
-			tag_name = pattern.exec(text)[1];
-		});
-
 	return {
-		tag_name,
+		tag_name: "neko",
 	};
 });

packages/backend/src/server/api/endpoints/notes/mentions.ts

@@ -7,6 +7,7 @@ import { generateMutedUserQuery } from "@/server/api/common/generate-muted-user-
 import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 import { generateBlockedUserQuery } from "@/server/api/common/generate-block-query.js";
 import { generateMutedNoteThreadQuery } from "@/server/api/common/generate-muted-note-thread-query.js";
+import { generateMutedNoteQuery } from "@/server/api/common/generate-muted-note-query.js";
 
 export const meta = {
 	tags: ["notes"],
@@ -69,6 +70,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	generateVisibilityQuery(query, user);
 	generateMutedUserQuery(query, user);
+	generateMutedNoteQuery(query, user);
 	generateMutedNoteThreadQuery(query, user);
 	generateBlockedUserQuery(query, user);
 

packages/backend/src/server/api/endpoints/notes/search.ts

@@ -1,4 +1,5 @@
 // import { FindManyOptions, In } from "typeorm";
+import { Brackets } from "typeorm";
 import { Notes } from "@/models/index.js";
 import { Note } from "@/models/entities/note.js";
 // import config from "@/config/index.js";
@@ -56,6 +57,7 @@ export const paramDef = {
 			default: null,
 		},
 		withFiles: { type: "boolean", nullable: true },
+		searchCwAndAlt: { type: "boolean", nullable: true },
 		channelId: {
 			type: "string",
 			format: "misskey:id",
@@ -92,7 +94,28 @@ export default define(meta, paramDef, async (ps, me) => {
 	}
 
 	if (ps.query != null) {
-		query.andWhere("note.text &@~ :q", { q: `${sqlLikeEscape(ps.query)}` });
+		const q = sqlLikeEscape(ps.query);
+
+		if (ps.searchCwAndAlt) {
+			query.andWhere(
+				new Brackets((qb) => {
+					qb.where("note.text &@~ :q", { q })
+						.orWhere("note.cw &@~ :q", { q })
+						.orWhere(
+							`EXISTS (
+								SELECT FROM "drive_file"
+								WHERE
+									comment &@~ :q
+								AND
+									drive_file."id" = ANY(note."fileIds")
+							)`,
+							{ q },
+						);
+				}),
+			);
+		} else {
+			query.andWhere("note.text &@~ :q", { q });
+		}
 	}
 
 	query.innerJoinAndSelect("note.user", "user");

packages/backend/src/server/web/index.ts

@@ -54,7 +54,9 @@ const bullBoardPath = "/queue";
 
 // Authenticate
 app.use(async (ctx, next) => {
-	if (ctx.path === bullBoardPath || ctx.path.startsWith(`${bullBoardPath}/`)) {
+	const url = decodeURI(ctx.path);
+
+	if (url === bullBoardPath || url.startsWith(`${bullBoardPath}/`)) {
 		const token = ctx.cookies.get("token");
 		if (token == null) {
 			ctx.status = 401;

packages/backend/src/services/note/create.ts

@@ -887,14 +887,17 @@ async function createMentionedEvents(
 	nm: NotificationManager,
 ) {
 	for (const u of mentionedUsers.filter((u) => Users.isLocalUser(u))) {
-		const threadMuted = await NoteThreadMutings.findOneBy({
+		const isWordMuted = await MutedNotes.existsBy({
 			userId: u.id,
-			threadId: note.threadId || note.id,
+			noteId: note.id,
 		});
+		if (isWordMuted) continue;
 
-		if (threadMuted) {
+		const isThreadMuted = await NoteThreadMutings.existsBy({
-			continue;
+			userId: u.id,
-		}
+			threadId: note.threadId ?? note.id,
+		});
+		if (isThreadMuted) continue;
 
 		// note with "specified" visibility might not be visible to mentioned users
 		try {

packages/client/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "client",
 	"private": true,
+	"type": "module",
 	"scripts": {
 		"watch": "pnpm vite build --watch --mode development",
 		"build": "pnpm vite build",

packages/client/src/components/MkSearchBox.vue

@@ -68,6 +68,12 @@
 				:class="$style.input"
 				>{{ i18n.ts.searchPostsWithFiles }}</FormSwitch
 			>
+			<FormSwitch
+				v-model="searchCwAndAlt"
+				class="form-switch"
+				:class="$style.input"
+				>{{ i18n.ts.searchCwAndAlt }}</FormSwitch
+			>
 			<div :class="$style.buttons">
 				<MkButton inline primary @click="search"
 					>{{ i18n.ts.search }}
@@ -128,7 +134,8 @@ const searchRange = ref(
 			}`
 		: "",
 );
-const searchPostsWithFiles = ref(searchParams.get("withFiles") === "true");
+const searchPostsWithFiles = ref(searchParams.get("withFiles") === "1");
+const searchCwAndAlt = ref(searchParams.get("detailed") === "1");
 
 function done(canceled: boolean, result?: searchQuery) {
 	emit("done", { canceled, result });
@@ -149,6 +156,7 @@ function search() {
 		from: searchUsers.value === "" ? undefined : searchUsers.value,
 		range: searchRange.value === "" ? undefined : searchRange.value,
 		withFiles: searchPostsWithFiles.value,
+		searchCwAndAlt: searchCwAndAlt.value,
 	});
 }
 

packages/client/src/pages/admin/index.vue

@@ -42,15 +42,6 @@
 							i18n.ts.configure
 						}}</MkA></MkInfo
 					>
-					<MkInfo v-if="updateAvailable" warn class="info"
-						>{{ i18n.ts.updateAvailable }}
-						<a
-							href="https://code.naskya.net/naskya/firefish"
-							target="_bank"
-							class="_link"
-							>{{ i18n.ts.check }}</a
-						></MkInfo
-					>
 
 					<MkSuperMenu :def="menuDef" :grid="narrow"></MkSuperMenu>
 				</div>
@@ -113,7 +104,6 @@ const noBotProtection =
 	!instance.enableRecaptcha;
 const noEmailServer = !instance.enableEmail;
 const thereIsUnresolvedAbuseReport = ref(false);
-const updateAvailable = ref(false);
 const currentPage = computed(() => router.currentRef.value.child);
 
 os.api("admin/abuse-user-reports", {
@@ -123,13 +113,6 @@ os.api("admin/abuse-user-reports", {
 	if (reports?.length > 0) thereIsUnresolvedAbuseReport.value = true;
 });
 
-if (defaultStore.state.showAdminUpdates) {
-	os.api("latest-version").then((res) => {
-		if (res == null || res.tag_name == null) return;
-		updateAvailable.value = !version.startsWith(res.tag_name);
-	});
-}
-
 const NARROW_THRESHOLD = 600;
 const ro = new ResizeObserver((entries, observer) => {
 	if (entries.length === 0) return;

packages/client/src/pages/search.vue

@@ -63,7 +63,8 @@ const props = defineProps<{
 	since?: string;
 	until?: string;
 	channel?: string;
-	withFiles: "false" | "true";
+	withFiles: "0" | "1";
+	searchCwAndAlt: "0" | "1";
 }>();
 
 const userId = props.user == null ? undefined : await getUserId(props.user);
@@ -79,7 +80,8 @@ const notesPagination = {
 			props.since == null ? undefined : getUnixTime(props.since, false),
 		untilDate:
 			props.until == null ? undefined : getUnixTime(props.until, true),
-		withFiles: props.withFiles === "true",
+		withFiles: props.withFiles === "1",
+		searchCwAndAlt: props.searchCwAndAlt === "1",
 		channelId: props.channel,
 	})),
 };

packages/client/src/router.ts

@@ -310,6 +310,7 @@ export const routes = [
 			until: "until",
 			withFiles: "withFiles",
 			channel: "channel",
+			detailed: "searchCwAndAlt",
 		},
 	},
 	{

packages/client/src/scripts/search.ts

@@ -21,6 +21,7 @@ export async function search() {
 					from?: string;
 					range?: string;
 					withFiles: boolean;
+					searchCwAndAlt: boolean;
 				};
 		  }
 	>((resolve, _) => {
@@ -69,24 +70,35 @@ export async function search() {
 	}
 
 	if (result.action === "search") {
-		let paramString = `withFiles=${result.withFiles ? "true" : "false"}`;
+		const params = new URLSearchParams();
+
+		params.append("withFiles", result.withFiles ? "1" : "0");
 
 		if (result.query != null) {
-			paramString += `&q=${encodeURIComponent(result.query)}`;
+			params.append("q", result.query);
 		}
 
 		if (result.from != null) {
 			if (result.from === "me" || result.from.includes("@"))
-				paramString += `&user=${encodeURIComponent(result.from)}`;
+				params.append("user", result.from);
-			else paramString += `&host=${encodeURIComponent(result.from)}`;
+			else params.append("host", result.from);
 		}
 
 		if (result.range != null) {
 			const split = result.range.split("-");
-			if (split[0] !== "") paramString += `&since=${split[0]}`;
+			if (split.length === 1) {
-			if (split[1] !== "") paramString += `&until=${split[1]}`;
+				params.append("since", result.range);
+				params.append("until", result.range);
+			} else {
+				if (split[0] !== "") params.append("since", split[0]);
+				if (split[1] !== "") params.append("until", split[1]);
+			}
 		}
 
-		mainRouter.push(`/search?${paramString}`);
+		if (result.searchCwAndAlt) {
+			params.append("detailed", "1");
+		}
+
+		mainRouter.push(`/search?${params.toString()}`);
 	}
 }

packages/client/vite.config.ts

@@ -2,10 +2,10 @@ import * as fs from "fs";
 import pluginVue from "@vitejs/plugin-vue";
 import { defineConfig } from "vite";
 
-import viteCompression from "vite-plugin-compression";
+import locales from "../../locales/index.mjs";
-import locales from "../../locales";
+import meta from "../../package.json" assert { type: "json" };
-import meta from "../../package.json";
 import pluginJson5 from "./vite.json5";
+import viteCompression from "vite-plugin-compression";
 
 const extensions = [
 	".ts",

packages/sw/package.json

@@ -1,6 +1,7 @@
 {
 	"name": "sw",
 	"private": true,
+	"type": "module",
 	"scripts": {
 		"build": "pnpm vite build --emptyOutDir",
 		"build:debug": "pnpm run build",

packages/sw/tsconfig.json

@@ -16,6 +16,7 @@
 		"noLib": false,
 		"strict": true,
 		"strictNullChecks": true,
+		"allowSyntheticDefaultImports": true,
 		"experimentalDecorators": true,
 		"resolveJsonModule": true,
 		"isolatedModules": true,
@@ -23,10 +24,7 @@
 		"paths": {
 			"@/*": ["./src/*"]
 		},
-		"typeRoots": [
+		"typeRoots": ["node_modules/@types", "@types"],
-			"node_modules/@types",
-			"@types",
-		],
 		"lib": ["esnext", "webworker"]
 	},
 	"compileOnSave": false,

packages/sw/vite.config.ts

@@ -1,6 +1,6 @@
 import { defineConfig } from "vite";
-const locales = require("../../locales");
+import locales from "../../locales/index.mjs";
-const meta = require("../../package.json");
+import meta from "../../package.json" assert { type: "json" };
 
 const isProduction = process.env.NODE_ENV === "production";
 import viteCompression from "vite-plugin-compression";