1 files changed, 21 insertions, 6 deletions
diff --git a/Swiften/Presence/PresenceOracle.cpp b/Swiften/Presence/PresenceOracle.cpp
index 59dff41..e4129fb 100644
--- a/Swiften/Presence/PresenceOracle.cpp
+++ b/Swiften/Presence/PresenceOracle.cpp
@@ -1,37 +1,38 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
-#include "PresenceOracle.h"
+#include <Swiften/Presence/PresenceOracle.h>
 #include <boost/bind.hpp>
 #include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/Roster/XMPPRoster.h>
 namespace Swift {
-PresenceOracle::PresenceOracle(StanzaChannel* stanzaChannel) {
+PresenceOracle::PresenceOracle(StanzaChannel* stanzaChannel, XMPPRoster* roster) : stanzaChannel_(stanzaChannel), xmppRoster_(roster) {
-        stanzaChannel_ = stanzaChannel;
        stanzaChannel_->onPresenceReceived.connect(boost::bind(&PresenceOracle::handleIncomingPresence, this, _1));
        stanzaChannel_->onAvailableChanged.connect(boost::bind(&PresenceOracle::handleStanzaChannelAvailableChanged, this, _1));
+        xmppRoster_->onJIDRemoved.connect(boost::bind(&PresenceOracle::handleJIDRemoved, this, _1));
 }
 PresenceOracle::~PresenceOracle() {
        stanzaChannel_->onPresenceReceived.disconnect(boost::bind(&PresenceOracle::handleIncomingPresence, this, _1));
        stanzaChannel_->onAvailableChanged.disconnect(boost::bind(&PresenceOracle::handleStanzaChannelAvailableChanged, this, _1));
+        xmppRoster_->onJIDRemoved.disconnect(boost::bind(&PresenceOracle::handleJIDRemoved, this, _1));
 }
 void PresenceOracle::handleStanzaChannelAvailableChanged(bool available) {
        if (available) {
                entries_.clear();
        }
 }
 void PresenceOracle::handleIncomingPresence(Presence::ref presence) {
        JID bareJID(presence->getFrom().toBare());
        if (presence->getType() == Presence::Subscribe) {
        }
        else {
@@ -41,11 +42,11 @@ void PresenceOracle::handleIncomingPresence(Presence::ref presence) {
                        passedPresence = Presence::ref(new Presence());
                        passedPresence->setType(Presence::Unavailable);
                        passedPresence->setFrom(bareJID);
                        passedPresence->setStatus(presence->getStatus());
                }
-                std::map<JID, boost::shared_ptr<Presence> > jidMap = entries_[bareJID];
+                PresenceMap jidMap = entries_[bareJID];
                if (passedPresence->getFrom().isBare() && presence->getType() == Presence::Unavailable) {
                        /* Have a bare-JID only presence of offline */
                        jidMap.clear();
                } else if (passedPresence->getType() == Presence::Available) {
                        /* Don't have a bare-JID only offline presence once there are available presences */
@@ -59,10 +60,24 @@ void PresenceOracle::handleIncomingPresence(Presence::ref presence) {
                entries_[bareJID] = jidMap;
                onPresenceChange(passedPresence);
        }
 }
+void PresenceOracle::handleJIDRemoved(const JID& removedJID) {
+        /* 3921bis says that we don't follow up with an unavailable, so simulate this ourselves */
+        Presence::ref unavailablePresence = Presence::ref(new Presence());
+        unavailablePresence->setType(Presence::Unavailable);
+        unavailablePresence->setFrom(removedJID);
+        if (entries_.find(removedJID) != entries_.end()) {
+                entries_[removedJID].clear();
+                entries_[removedJID][removedJID] = unavailablePresence;
+        }
+        onPresenceChange(unavailablePresence);
+}
 Presence::ref PresenceOracle::getLastPresence(const JID& jid) const {
        PresencesMap::const_iterator i = entries_.find(jid.toBare());
        if (i == entries_.end()) {
                return Presence::ref();
        }