Swiftdiff options
| author | Catalin Badea <catalin.badea392@gmail.com> | 2012-07-20 15:48:19 (GMT) |
|---|---|---|
| committer | Catalin Badea <catalin.badea392@gmail.com> | 2012-07-20 15:48:19 (GMT) |
| commit | 472d64357939d7cf4b70a6a47c83d93d500397d9 (patch) | |
| tree | 85f5390d251a6838ba13b9029fff2d9daa70e3be /Swift/Controllers/HistoryViewController.cpp | |
| parent | 36377ac0e0443de02d2a0d24bbe8632f12d211cd (diff) | |
| download | swift-contrib-472d64357939d7cf4b70a6a47c83d93d500397d9.zip swift-contrib-472d64357939d7cf4b70a6a47c83d93d500397d9.tar.bz2 | |
Refactor HistoryViewController.
Diffstat (limited to 'Swift/Controllers/HistoryViewController.cpp')
| -rw-r--r-- | Swift/Controllers/HistoryViewController.cpp | 64 |
1 files changed, 20 insertions, 44 deletions
diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp index baa7ebf..5f200f7 100644 --- a/Swift/Controllers/HistoryViewController.cpp +++ b/Swift/Controllers/HistoryViewController.cpp @@ -15,6 +15,7 @@ #include <Swiften/Avatars/AvatarManager.h> namespace Swift { + static const std::string category[] = { "Contacts", "MUC", "Contacts" }; HistoryViewController::HistoryViewController( const JID& selfJID, @@ -91,20 +92,14 @@ void HistoryViewController::handleSelectedContactChanged(RosterItem* newContact) JID contactJID = contact->getJID(); std::vector<HistoryMessage> messages; - if (roomPrivateContacts_.count(contactJID)) { - currentResultDate_ = *roomPrivateContacts_[contactJID].rbegin(); - messages = historyController_->getMessagesFromDate(selfJID_, contactJID, HistoryMessage::PrivateMessage, currentResultDate_); - currentItemType_ = HistoryMessage::PrivateMessage; - } - else if (contacts_.count(contactJID)) { - currentResultDate_ = *contacts_[contactJID].rbegin(); - messages = historyController_->getMessagesFromDate(selfJID_, contactJID, HistoryMessage::Chat, currentResultDate_); - currentItemType_ = HistoryMessage::Chat; - } - else { - currentResultDate_ = *rooms_[contactJID].rbegin(); - messages = historyController_->getMessagesFromDate(selfJID_, contactJID, HistoryMessage::Groupchat, currentResultDate_); - currentItemType_ = HistoryMessage::Groupchat; + for (int it = HistoryMessage::Chat; it <= HistoryMessage::PrivateMessage; it++) { + HistoryMessage::Type type = static_cast<HistoryMessage::Type>(it); + + if (contacts_[type].count(contactJID)) { + currentResultDate_ = *contacts_[type][contactJID].rbegin(); + currentItemType_ = type; + messages = historyController_->getMessagesFromDate(selfJID_, contactJID, type, currentResultDate_); + } } historyWindow_->setDate(currentResultDate_); @@ -129,20 +124,13 @@ void HistoryViewController::handleNewMessage(const HistoryMessage& message) { if (selectedItem_ && selectedItem_->getJID() == displayJID) { addNewMessage(message, false); } + // add new contact - else if (message.getType() == HistoryMessage::Groupchat && !rooms_.count(displayJID)) { - roster_->addContact(displayJID, displayJID, nickResolver_->jidToNick(displayJID), "MUC", avatarManager_->getAvatarPath(displayJID).string()); + else if (contacts_[message.getType()].count(displayJID)) { + roster_->addContact(displayJID, displayJID, nickResolver_->jidToNick(displayJID), category[message.getType()], avatarManager_->getAvatarPath(displayJID).string()); // // TODO add message date here - rooms_[displayJID] = std::set<boost::gregorian::date>(); - } - else if (message.getType() == HistoryMessage::Chat && !contacts_.count(displayJID)) { - roster_->addContact(displayJID, displayJID, nickResolver_->jidToNick(displayJID), "Contacts", avatarManager_->getAvatarPath(displayJID).string()); - contacts_[displayJID] = std::set<boost::gregorian::date>(); - } - else if (message.getType() == HistoryMessage::PrivateMessage && !roomPrivateContacts_.count(displayJID)) { - roster_->addContact(displayJID, displayJID, nickResolver_->jidToNick(displayJID), "Contacts", avatarManager_->getAvatarPath(displayJID).string()); - roomPrivateContacts_[displayJID] = std::set<boost::gregorian::date>(); + contacts_[message.getType()][displayJID] = std::set<boost::gregorian::date>(); } } @@ -155,25 +143,15 @@ void HistoryViewController::addNewMessage(const HistoryMessage& message, bool ad void HistoryViewController::handleReturnPressed(const std::string& keyword) { reset(); - // MUCs - rooms_ = historyController_->getContacts(selfJID_, HistoryMessage::Groupchat, keyword); - for (ContactsMap::const_iterator room = rooms_.begin(); room != rooms_.end(); room++) { - const JID& jid = room->first; - roster_->addContact(jid, jid, nickResolver_->jidToNick(jid), "MUC", avatarManager_->getAvatarPath(jid).string()); - } + for (int it = HistoryMessage::Chat; it <= HistoryMessage::PrivateMessage; it++) { + HistoryMessage::Type type = static_cast<HistoryMessage::Type>(it); - // Contacts - contacts_ = historyController_->getContacts(selfJID_, HistoryMessage::Chat, keyword); - for (ContactsMap::const_iterator contact = contacts_.begin(); contact != contacts_.end(); contact++) { - const JID& jid = contact->first; - roster_->addContact(jid, jid, nickResolver_->jidToNick(jid), "Contacts", avatarManager_->getAvatarPath(jid).string()); - } + contacts_[type] = historyController_->getContacts(selfJID_, type, keyword); - // MUC contacts - roomPrivateContacts_ = historyController_->getContacts(selfJID_, HistoryMessage::PrivateMessage, keyword); - for (ContactsMap::const_iterator contact = roomPrivateContacts_.begin(); contact != roomPrivateContacts_.end(); contact++) { - const JID& jid = contact->first; - roster_->addContact(jid, jid, nickResolver_->jidToNick(jid), "Contacts", avatarManager_->getAvatarPath(jid).string()); + for (ContactsMap::const_iterator contact = contacts_[type].begin(); contact != contacts_[type].end(); contact++) { + const JID& jid = contact->first; + roster_->addContact(jid, jid, nickResolver_->jidToNick(jid), category[type], avatarManager_->getAvatarPath(jid).string()); + } } } @@ -203,9 +181,7 @@ void HistoryViewController::handleNextButtonClicked() { void HistoryViewController::reset() { roster_->removeAll(); - rooms_.clear(); contacts_.clear(); - roomPrivateContacts_.clear(); selectedItem_ = NULL; historyWindow_->resetConversationView(); } |