fixing a git merge error.

This commit is contained in:
cutestnekoaqua 2023-02-05 12:38:40 +01:00
parent 9afe5424c0
commit 0f8b7eb440

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