diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-09 14:37:41 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-07-09 14:37:41 -0400 |
| commit | 1e90c8d40c243fbcbbbd578930a7a28536bd9af5 (patch) | |
| tree | 349206e27cf67cbca3958013bdd87a94b715b564 | |
| parent | 6b5af09df722133867db53272d386491af8c7395 (diff) | |
add version to web socket id text
4 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index 93d5adbc8..839fb0124 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -98,7 +98,7 @@ namespace MediaBrowser.Model.ApiClient /// Gets the users async. /// </summary> /// <returns>Task{UserDto[]}.</returns> - Task<UserDto[]> GetUsersAsync(); + Task<UserDto[]> GetUsersAsync(UserQuery query); /// <summary> /// Gets the public users async. diff --git a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs index d712bbc60..e932b4acb 100644 --- a/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs +++ b/MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs @@ -62,8 +62,12 @@ namespace MediaBrowser.Server.Implementations.Session var client = vals[0]; var deviceId = vals[1]; + var version = vals[2]; - var session = _sessionManager.Sessions.FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) && string.Equals(i.Client, client)); + var session = _sessionManager.Sessions + .FirstOrDefault(i => string.Equals(i.DeviceId, deviceId) && + string.Equals(i.Client, client) && + string.Equals(i.ApplicationVersion, version)); if (session != null) { diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js index 3117b4b00..b1c4a7a63 100644 --- a/MediaBrowser.WebDashboard/ApiClient.js +++ b/MediaBrowser.WebDashboard/ApiClient.js @@ -169,7 +169,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { webSocket.onopen = function () { setTimeout(function () { - self.sendWebSocketMessage("Identity", clientName + "|" + deviceId); + self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion); $(self).trigger("websocketopen"); }, 500); diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index bb1b35f24..d09b4a2cd 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="MediaBrowser.ApiClient.Javascript" version="3.0.141" targetFramework="net45" /> + <package id="MediaBrowser.ApiClient.Javascript" version="3.0.142" targetFramework="net45" /> <package id="ServiceStack.Common" version="3.9.54" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.54" targetFramework="net45" /> </packages>
\ No newline at end of file |