Merge pull request #1083 from ShokoAnime/Filters

Filters
ShokoAnime · Sep 28, 2023 · e6b7526 · e6b7526
2 parents 6c57ba0 + a1ffefa
commit e6b7526
Show file tree

Hide file tree

Showing 214 changed files with 11,674 additions and 8,817 deletions.
diff --git a/Shoko.CLI/Program.cs b/Shoko.CLI/Program.cs
@@ -1,9 +1,14 @@
 #region
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
 using Shoko.Server.Commands;
+using Shoko.Server.Filters;
+using Shoko.Server.Repositories;
 using Shoko.Server.Server;
 using Shoko.Server.Settings;
 using Shoko.Server.Utilities;
@@ -13,6 +18,7 @@ namespace Shoko.CLI;
 
 public static class Program
 {
+    private static ILogger _logger;
     public static void Main()
     {
         try
@@ -26,7 +32,7 @@ public static void Main()
         Utils.SetInstance();
         Utils.InitLogger();
         var logFactory = new LoggerFactory().AddNLog();
-        var logger = logFactory.CreateLogger("Main");
+        _logger = logFactory.CreateLogger("Main");
 
         try
         {
@@ -40,7 +46,7 @@ public static void Main()
         }
         catch (Exception e)
         {
-            logger.LogCritical(e, "The server failed to start");
+            _logger.LogCritical(e, "The server failed to start");
         }
     }
 

diff --git a/Shoko.Commons b/Shoko.Commons
diff --git a/Shoko.Server/API/APIExtensions.cs b/Shoko.Server/API/APIExtensions.cs
@@ -21,6 +21,7 @@
 using Shoko.Server.API.SignalR.Aggregate;
 using Shoko.Server.API.SignalR.Legacy;
 using Shoko.Server.API.Swagger;
+using Shoko.Server.API.v3.Helpers;
 using Shoko.Server.API.v3.Models.Shoko;
 using Shoko.Server.API.WebUI;
 using Shoko.Server.Plugin;
@@ -50,6 +51,9 @@ public static IServiceCollection AddAPI(this IServiceCollection services)
         services.AddSingleton<AVDumpEmitter>();
         services.AddSingleton<NetworkEmitter>();
         services.AddSingleton<QueueEmitter>();
+        services.AddScoped<FilterFactory>();
+        services.AddScoped<SeriesFactory>();
+        services.AddScoped<WebUIFactory>();
 
         services.AddAuthentication(options =>
         {

diff --git a/Shoko.Server/API/AuthenticationController.cs b/Shoko.Server/API/AuthenticationController.cs
@@ -24,7 +24,7 @@ public class AuthenticationController : BaseController
     [ProducesResponseType(400)]
     [ProducesResponseType(401)]
     [ProducesResponseType(200)]
-    public ActionResult<dynamic> Login(AuthUser auth)
+    public ActionResult<object> Login(AuthUser auth)
     {
         if (!ModelState.IsValid || string.IsNullOrEmpty(auth.user?.Trim()))
         {
@@ -58,7 +58,7 @@ public ActionResult ChangePassword([FromBody] string newPassword)
         try
         {
             User.Password = Digest.Hash(newPassword.Trim());
-            RepoFactory.JMMUser.Save(User, false);
+            RepoFactory.JMMUser.Save(User);
             RepoFactory.AuthTokens.DeleteAllWithUserID(User.JMMUserID);
             return Ok();
         }

diff --git a/Shoko.Server/API/v1/Implementations/ShokoServiceImplementation/ShokoServiceImplementation.cs b/Shoko.Server/API/v1/Implementations/ShokoServiceImplementation/ShokoServiceImplementation.cs
@@ -18,6 +18,8 @@
 using Shoko.Server.Commands;
 using Shoko.Server.Commands.AniDB;
 using Shoko.Server.Extensions;
+using Shoko.Server.Filters;
+using Shoko.Server.Filters.Legacy;
 using Shoko.Server.Models;
 using Shoko.Server.Plex;
 using Shoko.Server.Providers.AniDB.Interfaces;
@@ -175,16 +177,17 @@ public CL_MainChanges GetAllChanges(DateTime date, int userID)
             var changes = ChangeTracker<int>.GetChainedChanges(
                 new List<ChangeTracker<int>>
                 {
-                    RepoFactory.GroupFilter.GetChangeTracker(),
+                    RepoFactory.FilterPreset.GetChangeTracker(),
                     RepoFactory.AnimeGroup.GetChangeTracker(),
                     RepoFactory.AnimeGroup_User.GetChangeTracker(userID),
                     RepoFactory.AnimeSeries.GetChangeTracker(),
                     RepoFactory.AnimeSeries_User.GetChangeTracker(userID)
                 }, date);
+            var legacyConverter = HttpContext.RequestServices.GetRequiredService<LegacyFilterConverter>();
             c.Filters = new CL_Changes<CL_GroupFilter>
             {
-                ChangedItems = changes[0]
-                    .ChangedItems.Select(a => RepoFactory.GroupFilter.GetByID(a)?.ToClient())
+                ChangedItems = legacyConverter.ToClient(changes[0].ChangedItems.Select(a => RepoFactory.FilterPreset.GetByID(a)).ToList())
+                    .Select(a => a.Value)
                     .Where(a => a != null)
                     .ToList(),
                 RemovedItems = changes[0].RemovedItems.ToList(),
@@ -203,8 +206,7 @@ public CL_MainChanges GetAllChanges(DateTime date, int userID)
                     if (!c.Filters.ChangedItems.Any(a => a.GroupFilterID == ag.ParentGroupFilterID.Value))
                     {
                         end = false;
-                        var cag = RepoFactory.GroupFilter.GetByID(ag.ParentGroupFilterID.Value)?
-                            .ToClient();
+                        var cag = legacyConverter.ToClient(RepoFactory.FilterPreset.GetByID(ag.ParentGroupFilterID.Value));
                         if (cag != null)
                         {
                             c.Filters.ChangedItems.Add(cag);
@@ -270,8 +272,10 @@ public CL_Changes<CL_GroupFilter> GetGroupFilterChanges(DateTime date)
         var c = new CL_Changes<CL_GroupFilter>();
         try
         {
-            var changes = RepoFactory.GroupFilter.GetChangeTracker().GetChanges(date);
-            c.ChangedItems = changes.ChangedItems.Select(a => RepoFactory.GroupFilter.GetByID(a).ToClient())
+            var legacyConverter = HttpContext.RequestServices.GetRequiredService<LegacyFilterConverter>();
+            var changes = RepoFactory.FilterPreset.GetChangeTracker().GetChanges(date);
+            c.ChangedItems = legacyConverter.ToClient(changes.ChangedItems.Select(a => RepoFactory.FilterPreset.GetByID(a)).ToList())
+                .Select(a => a.Value)
                 .Where(a => a != null)
                 .ToList();
             c.RemovedItems = changes.RemovedItems.ToList();