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

Deduplicate emotes by name in smart tab emote completion strategy (#5705)

Browse source
This commit is contained in:
Ilya Zlobintsev 2024-11-12 16:41:12 +02:00 committed by GitHub
parent 6ceb987e7e
commit 63f363e5a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -42,6 +42,7 @@
- Minor: Tabs unhighlight when their content is read in other tabs. (#5649) - Minor: Tabs unhighlight when their content is read in other tabs. (#5649)
- Minor: Made usernames in bits and sub messages clickable. (#5686) - Minor: Made usernames in bits and sub messages clickable. (#5686)
- Minor: Mentions of FrankerFaceZ and BetterTTV in settings are standardized as such. (#5698) - Minor: Mentions of FrankerFaceZ and BetterTTV in settings are standardized as such. (#5698)
- Minor: Emote names are no longer duplicated when using smarter emote completion. (#5705)
- Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426, #5612) - Bugfix: Fixed tab move animation occasionally failing to start after closing a tab. (#5426, #5612)
- Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378) - Bugfix: If a network request errors with 200 OK, Qt's error code is now reported instead of the HTTP status. (#5378)
- Bugfix: Fixed restricted users usernames not being clickable. (#5405) - Bugfix: Fixed restricted users usernames not being clickable. (#5405)

4
src/controllers/completion/TabCompletionModel.cpp
View file

@ -43,11 +43,15 @@ void TabCompletionModel::updateResults(const QString &query,
query, fullTextContent, cursorPosition, isFirstWord); query, fullTextContent, cursorPosition, isFirstWord);
if (done) if (done)
{ {
auto uniqueResults = std::unique(results.begin(), results.end());
results.erase(uniqueResults, results.end());
this->setStringList(results); this->setStringList(results);
return; return;
} }
#endif #endif
this->source_->addToStringList(results, 0, isFirstWord); this->source_->addToStringList(results, 0, isFirstWord);
auto uniqueResults = std::unique(results.begin(), results.end());
results.erase(uniqueResults, results.end());
this->setStringList(results); this->setStringList(results);
} }
} }