From 97737b753b8a3e331ed89c0a1a0f57eb8e0344ea Mon Sep 17 00:00:00 2001
From: Tobias Fella <fella@posteo.de>
Date: Fri, 23 Jul 2021 23:12:03 +0200
Subject: [PATCH] Don't store custom emojis with ':' before and after the
 shortcode

As per recent changes to the MSC
---
 src/customemojimodel+network.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/customemojimodel+network.cpp b/src/customemojimodel+network.cpp
index f7ea08b26..d1c89da0a 100644
--- a/src/customemojimodel+network.cpp
+++ b/src/customemojimodel+network.cpp
@@ -39,10 +39,12 @@ void CustomEmojiModel::fetchEmojies()
     for (const auto& emoji : emojies.keys()) {
         const auto& data = emojies[emoji];
 
+        const auto e = emoji.startsWith(":") ? emoji : (QStringLiteral(":") + emoji + QStringLiteral(":"));
+
         d->emojies << CustomEmoji {
-            emoji,
+            e,
             data.toObject()["url"].toString(),
-            QRegularExpression(QStringLiteral(R"((^|[^\\]))") + emoji)
+            QRegularExpression(QStringLiteral(R"((^|[^\\]))") + e)
         };
     }
 
@@ -60,7 +62,7 @@ void CustomEmojiModel::addEmoji(const QString& name, const QUrl& location)
             const auto& data = d->conn->accountData("im.ponies.user_emotes");
             auto json = data != nullptr ? data->contentJson() : QJsonObject();
             auto emojiData = json["images"].toObject();
-            emojiData[QStringLiteral(":%1:").arg(name)] = QJsonObject({
+            emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
                 {QStringLiteral("url"), job->contentUri()}
             });
             json["images"] = emojiData;