summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2021-12-27 06:40:47 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2021-12-27 06:40:47 +0100
commit0897e4c062e9664bc139955067fb5d21201e6ee8 (patch)
tree99a730806f7396366d5e8e53070a8f1bb7a3444b /src
parentAdd an ugly custom emote completer using ~ (diff)
downloadnheko-0897e4c062e9664bc139955067fb5d21201e6ee8.tar.xz
Fix inclusion condition for overriden pack types
Diffstat (limited to 'src')
-rw-r--r--src/Cache.cpp2
-rw-r--r--src/CompletionProxyModel.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/Cache.cpp b/src/Cache.cpp

index 6db768d3..b1d03921 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp
@@ -3591,7 +3591,7 @@ Cache::getImagePacks(const std::string &room_id, std::optional<bool> stickers) for (const auto &img : pack.images) { if (stickers.has_value() && (img.second.overrides_usage() - ? (!stickers.value() ? img.second.is_sticker() : img.second.is_emoji()) + ? (stickers.value() ? !img.second.is_sticker() : !img.second.is_emoji()) : !pack_matches)) continue; diff --git a/src/CompletionProxyModel.cpp b/src/CompletionProxyModel.cpp
index 454f54b7..6354e91f 100644 --- a/src/CompletionProxyModel.cpp +++ b/src/CompletionProxyModel.cpp
@@ -71,8 +71,6 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model, &CompletionProxyModel::newSearchString, this, [this](QString s) { - s.remove(":"); - s.remove("@"); searchString_ = s.toLower(); invalidate(); },