Hardcover Recommendations and OAuth (Hotfix) (#4890)

Co-authored-by: Fred Silberberg <fred@silberberg.xyz>
Co-authored-by: Joe Milazzo <josephmajora@gmail.com>

Author: 3 people

.github/workflows/build-ui.yml

@@ -21,7 +21,7 @@ jobs:
       - run: |
           cd UI/Web || exit
           echo 'Installing web dependencies'
-          npm ci
+          npm ci --legacy-peer-deps
 
           echo 'Building UI'
           npm run prod

Kavita.API/Services/Plus/IExternalMetadataService.cs

@@ -19,14 +19,13 @@ public interface IExternalMetadataService
     /// <summary>
     /// Retrieves Metadata about a Recommended External Series
     /// </summary>
-    /// <param name="aniListId"></param>
-    /// <param name="malId"></param>
-    /// <param name="mangaBakaId"></param>
     /// <param name="seriesId"></param>
+    /// <param name="request"></param>
+    /// /// <param name="recommendedSeriesId"></param>
     /// <param name="ct"></param>
     /// <returns></returns>
     /// <exception cref="KavitaException"></exception>
-    Task<ExternalSeriesDetailDto?> GetExternalSeriesDetail(int? aniListId, long? malId, int? mangaBakaId, int? seriesId, CancellationToken ct = default);
+    Task<ExternalSeriesDetailDto?> GetExternalSeriesDetail(int seriesId, MetadataRequest request, int? recommendedSeriesId, CancellationToken ct = default);
 
     /// <summary>
     /// This is a task that runs on a schedule and slowly fetches data from Kavita+ to keep

Kavita.API/Services/Plus/IOAuthService.cs

@@ -7,7 +7,7 @@ namespace Kavita.API.Services.Plus;
 
 public interface IOAuthService
 {
-    Task HandleCallback(AppUser user, OAuthUpstream upstream, string token, string? refreshToken = null);
+    Task HandleCallback(AppUser user, OAuthUpstream upstream, string token, string? refreshToken = null, int? expiresIn = null);
 
     Task RefreshTokens(CancellationToken ct = default);
 }

Kavita.Common.Tests/Helpers/ExternalIdParserTests.cs

@@ -29,6 +29,10 @@ public void CanParseWeblink_ComicVine(string link, string expectedId)
 
     [Theory]
     [InlineData("https://mangabaka.org/3391", 3391)]
+    [InlineData("https://mangabaka.org/3391/Some-Slug/", 3391)]
+    [InlineData("https://mangabaka.org/3391?q=Something+Something", 3391)]
+    [InlineData("https://mangabaka.org/novel/84752/Spice-Wolf", 84752)]
+    [InlineData("https://mangabaka.org/manga/10803/Spice-Wolf", 10803)]
     public void CanParseWeblink_MangaBaka(string link, long expectedId)
     {
         Assert.Equal(ExternalIdParser.GetMangaBakaId(link), expectedId);

Kavita.Common/Helpers/ExternalIdParser.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 namespace Kavita.Common.Helpers;
 #nullable enable
@@ -14,11 +15,10 @@ public sealed record HardcoverUrlSlug(string Slug, bool IsStandAlone);
 /// <summary>
 /// Handles all things parsing of External Ids (weblinks, not set checks, anilist:X)
 /// </summary>
-public static class ExternalIdParser
+public static partial class ExternalIdParser
 {
     private const string AniListWeblinkWebsite = "https://anilist.co/manga/";
     private const string MalWeblinkWebsite = "https://myanimelist.net/manga/";
-    private const string GoogleBooksWeblinkWebsite = "https://books.google.com/books?id=";
     private const string MangaDexWeblinkWebsite = "https://mangadex.org/title/";
     private const string AniListStaffWebsite = "https://anilist.co/staff/";
     private const string AniListCharacterWebsite = "https://anilist.co/character/";
@@ -53,7 +53,6 @@ public static class ExternalIdParser
     {
         {AniListWeblinkWebsite, 0},
         {MalWeblinkWebsite, 0},
-        {GoogleBooksWeblinkWebsite, 0},
         {MangaDexWeblinkWebsite, 0},
         {AniListStaffWebsite, 0},
         {AniListCharacterWebsite, 0},
@@ -97,19 +96,14 @@ public static int GetAniListStaffId(string? url)
         return ExtractId<int?>(url, AniListStaffWebsite) ?? 0;
     }
 
-    public static string? GetGoogleBooksId(string? weblinks)
-    {
-        return ExtractId<string?>(weblinks, GoogleBooksWeblinkWebsite);
-    }
-
     public static string? GetMangaDexId(string? weblinks)
     {
         return ExtractId<string?>(weblinks, MangaDexWeblinkWebsite);
     }
 
     public static int GetMangaBakaId(string? weblinks)
     {
-        return ExtractId<int?>(weblinks, MangaBakaWebsite) ?? 0;
+        return ExtractId<int?>(weblinks, MangaBakaWebsite) ?? ExtractId<int?>(weblinks, MangaBakaWebsite, 1) ?? 0;
     }
 
     #region Header-based Parsing
@@ -200,19 +194,26 @@ public static string GetHardcoverStaffId(string? url)
     /// </summary>
     /// <param name="webLinks"></param>
     /// <param name="website"></param>
+    /// <param name="indexOverride"></param>
     /// <returns></returns>
-    private static T? ExtractId<T>(string? webLinks, string website)
+    private static T? ExtractId<T>(string? webLinks, string website, int? indexOverride = null)
     {
         if (string.IsNullOrEmpty(webLinks)) return default;
 
-        var index = WeblinkExtractionMap[website];
+        var index = indexOverride ?? WeblinkExtractionMap[website];
         foreach (var webLink in webLinks.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
         {
             if (!webLink.StartsWith(website)) continue;
 
             var tokens = webLink.Split(website)[1].Split('/');
             var value = tokens[index];
 
+            // Clean any query params
+            if (QueryParamsRegex().IsMatch(value))
+            {
+                value = value.Split('?')[0];
+            }
+
             if (typeof(T) == typeof(int?))
             {
                 if (int.TryParse(value, CultureInfo.InvariantCulture, out var intValue)) return (T)(object)intValue;
@@ -264,4 +265,7 @@ public static string GetHardcoverStaffId(string? url)
 
         throw new ArgumentException("Unsupported ID type. Supported types are int, long, and string.", nameof(id));
     }
+
+    [GeneratedRegex(".*?\\D+=.*")]
+    private static partial Regex QueryParamsRegex();
 }

Kavita.Database/Extensions/RestrictByAgeExtensions.cs

@@ -164,6 +164,19 @@ public static IQueryable<ReadingList> RestrictAgainstAgeRestriction(this IQuerya
         return q;
     }
 
+    public static IQueryable<ReadingListItem> RestrictAgainstAgeRestriction(this IQueryable<ReadingListItem> queryable, AgeRestriction restriction)
+    {
+        if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;
+        var q = queryable.Where(rl => rl.Series.Metadata.AgeRating <= restriction.AgeRating);
+
+        if (!restriction.IncludeUnknowns)
+        {
+            return q.Where(rl => rl.Series.Metadata.AgeRating != AgeRating.Unknown);
+        }
+
+        return q;
+    }
+
     public static IQueryable<AppUserRating> RestrictAgainstAgeRestriction(this IQueryable<AppUserRating> queryable, AgeRestriction restriction, int userId)
     {
         if (restriction.AgeRating == AgeRating.NotApplicable) return queryable;

Kavita.Database/Repositories/KavitaPlusAuditRepository.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Kavita.API.Repositories;
 using Kavita.API.Services.Plus;
+using Kavita.Common.Extensions;
 using Kavita.Common.Helpers;
 using Kavita.Database.Extensions;
 using Kavita.Models.DTOs.KavitaPlus;
@@ -185,6 +186,8 @@ public async Task<KavitaPlusAuditSeriesInfoDto> GetSeriesInfoAsync(
 
     private IQueryable<KavitaPlusAuditLog> BuildBaseQuery(KavitaPlusAuditFilterDto filter)
     {
+        var normalizedSeriesName = filter.Search?.ToNormalized() ?? string.Empty;
+
         return context.KavitaPlusAuditLogs
             .AsNoTracking()
             .WhereIf(filter.Category.HasValue, e => e.Category == filter.Category!.Value)
@@ -200,9 +203,9 @@ private IQueryable<KavitaPlusAuditLog> BuildBaseQuery(KavitaPlusAuditFilterDto f
             .WhereIf(filter.FromUtc.HasValue, e => e.CreatedUtc >= filter.FromUtc!.Value)
             .WhereIf(filter.ToUtc.HasValue, e => e.CreatedUtc <= filter.ToUtc!.Value)
             .WhereIf(!string.IsNullOrEmpty(filter.Search), e =>
-                context.Series.Any(s => s.Id == e.SeriesId && s.Name.Contains(filter.Search!)) ||
-                (e.User != null && e.User.UserName!.Contains(filter.Search!)) ||
-                (e.ErrorMessage != null && e.ErrorMessage.Contains(filter.Search!)))
+                context.Series.Any(s => s.Id == e.SeriesId && (s.NormalizedName.Contains(normalizedSeriesName) || s.NormalizedLocalizedName.Contains(normalizedSeriesName))) ||
+                (e.User != null && e.User.UserName != null && EF.Functions.Like(e.User.UserName, $"%{filter.Search}%")) ||
+                (e.ErrorMessage != null && EF.Functions.Like(e.ErrorMessage, $"%{filter.Search}%")))
             .OrderByDescending(e => e.CreatedUtc);
     }
 

Kavita.Database/Repositories/ReadingListRepository.cs

@@ -466,10 +466,12 @@ public async Task<IList<ReadingListItemDto>> GetReadingListItemDtosByIdAsync(int
         UserParams? userParams = null, CancellationToken ct = default)
     {
         var userLibraries = context.Library.GetUserLibraries(userId);
+        var ageRating = await context.AppUser.GetUserAgeRestriction(userId, ct);
 
         var query = context.ReadingListItem
             .Where(rli => rli.ReadingListId == readingListId)
             .Where(rli => userLibraries.Contains(rli.Series.LibraryId))
+            .RestrictAgainstAgeRestriction(ageRating)
             .OrderBy(rli => rli.Order)
             .ProjectToWithProgress<ReadingListItem, ReadingListItemDto>(mapper, userId)
             .AsSplitQuery();

Kavita.Models/DTOs/KavitaPlus/OAuth/OAuthUpstream.cs

@@ -6,8 +6,5 @@ public enum OAuthUpstream
     MangaBaka = 1,
     AniList = 2,
     MyAnimeList = 3,
-    /// <summary>
-    /// Hardcover has not yet implemented OAuth
-    /// </summary>
-    // Hardcover = 4,
+    Hardcover = 4,
 }

Kavita.Models/DTOs/KavitaPlus/Recommendation/ExternalSeriesDto.cs

@@ -16,6 +16,7 @@ public sealed record ExternalSeriesDto
     public int? AniListId { get; set; }
     public int? MangaBakaId { get; set; }
     public long? MalId { get; set; }
+    public int? HardcoverId { get; set; }
     [EnumDataType(typeof(ScrobbleProvider))]
     public ScrobbleProvider Provider { get; set; } = ScrobbleProvider.AniList;
     /// <summary>
@@ -35,4 +36,4 @@ public sealed record ExternalSeriesDto
     /// </summary>
     [EnumDataType(typeof(AgeRating))]
     public AgeRating AgeRating { get; set; } = AgeRating.Unknown;
-}
+}