From 57955a2b5612d287ad33dac1b96cf33fd1b33fec Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Mon, 18 Jul 2016 18:12:27 -0700
Subject: [PATCH] Expose protocol version to qml, and use it in query.

---
 interface/resources/qml/AddressBarDialog.qml | 19 +++++++++++++++----
 libraries/networking/src/AddressManager.cpp  |  5 +++++
 libraries/networking/src/AddressManager.h    |  1 +
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml
index b806bbbca2..0c9e5c9dbc 100644
--- a/interface/resources/qml/AddressBarDialog.qml
+++ b/interface/resources/qml/AddressBarDialog.qml
@@ -51,6 +51,7 @@ Window {
     }
     property var allDomains: [];
     property var suggestionChoices: [];
+    property var domainsBaseUrl: null;
     property int cardWidth: 200;
     property int cardHeight: 152;
 
@@ -245,10 +246,20 @@ Window {
         if (!options.page) {
             options.page = 1;
         }
-        // FIXME: really want places I'm allowed in, not just open ones.
-        // FIXME: If logged in, add hifi to the restriction options, in order to include places that require login.
-        // FIXME: add maturity
-        var url = "https://metaverse.highfidelity.com/api/v1/domains/all?open&active&restriction=open&sort_by=users&sort_order=desc&page=" + options.page + "&users=" + options.minUsers + "-" + options.maxUsers;
+        if (!domainsBaseUrl) {
+            var domainsOptions = [
+                'open', // published hours handle now
+                'active', // has at least one person connected. FIXME: really want any place that is verified accessible.
+                // FIXME: really want places I'm allowed in, not just open ones.
+                'restriction=open', // Not by whitelist, etc.  FIXME: If logged in, add hifi to the restriction options, in order to include places that require login.
+                // FIXME add maturity
+                'protocol=' + AddressManager.protocolVersion(),
+                'sort_by=users',
+                'sort_order=desc',
+            ];
+            domainsBaseUrl = "https://metaverse.highfidelity.com/api/v1/domains/all?" + domainsOptions.join('&');
+        }
+        var url = domainsBaseUrl + "&page=" + options.page + "&users=" + options.minUsers + "-" + options.maxUsers;
         getRequest(url, function (error, json) {
             if (!error && (json.status !== 'success')) {
                 error = new Error("Bad response: " + JSON.stringify(json));
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index b3a022cc3a..ae6aad3c4f 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -24,6 +24,7 @@
 #include "NodeList.h"
 #include "NetworkLogging.h"
 #include "UserActivityLogger.h"
+#include "udt/PacketHeaders.h"
 
 
 const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";
@@ -37,6 +38,10 @@ AddressManager::AddressManager() :
 
 }
 
+QString AddressManager::protocolVersion() {
+    return protocolVersionsSignatureBase64();
+}
+
 bool AddressManager::isConnected() {
     return DependencyManager::get<NodeList>()->getDomainHandler().isConnected();
 }
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index c013da3a72..2e9f177137 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -39,6 +39,7 @@ class AddressManager : public QObject, public Dependency {
     Q_PROPERTY(QString hostname READ getHost)
     Q_PROPERTY(QString pathname READ currentPath)
 public:
+    Q_INVOKABLE QString protocolVersion();
     using PositionGetter = std::function<glm::vec3()>;
     using OrientationGetter = std::function<glm::quat()>;