1 files changed, 46 insertions, 43 deletions
diff --git a/Swift/Controllers/ContactSuggester.cpp b/Swift/Controllers/ContactSuggester.cpp
index f1104b0..4b621db 100644
--- a/Swift/Controllers/ContactSuggester.cpp
+++ b/Swift/Controllers/ContactSuggester.cpp
@@ -4,24 +4,27 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2014-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include <Swift/Controllers/ContactSuggester.h>
 
+#include <algorithm>
+#include <set>
+#include <vector>
+
+#include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/find.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/lambda/bind.hpp>
+#include <boost/bind.hpp>
 
 #include <Swiften/Base/Algorithm.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/JID/JID.h>
 
 #include <Swift/Controllers/ContactProvider.h>
 
-#include <algorithm>
-#include <vector>
-#include <set>
-
-namespace lambda = boost::lambda;
-
 namespace Swift {
 
 ContactSuggester::ContactSuggester() {
@@ -31,50 +34,50 @@ ContactSuggester::~ContactSuggester() {
 }
 
 void ContactSuggester::addContactProvider(ContactProvider* provider) {
-	contactProviders_.push_back(provider);
+    contactProviders_.push_back(provider);
 }
 
-bool ContactSuggester::matchContact(const std::string& search, const Contact& c) {
-	return fuzzyMatch(c.name, search) || fuzzyMatch(c.jid.toString(), search);
+bool ContactSuggester::matchContact(const std::string& search, const Contact::ref& c) {
+    if (fuzzyMatch(c->name, search)) {
+        return true;
+    }
+    else if (c->jid.isValid()) {
+        return fuzzyMatch(c->jid.toString(), search);
+    }
+    return false;
 }
 
-std::vector<Contact> ContactSuggester::getSuggestions(const std::string& search) const {
-	std::vector<Contact> results;
+std::vector<Contact::ref> ContactSuggester::getSuggestions(const std::string& search, bool withMUCNicks) const {
+    std::vector<Contact::ref> results;
 
-	foreach(ContactProvider* provider, contactProviders_) {
-		append(results, provider->getContacts());
-	}
+    for (auto provider : contactProviders_) {
+        append(results, provider->getContacts(withMUCNicks));
+    }
 
-	std::sort(results.begin(), results.end(),
-		lambda::bind(&Contact::jid, lambda::_1) < lambda::bind(&Contact::jid, lambda::_2));
-	results.erase(std::unique(results.begin(), results.end(),
-		lambda::bind(&Contact::jid, lambda::_1) == lambda::bind(&Contact::jid, lambda::_2)),
-		results.end());
-	results.erase(std::remove_if(results.begin(), results.end(), !lambda::bind(&ContactSuggester::matchContact, search, lambda::_1)),
-		results.end());
-	std::sort(results.begin(), results.end(), ContactSuggester::chatSortPredicate);
+    std::sort(results.begin(), results.end(), Contact::lexicographicalSortPredicate);
+    results.erase(std::unique(results.begin(), results.end(), Contact::equalityPredicate), results.end());
+    results.erase(std::remove_if(results.begin(), results.end(), [&](const Contact::ref contact) {
+        return !matchContact(search, contact);
+    }), results.end());
+    std::sort(results.begin(), results.end(), boost::bind(&Contact::sortPredicate, _1, _2, search));
 
-	return results;
+    return results;
 }
 
 bool ContactSuggester::fuzzyMatch(std::string text, std::string match) {
-	for (std::string::iterator currentQueryChar = match.begin(); currentQueryChar != match.end(); currentQueryChar++) {
-		//size_t result = text.find(*currentQueryChar);
-		std::string::iterator result = boost::algorithm::ifind_first(text, std::string(currentQueryChar, currentQueryChar+1)).begin();
-		if (result == text.end()) {
-			return false;
-		}
-		text.erase(result);
-	}
-	return true;
-}
-
-bool ContactSuggester::chatSortPredicate(const Contact& a, const Contact& b) {
-	if (a.statusType == b.statusType) {
-		return a.name.compare(b.name) < 0;
-	} else {
-		return a.statusType < b.statusType;
-	}
+    std::string lowerText = text;
+    boost::algorithm::to_lower(lowerText);
+    std::string lowerMatch = match;
+    boost::algorithm::to_lower(lowerMatch);
+    size_t lastMatch = 0;
+    for (char i : lowerMatch) {
+        size_t where = lowerText.find_first_of(i, lastMatch);
+        if (where == std::string::npos) {
+            return false;
+        }
+        lastMatch = where + 1;
+    }
+    return true;
 }
 
 }