mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Started designing the backend localization service * Worked in Transloco for initial PoC * Worked in Transloco for initial PoC * Translated the login screen * translated dashboard screen * Started work on the backend * Fixed a logic bug * translated edit-user screen * Hooked up the backend for having a locale property. * Hooked up the ability to view the available locales and switch to them. * Made the localization service languages be derived from what's in langs/ directory. * Fixed up localization switching * Switched when we check for a license on UI bootstrap * Tweaked some code * Fixed the bug where dashboard wasn't loading and made it so language switching is working. * Fixed a bug on dashboard with languagePath * Converted user-scrobble-history.component.html * Converted spoiler.component.html * Converted review-series-modal.component.html * Converted review-card-modal.component.html * Updated the readme * Translated using Weblate (English) Currently translated at 100.0% (54 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/en/ * Converted review-card.component.html * Deleted dead component * Converted want-to-read.component.html * Added translation using Weblate (Korean) * Translated using Weblate (Spanish) Currently translated at 40.7% (22 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/es/ * Translated using Weblate (Korean) Currently translated at 62.9% (34 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/ko/ * Converted user-preferences.component.html * Translated using Weblate (Korean) Currently translated at 92.5% (50 of 54 strings) Translation: Kavita/ui Translate-URL: https://hosted.weblate.org/projects/kavita/ui/ko/ * Converted user-holds.component.html * Converted theme-manager.component.html * Converted restriction-selector.component.html * Converted manage-devices.component.html * Converted edit-device.component.html * Converted change-password.component.html * Converted change-email.component.html * Converted change-age-restriction.component.html * Converted api-key.component.html * Converted anilist-key.component.html * Converted typeahead.component.html * Converted user-stats-info-cards.component.html * Converted user-stats.component.html * Converted top-readers.component.html * Converted some pipes and ensure translation is loaded before the app. * Finished all but one pipe for localization * Converted directory-picker.component.html * Converted library-access-modal.component.html * Converted a few components * Converted a few components * Converted a few components * Converted a few components * Converted a few components * Merged weblate in * ... -> … update * Updated the readme * Updateded all fonts to be woff2 * Cleaned up some strings to increase re-use * Removed an old flow (that doesn't exist in backend any longer) from when we introduced emails on Kavita. * Converted Series detail * Lots more converted * Lots more converted & hooked up the ability to flatten during prod build the language files. * Lots more converted * Lots more converted & fixed a bunch of broken pipes due to inject() * Lots more converted * Lots more converted * Lots more converted & fixed some bad keys * Lots more converted * Fixed some bugs with admin dasbhoard nested tabs not rendering on first load due to not using onpush change detection * Fixed up some localization errors and fixed forgot password error when the user doesn't have change password permission * Fixed a stupid build issue again * Started adding errors for interceptor and backend. * Finished off manga-reader * More translations * Few fixes * Fixed a bug where character tag badges weren't showing the name on chapter info * All components are translated * All toasts are translated * All confirm/alerts are translated * Trying something new for the backend * Migrated the localization strings for the backend into a new file. * Updated the localization service to be able to do backend localization with fallback to english. * Cleaned up some external reviews code to reduce looping * Localized AccountController.cs * 60% done with controllers * All controllers are done * All KavitaExceptions are covered * Some shakeout fixes * Prep for initial merge * Everything is done except options and basic shakeout proves response times are good. Unit tests are broken. * Fixed up the unit tests * All unit tests are now working * Removed some quantifier * I'm not sure I can support localization for some Volume/Chapter/Book strings within the codebase. --------- Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> Co-authored-by: majora2007 <kavitareader@gmail.com> Co-authored-by: expertjun <jtrobin@naver.com> Co-authored-by: ThePromidius <thepromidiusyt@gmail.com>
159 lines
6.5 KiB
C#
159 lines
6.5 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Constants;
|
|
using API.Data;
|
|
using API.DTOs;
|
|
using API.DTOs.Recommendation;
|
|
using API.Extensions;
|
|
using API.Helpers;
|
|
using API.Services;
|
|
using API.Services.Plus;
|
|
using EasyCaching.Core;
|
|
using Microsoft.AspNetCore.Mvc;
|
|
using Microsoft.Extensions.Caching.Memory;
|
|
using Newtonsoft.Json;
|
|
|
|
namespace API.Controllers;
|
|
|
|
public class RecommendedController : BaseApiController
|
|
{
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IRecommendationService _recommendationService;
|
|
private readonly ILicenseService _licenseService;
|
|
private readonly ILocalizationService _localizationService;
|
|
private readonly IEasyCachingProvider _cacheProvider;
|
|
public const string CacheKey = "recommendation_";
|
|
|
|
public RecommendedController(IUnitOfWork unitOfWork, IRecommendationService recommendationService,
|
|
ILicenseService licenseService, IEasyCachingProviderFactory cachingProviderFactory,
|
|
ILocalizationService localizationService)
|
|
{
|
|
_unitOfWork = unitOfWork;
|
|
_recommendationService = recommendationService;
|
|
_licenseService = licenseService;
|
|
_localizationService = localizationService;
|
|
_cacheProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.KavitaPlusRecommendations);
|
|
}
|
|
|
|
/// <summary>
|
|
/// For Kavita+ users, this will return recommendations on the server.
|
|
/// </summary>
|
|
/// <param name="seriesId"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("recommendations")]
|
|
[ResponseCache(CacheProfileName = ResponseCacheProfiles.KavitaPlus, VaryByQueryKeys = new []{"seriesId"})]
|
|
public async Task<ActionResult<RecommendationDto>> GetRecommendations(int seriesId)
|
|
{
|
|
var userId = User.GetUserId();
|
|
if (!await _licenseService.HasActiveLicense())
|
|
{
|
|
return Ok(new RecommendationDto());
|
|
}
|
|
|
|
if (!await _unitOfWork.UserRepository.HasAccessToSeries(userId, seriesId))
|
|
{
|
|
return BadRequest(await _localizationService.Translate(User.GetUserId(), "series-restricted"));
|
|
}
|
|
|
|
var cacheKey = $"{CacheKey}-{seriesId}-{userId}";
|
|
var results = await _cacheProvider.GetAsync<RecommendationDto>(cacheKey);
|
|
if (results.HasValue)
|
|
{
|
|
return Ok(results.Value);
|
|
}
|
|
|
|
var ret = await _recommendationService.GetRecommendationsForSeries(userId, seriesId);
|
|
await _cacheProvider.SetAsync(cacheKey, ret, TimeSpan.FromHours(10));
|
|
return Ok(ret);
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Quick Reads are series that should be readable in less than 10 in total and are not Ongoing in release.
|
|
/// </summary>
|
|
/// <param name="libraryId">Library to restrict series to</param>
|
|
/// <param name="userParams">Pagination</param>
|
|
/// <returns></returns>
|
|
[HttpGet("quick-reads")]
|
|
public async Task<ActionResult<PagedList<SeriesDto>>> GetQuickReads(int libraryId, [FromQuery] UserParams userParams)
|
|
{
|
|
userParams ??= UserParams.Default;
|
|
var series = await _unitOfWork.SeriesRepository.GetQuickReads(User.GetUserId(), libraryId, userParams);
|
|
|
|
Response.AddPaginationHeader(series.CurrentPage, series.PageSize, series.TotalCount, series.TotalPages);
|
|
return Ok(series);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Quick Catchup Reads are series that should be readable in less than 10 in total and are Ongoing in release.
|
|
/// </summary>
|
|
/// <param name="libraryId">Library to restrict series to</param>
|
|
/// <param name="userParams"></param>
|
|
/// <returns></returns>
|
|
[HttpGet("quick-catchup-reads")]
|
|
public async Task<ActionResult<PagedList<SeriesDto>>> GetQuickCatchupReads(int libraryId, [FromQuery] UserParams userParams)
|
|
{
|
|
userParams ??= UserParams.Default;
|
|
var series = await _unitOfWork.SeriesRepository.GetQuickCatchupReads(User.GetUserId(), libraryId, userParams);
|
|
|
|
Response.AddPaginationHeader(series.CurrentPage, series.PageSize, series.TotalCount, series.TotalPages);
|
|
return Ok(series);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Highly Rated based on other users ratings. Will pull series with ratings > 4.0, weighted by count of other users.
|
|
/// </summary>
|
|
/// <param name="libraryId">Library to restrict series to</param>
|
|
/// <param name="userParams">Pagination</param>
|
|
/// <returns></returns>
|
|
[HttpGet("highly-rated")]
|
|
public async Task<ActionResult<PagedList<SeriesDto>>> GetHighlyRated(int libraryId, [FromQuery] UserParams userParams)
|
|
{
|
|
var userId = User.GetUserId();
|
|
userParams ??= UserParams.Default;
|
|
var series = await _unitOfWork.SeriesRepository.GetHighlyRated(userId, libraryId, userParams);
|
|
await _unitOfWork.SeriesRepository.AddSeriesModifiers(userId, series);
|
|
Response.AddPaginationHeader(series.CurrentPage, series.PageSize, series.TotalCount, series.TotalPages);
|
|
return Ok(series);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Chooses a random genre and shows series that are in that without reading progress
|
|
/// </summary>
|
|
/// <param name="libraryId">Library to restrict series to</param>
|
|
/// <param name="genreId">Genre Id</param>
|
|
/// <param name="userParams">Pagination</param>
|
|
/// <returns></returns>
|
|
[HttpGet("more-in")]
|
|
public async Task<ActionResult<PagedList<SeriesDto>>> GetMoreIn(int libraryId, int genreId, [FromQuery] UserParams userParams)
|
|
{
|
|
var userId = User.GetUserId();
|
|
|
|
userParams ??= UserParams.Default;
|
|
var series = await _unitOfWork.SeriesRepository.GetMoreIn(userId, libraryId, genreId, userParams);
|
|
await _unitOfWork.SeriesRepository.AddSeriesModifiers(userId, series);
|
|
|
|
Response.AddPaginationHeader(series.CurrentPage, series.PageSize, series.TotalCount, series.TotalPages);
|
|
return Ok(series);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Series that are fully read by the user in no particular order
|
|
/// </summary>
|
|
/// <param name="libraryId">Library to restrict series to</param>
|
|
/// <param name="userParams">Pagination</param>
|
|
/// <returns></returns>
|
|
[HttpGet("rediscover")]
|
|
public async Task<ActionResult<PagedList<SeriesDto>>> GetRediscover(int libraryId, [FromQuery] UserParams userParams)
|
|
{
|
|
userParams ??= UserParams.Default;
|
|
var series = await _unitOfWork.SeriesRepository.GetRediscover(User.GetUserId(), libraryId, userParams);
|
|
|
|
Response.AddPaginationHeader(series.CurrentPage, series.PageSize, series.TotalCount, series.TotalPages);
|
|
return Ok(series);
|
|
}
|
|
|
|
}
|