From 16ccfe29308aaad1ccb42f1b42d37ae007e33512 Mon Sep 17 00:00:00 2001
From: 1hitsong <3330318+1hitsong@users.noreply.github.com>
Date: Sat, 28 Oct 2023 08:13:31 -0400
Subject: [PATCH] Code cleanup based on review

---
 source/ShowScenes.brs    |  4 ----
 source/api/sdk.bs        |  2 +-
 source/utils/globals.brs |  2 +-
 source/utils/session.bs  | 16 +++++++++++++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index b236aad3..28d38b84 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -119,7 +119,6 @@ function LoginFlow()
                     else
                         print "Success! Auth token is still valid"
                         session.user.Login(currentUser, true)
-                        session.user.LoadUserPreferences()
                         LoadUserAbilities()
                         return true
                     end if
@@ -132,7 +131,6 @@ function LoginFlow()
                 if isValid(userData)
                     print "login success!"
                     session.user.Login(userData, true)
-                    session.user.LoadUserPreferences()
                     LoadUserAbilities()
                     return true
                 else
@@ -175,7 +173,6 @@ function LoginFlow()
                 if isValid(userData)
                     print "login success!"
                     session.user.Login(userData, true)
-                    session.user.LoadUserPreferences()
                     LoadUserAbilities()
                     return true
                 else
@@ -201,7 +198,6 @@ function LoginFlow()
         goto start_login
     end if
 
-    session.user.LoadUserPreferences()
     LoadUserAbilities()
     m.global.sceneManager.callFunc("clearScenes")
 
diff --git a/source/api/sdk.bs b/source/api/sdk.bs
index 45be12d8..38ef4929 100644
--- a/source/api/sdk.bs
+++ b/source/api/sdk.bs
@@ -1374,7 +1374,7 @@ namespace api
         end function
 
         ' Gets a list of sessions.
-        function Get(params = {} as object)
+        function Get(params = { "deviceId": m.global.device.serverDeviceName } as object)
             req = APIRequest("/sessions", params)
             return getJson(req)
         end function
diff --git a/source/utils/globals.brs b/source/utils/globals.brs
index 5006641c..2c3dd2a7 100644
--- a/source/utils/globals.brs
+++ b/source/utils/globals.brs
@@ -107,7 +107,7 @@ sub SaveDeviceToGlobal()
             uuid: deviceInfo.GetRandomUUID(),
             name: displayName,
             friendlyName: filteredFriendly,
-            serverDeviceName: "",
+            serverDeviceName: deviceInfo.getChannelClientID(),
             model: deviceInfo.GetModel(),
             modelType: deviceInfo.GetModelType(),
             modelDetails: deviceInfo.GetModelDetails(),
diff --git a/source/utils/session.bs b/source/utils/session.bs
index d8e6dfc9..62b20731 100644
--- a/source/utils/session.bs
+++ b/source/utils/session.bs
@@ -173,16 +173,23 @@ namespace session
                 set_user_setting("token", tmpSession.user.authToken)
                 set_user_setting("username", tmpSession.user.name)
             end if
+
+            session.user.LoadUserPreferences()
         end sub
 
-        ' Load and parse Display Settings from server
-        sub LoadUserPreferences()
-            ' Save device id so we don't calculate it every time we need it
+        ' Sets the global service device name value used by the API
+        sub SetServerDeviceName()
             if isValid(m.global.session.user) and isValid(m.global.session.user.friendlyName)
                 m.global.device.serverDeviceName = m.global.device.id + m.global.session.user.friendlyName
             else
                 m.global.device.serverDeviceName = m.global.device.id
             end if
+        end sub
+
+        ' Load and parse Display Settings from server
+        sub LoadUserPreferences()
+            ' Save device id so we don't calculate it every time we need it
+            session.user.SetServerDeviceName()
 
             id = m.global.session.user.id
             ' Currently using client "emby", which is what website uses so we get same Display prefs as web.
@@ -344,6 +351,9 @@ namespace session
                         session.user.settings.Save(item, get_setting(item))
                     end if
                 end for
+
+                ' Reset server device name state
+                session.user.SetServerDeviceName()
             end sub
 
             ' Saves the user setting to the global session.