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

fixes #1304 emote.name eating the .name

Browse source
This commit is contained in:
fourtf 2019-09-15 19:05:04 +02:00
parent 04f8875c4d
commit 84b1efcd24
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/providers/twitch/TwitchMessageBuilder.cpp
View file

@ -355,7 +355,7 @@ void TwitchMessageBuilder::addWords(
auto i = int(); auto i = int();
auto currentTwitchEmote = twitchEmotes.begin(); auto currentTwitchEmote = twitchEmotes.begin();
for (const auto &word : words) for (auto word : words)
{ {
// check if it's a twitch emote twitch emote // check if it's a twitch emote twitch emote
while (currentTwitchEmote != twitchEmotes.end() && while (currentTwitchEmote != twitchEmotes.end() &&
@ -376,10 +376,20 @@ void TwitchMessageBuilder::addWords(
MessageElementFlag::TwitchEmote); MessageElementFlag::TwitchEmote);
i += word.length() + 1; i += word.length() + 1;
int len = std::get<2>(*currentTwitchEmote).string.length();
currentTwitchEmote++; currentTwitchEmote++;
if (len < word.length())
{
word = word.mid(len);
this->message().elements.back()->setTrailingSpace(false);
}
else
{
continue; continue;
} }
}
// split words // split words
for (auto &variant : getApp()->emotes->emojis.parse(word)) for (auto &variant : getApp()->emotes->emojis.parse(word))