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

Revert back to old emote parsing

Browse source
This commit is contained in:
Rasmus Karlsson 2024-10-20 11:44:27 +02:00
parent 802edeb8de
commit 55b8daf7a0
No known key found for this signature in database
1 changed files with 92 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
src/messages/MessageBuilder.cpp
View file

@ -380,6 +380,97 @@ EmotePtr makeAutoModBadge()
Url{"https://dashboard.twitch.tv/settings/moderation/automod"}});
}
std::tuple<std::optional<EmotePtr>, MessageElementFlags, bool> parseEmote(
TwitchChannel *twitchChannel, const EmoteName &name)
{
// Emote order:
// - FrankerFaceZ Channel
// - BetterTTV Channel
// - 7TV Channel
// - FrankerFaceZ Global
// - BetterTTV Global
// - 7TV Global
const auto *globalFfzEmotes = getApp()->getFfzEmotes();
const auto *globalBttvEmotes = getApp()->getBttvEmotes();
const auto *globalSeventvEmotes = getApp()->getSeventvEmotes();
std::optional<EmotePtr> emote{};
if (twitchChannel != nullptr)
{
// Check for channel emotes
emote = twitchChannel->ffzEmote(name);
if (emote)
{
return {
emote,
MessageElementFlag::FfzEmote,
false,
};
}
emote = twitchChannel->bttvEmote(name);
if (emote)
{
return {
emote,
MessageElementFlag::BttvEmote,
false,
};
}
emote = twitchChannel->seventvEmote(name);
if (emote)
{
return {
emote,
MessageElementFlag::SevenTVEmote,
emote.value()->zeroWidth,
};
}
}
// Check for global emotes
emote = globalFfzEmotes->emote(name);
if (emote)
{
return {
emote,
MessageElementFlag::FfzEmote,
false,
};
}
emote = globalBttvEmotes->emote(name);
if (emote)
{
return {
emote,
MessageElementFlag::BttvEmote,
zeroWidthEmotes.contains(name.string),
};
}
emote = globalSeventvEmotes->globalEmote(name);
if (emote)
{
return {
emote,
MessageElementFlag::SevenTVEmote,
emote.value()->zeroWidth,
};
}
return {
{},
{},
false,
};
}
} // namespace
namespace chatterino {
@ -2512,71 +2603,13 @@ Outcome MessageBuilder::tryAppendEmote(TwitchChannel *twitchChannel,
{
auto *app = getApp();
auto flags = MessageElementFlags();
auto emote = std::optional<EmotePtr>{};
// Emote order:
// - FrankerFaceZ Channel
// - BetterTTV Channel
// - 7TV Channel
// - FrankerFaceZ Global
// - BetterTTV Global
// - 7TV Global
[&] {
if (twitchChannel)
{
emote = twitchChannel->ffzEmote(name);
if (emote)
{
flags = MessageElementFlag::FfzEmote;
return;
}
emote = twitchChannel->bttvEmote(name);
if (emote)
{
flags = MessageElementFlag::BttvEmote;
return;
}
emote = twitchChannel->seventvEmote(name);
if (emote)
{
flags = MessageElementFlag::SevenTVEmote;
return;
}
}
// check for global emotes
emote = app->getFfzEmotes()->emote(name);
if (emote)
{
flags = MessageElementFlag::FfzEmote;
return;
}
emote = app->getBttvEmotes()->emote(name);
if (emote)
{
flags = MessageElementFlag::BttvEmote;
return;
}
emote = app->getSeventvEmotes()->globalEmote(name);
if (emote)
{
flags = MessageElementFlag::SevenTVEmote;
return;
}
}();
auto [emote, flags, zeroWidth] = parseEmote(twitchChannel, name);
if (!emote)
{
return Failure;
}
bool zeroWidth = emote.value()->zeroWidth;
if (zeroWidth && getSettings()->enableZeroWidthEmotes && !this->isEmpty())
{
// Attempt to merge current zero-width emote into any previous emotes