chatterino2
Code Issues

Update emote parsing (#1714)

Browse Source 
Fixes #1707
This commit is contained in:
pajlada
2020-09-26 08:21:46 -04:00
committed by GitHub
parent d9e6488be3
commit 20e4d6b3d2
4 changed files with 147 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/providers/twitch/TwitchMessageBuilder.cpp
+115 -74
View File
@@ -282,7 +282,7 @@ MessagePtr TwitchMessageBuilder::build()
}
// twitch emotes
std::vector<std::tuple<int, EmotePtr, EmoteName>> twitchEmotes;
std::vector<TwitchEmoteOccurence> twitchEmotes;
iterator = this->tags.find("emotes");
if (iterator != this->tags.end())
@@ -307,12 +307,11 @@ MessagePtr TwitchMessageBuilder::build()
std::sort(twitchEmotes.begin(), twitchEmotes.end(),
[](const auto &a, const auto &b) {
return std::get<0>(a) < std::get<0>(b);
return a.start < b.start; //
});
twitchEmotes.erase(std::unique(twitchEmotes.begin(), twitchEmotes.end(),
[](const auto &first, const auto &second) {
return std::get<0>(first) ==
std::get<0>(second);
return first.start == second.start;
}),
twitchEmotes.end());
@@ -339,47 +338,90 @@ MessagePtr TwitchMessageBuilder::build()
return this->release();
}
bool doesWordContainATwitchEmote(
int cursor, const QString &word,
const std::vector<TwitchEmoteOccurence> &twitchEmotes,
std::vector<TwitchEmoteOccurence>::const_iterator &currentTwitchEmoteIt)
{
if (currentTwitchEmoteIt == twitchEmotes.end())
{
// No emote to add!
return false;
}
const auto &currentTwitchEmote = *currentTwitchEmoteIt;
auto wordEnd = cursor + word.length();
// Check if this emote fits within the word boundaries
if (currentTwitchEmote.start < cursor || currentTwitchEmote.end > wordEnd)
{
// this emote does not fit xd
return false;
}
return true;
}
void TwitchMessageBuilder::addWords(
const QStringList &words,
const std::vector<std::tuple<int, EmotePtr, EmoteName>> &twitchEmotes)
const std::vector<TwitchEmoteOccurence> &twitchEmotes)
{
auto i = int();
auto currentTwitchEmote = twitchEmotes.begin();
// cursor currently indicates what character index we're currently operating in the full list of words
int cursor = 0;
auto currentTwitchEmoteIt = twitchEmotes.begin();
for (auto word : words)
{
// check if it's a twitch emote twitch emote
while (currentTwitchEmote != twitchEmotes.end() &&
std::get<0>(*currentTwitchEmote) < i)
while (doesWordContainATwitchEmote(cursor, word, twitchEmotes,
currentTwitchEmoteIt))
{
++currentTwitchEmote;
}
if (currentTwitchEmote != twitchEmotes.end() &&
std::get<0>(*currentTwitchEmote) == i)
{
auto emoteImage = std::get<1>(*currentTwitchEmote);
if (emoteImage == nullptr)
{
qDebug() << "emoteImage nullptr"
<< std::get<2>(*currentTwitchEmote).string;
}
this->emplace<EmoteElement>(emoteImage,
MessageElementFlag::TwitchEmote);
i += word.length() + 1;
int len = std::get<2>(*currentTwitchEmote).string.length();
currentTwitchEmote++;
if (len < word.length())
auto wordEnd = cursor + word.length();
const auto &currentTwitchEmote = *currentTwitchEmoteIt;
if (currentTwitchEmote.start == cursor)
{
// This emote exists right at the start of the word!
this->emplace<EmoteElement>(currentTwitchEmote.ptr,
MessageElementFlag::TwitchEmote);
auto len = currentTwitchEmote.name.string.length();
cursor += len;
word = word.mid(len);
this->message().elements.back()->setTrailingSpace(false);
}
else
{
++currentTwitchEmoteIt;
if (word.isEmpty())
{
// space
cursor += 1;
break;
}
else
{
this->message().elements.back()->setTrailingSpace(false);
}
continue;
}
// Emote is not at the start
// 1. Add text before the emote
QString preText = word.left(currentTwitchEmote.start - cursor);
for (auto &variant : getApp()->emotes->emojis.parse(preText))
{
boost::apply_visitor(
[&](auto &&arg) { this->addTextOrEmoji(arg); }, variant);
}
cursor += preText.size();
word = word.mid(preText.size());
}
if (word.isEmpty())
{
continue;
}
// split words
@@ -389,7 +431,7 @@ void TwitchMessageBuilder::addWords(
variant);
}
i += word.size() + 1;
cursor += word.size() + 1;
}
}
@@ -660,36 +702,32 @@ void TwitchMessageBuilder::appendUsername()
}
void TwitchMessageBuilder::runIgnoreReplaces(
std::vector<std::tuple<int, EmotePtr, EmoteName>> &twitchEmotes)
std::vector<TwitchEmoteOccurence> &twitchEmotes)
{
auto phrases = getCSettings().ignoredMessages.readOnly();
auto removeEmotesInRange =
[](int pos, int len,
std::vector<std::tuple<int, EmotePtr, EmoteName>>
&twitchEmotes) mutable {
auto it =
std::partition(twitchEmotes.begin(), twitchEmotes.end(),
[pos, len](const auto &item) {
return !((std::get<0>(item) >= pos) &&
std::get<0>(item) < (pos + len));
});
for (auto copy = it; copy != twitchEmotes.end(); ++copy)
auto removeEmotesInRange = [](int pos, int len,
auto &twitchEmotes) mutable {
auto it = std::partition(
twitchEmotes.begin(), twitchEmotes.end(),
[pos, len](const auto &item) {
return !((item.start >= pos) && item.start < (pos + len));
});
for (auto copy = it; copy != twitchEmotes.end(); ++copy)
{
if ((*copy).ptr == nullptr)
{
if (std::get<1>(*copy) == nullptr)
{
qDebug() << "remem nullptr" << std::get<2>(*copy).string;
}
qDebug() << "remem nullptr" << (*copy).name.string;
}
std::vector<std::tuple<int, EmotePtr, EmoteName>> v(
it, twitchEmotes.end());
twitchEmotes.erase(it, twitchEmotes.end());
return v;
};
}
std::vector<TwitchEmoteOccurence> v(it, twitchEmotes.end());
twitchEmotes.erase(it, twitchEmotes.end());
return v;
};
auto shiftIndicesAfter = [&twitchEmotes](int pos, int by) mutable {
for (auto &item : twitchEmotes)
{
auto &index = std::get<0>(item);
auto &index = item.start;
if (index >= pos)
{
index += by;
@@ -717,8 +755,12 @@ void TwitchMessageBuilder::runIgnoreReplaces(
{
qDebug() << "emote null" << emote.first.string;
}
twitchEmotes.push_back(std::tuple<int, EmotePtr, EmoteName>{
startIndex + pos, emote.second, emote.first});
twitchEmotes.push_back(TwitchEmoteOccurence{
startIndex + pos,
startIndex + pos + emote.first.string.length(),
emote.second,
emote.first,
});
}
}
pos += word.length() + 1;
@@ -776,13 +818,13 @@ void TwitchMessageBuilder::runIgnoreReplaces(
for (auto &tup : vret)
{
if (std::get<1>(tup) == nullptr)
if (tup.ptr == nullptr)
{
qDebug() << "v nullptr" << std::get<2>(tup).string;
qDebug() << "v nullptr" << tup.name.string;
continue;
}
QRegularExpression emoteregex(
"\\b" + std::get<2>(tup).string + "\\b",
"\\b" + tup.name.string + "\\b",
QRegularExpression::UseUnicodePropertiesOption);
auto _match = emoteregex.match(midExtendedRef);
if (_match.hasMatch())
@@ -790,7 +832,7 @@ void TwitchMessageBuilder::runIgnoreReplaces(
int last = _match.lastCapturedIndex();
for (int i = 0; i <= last; ++i)
{
std::get<0>(tup) = from + _match.capturedStart();
tup.start = from + _match.capturedStart();
twitchEmotes.push_back(std::move(tup));
}
}
@@ -845,13 +887,13 @@ void TwitchMessageBuilder::runIgnoreReplaces(
for (auto &tup : vret)
{
if (std::get<1>(tup) == nullptr)
if (tup.ptr == nullptr)
{
qDebug() << "v nullptr" << std::get<2>(tup).string;
qDebug() << "v nullptr" << tup.name.string;
continue;
}
QRegularExpression emoteregex(
"\\b" + std::get<2>(tup).string + "\\b",
"\\b" + tup.name.string + "\\b",
QRegularExpression::UseUnicodePropertiesOption);
auto match = emoteregex.match(midExtendedRef);
if (match.hasMatch())
@@ -859,7 +901,7 @@ void TwitchMessageBuilder::runIgnoreReplaces(
int last = match.lastCapturedIndex();
for (int i = 0; i <= last; ++i)
{
std::get<0>(tup) = from + match.capturedStart();
tup.start = from + match.capturedStart();
twitchEmotes.push_back(std::move(tup));
}
}
@@ -874,8 +916,7 @@ void TwitchMessageBuilder::runIgnoreReplaces(
}
void TwitchMessageBuilder::appendTwitchEmote(
const QString &emote,
std::vector<std::tuple<int, EmotePtr, EmoteName>> &vec,
const QString &emote, std::vector<TwitchEmoteOccurence> &vec,
std::vector<int> &correctPositions)
{
auto app = getApp();
@@ -914,13 +955,13 @@ void TwitchMessageBuilder::appendTwitchEmote(
auto name =
EmoteName{this->originalMessage_.mid(start, end - start + 1)};
auto tup = std::tuple<int, EmotePtr, EmoteName>{
start, app->emotes->twitch.getOrCreateEmote(id, name), name};
if (std::get<1>(tup) == nullptr)
TwitchEmoteOccurence emoteOccurence{
start, end, app->emotes->twitch.getOrCreateEmote(id, name), name};
if (emoteOccurence.ptr == nullptr)
{
qDebug() << "nullptr" << std::get<2>(tup).string;
qDebug() << "nullptr" << emoteOccurence.name.string;
}
vec.push_back(std::move(tup));
vec.push_back(std::move(emoteOccurence));
}
}
src/providers/twitch/TwitchMessageBuilder.hpp
+14 -9
View File
@@ -18,6 +18,13 @@ using EmotePtr = std::shared_ptr<const Emote>;
class Channel;
class TwitchChannel;
struct TwitchEmoteOccurence {
int start;
int end;
EmotePtr ptr;
EmoteName name;
};
class TwitchMessageBuilder : public SharedMessageBuilder
{
public:
@@ -52,19 +59,17 @@ private:
void parseMessageID();
void parseRoomID();
void appendUsername();
void runIgnoreReplaces(
std::vector<std::tuple<int, EmotePtr, EmoteName>> &twitchEmotes);
void runIgnoreReplaces(std::vector<TwitchEmoteOccurence> &twitchEmotes);
boost::optional<EmotePtr> getTwitchBadge(const Badge &badge);
void appendTwitchEmote(
const QString &emote,
std::vector<std::tuple<int, EmotePtr, EmoteName>> &vec,
std::vector<int> &correctPositions);
void appendTwitchEmote(const QString &emote,
std::vector<TwitchEmoteOccurence> &vec,
std::vector<int> &correctPositions);
Outcome tryAppendEmote(const EmoteName &name);
void addWords(
const QStringList &words,
const std::vector<std::tuple<int, EmotePtr, EmoteName>> &twitchEmotes);
void addWords(const QStringList &words,
const std::vector<TwitchEmoteOccurence> &twitchEmotes);
void addTextOrEmoji(EmotePtr emote) override;
void addTextOrEmoji(const QString &value) override;