Merge pull request #14 from jellyfin/10.7

Target 10.7

Author: oddstr13

Jellyfin.Plugin.Slack/Api/SlackNotificationsController.cs

@@ -1,10 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
 using System.Net.Mime;
+using System.Text.Json;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Json;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Serialization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
@@ -16,15 +19,16 @@ namespace Jellyfin.Plugin.Slack.Api
     [Produces(MediaTypeNames.Application.Json)]
     public class SlackNotificationsController : ControllerBase
     {
-        private readonly IHttpClient _httpClient;
+        private readonly IHttpClientFactory _httpClientFactory;
         private readonly ILogger<SlackNotificationsController> _logger;
-        private readonly IJsonSerializer _serializer;
-        
-        public SlackNotificationsController(ILogger<SlackNotificationsController> logger, IHttpClient httpClient, IJsonSerializer serializer)
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
+
+        public SlackNotificationsController(ILogger<SlackNotificationsController> logger, IHttpClientFactory httpClientFactory)
         {
               _logger = logger;
-              _httpClient = httpClient;
-              _serializer = serializer;
+              _httpClientFactory = httpClientFactory;
+              _jsonSerializerOptions = JsonDefaults.GetOptions();
+
         }
 
         /// <summary>
@@ -54,15 +58,9 @@ public async Task<ActionResult> SendSlackTestNotification([FromRoute] string use
                 parameters.Add("icon_url", options.IconUrl);
             }
 
-            var httpRequest = new HttpRequestOptions
-            {
-                Url = options.WebHookUrl,
-                RequestContent = _serializer.SerializeToString(parameters),
-                RequestContentType = "application/json",
-            };
-
-            await _httpClient.Post(httpRequest).ConfigureAwait(false);
-
+            using var response = await _httpClientFactory.CreateClient(NamedClient.Default)
+                .PostAsJsonAsync(options.WebHookUrl, parameters, _jsonSerializerOptions)
+                .ConfigureAwait(false);
             _logger.LogInformation("Slack test notification sent.");
 
             return NoContent();

Jellyfin.Plugin.Slack/Jellyfin.Plugin.Slack.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <AssemblyVersion>6.0.0.0</AssemblyVersion>
-    <FileVersion>6.0.0.0</FileVersion>
+    <TargetFramework>net5.0</TargetFramework>
+    <AssemblyVersion>7.0.0.0</AssemblyVersion>
+    <FileVersion>7.0.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,7 +15,7 @@
     <PackageReference Include="Jellyfin.Data" Version="10.*-*" />
     <PackageReference Include="Jellyfin.Controller" Version="10.*-*" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
   </ItemGroup>
 
 </Project>

Jellyfin.Plugin.Slack/Notifier.cs

@@ -1,30 +1,31 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Plugin.Slack.Configuration;
 using Jellyfin.Data.Entities;
+using MediaBrowser.Common.Json;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Notifications;
-using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
 
 namespace Jellyfin.Plugin.Slack
 {
     public class Notifier : INotificationService
     {
         private readonly ILogger<Notifier> _logger;
-        private readonly IHttpClient _httpClient;
-        private readonly IJsonSerializer _serializer;
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly JsonSerializerOptions _jsonSerializerOptions;
 
-        public Notifier(ILogger<Notifier> logger, IHttpClient httpClient, IJsonSerializer serializer)
+        public Notifier(ILogger<Notifier> logger, IHttpClientFactory httpClientFactory)
         {
             _logger = logger;
-            _httpClient = httpClient;
-            _serializer = serializer;
+            _httpClientFactory = httpClientFactory;
+            _jsonSerializerOptions = JsonDefaults.GetOptions();
         }
 
         public bool IsEnabledForUser(User user)
@@ -59,14 +60,10 @@ public async Task SendNotification(UserNotification request, CancellationToken c
             }
 
             _logger.LogDebug("Notification to Slack : {0} - {1}", options.WebHookUrl, request.Description);
-            var httpRequest = new HttpRequestOptions
-            {
-                Url = options.WebHookUrl,
-                RequestContent = _serializer.SerializeToString(parameters),
-                RequestContentType = "application/json",
-            };
 
-            await _httpClient.Post(httpRequest).ConfigureAwait(false);
+            using var response = await _httpClientFactory.CreateClient(NamedClient.Default)
+                .PostAsJsonAsync(options.WebHookUrl, parameters, _jsonSerializerOptions, cancellationToken)
+                .ConfigureAwait(false);
         }
 
         private bool IsValid(SlackConfiguration options)

build.yaml

@@ -1,8 +1,9 @@
 ---
 name: "Slack Notifications"
 guid: "94fb77c3-55ad-4c50-bf4e-4e5497467b79"
-version: "6.0.0.0"
-targetAbi: "10.6.0.0"
+version: "7.0.0.0"
+targetAbi: "10.7.0.0"
+framework: "net5.0"
 overview: "Get notifications via Slack"
 description: >
   Get notifications via Slack.