Fix some issues with completer

resources/qml/ActiveCallBar.qml

@@ -53,7 +53,6 @@ Rectangle {
 
         Connections {
             target: TimelineManager
-
             onCallStateChanged: {
                 switch (state) {
                 case WebRTCState.INITIATING:

resources/qml/Completer.qml

@@ -9,55 +9,72 @@ Popup {
     property int currentIndex: -1
     property string completerName
     property var completer
+    property bool bottomToTop: true
 
     function up() {
-        currentIndex = currentIndex - 1;
+        if (bottomToTop)
-        if (currentIndex == -2)
+            down_();
-            currentIndex = repeater.count - 1;
+        else
-
+            up_();
     }
 
     function down() {
+        if (bottomToTop)
+            up_();
+        else
+            down_();
+    }
+
+    function up_() {
+        currentIndex = currentIndex - 1;
+        if (currentIndex == -2)
+            currentIndex = listView.count - 1;
+
+    }
+
+    function down_() {
         currentIndex = currentIndex + 1;
-        if (currentIndex >= repeater.count)
+        if (currentIndex >= listView.count)
             currentIndex = -1;
 
     }
 
     function currentCompletion() {
-        if (currentIndex > -1 && currentIndex < repeater.count)
+        if (currentIndex > -1 && currentIndex < listView.count)
             return completer.completionAt(currentIndex);
         else
             return null;
     }
 
     onCompleterNameChanged: {
-        if (completerName)
+        if (completerName) {
             completer = TimelineManager.timeline.input.completerFor(completerName);
-        else
+            completer.setSearchString("");
+        } else {
             completer = undefined;
         }
+    }
     padding: 0
     onAboutToShow: currentIndex = -1
+    height: listView.contentHeight
 
     Connections {
         onTimelineChanged: completer = null
         target: TimelineManager
     }
 
-    ColumnLayout {
+    ListView {
+        id: listView
+
         anchors.fill: parent
-        spacing: 0
+        implicitWidth: contentItem.childrenRect.width
-
-        Repeater {
-            id: repeater
-
         model: completer
+        verticalLayoutDirection: popup.bottomToTop ? ListView.BottomToTop : ListView.TopToBottom
 
         delegate: Rectangle {
-                color: model.index == popup.currentIndex ? colors.window : colors.alternateBase
+            color: model.index == popup.currentIndex ? colors.highlight : colors.base
             height: chooser.childrenRect.height + 4
-                width: chooser.childrenRect.width + 4
+            implicitWidth: chooser.childrenRect.width + 4
 
             DelegateChooser {
                 id: chooser
@@ -82,7 +99,7 @@ Popup {
 
                         Label {
                             text: model.displayName
-                                color: colors.text
+                            color: model.index == popup.currentIndex ? colors.highlightedText : colors.text
                         }
 
                     }
@@ -99,15 +116,13 @@ Popup {
 
                         Label {
                             text: model.unicode
-                                color: colors.text
+                            color: model.index == popup.currentIndex ? colors.highlightedText : colors.text
                             font: Settings.emojiFont
                         }
 
                         Label {
                             text: model.shortName
-                                color: colors.text
+                            color: model.index == popup.currentIndex ? colors.highlightedText : colors.text
-                            }
-
                         }
 
                     }
@@ -141,7 +156,7 @@ Popup {
     }
 
     background: Rectangle {
-        color: colors.alternateBase
+        color: colors.base
         implicitHeight: popup.contentHeight
         implicitWidth: popup.contentWidth
     }

resources/qml/MessageView.qml

@@ -182,7 +182,6 @@ ListView {
 
         Connections {
             target: chat
-
             onMovementEnded: {
                 if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height)
                     chat.model.currentIndex = index;

resources/qml/TimelineView.qml

@@ -131,7 +131,6 @@ Page {
 
         Connections {
             target: TimelineManager
-
             onNewDeviceVerificationRequest: {
                 var dialog = deviceVerificationDialog.createObject(timelineRoot, {
                     "flow": flow
@@ -142,7 +141,6 @@ Page {
 
         Connections {
             target: TimelineManager.timeline
-            
             onOpenProfile: {
                 var userProfile = userProfileComponent.createObject(timelineRoot, {
                     "profile": profile

src/CompletionProxyModel.h

@@ -43,16 +43,40 @@ struct trie
                                 return ret;
                         else {
                                 auto temp = t.valuesAndSubvalues(limit - ret.size());
-                                ret.insert(ret.end(), temp.begin(), temp.end());
+                                for (auto &&v : temp) {
+                                        if (ret.size() >= limit)
+                                                return ret;
+
+                                        if (std::find(ret.begin(), ret.end(), v) == ret.end()) {
+                                                ret.push_back(std::move(v));
+                                        }
+                                }
                         }
                 }
 
                 return ret;
         }
 
-        std::vector<Value> search(const QVector<Key> &keys, size_t limit) const
+        std::vector<Value> search(const QVector<Key> &keys,
+                                  size_t limit,
+                                  size_t max_distance = 2) const
         {
                 std::vector<Value> ret;
+                if (!limit)
+                        return ret;
+
+                auto append = [&ret, limit](std::vector<Value> &&in) {
+                        for (auto &&v : in) {
+                                if (ret.size() >= limit)
+                                        return;
+
+                                if (std::find(ret.begin(), ret.end(), v) == ret.end()) {
+                                        ret.push_back(std::move(v));
+                                }
+                        }
+                };
+
+                {
                         auto t = this;
                         int i  = 0;
                         for (; i < (int)keys.size(); i++) {
@@ -67,6 +91,47 @@ struct trie
                         if (t) {
                                 ret = t->valuesAndSubvalues(limit);
                         }
+                }
+
+                if (max_distance && keys.size() < static_cast<int>(limit) && keys.size() > 1) {
+                        max_distance -= 1;
+
+                        // swap chars case
+                        if (keys.size() >= 2) {
+                                auto t = this;
+                                for (int i = 1; i >= 0; i--) {
+                                        if (auto e = t->next.find(keys[i]); e != t->next.end()) {
+                                                t = &e->second;
+                                        } else {
+                                                t = nullptr;
+                                                break;
+                                        }
+                                }
+
+                                if (t) {
+                                        append(t->search(
+                                          keys.mid(2), (limit - ret.size()) * 2, max_distance));
+                                }
+                        }
+
+                        // delete character case
+                        append(this->search(keys.mid(1), (limit - ret.size()) * 2, max_distance));
+
+                        // substitute and insert cases
+                        for (const auto &[k, t] : this->next) {
+                                if (k == keys[0] || ret.size() >= limit)
+                                        break;
+
+                                // substitute
+                                append(this->search(keys.mid(1), limit - ret.size(), max_distance));
+
+                                if (ret.size() >= limit)
+                                        break;
+
+                                // insert
+                                append(this->search(keys, limit - ret.size(), max_distance));
+                        }
+                }
 
                 return ret;
         }