1 files changed, 16 insertions, 1 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
@@ -939,52 +939,67 @@ void ChatsManager::handleRecentActivated(const ChatListWindow::Chat& chat) {
 			inviteJIDs.push_back(pair.second);
 		}
 		uiEventStream_->send(boost::make_shared<CreateImpromptuMUCUIEvent>(inviteJIDs, chat.jid, ""));
 	}
 	else if (chat.isMUC) {
 		/* FIXME: This means that recents requiring passwords will just flat-out not work */
 		uiEventStream_->send(boost::make_shared<JoinMUCUIEvent>(chat.jid, boost::optional<std::string>(), chat.nick));
 	}
 	else {
 		uiEventStream_->send(boost::make_shared<RequestChatUIEvent>(chat.jid));
 	}
 }
 
 void ChatsManager::handleLocalServiceFound(const JID& service, boost::shared_ptr<DiscoInfo> info) {
 	foreach (DiscoInfo::Identity identity, info->getIdentities()) {
 			if ((identity.getCategory() == "directory"
 				&& identity.getType() == "chatroom")
 				|| (identity.getCategory() == "conference"
 				&& identity.getType() == "text")) {
 				localMUCServiceJID_ = service;
 				localMUCServiceFinderWalker_->endWalk();
 				SWIFT_LOG(debug) << "Use following MUC service for impromptu chats: " << localMUCServiceJID_ << std::endl;
 				break;
 			}
 	}
 }
 
 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_;
 }
 
 }