chatterino2
Code Issues

Merge branch 'master' into apa-notification-on-live

Browse Source
This commit is contained in:
pajlada
2018-09-16 17:43:53 +02:00
committed by GitHub
parent e89caa9e78 23cf815219
commit e2a7765964
53 changed files with 628 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchChannel.cpp
+7 -6
View File
@@ -633,12 +633,13 @@ void TwitchChannel::refreshBadges()
auto jsonVersion = jsonVersion_->toObject();
auto emote = std::make_shared<Emote>(Emote{
EmoteName{},
ImageSet{Image::fromUrl(
{jsonVersion["image_url_1x"].toString()}),
Image::fromUrl(
{jsonVersion["image_url_2x"].toString()}),
Image::fromUrl(
{jsonVersion["image_url_4x"].toString()})},
ImageSet{
Image::fromUrl({jsonVersion["image_url_1x"].toString()},
1),
Image::fromUrl({jsonVersion["image_url_2x"].toString()},
.5),
Image::fromUrl({jsonVersion["image_url_4x"].toString()},
.25)},
Tooltip{jsonRoot["description"].toString()},
Url{jsonVersion["clickURL"].toString()}});