mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 23:30:50 +02:00
add version to web socket id text
This commit is contained in:
parent
6b5af09df7
commit
1e90c8d40c
|
@ -98,7 +98,7 @@ namespace MediaBrowser.Model.ApiClient
|
||||||
/// Gets the users async.
|
/// Gets the users async.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>Task{UserDto[]}.</returns>
|
/// <returns>Task{UserDto[]}.</returns>
|
||||||
Task<UserDto[]> GetUsersAsync();
|
Task<UserDto[]> GetUsersAsync(UserQuery query);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the public users async.
|
/// Gets the public users async.
|
||||||
|
|
|
@ -62,8 +62,12 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
|
|
||||||
var client = vals[0];
|
var client = vals[0];
|
||||||
var deviceId = vals[1];
|
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)
|
if (session != null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -169,7 +169,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
|
||||||
webSocket.onopen = function () {
|
webSocket.onopen = function () {
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
|
|
||||||
self.sendWebSocketMessage("Identity", clientName + "|" + deviceId);
|
self.sendWebSocketMessage("Identity", clientName + "|" + deviceId + "|" + applicationVersion);
|
||||||
|
|
||||||
$(self).trigger("websocketopen");
|
$(self).trigger("websocketopen");
|
||||||
}, 500);
|
}, 500);
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<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.Common" version="3.9.54" targetFramework="net45" />
|
||||||
<package id="ServiceStack.Text" version="3.9.54" targetFramework="net45" />
|
<package id="ServiceStack.Text" version="3.9.54" targetFramework="net45" />
|
||||||
</packages>
|
</packages>
|
Loading…
Reference in a new issue