natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fixing a git merge error.

This commit is contained in:
cutestnekoaqua 2023-02-05 12:38:40 +01:00
parent 4bd399f321
commit 44c6bc7dd0
No known key found for this signature in database
GPG Key ID: 6BF0964A5069C1E0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/misc/reaction-lib.ts
View File

@ -71,6 +71,12 @@ export async function toDbReaction(
if (Object.keys(legacies).includes(reaction)) return legacies[reaction]; if (Object.keys(legacies).includes(reaction)) return legacies[reaction];
// Convert old heart to new // Convert old heart to new
if (reaction === "♥️") return "❤️"; if (reaction === "♥️") return "❤️";
// Allow unicode reactions
const match = emojiRegex.exec(reaction);
if (match) {
const unicode = match[0];
return unicode;
}
const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/); const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);
if (custom) { if (custom) {