Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements

.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

.woodpecker/dockerHubTag.yml

@@ -17,5 +17,3 @@ pipeline:
       event: tag
       tag: v*
 
-depends_on:
-  - prSecurityCheck

locales/en-US.yml

@@ -816,6 +816,7 @@ lastCommunication: "Last communication"
 resolved: "Resolved"
 unresolved: "Unresolved"
 breakFollow: "Remove follower"
+breakFollowConfirm: "Are you sure want to remove follower?"
 itsOn: "Enabled"
 itsOff: "Disabled"
 emailRequiredForSignup: "Require email address for sign-up"

locales/ja-JP.yml

@@ -816,6 +816,7 @@ lastCommunication: "直近の通信"
 resolved: "解決済み"
 unresolved: "未解決"
 breakFollow: "フォロワーを解除"
+breakFollowConfirm: "フォロワー解除しますか？"
 itsOn: "オンになっています"
 itsOff: "オフになっています"
 emailRequiredForSignup: "アカウント登録にメールアドレスを必須にする"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "13.1.0",
+	"version": "13.1.1",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

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/misc/reaction-lib.ts

@@ -35,6 +35,12 @@ export function convertLegacyReactions(reactions: Record<string, number>) {
 			} else {
 				_reactions[legacies[reaction]] = reactions[reaction];
 			}
+		} else if (reaction === "♥️") {
+			if (_reactions["❤️"]) {
+				_reactions["❤️"] += reactions[reaction];
+			} else {
+				_reactions["❤️"] = reactions[reaction];
+			}
 		} else {
 			if (_reactions[reaction]) {
 				_reactions[reaction] += reactions[reaction];
@@ -61,14 +67,16 @@ export async function toDbReaction(
 
 	reacterHost = toPunyNullable(reacterHost);
 
-	// 文字列タイプのリアクションを絵文字に変換
+	// Convert string-type reactions to unicode
 	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
+	// Convert old heart to new
+	if (reaction === "♥️") return "❤️";
 
-	// Unicode絵文字
+	// Allow unicode reactions
 	const match = emojiRegex.exec(reaction);
 	if (match) {
 		const unicode = match[0];
-		return unicode.match("\u200d") ? unicode : unicode.replace(/\ufe0f/g, "");
+		return unicode;
 	}
 
 	const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);

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);

packages/client/src/emojilist.json

@@ -1496,7 +1496,7 @@
 	{ "category": "symbols", "char": "🀄", "name": "mahjong", "keywords": ["game", "play", "chinese", "kanji"] },
 	{ "category": "symbols", "char": "♠️", "name": "spades", "keywords": ["poker", "cards", "suits", "magic"] },
 	{ "category": "symbols", "char": "♣️", "name": "clubs", "keywords": ["poker", "cards", "magic", "suits"] },
-	{ "category": "symbols", "char": "♥️", "name": "hearts", "keywords": ["poker", "cards", "magic", "suits"] },
+	{ "category": "symbols", "char": "❤️", "name": "hearts", "keywords": ["poker", "cards", "magic", "suits"] },
 	{ "category": "symbols", "char": "♦️", "name": "diamonds", "keywords": ["poker", "cards", "magic", "suits"] },
 	{ "category": "symbols", "char": "🎴", "name": "flower_playing_cards", "keywords": ["game", "sunset", "red"] },
 	{ "category": "symbols", "char": "💭", "name": "thought_balloon", "keywords": ["bubble", "cloud", "speech", "thinking", "dream"] },

packages/client/src/scripts/get-user-menu.ts

@@ -192,6 +192,8 @@ export function getUserMenu(user, router: Router = mainRouter) {
 	}
 
 	async function invalidateFollow() {
+		if (!(await getConfirmed(i18n.ts.breakFollowConfirm))) return;
+
 		os.apiWithDialog("following/invalidate", {
 			userId: user.id,
 		}).then(() => {