From 0897e4c062e9664bc139955067fb5d21201e6ee8 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 27 Dec 2021 06:40:47 +0100
Subject: [PATCH] Fix inclusion condition for overriden pack types

---
 src/Cache.cpp                | 2 +-
 src/CompletionProxyModel.cpp | 2 --
 2 files changed, 1 insertion(+), 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();
       },