Release Testing Day 3 (#1951)

* Code cleanup.

Fixed OPDS images missing api key.

Fixed theme color on site manifest not being black.

* Removed a console.log from timeago pipe

* Reading list page is now alphabetical and the modal for adding to a reading list is ordered by most recent.

* Fixed a bug where remove read from reading list failed due to Calculating Start and End date assuming chapter would always be there.

* Fixed a bug where reading list cover would get reset when editing the reading list.

* Fixed a bug where reading list item didn't have not read badge. It's on old style.

* Fixed a bug where user-preferences was hitting an admin only api when there was a better alternative

* Slight memory improvement on a common db call

* Fixed a bug where resetting to default theme when a theme was deleted was throwing an exception and failing.

* All Login dtos now have the active KavitaVersion to make external apps able to handle what version of the API they are connecting with.

* Fixed up a case where getVolume repo method always assumed there was a volume by that Id.

API/Data/Repositories/ReadingListRepository.cs

@@ -27,7 +27,7 @@ public enum ReadingListIncludes
 
 public interface IReadingListRepository
 {
-    Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams);
+    Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams, bool sortByLastModified = true);
     Task<ReadingList?> GetReadingListByIdAsync(int readingListId, ReadingListIncludes includes = ReadingListIncludes.None);
     Task<IEnumerable<ReadingListItemDto>> GetReadingListItemDtosByIdAsync(int readingListId, int userId);
     Task<ReadingListDto?> GetReadingListDtoByIdAsync(int readingListId, int userId);
@@ -166,17 +166,18 @@ public class ReadingListRepository : IReadingListRepository
     }
 
 
-    public async Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams)
+    public async Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams, bool sortByLastModified = true)
     {
         var userAgeRating = (await _context.AppUser.SingleAsync(u => u.Id == userId)).AgeRestriction;
         var query = _context.ReadingList
             .Where(l => l.AppUserId == userId || (includePromoted &&  l.Promoted ))
-            .Where(l => l.AgeRating >= userAgeRating)
-            .OrderBy(l => l.LastModified)
-            .ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
+            .Where(l => l.AgeRating >= userAgeRating);
+        query = sortByLastModified ? query.OrderByDescending(l => l.LastModified) : query.OrderBy(l => l.NormalizedTitle);
+
+       var finalQuery = query.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
             .AsNoTracking();
 
-        return await PagedList<ReadingListDto>.CreateAsync(query, userParams.PageNumber, userParams.PageSize);
+        return await PagedList<ReadingListDto>.CreateAsync(finalQuery, userParams.PageNumber, userParams.PageSize);
     }
 
     public async Task<IEnumerable<ReadingListDto>> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId, bool includePromoted)

API/Data/Repositories/SeriesRepository.cs

@@ -140,10 +140,8 @@ public class SeriesRepository : ISeriesRepository
     private readonly DataContext _context;
     private readonly IMapper _mapper;
 
-
-    // [GeneratedRegex(@"\d{4}", RegexOptions.Compiled, 50000)]
-    // private static partial Regex YearRegex();
-    private readonly Regex _yearRegex = new Regex(@"\d{4}", RegexOptions.Compiled, Services.Tasks.Scanner.Parser.Parser.RegexTimeout);
+    private readonly Regex _yearRegex = new Regex(@"\d{4}", RegexOptions.Compiled,
+        Services.Tasks.Scanner.Parser.Parser.RegexTimeout);
 
     public SeriesRepository(DataContext context, IMapper mapper)
     {

API/Data/Repositories/SiteThemeRepository.cs

@@ -71,7 +71,7 @@ public class SiteThemeRepository : ISiteThemeRepository
     {
         var result =  await _context.SiteTheme
             .Where(t => t.IsDefault)
-            .SingleOrDefaultAsync();
+            .FirstOrDefaultAsync();
 
         if (result == null)
         {

API/Data/Repositories/UserRepository.cs

@@ -337,7 +337,7 @@ public class UserRepository : IUserRepository
         return await _context.AppUser
             .Where(u => u.ApiKey != null && u.ApiKey.Equals(apiKey))
             .Select(u => u.Id)
-            .SingleOrDefaultAsync();
+            .FirstOrDefaultAsync();
     }
 
 

API/Data/Repositories/VolumeRepository.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 using API.DTOs;
@@ -21,7 +22,7 @@ public interface IVolumeRepository
     Task<IList<int>> GetChapterIdsByVolumeIds(IReadOnlyList<int> volumeIds);
     Task<IEnumerable<VolumeDto>> GetVolumesDtoAsync(int seriesId, int userId);
     Task<Volume?> GetVolumeAsync(int volumeId);
-    Task<VolumeDto> GetVolumeDtoAsync(int volumeId, int userId);
+    Task<VolumeDto?> GetVolumeDtoAsync(int volumeId, int userId);
     Task<IEnumerable<Volume>> GetVolumesForSeriesAsync(IList<int> seriesIds, bool includeChapters = false);
     Task<IEnumerable<Volume>> GetVolumes(int seriesId);
     Task<Volume?> GetVolumeByIdAsync(int volumeId);
@@ -119,7 +120,7 @@ public class VolumeRepository : IVolumeRepository
     /// <param name="volumeId"></param>
     /// <param name="userId"></param>
     /// <returns></returns>
-    public async Task<VolumeDto> GetVolumeDtoAsync(int volumeId, int userId)
+    public async Task<VolumeDto?> GetVolumeDtoAsync(int volumeId, int userId)
     {
         var volume = await _context.Volume
             .Where(vol => vol.Id == volumeId)
@@ -127,7 +128,9 @@ public class VolumeRepository : IVolumeRepository
             .ThenInclude(c => c.Files)
             .AsSplitQuery()
             .ProjectTo<VolumeDto>(_mapper.ConfigurationProvider)
-            .SingleAsync(vol => vol.Id == volumeId);
+            .SingleOrDefaultAsync(vol => vol.Id == volumeId);
+
+        if (volume == null) return null;
 
         var volumeList = new List<VolumeDto>() {volume};
         await AddVolumeModifiers(userId, volumeList);