diff options
| author | Patrick Barron <barronpm@gmail.com> | 2020-05-15 17:20:07 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2020-05-15 17:20:07 -0400 |
| commit | aca7e221d811040bdb14da6390bbd16c5f7db785 (patch) | |
| tree | 87c77521066511890e236a97afb27a475f32c0a3 /MediaBrowser.Model/Net/WebSocketMessage.cs | |
| parent | b7621d762c58320b35096838ae8ab10d98ea9bb2 (diff) | |
| parent | 652e9702fc67784fd11e26ee159f31e6f0ba9dd7 (diff) | |
Merge branch 'master' into userdb-efcore
# Conflicts:
# Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs
# Emby.Server.Implementations/ApplicationHost.cs
# Emby.Server.Implementations/Devices/DeviceManager.cs
# Jellyfin.Server/Jellyfin.Server.csproj
# Jellyfin.Server/Migrations/MigrationRunner.cs
# MediaBrowser.Controller/Devices/IDeviceManager.cs
Diffstat (limited to 'MediaBrowser.Model/Net/WebSocketMessage.cs')
| -rw-r--r-- | MediaBrowser.Model/Net/WebSocketMessage.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Net/WebSocketMessage.cs b/MediaBrowser.Model/Net/WebSocketMessage.cs index 7575224d4..03f03e4cc 100644 --- a/MediaBrowser.Model/Net/WebSocketMessage.cs +++ b/MediaBrowser.Model/Net/WebSocketMessage.cs @@ -1,5 +1,8 @@ + #pragma warning disable CS1591 +using System; + namespace MediaBrowser.Model.Net { /// <summary> @@ -13,7 +16,9 @@ namespace MediaBrowser.Model.Net /// </summary> /// <value>The type of the message.</value> public string MessageType { get; set; } - public string MessageId { get; set; } + + public Guid MessageId { get; set; } + public string ServerId { get; set; } /// <summary> @@ -22,5 +27,4 @@ namespace MediaBrowser.Model.Net /// <value>The data.</value> public T Data { get; set; } } - } |