1 files changed, 28 insertions, 22 deletions
diff --git a/Swiften/Disco/FeatureOracle.h b/Swiften/Disco/FeatureOracle.h
index d579e5a..be0cd6f 100644
--- a/Swiften/Disco/FeatureOracle.h
+++ b/Swiften/Disco/FeatureOracle.h
@@ -1,11 +1,14 @@
 /*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <unordered_map>
+#include <unordered_set>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/Tristate.h>
 #include <Swiften/Elements/DiscoInfo.h>
@@ -20,27 +23,30 @@ class PresenceOracle;
  * @brief The FeatureOracle class enables direct feature support lookup for client features supported by Swiften.
  */
 class SWIFTEN_API FeatureOracle {
-	public:
-		FeatureOracle(EntityCapsProvider* capsProvider, PresenceOracle* presenceOracle);
-
-	public:
-		Tristate isFileTransferSupported(const JID& jid);
-		Tristate isMessageReceiptsSupported(const JID& jid);
-		Tristate isMessageCorrectionSupported(const JID& jid);
-
-	private:
-		/**
-		 * @brief getDiscoResultForJID returns a  shared reference to a DiscoInfo representing features supported by the jid.
-		 * @param jid The JID to return the DiscoInfo::ref for.
-		 * @return DiscoResult::ref
-		 */
-		DiscoInfo::ref getDiscoResultForJID(const JID& jid);
-
-		Tristate isFeatureSupported(const JID& jid, const std::string& feature);
-
-	private:
-		EntityCapsProvider* capsProvider_;
-		PresenceOracle* presenceOracle_;
+    public:
+        FeatureOracle(EntityCapsProvider* capsProvider, PresenceOracle* presenceOracle);
+
+    public:
+        Tristate isFileTransferSupported(const JID& jid);
+        Tristate isMessageReceiptsSupported(const JID& jid);
+        Tristate isMessageCorrectionSupported(const JID& jid);
+        Tristate isWhiteboardSupported(const JID& jid);
+
+        JID getMostAvailableClientForFileTrasfer(const JID& bareJID);
+
+    private:
+        /**
+         * @brief getDiscoResultForJID returns a  shared reference to a DiscoInfo representing features supported by the jid.
+         * @param jid The JID to return an std::unordered_map<std::string, Tristate> for.
+         * @return std::unordered_map<std::string, Tristate>
+         */
+        std::unordered_map<std::string, Tristate> getFeaturesForJID(const JID& jid);
+
+        Tristate isFeatureSupported(const std::unordered_map<std::string, Tristate>& supportedFeatures, const std::string& feature);
+
+    private:
+        EntityCapsProvider* capsProvider_;
+        PresenceOracle* presenceOracle_;
 };
 
 }