10 files changed, 43 insertions, 13 deletions
diff --git a/Swift/Controllers/Chat/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index 3db1327..c180024 100644
--- a/Swift/Controllers/Chat/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -965,25 +965,40 @@ void ChatsManager::handleLocalServiceFound(const JID& service, boost::shared_ptr
 
 void ChatsManager::handleLocalServiceWalkFinished() {
 	onImpromptuMUCServiceDiscovered(!localMUCServiceJID_.toString().empty());
 }
 
 std::vector<ChatListWindow::Chat> ChatsManager::getRecentChats() const {
 	return std::vector<ChatListWindow::Chat>(recentChats_.begin(), recentChats_.end());
 }
 
-std::vector<Contact::ref> Swift::ChatsManager::getContacts() {
+std::vector<Contact::ref> Swift::ChatsManager::getContacts(bool withMUCNicks) {
 	std::vector<Contact::ref> result;
 	foreach (ChatListWindow::Chat chat, recentChats_) {
 		if (!chat.isMUC) {
 			result.push_back(boost::make_shared<Contact>(chat.chatName.empty() ? chat.jid.toString() : chat.chatName, chat.jid, chat.statusType, chat.avatarPath));
 		}
 	}
+	if (withMUCNicks) {
+		/* collect MUC nicks */
+		typedef std::map<JID, MUCController*>::value_type Item;
+		foreach (const Item& item, mucControllers_) {
+			JID mucJID = item.second->getToJID();
+			std::map<std::string, JID> participants = item.second->getParticipantJIDs();
+			typedef std::map<std::string, JID>::value_type ParticipantType;
+			foreach (const ParticipantType& participant, participants) {
+				const JID nickJID = JID(mucJID.getNode(), mucJID.getDomain(), participant.first);
+				Presence::ref presence = presenceOracle_->getLastPresence(nickJID);
+				const boost::filesystem::path avatar = avatarManager_->getAvatarPath(nickJID);
+				result.push_back(boost::make_shared<Contact>(participant.first, JID(), presence->getShow(), avatar));
+			}
+		}
+	}
 	return result;
 }
 
 ChatsManager::SingleChatWindowFactoryAdapter::SingleChatWindowFactoryAdapter(ChatWindow* chatWindow) : chatWindow_(chatWindow) {}
 ChatsManager::SingleChatWindowFactoryAdapter::~SingleChatWindowFactoryAdapter() {}
 ChatWindow* ChatsManager::SingleChatWindowFactoryAdapter::createChatWindow(const JID &, UIEventStream*) {
 	return chatWindow_;
 }
 
diff --git a/Swift/Controllers/Chat/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h
index 179f536..575b3cb 100644
--- a/Swift/Controllers/Chat/ChatsManager.h
+++ b/Swift/Controllers/Chat/ChatsManager.h
@@ -67,19 +67,19 @@ namespace Swift {
 	class ChatsManager : public ContactProvider {
 		public:
 			ChatsManager(JID jid, StanzaChannel* stanzaChannel, IQRouter* iqRouter, EventController* eventController, ChatWindowFactory* chatWindowFactory, JoinMUCWindowFactory* joinMUCWindowFactory, NickResolver* nickResolver, PresenceOracle* presenceOracle, PresenceSender* presenceSender, UIEventStream* uiEventStream, ChatListWindowFactory* chatListWindowFactory, bool useDelayForLatency, TimerFactory* timerFactory, MUCRegistry* mucRegistry, EntityCapsProvider* entityCapsProvider, MUCManager* mucManager, MUCSearchWindowFactory* mucSearchWindowFactory, ProfileSettingsProvider* profileSettings, FileTransferOverview* ftOverview, XMPPRoster* roster, bool eagleMode, SettingsProvider* settings, HistoryController* historyController_, WhiteboardManager* whiteboardManager, HighlightManager* highlightManager, ClientBlockListManager* clientBlockListManager, const std::map<std::string, std::string>& emoticons, UserSearchController* inviteUserSearchController, VCardManager* vcardManager);
 			virtual ~ChatsManager();
 			void setAvatarManager(AvatarManager* avatarManager);
 			void setOnline(bool enabled);
 			void setServerDiscoInfo(boost::shared_ptr<DiscoInfo> info);
 			void handleIncomingMessage(boost::shared_ptr<Message> message);
 			std::vector<ChatListWindow::Chat> getRecentChats() const;
-			virtual std::vector<Contact::ref> getContacts();
+			virtual std::vector<Contact::ref> getContacts(bool withMUCNicks);
 
 			boost::signal<void (bool supportsImpromptu)> onImpromptuMUCServiceDiscovered;
 
 		private:
 			class SingleChatWindowFactoryAdapter : public ChatWindowFactory {
 				public:
 					SingleChatWindowFactoryAdapter(ChatWindow* chatWindow);
 					virtual ~SingleChatWindowFactoryAdapter();
 					virtual ChatWindow* createChatWindow(const JID &, UIEventStream*);
diff --git a/Swift/Controllers/Chat/UserSearchController.cpp b/Swift/Controllers/Chat/UserSearchController.cpp
index f259a9a..f1849c9 100644
--- a/Swift/Controllers/Chat/UserSearchController.cpp
+++ b/Swift/Controllers/Chat/UserSearchController.cpp
@@ -190,19 +190,20 @@ void UserSearchController::handleNameSuggestionRequest(const JID &jid) {
 	suggestionsJID_= jid;
 	VCard::ref vcard = vcardManager_->getVCardAndRequestWhenNeeded(jid);
 	if (vcard) {
 		handleVCardChanged(jid, vcard);
 	}
 }
 
 void UserSearchController::handleContactSuggestionsRequested(std::string text) {
 	const std::vector<JID> existingJIDs = window_->getJIDs();
-	std::vector<Contact::ref> suggestions = contactSuggester_->getSuggestions(text);
+	std::vector<Contact::ref> suggestions = contactSuggester_->getSuggestions(text, false);
+	/* do not suggest contacts that have already been added to the chat list */
 	std::vector<Contact::ref>::iterator i = suggestions.begin();
 	while (i != suggestions.end()) {
 		bool found = false;
 		foreach (const JID& jid, existingJIDs) {
 			if ((*i)->jid == jid) {
 				found = true;
 				break;
 			}
 		}
diff --git a/Swift/Controllers/Contact.cpp b/Swift/Controllers/Contact.cpp
index 198443d..be2b83a 100644
--- a/Swift/Controllers/Contact.cpp
+++ b/Swift/Controllers/Contact.cpp
@@ -11,23 +11,31 @@
 namespace Swift {
 
 Contact::Contact() {
 }
 
 Contact::Contact(const std::string& name, const JID& jid, StatusShow::Type statusType, const boost::filesystem::path& path) : name(name), jid(jid), statusType(statusType), avatarPath(path) {
 }
 
 bool Contact::lexicographicalSortPredicate(const Contact::ref& a, const Contact::ref& b) {
-	return a->jid < b->jid;
+	if (a->jid.isValid() && b->jid.isValid()) {
+		return a->jid < b->jid;
+	} else {
+		return a->name < b->name;
+	}
 }
 
 bool Contact::equalityPredicate(const Contact::ref& a, const Contact::ref& b) {
-	return a->jid == b->jid;
+	if (a->jid.isValid() && b->jid.isValid()) {
+		return a->jid == b->jid;
+	} else {
+		return a->name == b->name;
+	}
 }
 
 bool Contact::sortPredicate(const Contact::ref& a, const Contact::ref& b, const std::string& search) {
 	/* perform case insensitive comparisons */
 	std::string aLower = a->name;
 	boost::to_lower(aLower);
 	std::string bLower = b->name;
 	boost::to_lower(bLower);
 	std::string searchLower = search;
diff --git a/Swift/Controllers/ContactProvider.h b/Swift/Controllers/ContactProvider.h
index 0e56de5..acc2bdc 100644
--- a/Swift/Controllers/ContactProvider.h
+++ b/Swift/Controllers/ContactProvider.h
@@ -15,13 +15,13 @@
 #include <vector>
 
 #include <Swift/Controllers/Contact.h>
 
 namespace Swift {
 
 class ContactProvider {
 	public:
 		virtual ~ContactProvider();
-		virtual std::vector<Contact::ref> getContacts() = 0;
+		virtual std::vector<Contact::ref> getContacts(bool withMUCNicks) = 0;
 };
 
 }
diff --git a/Swift/Controllers/ContactSuggester.cpp b/Swift/Controllers/ContactSuggester.cpp
index 42e8308..8627aeb 100644
--- a/Swift/Controllers/ContactSuggester.cpp
+++ b/Swift/Controllers/ContactSuggester.cpp
@@ -37,26 +37,32 @@ ContactSuggester::ContactSuggester() {
 
 ContactSuggester::~ContactSuggester() {
 }
 
 void ContactSuggester::addContactProvider(ContactProvider* provider) {
 	contactProviders_.push_back(provider);
 }
 
 bool ContactSuggester::matchContact(const std::string& search, const Contact::ref& c) {
-	return fuzzyMatch(c->name, search) || fuzzyMatch(c->jid.toString(), search);
+	if (fuzzyMatch(c->name, search)) {
+		return true;
+	}
+	else if (c->jid.isValid()) {
+		return fuzzyMatch(c->jid.toString(), search);
+	}
+	return false;
 }
 
-std::vector<Contact::ref> ContactSuggester::getSuggestions(const std::string& search) const {
+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());
+		append(results, provider->getContacts(withMUCNicks));
 	}
 
 	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(), !lambda::bind(&matchContact, search, lambda::_1)),
 		results.end());
 	std::sort(results.begin(), results.end(), boost::bind(&Contact::sortPredicate, _1, _2, search));
 
 	return results;
diff --git a/Swift/Controllers/ContactSuggester.h b/Swift/Controllers/ContactSuggester.h
index 1c796c9..ae47766 100644
--- a/Swift/Controllers/ContactSuggester.h
+++ b/Swift/Controllers/ContactSuggester.h
@@ -23,19 +23,19 @@ namespace Swift {
 	class ContactProvider;
 
 	class ContactSuggester {
 	public:
 		ContactSuggester();
 		~ContactSuggester();
 
 		void addContactProvider(ContactProvider* provider);
 
-		std::vector<Contact::ref> getSuggestions(const std::string& search) const;
+		std::vector<Contact::ref> getSuggestions(const std::string& search, bool withMUCNicks) const;
 	public:
 		static bool matchContact(const std::string& search, const Contact::ref& c);
 		/**
 		 * Performs fuzzy matching on the string text. Matches when each character of match string is present in sequence in text string.
 		 */
 		static bool fuzzyMatch(std::string text, std::string match);
 
 	private:
 		std::vector<ContactProvider*> contactProviders_;
diff --git a/Swift/Controllers/ContactsFromXMPPRoster.cpp b/Swift/Controllers/ContactsFromXMPPRoster.cpp
index 7559962..abd62bd 100644
--- a/Swift/Controllers/ContactsFromXMPPRoster.cpp
+++ b/Swift/Controllers/ContactsFromXMPPRoster.cpp
@@ -21,19 +21,19 @@
 
 namespace Swift {
 
 ContactsFromXMPPRoster::ContactsFromXMPPRoster(XMPPRoster* roster, AvatarManager* avatarManager, PresenceOracle* presenceOracle) : roster_(roster), avatarManager_(avatarManager), presenceOracle_(presenceOracle) {
 }
 
 ContactsFromXMPPRoster::~ContactsFromXMPPRoster() {
 }
 
-std::vector<Contact::ref> ContactsFromXMPPRoster::getContacts() {
+std::vector<Contact::ref> ContactsFromXMPPRoster::getContacts(bool /*withMUCNicks*/) {
 	std::vector<Contact::ref> results;
 	std::vector<XMPPRosterItem> rosterItems = roster_->getItems();
 	foreach(const XMPPRosterItem& rosterItem, rosterItems) {
 		Contact::ref contact = boost::make_shared<Contact>(rosterItem.getName().empty() ? rosterItem.getJID().toString() : rosterItem.getName(), rosterItem.getJID(), StatusShow::None,"");
 		contact->statusType = presenceOracle_->getHighestPriorityPresence(contact->jid) ? presenceOracle_->getHighestPriorityPresence(contact->jid)->getShow() : StatusShow::None;
 		contact->avatarPath = avatarManager_->getAvatarPath(contact->jid);
 		results.push_back(contact);
 	}
 	return results;
diff --git a/Swift/Controllers/ContactsFromXMPPRoster.h b/Swift/Controllers/ContactsFromXMPPRoster.h
index 4adc606..b76adc4 100644
--- a/Swift/Controllers/ContactsFromXMPPRoster.h
+++ b/Swift/Controllers/ContactsFromXMPPRoster.h
@@ -19,17 +19,17 @@ namespace Swift {
 class PresenceOracle;
 class AvatarManager;
 class XMPPRoster;
 
 class ContactsFromXMPPRoster : public ContactProvider {
 	public:
 		ContactsFromXMPPRoster(XMPPRoster* roster, AvatarManager* avatarManager, PresenceOracle* presenceOracle);
 		virtual ~ContactsFromXMPPRoster();
 
-		virtual std::vector<Contact::ref> getContacts();
+		virtual std::vector<Contact::ref> getContacts(bool withMUCNicks);
 	private:
 		XMPPRoster* roster_;
 		AvatarManager* avatarManager_;
 		PresenceOracle* presenceOracle_;
 };
 
 }
diff --git a/Swift/Controllers/HighlightEditorController.cpp b/Swift/Controllers/HighlightEditorController.cpp
index 38007f0..efa3ba2 100644
--- a/Swift/Controllers/HighlightEditorController.cpp
+++ b/Swift/Controllers/HighlightEditorController.cpp
@@ -43,14 +43,14 @@ void HighlightEditorController::handleUIEvent(boost::shared_ptr<UIEvent> rawEven
 			highlightEditorWindow_->onContactSuggestionsRequested.connect(boost::bind(&HighlightEditorController::handleContactSuggestionsRequested, this, _1));
 		}
 		highlightEditorWindow_->show();
 	}
 }
 
 void HighlightEditorController::handleContactSuggestionsRequested(const std::string& text)
 {
 	if (contactSuggester_) {
-		highlightEditorWindow_->setContactSuggestions(contactSuggester_->getSuggestions(text));
+		highlightEditorWindow_->setContactSuggestions(contactSuggester_->getSuggestions(text, true));
 	}
 }
 
 }