noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

actually display channel ffz emotes as channel ffz emotes (#279)

Browse source
This commit is contained in:
Ckat 2018-03-05 22:37:01 +01:00 committed by pajlada
parent 1d1f40bf44
commit 0423702e50
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/singletons/emotemanager.cpp
View file

@ -63,14 +63,14 @@ static void FillInFFZEmoteData(const QJsonObject &urls, const QString &code,
assert(!url1x.isEmpty()); assert(!url1x.isEmpty());
emoteData.image1x = new Image(url1x, 1, code, code + "<br />Global FFZ Emote"); emoteData.image1x = new Image(url1x, 1, code, code);
if (!url2x.isEmpty()) { if (!url2x.isEmpty()) {
emoteData.image2x = new Image(url2x, 0.5, code, code + "<br />Global FFZ Emote"); emoteData.image2x = new Image(url2x, 0.5, code, code);
} }
if (!url3x.isEmpty()) { if (!url3x.isEmpty()) {
emoteData.image3x = new Image(url3x, 0.25, code, code + "<br />Global FFZ Emote"); emoteData.image3x = new Image(url3x, 0.25, code, code);
} }
} }
@ -192,7 +192,7 @@ void EmoteManager::reloadFFZChannelEmotes(const QString &channelName,
auto emote = auto emote =
this->getFFZChannelEmoteFromCaches().getOrAdd(id, [this, &code, &urls] { this->getFFZChannelEmoteFromCaches().getOrAdd(id, [this, &code, &urls] {
util::EmoteData emoteData; util::EmoteData emoteData;
FillInFFZEmoteData(urls, code, emoteData); FillInFFZEmoteData(urls, code + "<br/>Channel FFZ Emote", emoteData);
return emoteData; return emoteData;
}); });
@ -524,7 +524,7 @@ void EmoteManager::loadFFZEmotes()
QJsonObject urls = object.value("urls").toObject(); QJsonObject urls = object.value("urls").toObject();
util::EmoteData emoteData; util::EmoteData emoteData;
FillInFFZEmoteData(urls, code, emoteData); FillInFFZEmoteData(urls, code + "<br/>Global FFZ Emote", emoteData);
this->ffzGlobalEmotes.insert(code, emoteData); this->ffzGlobalEmotes.insert(code, emoteData);
codes.push_back(code.toStdString()); codes.push_back(code.toStdString());