michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add version to web socket id text

Browse Source
This commit is contained in:
Luke Pulverenti 2013-07-09 14:37:41 -04:00
parent 6b5af09df7
commit 1e90c8d40c
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Model/ApiClient/IApiClient.cs
View File

@ -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.

6
MediaBrowser.Server.Implementations/Session/SessionWebSocketListener.cs
View File

@ -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)
{

2
MediaBrowser.WebDashboard/ApiClient.js
View File

@ -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);

2
MediaBrowser.WebDashboard/packages.config
View File

@ -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>