chatterino2
Code Issues

CompletionModel tagged strings now have types (i.e. bttv emote, name, twitch emote)

Browse Source 
Usernames can be overriden (capitalized overrides lowercase, but not the other way around)
This commit is contained in:
Rasmus Karlsson
2018-03-30 12:06:02 +02:00
parent 4790f68557
commit f567f10d10
2 changed files with 79 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/completionmodel.cpp
+25 -11
View File
@@ -7,6 +7,8 @@
#include <QtAlgorithms>
#include <utility>
namespace chatterino {
CompletionModel::CompletionModel(const QString &_channelName)
@@ -24,40 +26,41 @@ void CompletionModel::refresh()
// TODO: Fix this so it properly updates with the proper api. oauth token needs proper scope
for (const auto &m : emoteManager.twitchAccountEmotes) {
for (const auto &emoteName : m.second.emoteCodes) {
this->addString(emoteName);
// XXX: No way to discern between a twitch global emote and sub emote right now
this->addString(emoteName, TaggedString::Type::TwitchGlobalEmote);
}
}
// Global: BTTV Global Emotes
std::vector<std::string> &bttvGlobalEmoteCodes = emoteManager.bttvGlobalEmoteCodes;
for (const auto &m : bttvGlobalEmoteCodes) {
this->addString(m);
this->addString(m, TaggedString::Type::BTTVGlobalEmote);
}
// Global: FFZ Global Emotes
std::vector<std::string> &ffzGlobalEmoteCodes = emoteManager.ffzGlobalEmoteCodes;
for (const auto &m : ffzGlobalEmoteCodes) {
this->addString(m);
this->addString(m, TaggedString::Type::FFZGlobalEmote);
}
// Channel-specific: BTTV Channel Emotes
std::vector<std::string> &bttvChannelEmoteCodes =
emoteManager.bttvChannelEmoteCodes[this->channelName.toStdString()];
for (const auto &m : bttvChannelEmoteCodes) {
this->addString(m);
this->addString(m, TaggedString::Type::BTTVChannelEmote);
}
// Channel-specific: FFZ Channel Emotes
std::vector<std::string> &ffzChannelEmoteCodes =
emoteManager.ffzChannelEmoteCodes[this->channelName.toStdString()];
for (const auto &m : ffzChannelEmoteCodes) {
this->addString(m);
this->addString(m, TaggedString::Type::FFZChannelEmote);
}
// Global: Emojis
const auto &emojiShortCodes = emoteManager.emojiShortCodes;
for (const auto &m : emojiShortCodes) {
this->addString(":" + m + ":");
this->addString(":" + m + ":", TaggedString::Type::Emoji);
}
// Channel-specific: Usernames
@@ -76,22 +79,33 @@ void CompletionModel::refresh()
// }
}
void CompletionModel::addString(const std::string &str)
void CompletionModel::addString(const std::string &str, TaggedString::Type type)
{
// Always add a space at the end of completions
this->emotes.insert(this->createEmote(str + " "));
this->emotes.insert({qS(str + " "), type});
}
void CompletionModel::addString(const QString &str)
void CompletionModel::addString(const QString &str, TaggedString::Type type)
{
// Always add a space at the end of completions
this->emotes.insert(this->createEmote(str + " "));
this->emotes.insert({str + " ", type});
}
void CompletionModel::addUser(const QString &str)
{
auto ts = this->createUser(str + " ");
// Always add a space at the end of completions
this->emotes.insert(this->createUser(str + " "));
std::pair<std::set<TaggedString>::iterator, bool> p = this->emotes.insert(ts);
if (!p.second) {
// No inseration was made, figure out if we need to replace the username.
if (p.first->str > ts.str) {
// Replace lowercase version of name with mixed-case version
this->emotes.erase(p.first);
auto result2 = this->emotes.insert(ts);
assert(result2.second);
}
}
}
} // namespace chatterino