Merge pull request 'main' (#9554) from main into develop

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9554

.woodpecker/dockerHubRelease.yml

@@ -11,10 +11,5 @@ pipeline:
       password:
         # Secret 'docker_password' needs to be set in the CI settings
         from_secret: docker_password
-    when:
-      # Push new version of tag latest if new push on main-branch
-      event: push
-      branch: main
 
-depends_on:
-  - prSecurityCheck
+branch: main

packages/backend/src/misc/nyaize.ts

@@ -2,9 +2,9 @@ export function nyaize(text: string): string {
 	return (
 		text
 			// ja-JP
-			.replace(/な/g, "にゃ")
-			.replace(/ナ/g, "ニャ")
-			.replace(/ﾅ/g, "ﾆｬ")
+			.replaceAll("な", "にゃ")
+			.replaceAll("ナ", "ニャ")
+			.replaceAll("ﾅ", "ﾆｬ")
 			// en-US
 			.replace(/(?<=n)a/gi, (x) => (x === "A" ? "YA" : "ya"))
 			.replace(/(?<=morn)ing/gi, (x) => (x === "ING" ? "YAN" : "yan"))

packages/backend/src/server/api/endpoints/notes/search-by-tag.ts

@@ -93,7 +93,7 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	try {
 		if (ps.tag) {
-			if (!safeForSql(ps.tag)) throw new Error("Injection");
+			if (!safeForSql(normalizeForSearch(ps.tag))) throw "Injection";
 			query.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`);
 		} else {
 			query.andWhere(
@@ -102,7 +102,8 @@ export default define(meta, paramDef, async (ps, me) => {
 						qb.orWhere(
 							new Brackets((qb) => {
 								for (const tag of tags) {
-									if (!safeForSql(tag)) throw new Error("Injection");
+									if (!safeForSql(normalizeForSearch(ps.tag)))
+										throw "Injection";
 									qb.andWhere(`'{"${normalizeForSearch(tag)}"}' <@ note.tags`);
 								}
 							}),

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

@@ -209,12 +209,12 @@ export default async function (
 		await Blockings.delete(blocking.id);
 	} else {
 		// それ以外は単純に例外
-		if (blocking != null)
+		if (blocking)
 			throw new IdentifiableError(
 				"710e8fb0-b8c3-4922-be49-d5d93d8e6a6e",
 				"blocking",
 			);
-		if (blocked != null)
+		if (blocked)
 			throw new IdentifiableError(
 				"3338392a-f764-498d-8855-db939dcf8c48",
 				"blocked",

packages/backend/src/services/following/requests/create.ts

@@ -38,8 +38,8 @@ export default async function (
 		}),
 	]);
 
-	if (blocking != null) throw new Error("blocking");
-	if (blocked != null) throw new Error("blocked");
+	if (blocking) throw new Error("blocking");
+	if (blocked) throw new Error("blocked");
 
 	const followRequest = await FollowRequests.insert({
 		id: genId(),

packages/client/src/components/MkEmojiPicker.vue

@@ -316,7 +316,7 @@ function done(query?: any): boolean | void {
 	if (query == null) query = q.value;
 	if (query == null || typeof query !== 'string') return;
 
-	const q2 = query.replace(/:/g, '');
+	const q2 = query.replaceAll(':', '');
 	const exactMatchCustom = customEmojis.find(emoji => emoji.name === q2);
 	if (exactMatchCustom) {
 		chosen(exactMatchCustom);