From 44c6bc7dd0c796a2c28136ab5574c39a8941c20c Mon Sep 17 00:00:00 2001
From: cutestnekoaqua <waterdev@galaxycrow.de>
Date: Sun, 5 Feb 2023 12:38:40 +0100
Subject: [PATCH] fixing a git merge error.

---
 packages/backend/src/misc/reaction-lib.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index 5fd47aab70..babebfb627 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -71,6 +71,12 @@ export async function toDbReaction(
 	if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
 	// Convert old heart to new
 	if (reaction === "♥️") return "❤️";
+	// Allow unicode reactions
+	const match = emojiRegex.exec(reaction);
+	if (match) {
+		const unicode = match[0];
+		return unicode;
+	}
 
 	const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);
 	if (custom) {