3 files changed, 176 insertions, 9 deletions
diff --git a/Swiften/Presence/PresenceOracle.cpp b/Swiften/Presence/PresenceOracle.cpp
index e4129fb..8623529 100644
--- a/Swiften/Presence/PresenceOracle.cpp
+++ b/Swiften/Presence/PresenceOracle.cpp
@@ -6,9 +6,13 @@
 
 #include <Swiften/Presence/PresenceOracle.h>
 
+#include <queue>
+
 #include <boost/bind.hpp>
 
+#include <Swiften/Base/foreach.h>
 #include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/Elements/StatusShow.h>
 #include <Swiften/Roster/XMPPRoster.h>
 
 namespace Swift {
@@ -106,6 +110,91 @@ std::vector<Presence::ref> PresenceOracle::getAllPresence(const JID& bareJID) co
 	return results;
 }
 
+struct PresenceAccountCmp {
+	static int preferenceFromStatusShow(StatusShow::Type showType) {
+		switch (showType) {
+			case StatusShow::FFC:
+				return 5;
+			case StatusShow::Online:
+				return 4;
+			case StatusShow::DND:
+				return 3;
+			case StatusShow::Away:
+				return 2;
+			case StatusShow::XA:
+				return 1;
+			case StatusShow::None:
+				return 0;
+		}
+		assert(false);
+		return -1;
+	}
+
+	bool operator()(const Presence::ref& a, const Presence::ref& b) {
+		int aPreference = preferenceFromStatusShow(a->getShow());
+		int bPreference = preferenceFromStatusShow(b->getShow());
+
+		if (aPreference != bPreference) {
+			return aPreference < bPreference;
+		}
+		if (a->getPriority() != b->getPriority()) {
+			return a->getPriority() < b->getPriority();
+		}
+		return a->getFrom().getResource() < b->getFrom().getResource();
+	}
+};
+
+typedef std::priority_queue<Presence::ref, std::vector<Presence::ref>, PresenceAccountCmp> PresenceAccountPriorityQueue;
+
+Presence::ref PresenceOracle::getActivePresence(const std::vector<Presence::ref> presences) {
+	Presence::ref accountPresence;
+
+	PresenceAccountPriorityQueue online;
+	PresenceAccountPriorityQueue away;
+	PresenceAccountPriorityQueue offline;
+
+	foreach(Presence::ref presence, presences) {
+		switch (presence->getShow()) {
+			case StatusShow::Online:
+				online.push(presence);
+				break;
+			case StatusShow::Away:
+				away.push(presence);
+				break;
+			case StatusShow::FFC:
+				online.push(presence);
+				break;
+			case StatusShow::XA:
+				away.push(presence);
+				break;
+			case StatusShow::DND:
+				away.push(presence);
+				break;
+			case StatusShow::None:
+				offline.push(presence);
+				break;
+		}
+	}
+
+	if (!online.empty()) {
+		accountPresence = online.top();
+	}
+	else if (!away.empty()) {
+		accountPresence = away.top();
+	}
+	else if (!offline.empty()) {
+		accountPresence = offline.top();
+	}
+	return accountPresence;
+}
+
+Presence::ref PresenceOracle::getAccountPresence(const JID& jid) const {
+	Presence::ref accountPresence;
+	std::vector<Presence::ref> allPresences = getAllPresence(jid.toBare());
+	accountPresence = getActivePresence(allPresences);
+	return accountPresence;
+}
+
 Presence::ref PresenceOracle::getHighestPriorityPresence(const JID& bareJID) const {
 	PresencesMap::const_iterator i = entries_.find(bareJID);
 	if (i == entries_.end()) {
diff --git a/Swiften/Presence/PresenceOracle.h b/Swiften/Presence/PresenceOracle.h
index f312506..a010e8e 100644
--- a/Swiften/Presence/PresenceOracle.h
+++ b/Swiften/Presence/PresenceOracle.h
@@ -17,6 +17,11 @@ namespace Swift {
 	class StanzaChannel;
 	class XMPPRoster;
 
+	/**
+	 * The PresenceOracle class observes all received presence stanzas for
+	 * the \ref StanzaChannel class passed in the constructor and maintains a
+	 * cache.
+	 */
 	class SWIFTEN_API PresenceOracle {
 		public:
 			PresenceOracle(StanzaChannel* stanzaChannel, XMPPRoster* roster);
@@ -26,6 +31,34 @@ namespace Swift {
 			Presence::ref getHighestPriorityPresence(const JID& bareJID) const;
 			std::vector<Presence::ref> getAllPresence(const JID& bareJID) const;
 
+			/**
+			 * \brief Returns the relevant presence for a list of resource presences.
+			 *
+			 * It only takes the presence show type into account. Priorities are
+			 * ignored as various clients set them to arbitrary values unrelated
+			 * to actual end point availability.
+			 *
+			 * The presences of the resources are group by availablilty and sorted
+			 * by show type in the following order:
+			 *
+			 * -# Online
+			 *    -# Free for Chat
+			 *    -# Available
+			 * -# Away
+			 *    -# DND
+			 *    -# Extended Away
+			 *    -# Away
+			 * -# Offline
+			 *    -# Unavailable
+			 */
+			static Presence::ref getActivePresence(const std::vector<Presence::ref> presences);
+
+			/**
+			 * \brief This considers all online resources of a bare JID and returns
+			 * the value returned by \ref getActivePresence when passing this list.
+			 */
+			Presence::ref getAccountPresence(const JID& jid) const;
+
 		public:
 			boost::signal<void (Presence::ref)> onPresenceChange;
 
diff --git a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
index 85dcca9..6d16d80 100644
--- a/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
+++ b/Swiften/Presence/UnitTest/PresenceOracleTest.cpp
@@ -28,6 +28,7 @@ class PresenceOracleTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST(testHighestPresenceMultiple);
 		CPPUNIT_TEST(testHighestPresenceGlobal);
 		CPPUNIT_TEST(testHighestPresenceChangePriority);
+		CPPUNIT_TEST(testGetActivePresence);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
@@ -52,15 +53,15 @@ class PresenceOracleTest : public CppUnit::TestFixture {
 		}
 
 		void testHighestPresenceSingle() {
-					JID bareJID("alice@wonderland.lit");
-					Presence::ref fiveOn = makeOnline("blah", 5);
-					Presence::ref fiveOff = makeOffline("/blah");
-					CPPUNIT_ASSERT_EQUAL(Presence::ref(), oracle_->getHighestPriorityPresence(bareJID));
-					stanzaChannel_->onPresenceReceived(fiveOn);
-					CPPUNIT_ASSERT_EQUAL(fiveOn, oracle_->getHighestPriorityPresence(bareJID));
-					stanzaChannel_->onPresenceReceived(fiveOff);
-					CPPUNIT_ASSERT_EQUAL(fiveOff, oracle_->getHighestPriorityPresence(bareJID));
-				}
+			JID bareJID("alice@wonderland.lit");
+			Presence::ref fiveOn = makeOnline("blah", 5);
+			Presence::ref fiveOff = makeOffline("/blah");
+			CPPUNIT_ASSERT_EQUAL(Presence::ref(), oracle_->getHighestPriorityPresence(bareJID));
+			stanzaChannel_->onPresenceReceived(fiveOn);
+			CPPUNIT_ASSERT_EQUAL(fiveOn, oracle_->getHighestPriorityPresence(bareJID));
+			stanzaChannel_->onPresenceReceived(fiveOff);
+			CPPUNIT_ASSERT_EQUAL(fiveOff, oracle_->getHighestPriorityPresence(bareJID));
+		}
 
 		void testHighestPresenceMultiple() {
 			JID bareJID("alice@wonderland.lit");
@@ -151,8 +152,52 @@ class PresenceOracleTest : public CppUnit::TestFixture {
 
 			CPPUNIT_ASSERT(!oracle_->getLastPresence(user1));
 		}
+
+		void testGetActivePresence() {
+			{
+				std::vector<Presence::ref> presenceList;
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceA", 10, Presence::Available, StatusShow::Away));
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceB", 5, Presence::Available, StatusShow::Online));
+
+				CPPUNIT_ASSERT_EQUAL(StatusShow::Online, PresenceOracle::getActivePresence(presenceList)->getShow());
+			}
+
+			{
+				std::vector<Presence::ref> presenceList;
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceA", 10, Presence::Available, StatusShow::Away));
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceB", 5, Presence::Available, StatusShow::DND));
+
+				CPPUNIT_ASSERT_EQUAL(StatusShow::DND, PresenceOracle::getActivePresence(presenceList)->getShow());
+			}
+
+			{
+				std::vector<Presence::ref> presenceList;
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceA", 0, Presence::Available, StatusShow::Online));
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceB", 0, Presence::Available, StatusShow::DND));
+
+				CPPUNIT_ASSERT_EQUAL(StatusShow::Online, PresenceOracle::getActivePresence(presenceList)->getShow());
+			}
+
+			{
+				std::vector<Presence::ref> presenceList;
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceA", 1, Presence::Available, StatusShow::Online));
+				presenceList.push_back(createPresence("alice@wonderland.lit/resourceB", 0, Presence::Available, StatusShow::Online));
+
+				CPPUNIT_ASSERT_EQUAL(JID("alice@wonderland.lit/resourceA"), PresenceOracle::getActivePresence(presenceList)->getFrom());
+			}
+		}
 	
 	private:
+		Presence::ref createPresence(const JID &jid, int priority, Presence::Type type, const StatusShow::Type& statusShow) {
+			Presence::ref presence = boost::make_shared<Presence>();
+			presence->setFrom(jid);
+			presence->setPriority(priority);
+			presence->setType(type);
+			presence->setShow(statusShow);
+			return presence;
+		}
+
+
 		Presence::ref makeOnline(const std::string& resource, int priority) {
 			Presence::ref presence(new Presence());
 			presence->setPriority(priority);