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

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

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

packages/client/src/components/MkNote.vue

@@ -381,8 +381,7 @@ function readPromo() {
 		}
 		
 		> div > i {
-			position: absolute;
-			right: 100%;
+			margin-left: -.5px;
 		}
 		> .info {
 			display: flex;
@@ -605,6 +604,7 @@ function readPromo() {
 					opacity: 0.7;
 					flex-grow: 1;
 					max-width: 3.5em;
+					width: max-content;
 					min-width: max-content;
 					&:first-of-type {
 						margin-left: -.5em;
@@ -637,11 +637,15 @@ function readPromo() {
 
 	&.max-width_450px {
 		--avatarSize: 46px;
+		padding-top: 6px;
 		> .note-context {
 			padding-inline: 16px;
 			margin-top: 0;
 			> :not(.line) {
-				margin-top: 10px;
+				margin-top: 5px;
+			}
+			> .line {
+				margin-right: 10px;
 			}
 		}
 		> .article {

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"] },