From 1e90c8d40c243fbcbbbd578930a7a28536bd9af5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 9 Jul 2013 14:37:41 -0400
Subject: [PATCH] add version to web socket id text

---
 MediaBrowser.Model/ApiClient/IApiClient.cs                  | 2 +-
 .../Session/SessionWebSocketListener.cs                     | 6 +++++-
 MediaBrowser.WebDashboard/ApiClient.js                      | 2 +-
 MediaBrowser.WebDashboard/packages.config                   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 93d5adbc8f..839fb01245 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 d712bbc60c..e932b4acb2 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 3117b4b006..b1c4a7a633 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 bb1b35f247..d09b4a2cd2 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