ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't store custom emojis with ':' before and after the shortcode

Browse Source 
As per recent changes to the MSC
This commit is contained in:
Tobias Fella
2021-07-23 23:12:03 +02:00
parent f8db9c4ecb
commit 97737b753b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/customemojimodel+network.cpp
View File

@@ -39,10 +39,12 @@ void CustomEmojiModel::fetchEmojies()
for (const auto& emoji : emojies.keys()) { for (const auto& emoji : emojies.keys()) {
const auto& data = emojies[emoji]; const auto& data = emojies[emoji];
const auto e = emoji.startsWith(":") ? emoji : (QStringLiteral(":") + emoji + QStringLiteral(":"));
d->emojies << CustomEmoji { d->emojies << CustomEmoji {
emoji, e,
data.toObject()["url"].toString(), 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"); const auto& data = d->conn->accountData("im.ponies.user_emotes");
auto json = data != nullptr ? data->contentJson() : QJsonObject(); auto json = data != nullptr ? data->contentJson() : QJsonObject();
auto emojiData = json["images"].toObject(); auto emojiData = json["images"].toObject();
emojiData[QStringLiteral(":%1:").arg(name)] = QJsonObject({ emojiData[QStringLiteral("%1").arg(name)] = QJsonObject({
{QStringLiteral("url"), job->contentUri()} {QStringLiteral("url"), job->contentUri()}
}); });
json["images"] = emojiData; json["images"] = emojiData;