Jellyfin 10.10 compatibility

shemanaev · Dec 17, 2024 · 773305c · 773305c
1 parent 95ea08b
commit 773305c
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 30 deletions.
diff --git a/Jellyfin.Webhooks/Dto/SessionInfoDto.cs b/Jellyfin.Webhooks/Dto/SessionInfoDto.cs
@@ -13,6 +13,17 @@ public class SessionInfoDto
         public string ApplicationVersion { get; set; }
         public PlayerStateInfo PlayState { get; set; }
 
+        public SessionInfoDto(MediaBrowser.Model.Dto.SessionInfoDto session)
+        {
+            Id = session.Id;
+            Client = session.Client;
+            DeviceId = session.DeviceId;
+            DeviceName = session.DeviceName;
+            RemoteEndPoint = session.RemoteEndPoint;
+            ApplicationVersion = session.ApplicationVersion;
+            PlayState = session.PlayState;
+        }
+
         public SessionInfoDto(SessionInfo session)
         {
             Id = session.Id;

diff --git a/Jellyfin.Webhooks/Formats/DefaultFormat.cs b/Jellyfin.Webhooks/Formats/DefaultFormat.cs
@@ -52,7 +52,7 @@ public class DefaultFormatPayload
         public HookEvent Event { get; set; }
         public BaseItemDto Item { get; set; }
         public UserDto User { get; set; }
-        public SessionInfoDto Session { get; set; }
+        public Dto.SessionInfoDto Session { get; set; }
         public ServerInfoDto Server { get; set; }
         public object AdditionalData { get; set; }
         public BaseItemDto Series { get; set; }

diff --git a/Jellyfin.Webhooks/Jellyfin.Webhooks.csproj b/Jellyfin.Webhooks/Jellyfin.Webhooks.csproj
@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Jellyfin.Webhooks</RootNamespace>
-    <AssemblyVersion>3.7.0.0</AssemblyVersion>
-    <FileVersion>3.7.0.0</FileVersion>
+    <AssemblyVersion>3.8.0.0</AssemblyVersion>
+    <FileVersion>3.8.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Jellyfin.Controller" Version="10.9.0" />
-    <PackageReference Include="Jellyfin.Data" Version="10.9.0" />
-    <PackageReference Include="Jellyfin.Model" Version="10.9.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Jellyfin.Controller" Version="10.10.3" />
+    <PackageReference Include="Jellyfin.Data" Version="10.10.3" />
+    <PackageReference Include="Jellyfin.Model" Version="10.10.3" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 

diff --git a/Jellyfin.Webhooks/Notifiers/AuthenticationFailureNotifier.cs b/Jellyfin.Webhooks/Notifiers/AuthenticationFailureNotifier.cs
@@ -1,29 +1,28 @@
 using System.Threading.Tasks;
-using Jellyfin.Data.Events;
 using MediaBrowser.Controller.Events;
-using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller;
 using Jellyfin.Webhooks.Configuration;
 using Jellyfin.Webhooks.Dto;
+using MediaBrowser.Controller.Events.Authentication;
 
 namespace Jellyfin.Webhooks.Notifiers;
 
 public class AuthenticationFailureNotifier(
     IServerApplicationHost applicationHost,
     ISender sender
-) : IEventConsumer<GenericEventArgs<AuthenticationRequest>>
+) : IEventConsumer<AuthenticationRequestEventArgs>
 {
-    public async Task OnEvent(GenericEventArgs<AuthenticationRequest> eventArgs)
+    public async Task OnEvent(AuthenticationRequestEventArgs eventArgs)
     {
-        if (eventArgs.Argument is null)
+        if (eventArgs is null)
         {
             return;
         }
 
         await sender.Send(new EventInfo
         {
             Event = HookEvent.AuthenticationFailed,
-            AdditionalData = eventArgs.Argument,
+            AdditionalData = eventArgs,
             Server = new ServerInfoDto
             {
                 Id = applicationHost.SystemId,

diff --git a/Jellyfin.Webhooks/Notifiers/AuthenticationSuccessNotifier.cs b/Jellyfin.Webhooks/Notifiers/AuthenticationSuccessNotifier.cs
@@ -1,32 +1,31 @@
 using System.Threading.Tasks;
-using Jellyfin.Data.Events;
 using Jellyfin.Webhooks.Configuration;
 using Jellyfin.Webhooks.Dto;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Authentication;
+using MediaBrowser.Controller.Events.Authentication;
 
 namespace Jellyfin.Webhooks.Notifiers;
 
 public class AuthenticationSuccessNotifier(
     IServerApplicationHost applicationHost,
     IUserManager userManager,
     ISender sender
-) : IEventConsumer<GenericEventArgs<AuthenticationResult>>
+) : IEventConsumer<AuthenticationResultEventArgs>
 {
-    public async Task OnEvent(GenericEventArgs<AuthenticationResult> eventArgs)
+    public async Task OnEvent(AuthenticationResultEventArgs eventArgs)
     {
-        if (eventArgs.Argument is null)
+        if (eventArgs is null)
         {
             return;
         }
 
-        var user = userManager.GetUserById(eventArgs.Argument.User.Id);
+        var user = userManager.GetUserById(eventArgs.User.Id);
         await sender.Send(new EventInfo
         {
             Event = HookEvent.AuthenticationSucceeded,
-            Session = new SessionInfoDto(eventArgs.Argument.SessionInfo),
+            Session = new SessionInfoDto(eventArgs.SessionInfo),
             User = user,
             Server = new ServerInfoDto
             {

diff --git a/Jellyfin.Webhooks/PluginServiceRegistrator.cs b/Jellyfin.Webhooks/PluginServiceRegistrator.cs
@@ -1,11 +1,9 @@
-using Jellyfin.Data.Events;
-using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Controller.Session;
 using Microsoft.Extensions.DependencyInjection;
 using Jellyfin.Webhooks.Notifiers;
+using MediaBrowser.Controller.Events.Authentication;
 
 namespace Jellyfin.Webhooks;
 
@@ -17,7 +15,7 @@ public void RegisterServices(IServiceCollection serviceCollection, IServerApplic
         serviceCollection.AddScoped<ISender, Sender>();
 
         // Security consumers.
-        serviceCollection.AddScoped<IEventConsumer<GenericEventArgs<AuthenticationRequest>>, AuthenticationFailureNotifier>();
-        serviceCollection.AddScoped<IEventConsumer<GenericEventArgs<AuthenticationResult>>, AuthenticationSuccessNotifier>();
+        serviceCollection.AddScoped<IEventConsumer<AuthenticationRequestEventArgs>, AuthenticationFailureNotifier>();
+        serviceCollection.AddScoped<IEventConsumer<AuthenticationResultEventArgs>, AuthenticationSuccessNotifier>();
     }
 }
diff --git a/build.yaml b/build.yaml
@@ -1,8 +1,8 @@
 ---
 name: "Webhooks"
 guid: "eb5d7894-8eef-4b36-aa6f-5d124e828ce1"
-version: "3.7.0.0"
-targetAbi: "10.9.0.0"
+version: "3.8.0.0"
+targetAbi: "10.10.3.0"
 framework: "net8.0"
 overview: "Webhooks. Flexible and robust"
 description: >
@@ -12,4 +12,4 @@ owner: "shemanaev"
 artifacts:
   - "Jellyfin.Webhooks.dll"
 changelog: >
-  Jellyfin 10.9 compatibility
+  Jellyfin 10.10 compatibility