fix(autocomplete): don't auto-complete own nick

In the process also remove the dependency of the auto completer on Core.
qTox · Nov 22, 2018 · f188409 · f188409
1 parent 1ebcac4
commit f188409
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/model/group.cpp b/src/model/group.cpp
@@ -183,3 +183,8 @@ void Group::setSelfName(const QString& name)
 {
     selfName = name;
 }
+
+QString Group::getSelfName() const
+{
+    return selfName;
+}
diff --git a/src/model/group.h b/src/model/group.h
@@ -55,6 +55,7 @@ class Group : public Contact
     const ToxPk resolvePeerId(int peerId) const;
     QString resolveToxId(const ToxPk& id) const;
     void setSelfName(const QString& name);
+    QString getSelfName() const;
 
 signals:
     void titleChangedByUser(uint32_t groupId, const QString& title);

diff --git a/src/widget/form/tabcompleter.cpp b/src/widget/form/tabcompleter.cpp
@@ -25,7 +25,6 @@
 #include <QKeyEvent>
 #include <QRegExp>
 
-#include "src/core/core.h"
 #include "src/model/group.h"
 #include "src/widget/tool/chattextedit.h"
 
@@ -72,7 +71,11 @@ void TabCompleter::buildCompletionList()
     QRegExp regex(QString("^[-_\\[\\]{}|`^.\\\\]*").append(QRegExp::escape(tabAbbrev)),
                   Qt::CaseInsensitive);
 
-    for (auto name : group->getPeerList()) {
+    const QString ownNick = group->getSelfName();
+    for (const auto& name : group->getPeerList()) {
+        if (name == ownNick) {
+            continue;   // don't auto complete own name
+        }
         if (regex.indexIn(name) > -1) {
             SortableString lower = SortableString(name.toLower());
             completionMap[lower] = name;
@@ -96,8 +99,9 @@ void TabCompleter::complete()
         auto cur = msgEdit->textCursor();
         cur.setPosition(cur.selectionEnd());
         msgEdit->setTextCursor(cur);
-        for (int i = 0; i < lastCompletionLength; ++i)
+        for (int i = 0; i < lastCompletionLength; ++i) {
             msgEdit->textCursor().deletePreviousChar();
+        }
 
         // insert completion
         msgEdit->insertPlainText(*nextCompletion);
@@ -127,12 +131,6 @@ void TabCompleter::reset()
 // this determines the sort order
 bool TabCompleter::SortableString::operator<(const SortableString& other) const
 {
-    QString name = Core::getInstance()->getUsername();
-    if (this->contents == name)
-        return false;
-    else if (other.contents == name)
-        return true;
-
     /*  QDateTime thisTime = thisUser->lastChannelActivity(_currentBufferId);
     QDateTime thatTime = thatUser->lastChannelActivity(_currentBufferId);