noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix tabbing some emotes (i.e. R-))

Browse source
This commit is contained in:
Rasmus Karlsson 2018-06-19 20:04:12 +00:00
parent 8f00d1aece
commit 7703087fb4
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/providers/twitch/twitchemotes.cpp
View file

@ -21,6 +21,26 @@ QString getEmoteLink(const QString &id, const QString &emoteScale)
return value.replace("{id}", id).replace("{scale}", emoteScale); return value.replace("{id}", id).replace("{scale}", emoteScale);
} }
QString cleanUpCode(const QString &dirtyEmoteCode)
{
// clang-format off
static QMap<QString, QString> emoteNameReplacements{
{"[oO](_|\\.)[oO]", "O_o"}, {"\\&gt\\;\\(", "&gt;("}, {"\\&lt\\;3", "&lt;3"},
{"\\:-?(o|O)", ":O"}, {"\\:-?(p|P)", ":P"}, {"\\:-?[\\\\/]", ":/"},
{"\\:-?[z|Z|\\|]", ":Z"}, {"\\:-?\\(", ":("}, {"\\:-?\\)", ":)"},
{"\\:-?D", ":D"}, {"\\;-?(p|P)", ";P"}, {"\\;-?\\)", ";)"},
{"R-?\\)", "R)"}, {"B-?\\)", "B)"},
};
// clang-format on
auto it = emoteNameReplacements.find(dirtyEmoteCode);
if (it != emoteNameReplacements.end()) {
return it.value();
}
return dirtyEmoteCode;
}
} // namespace } // namespace
// id is used for lookup // id is used for lookup
@ -95,8 +115,9 @@ void TwitchEmotes::refresh(const std::shared_ptr<TwitchAccount> &user)
QJsonObject emoticon = emoteValue.toObject(); QJsonObject emoticon = emoteValue.toObject();
QString id = QString::number(emoticon["id"].toInt()); QString id = QString::number(emoticon["id"].toInt());
QString code = emoticon["code"].toString(); QString code = emoticon["code"].toString();
emoteSet.emotes.emplace_back(id, code); auto cleanCode = cleanUpCode(code);
emoteData.emoteCodes.push_back(code); emoteSet.emotes.emplace_back(id, cleanCode);
emoteData.emoteCodes.push_back(cleanCode);
util::EmoteData emote = this->getEmoteById(id, code); util::EmoteData emote = this->getEmoteById(id, code);
emoteData.emotes.insert(code, emote); emoteData.emotes.insert(code, emote);