From 330789471d1b40a72f41f29e195de24eabd811b0 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Thu, 27 Sep 2018 12:03:37 -0700
Subject: [PATCH] Fix merge conflict and set proper polling times

---
 scripts/modules/appUi.js                      | 28 +++++++++++++------
 .../src/modules/hf-notifications.js           |  8 +++---
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/scripts/modules/appUi.js b/scripts/modules/appUi.js
index 0e7461c5f1..83d99cd42b 100644
--- a/scripts/modules/appUi.js
+++ b/scripts/modules/appUi.js
@@ -107,7 +107,9 @@ function AppUi(properties) {
     that.notificationPollCaresAboutSince = false;
     that.notificationInitialCallbackMade = false;
     that.notificationDisplayBanner = function (message) {
-        Window.displayAnnouncement(message);
+        if (!that.isOpen) {
+            Window.displayAnnouncement(message);
+        }
     };
     //
     // END Notification Handling Defaults
@@ -118,6 +120,7 @@ function AppUi(properties) {
         // Set isOpen, wireEventBridge, set buttonActive as appropriate,
         // and finally call onOpened() or onClosed() IFF defined.
         that.setCurrentVisibleScreenMetadata(type, url);
+
         if (that.checkIsOpen(type, url)) {
             that.wireEventBridge(true);
             if (!that.isOpen) {
@@ -155,17 +158,21 @@ function AppUi(properties) {
             return;
         }
 
-        // User is "appearing offline"
-        if (GlobalServices.findableBy === "none") {
+        // User is "appearing offline" or is offline
+        if (GlobalServices.findableBy === "none" || Account.username === "") {
             that.notificationPollTimeout = Script.setTimeout(that.notificationPoll, that.notificationPollTimeoutMs);
             return;
         }
 
         var url = METAVERSE_BASE + that.notificationPollEndpoint;
 
+        var settingsKey = "notifications/" + that.buttonName + "/lastPoll";
+        var currentTimestamp = new Date().getTime();
+        var lastPollTimestamp = Settings.getValue(settingsKey, currentTimestamp);
         if (that.notificationPollCaresAboutSince) {
-            url = url + "&since=" + (new Date().getTime());
+            url = url + "&since=" + lastPollTimestamp/1000;
         }
+        Settings.setValue(settingsKey, currentTimestamp);
 
         console.debug(that.buttonName, 'polling for notifications at endpoint', url);
 
@@ -193,17 +200,18 @@ function AppUi(properties) {
             } else {
                 concatenatedServerResponse = concatenatedServerResponse.concat(that.notificationDataProcessPage(response));
                 currentDataPageToRetrieve++;
-                request({ uri: (url + "&page=" + currentDataPageToRetrieve) }, requestCallback);
+                request({ json: true, uri: (url + "&page=" + currentDataPageToRetrieve) }, requestCallback);
             }
         }
 
-        request({ uri: url }, requestCallback);
+        request({ json: true, uri: url }, requestCallback);
     };
 
     // This won't do anything if there isn't a notification endpoint set
     that.notificationPoll();
 
-    function availabilityChanged() {
+    function restartNotificationPoll() {
+        that.notificationInitialCallbackMade = false;
         if (that.notificationPollTimeout) {
             Script.clearTimeout(that.notificationPollTimeout);
             that.notificationPollTimeout = false;
@@ -303,7 +311,8 @@ function AppUi(properties) {
         } : that.ignore;
     that.onScriptEnding = function onScriptEnding() {
         // Close if necessary, clean up any remaining handlers, and remove the button.
-        GlobalServices.findableByChanged.disconnect(availabilityChanged);
+        GlobalServices.myUsernameChanged.disconnect(restartNotificationPoll);
+        GlobalServices.findableByChanged.disconnect(restartNotificationPoll);
         if (that.isOpen) {
             that.close();
         }
@@ -323,7 +332,8 @@ function AppUi(properties) {
     that.tablet.screenChanged.connect(that.onScreenChanged);
     that.button.clicked.connect(that.onClicked);
     Script.scriptEnding.connect(that.onScriptEnding);
-    GlobalServices.findableByChanged.connect(availabilityChanged);
+    GlobalServices.findableByChanged.connect(restartNotificationPoll);
+    GlobalServices.myUsernameChanged.connect(restartNotificationPoll);
     if (that.buttonName == Settings.getValue("startUpApp")) {
         Settings.setValue("startUpApp", "");
         Script.setTimeout(function () {
diff --git a/server-console/src/modules/hf-notifications.js b/server-console/src/modules/hf-notifications.js
index a9ee2489a9..281ca1cb53 100644
--- a/server-console/src/modules/hf-notifications.js
+++ b/server-console/src/modules/hf-notifications.js
@@ -9,10 +9,10 @@ const GetBuildInfo = hfApp.getBuildInfo;
 const buildInfo = GetBuildInfo();
 
 const notificationIcon = path.join(__dirname, '../../resources/console-notification.png');
-const STORIES_NOTIFICATION_POLL_TIME_MS = 15 * 1000;     // 120 * 1000;
-const PEOPLE_NOTIFICATION_POLL_TIME_MS = 15 * 1000;      // 120 * 1000;
-const WALLET_NOTIFICATION_POLL_TIME_MS = 15 * 1000;      // 600 * 1000;
-const MARKETPLACE_NOTIFICATION_POLL_TIME_MS = 15 * 1000; // 600 * 1000;
+const STORIES_NOTIFICATION_POLL_TIME_MS = 120 * 1000;
+const PEOPLE_NOTIFICATION_POLL_TIME_MS = 120 * 1000;
+const WALLET_NOTIFICATION_POLL_TIME_MS = 600 * 1000;
+const MARKETPLACE_NOTIFICATION_POLL_TIME_MS = 600 * 1000;
 
 const METAVERSE_SERVER_URL= process.env.HIFI_METAVERSE_URL ? process.env.HIFI_METAVERSE_URL : 'https://metaverse.highfidelity.com'
 const STORIES_URL= '/api/v1/user_stories';