Remove twitchemotes.com-related functionality (#3136)
Co-authored-by: Paweł <zneix@zneix.eu>
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
## Unversioned
|
## Unversioned
|
||||||
|
|
||||||
|
- Minor: Remove TwitchEmotes.com attribution and the open/copy options when right-clicking a Twitch Emote. (#2214, #3136)
|
||||||
- Bugfix: Moderation mode and active filters are now preserved when opening a split as a popup. (#3113, #3130)
|
- Bugfix: Moderation mode and active filters are now preserved when opening a split as a popup. (#3113, #3130)
|
||||||
- Bugfix: Fixed a bug that caused all badge highlights to use the same color. (#3132, #3134)
|
- Bugfix: Fixed a bug that caused all badge highlights to use the same color. (#3132, #3134)
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ EmotePtr TwitchEmotes::getOrCreateEmote(const EmoteId &id,
|
|||||||
Image::fromUrl(getEmoteLink(id, "3.0"), 0.25),
|
Image::fromUrl(getEmoteLink(id, "3.0"), 0.25),
|
||||||
},
|
},
|
||||||
Tooltip{name.toHtmlEscaped() + "<br>Twitch Emote"},
|
Tooltip{name.toHtmlEscaped() + "<br>Twitch Emote"},
|
||||||
Url{QString("https://twitchemotes.com/emotes/%1").arg(id.string)}});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
return shared;
|
return shared;
|
||||||
|
|||||||
@@ -108,11 +108,7 @@ namespace {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
if (creatorFlags.has(MessageElementFlag::TwitchEmote))
|
if (creatorFlags.has(MessageElementFlag::BttvEmote))
|
||||||
{
|
|
||||||
addPageLink("TwitchEmotes");
|
|
||||||
}
|
|
||||||
else if (creatorFlags.has(MessageElementFlag::BttvEmote))
|
|
||||||
{
|
{
|
||||||
addPageLink("BTTV");
|
addPageLink("BTTV");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,7 +161,6 @@ AboutPage::AboutPage()
|
|||||||
l.emplace<QLabel>("Google emojis provided by <a href=\"https://google.com\">Google</a>")->setOpenExternalLinks(true);
|
l.emplace<QLabel>("Google emojis provided by <a href=\"https://google.com\">Google</a>")->setOpenExternalLinks(true);
|
||||||
l.emplace<QLabel>("Emoji datasource provided by <a href=\"https://www.iamcal.com/\">Cal Henderson</a>"
|
l.emplace<QLabel>("Emoji datasource provided by <a href=\"https://www.iamcal.com/\">Cal Henderson</a>"
|
||||||
"(<a href=\"https://github.com/iamcal/emoji-data/blob/master/LICENSE\">show license</a>)")->setOpenExternalLinks(true);
|
"(<a href=\"https://github.com/iamcal/emoji-data/blob/master/LICENSE\">show license</a>)")->setOpenExternalLinks(true);
|
||||||
l.emplace<QLabel>("Twitch emote data provided by <a href=\"https://twitchemotes.com/\">twitchemotes.com</a> through the <a href=\"https://github.com/Chatterino/api\">Chatterino API</a>")->setOpenExternalLinks(true);
|
|
||||||
// clang-format on
|
// clang-format on
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user