diff options
Diffstat (limited to 'Swift/Controllers/HistoryViewController.cpp')
-rw-r--r-- | Swift/Controllers/HistoryViewController.cpp | 83 |
1 files changed, 49 insertions, 34 deletions
diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp index 18e27bd..b7b71cd 100644 --- a/Swift/Controllers/HistoryViewController.cpp +++ b/Swift/Controllers/HistoryViewController.cpp @@ -30,7 +30,8 @@ HistoryViewController::HistoryViewController( avatarManager_(avatarManager), historyWindowFactory_(historyWindowFactory), historyWindow_(NULL), - selectedItem_(NULL) { + selectedItem_(NULL), + currentDate_(boost::gregorian::not_a_date_time) { uiEventStream_->onUIEvent.connect(boost::bind(&HistoryViewController::handleUIEvent, this, _1)); historyController_->onNewMessage.connect(boost::bind(&HistoryViewController::handleNewMessage, this, _1)); @@ -42,6 +43,7 @@ HistoryViewController::~HistoryViewController() { historyController_->onNewMessage.disconnect(boost::bind(&HistoryViewController::handleNewMessage, this, _1)); if (historyWindow_) { historyWindow_->onSelectedContactChanged.disconnect(boost::bind(&HistoryViewController::handleSelectedContactChanged, this, _1)); + historyWindow_->onReturnPressed.disconnect(boost::bind(&HistoryViewController::handleReturnPressed, this, _1)); delete historyWindow_; } delete roster_; @@ -54,37 +56,14 @@ void HistoryViewController::handleUIEvent(boost::shared_ptr<UIEvent> rawEvent) { if (historyWindow_ == NULL) { historyWindow_ = historyWindowFactory_->createHistoryWindow(uiEventStream_); historyWindow_->onSelectedContactChanged.connect(boost::bind(&HistoryViewController::handleSelectedContactChanged, this, _1)); + historyWindow_->onReturnPressed.connect(boost::bind(&HistoryViewController::handleReturnPressed, this, _1)); historyWindow_->setRosterModel(roster_); - - // MUCs - std::set<JID> rooms = historyController_->getContacts(selfJID_, HistoryMessage::Groupchat); - foreach (const JID& room, rooms) { - if ( !rooms_.count(room)) { - roster_->addContact(room, room, nickResolver_->jidToNick(room), "MUC", avatarManager_->getAvatarPath(room).string()); - rooms_.insert(room); - } - } - - // Contacts - std::set<JID> contacts = historyController_->getContacts(selfJID_, HistoryMessage::Chat); - foreach (const JID& contact, contacts) { - if (!contacts_.count(contact)) { - roster_->addContact(contact, contact, nickResolver_->jidToNick(contact), "Contacts", avatarManager_->getAvatarPath(contact).string()); - contacts_.insert(contact); - } - } - - // MUC contacts - std::set<JID> roomPrivateContacts = historyController_->getContacts(selfJID_, HistoryMessage::PrivateMessage); - foreach (const JID& contact, roomPrivateContacts) { - if ( !roomPrivateContacts_.count(contact)) { - roster_->addContact(contact, contact, nickResolver_->jidToNick(contact), "Contacts", avatarManager_->getAvatarPath(contact).string()); - roomPrivateContacts_.insert(contact); - } - } } + // populate roster by doing an empty search + handleReturnPressed(std::string()); + historyWindow_->activate(); } } @@ -105,13 +84,16 @@ void HistoryViewController::handleSelectedContactChanged(RosterItem* newContact) std::vector<HistoryMessage> messages; if (roomPrivateContacts_.count(contactJID)) { - messages = historyController_->getMessages(selfJID_, contactJID, HistoryMessage::PrivateMessage); + currentDate_ = *roomPrivateContacts_[contactJID].rbegin(); + messages = historyController_->getMessages(selfJID_, contactJID, HistoryMessage::PrivateMessage, currentDate_); } else if (contacts_.count(contactJID)) { - messages = historyController_->getMessages(selfJID_, contactJID, HistoryMessage::Chat); + currentDate_ = *contacts_[contactJID].rbegin(); + messages = historyController_->getMessages(selfJID_, contactJID, HistoryMessage::Chat, currentDate_); } else { - messages = historyController_->getMessages(selfJID_, contactJID, HistoryMessage::Groupchat); + currentDate_ = *rooms_[contactJID].rbegin(); + messages = historyController_->getMessages(selfJID_, contactJID, HistoryMessage::Groupchat, currentDate_); } foreach (const HistoryMessage& message, messages) { @@ -137,15 +119,17 @@ void HistoryViewController::handleNewMessage(const HistoryMessage& message) { // add new contact else if (message.getType() == HistoryMessage::Groupchat && !rooms_.count(displayJID)) { roster_->addContact(displayJID, displayJID, nickResolver_->jidToNick(displayJID), "MUC", avatarManager_->getAvatarPath(displayJID).string()); - rooms_.insert(displayJID); + // + // 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_.insert(displayJID); + 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_.insert(displayJID); + roomPrivateContacts_[displayJID] = std::set<boost::gregorian::date>(); } } @@ -155,4 +139,35 @@ void HistoryViewController::addNewMessage(const HistoryMessage& message) { historyWindow_->addMessage(message.getMessage(), nickResolver_->jidToNick(message.getFromJID()), senderIsSelf, avatarPath, message.getTime()); } +void HistoryViewController::handleReturnPressed(const std::string& keyword) { + roster_->removeAll(); + rooms_.clear(); + contacts_.clear(); + roomPrivateContacts_.clear(); + selectedItem_ = NULL; + historyWindow_->resetConversationView(); + // TODO set date + + // 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()); + } + + // 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()); + } + + // 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()); + } +} + } |