chatterino2
Code Issues

Added system message if no bttv emotes found instead of "unknown error" (#2542)

Browse Source 
Co-authored-by: Paweł <zneix@zneix.eu>
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
Auro
2021-03-21 09:27:28 -04:00
committed by GitHub
parent a893cdaebe
commit 6ef515a0e2
3 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/ffz/FfzEmotes.cpp
+21 -5
View File
@@ -12,6 +12,10 @@
namespace chatterino {
namespace {
const QString CHANNEL_HAS_NO_EMOTES(
"This channel has no FrankerFaceZ channel emotes.");
Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
{
auto emote = urls.value(emoteScale);
@@ -210,11 +214,23 @@ void FfzEmotes::loadChannel(
auto emoteMap = parseChannelEmotes(json);
auto modBadge = parseModBadge(json);
bool hasEmotes = !emoteMap.empty();
emoteCallback(std::move(emoteMap));
modBadgeCallback(std::move(modBadge));
if (auto shared = channel.lock(); manualRefresh)
shared->addMessage(
makeSystemMessage("FrankerFaceZ channel emotes reloaded."));
{
if (hasEmotes)
{
shared->addMessage(makeSystemMessage(
"FrankerFaceZ channel emotes reloaded."));
}
else
{
shared->addMessage(
makeSystemMessage(CHANNEL_HAS_NO_EMOTES));
}
}
return Success;
})
@@ -222,12 +238,12 @@ void FfzEmotes::loadChannel(
auto shared = channel.lock();
if (!shared)
return;
if (result.status() == 203)
if (result.status() == 404)
{
// User does not have any FFZ emotes
if (manualRefresh)
shared->addMessage(makeSystemMessage(
"This channel has no FrankerFaceZ channel emotes."));
shared->addMessage(
makeSystemMessage(CHANNEL_HAS_NO_EMOTES));
}
else if (result.status() == NetworkResult::timedoutStatus)
{