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>
458 lines
16 KiB
C#
458 lines
16 KiB
C#
using System;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Constants;
|
|
using API.DTOs;
|
|
using API.DTOs.Account;
|
|
using API.DTOs.Filtering;
|
|
using API.DTOs.Reader;
|
|
using API.DTOs.Scrobbling;
|
|
using API.DTOs.SeriesDetail;
|
|
using API.Entities;
|
|
using API.Extensions;
|
|
using API.Extensions.QueryExtensions;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
|
|
[Flags]
|
|
public enum AppUserIncludes
|
|
{
|
|
None = 1,
|
|
Progress = 2,
|
|
Bookmarks = 4,
|
|
ReadingLists = 8,
|
|
Ratings = 16,
|
|
UserPreferences = 32,
|
|
WantToRead = 64,
|
|
ReadingListsWithItems = 128,
|
|
Devices = 256,
|
|
ScrobbleHolds = 512
|
|
|
|
}
|
|
|
|
public interface IUserRepository
|
|
{
|
|
void Update(AppUser user);
|
|
void Update(AppUserPreferences preferences);
|
|
void Update(AppUserBookmark bookmark);
|
|
void Add(AppUserBookmark bookmark);
|
|
public void Delete(AppUser? user);
|
|
void Delete(AppUserBookmark bookmark);
|
|
Task<IEnumerable<MemberDto>> GetEmailConfirmedMemberDtosAsync(bool emailConfirmed = true);
|
|
Task<IEnumerable<AppUser>> GetAdminUsersAsync();
|
|
Task<bool> IsUserAdminAsync(AppUser? user);
|
|
Task<AppUserRating?> GetUserRatingAsync(int seriesId, int userId);
|
|
Task<IList<UserReviewDto>> GetUserRatingDtosForSeriesAsync(int seriesId, int userId);
|
|
Task<AppUserPreferences?> GetPreferencesAsync(string username);
|
|
Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForSeries(int userId, int seriesId);
|
|
Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForVolume(int userId, int volumeId);
|
|
Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForChapter(int userId, int chapterId);
|
|
Task<IEnumerable<BookmarkDto>> GetAllBookmarkDtos(int userId, FilterDto filter);
|
|
Task<IEnumerable<AppUserBookmark>> GetAllBookmarksAsync();
|
|
Task<AppUserBookmark?> GetBookmarkForPage(int page, int chapterId, int userId);
|
|
Task<AppUserBookmark?> GetBookmarkAsync(int bookmarkId);
|
|
Task<int> GetUserIdByApiKeyAsync(string apiKey);
|
|
Task<AppUser?> GetUserByUsernameAsync(string username, AppUserIncludes includeFlags = AppUserIncludes.None);
|
|
Task<AppUser?> GetUserByIdAsync(int userId, AppUserIncludes includeFlags = AppUserIncludes.None);
|
|
Task<int> GetUserIdByUsernameAsync(string username);
|
|
Task<IList<AppUserBookmark>> GetAllBookmarksByIds(IList<int> bookmarkIds);
|
|
Task<AppUser?> GetUserByEmailAsync(string email);
|
|
Task<IEnumerable<AppUserPreferences>> GetAllPreferencesByThemeAsync(int themeId);
|
|
Task<bool> HasAccessToLibrary(int libraryId, int userId);
|
|
Task<bool> HasAccessToSeries(int userId, int seriesId);
|
|
Task<IEnumerable<AppUser>> GetAllUsersAsync(AppUserIncludes includeFlags = AppUserIncludes.None);
|
|
Task<AppUser?> GetUserByConfirmationToken(string token);
|
|
Task<AppUser> GetDefaultAdminUser();
|
|
Task<IEnumerable<AppUserRating>> GetSeriesWithRatings(int userId);
|
|
Task<IEnumerable<AppUserRating>> GetSeriesWithReviews(int userId);
|
|
Task<bool> HasHoldOnSeries(int userId, int seriesId);
|
|
Task<IList<ScrobbleHoldDto>> GetHolds(int userId);
|
|
Task<string> GetLocale(int userId);
|
|
}
|
|
|
|
public class UserRepository : IUserRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly UserManager<AppUser> _userManager;
|
|
private readonly IMapper _mapper;
|
|
|
|
public UserRepository(DataContext context, UserManager<AppUser> userManager, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_userManager = userManager;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Update(AppUser user)
|
|
{
|
|
_context.Entry(user).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Update(AppUserPreferences preferences)
|
|
{
|
|
_context.Entry(preferences).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Update(AppUserBookmark bookmark)
|
|
{
|
|
_context.Entry(bookmark).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Add(AppUserBookmark bookmark)
|
|
{
|
|
_context.AppUserBookmark.Add(bookmark);
|
|
}
|
|
|
|
public void Delete(AppUser? user)
|
|
{
|
|
if (user == null) return;
|
|
_context.AppUser.Remove(user);
|
|
}
|
|
|
|
public void Delete(AppUserBookmark bookmark)
|
|
{
|
|
_context.AppUserBookmark.Remove(bookmark);
|
|
}
|
|
|
|
/// <summary>
|
|
/// A one stop shop to get a tracked AppUser instance with any number of JOINs generated by passing bitwise flags.
|
|
/// </summary>
|
|
/// <param name="username"></param>
|
|
/// <param name="includeFlags">Includes() you want. Pass multiple with flag1 | flag2 </param>
|
|
/// <returns></returns>
|
|
public async Task<AppUser?> GetUserByUsernameAsync(string username, AppUserIncludes includeFlags = AppUserIncludes.None)
|
|
{
|
|
return await _context.Users
|
|
.Where(x => x.UserName == username)
|
|
.Includes(includeFlags)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// A one stop shop to get a tracked AppUser instance with any number of JOINs generated by passing bitwise flags.
|
|
/// </summary>
|
|
/// <param name="userId"></param>
|
|
/// <param name="includeFlags">Includes() you want. Pass multiple with flag1 | flag2 </param>
|
|
/// <returns></returns>
|
|
public async Task<AppUser?> GetUserByIdAsync(int userId, AppUserIncludes includeFlags = AppUserIncludes.None)
|
|
{
|
|
return await _context.Users
|
|
.Where(x => x.Id == userId)
|
|
.Includes(includeFlags)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUserBookmark>> GetAllBookmarksAsync()
|
|
{
|
|
return await _context.AppUserBookmark.ToListAsync();
|
|
}
|
|
|
|
public async Task<AppUserBookmark?> GetBookmarkForPage(int page, int chapterId, int userId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(b => b.Page == page && b.ChapterId == chapterId && b.AppUserId == userId)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<AppUserBookmark?> GetBookmarkAsync(int bookmarkId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(b => b.Id == bookmarkId)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// This fetches the Id for a user. Use whenever you just need an ID.
|
|
/// </summary>
|
|
/// <param name="username"></param>
|
|
/// <returns></returns>
|
|
public async Task<int> GetUserIdByUsernameAsync(string username)
|
|
{
|
|
return await _context.Users
|
|
.Where(x => x.UserName == username)
|
|
.Select(u => u.Id)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// Returns all Bookmarks for a given set of Ids
|
|
/// </summary>
|
|
/// <param name="bookmarkIds"></param>
|
|
/// <returns></returns>
|
|
public async Task<IList<AppUserBookmark>> GetAllBookmarksByIds(IList<int> bookmarkIds)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(b => bookmarkIds.Contains(b.Id))
|
|
.OrderBy(b => b.Created)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<AppUser?> GetUserByEmailAsync(string email)
|
|
{
|
|
var lowerEmail = email.ToLower();
|
|
return await _context.AppUser.SingleOrDefaultAsync(u => u.Email != null && u.Email.ToLower().Equals(lowerEmail));
|
|
}
|
|
|
|
|
|
public async Task<IEnumerable<AppUserPreferences>> GetAllPreferencesByThemeAsync(int themeId)
|
|
{
|
|
return await _context.AppUserPreferences
|
|
.Include(p => p.Theme)
|
|
.Where(p => p.Theme.Id == themeId)
|
|
.AsSplitQuery()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<bool> HasAccessToLibrary(int libraryId, int userId)
|
|
{
|
|
return await _context.Library
|
|
.Include(l => l.AppUsers)
|
|
.AsSplitQuery()
|
|
.AnyAsync(library => library.AppUsers.Any(user => user.Id == userId) && library.Id == libraryId);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Does the user have library and age restriction access to a given series
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public async Task<bool> HasAccessToSeries(int userId, int seriesId)
|
|
{
|
|
var userRating = await _context.AppUser.GetUserAgeRestriction(userId);
|
|
return await _context.Series
|
|
.Include(s => s.Library)
|
|
.Where(s => s.Library.AppUsers.Any(user => user.Id == userId))
|
|
.RestrictAgainstAgeRestriction(userRating)
|
|
.AsSplitQuery()
|
|
.AnyAsync(s => s.Id == seriesId);
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUser>> GetAllUsersAsync(AppUserIncludes includeFlags = AppUserIncludes.None)
|
|
{
|
|
return await _context.AppUser
|
|
.Includes(includeFlags)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<AppUser?> GetUserByConfirmationToken(string token)
|
|
{
|
|
return await _context.AppUser
|
|
.SingleOrDefaultAsync(u => u.ConfirmationToken != null && u.ConfirmationToken.Equals(token));
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns the first admin account created
|
|
/// </summary>
|
|
/// <returns></returns>
|
|
public async Task<AppUser> GetDefaultAdminUser()
|
|
{
|
|
return (await _userManager.GetUsersInRoleAsync(PolicyConstants.AdminRole))
|
|
.OrderBy(u => u.Created)
|
|
.First();
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUserRating>> GetSeriesWithRatings(int userId)
|
|
{
|
|
return await _context.AppUserRating
|
|
.Where(u => u.AppUserId == userId && u.Rating > 0)
|
|
.Include(u => u.Series)
|
|
.AsSplitQuery()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUserRating>> GetSeriesWithReviews(int userId)
|
|
{
|
|
return await _context.AppUserRating
|
|
.Where(u => u.AppUserId == userId && !string.IsNullOrEmpty(u.Review))
|
|
.Include(u => u.Series)
|
|
.AsSplitQuery()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<bool> HasHoldOnSeries(int userId, int seriesId)
|
|
{
|
|
return await _context.AppUser
|
|
.AsSplitQuery()
|
|
.AnyAsync(u => u.ScrobbleHolds.Select(s => s.SeriesId).Contains(seriesId) && u.Id == userId);
|
|
}
|
|
|
|
public async Task<IList<ScrobbleHoldDto>> GetHolds(int userId)
|
|
{
|
|
return await _context.ScrobbleHold
|
|
.Where(s => s.AppUserId == userId)
|
|
.ProjectTo<ScrobbleHoldDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<string> GetLocale(int userId)
|
|
{
|
|
return await _context.AppUserPreferences.Where(p => p.AppUserId == userId)
|
|
.Select(p => p.Locale)
|
|
.SingleAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUser>> GetAdminUsersAsync()
|
|
{
|
|
return await _userManager.GetUsersInRoleAsync(PolicyConstants.AdminRole);
|
|
}
|
|
|
|
public async Task<bool> IsUserAdminAsync(AppUser? user)
|
|
{
|
|
if (user == null) return false;
|
|
return await _userManager.IsInRoleAsync(user, PolicyConstants.AdminRole);
|
|
}
|
|
|
|
public async Task<AppUserRating?> GetUserRatingAsync(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserRating
|
|
.Where(r => r.SeriesId == seriesId && r.AppUserId == userId)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IList<UserReviewDto>> GetUserRatingDtosForSeriesAsync(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserRating
|
|
.Include(r => r.AppUser)
|
|
.Where(r => r.SeriesId == seriesId)
|
|
.Where(r => r.AppUser.UserPreferences.ShareReviews || r.AppUserId == userId)
|
|
.OrderBy(r => r.AppUserId == userId)
|
|
.ThenBy(r => r.Rating)
|
|
.AsSplitQuery()
|
|
.ProjectTo<UserReviewDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<AppUserPreferences?> GetPreferencesAsync(string username)
|
|
{
|
|
return await _context.AppUserPreferences
|
|
.Include(p => p.AppUser)
|
|
.Include(p => p.Theme)
|
|
.AsSplitQuery()
|
|
.SingleOrDefaultAsync(p => p.AppUser.UserName == username);
|
|
}
|
|
|
|
public async Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForSeries(int userId, int seriesId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId && x.SeriesId == seriesId)
|
|
.OrderBy(x => x.Created)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForVolume(int userId, int volumeId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId && x.VolumeId == volumeId)
|
|
.OrderBy(x => x.Created)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForChapter(int userId, int chapterId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId && x.ChapterId == chapterId)
|
|
.OrderBy(x => x.Created)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Get all bookmarks for the user
|
|
/// </summary>
|
|
/// <param name="userId"></param>
|
|
/// <param name="filter">Only supports SeriesNameQuery</param>
|
|
/// <returns></returns>
|
|
public async Task<IEnumerable<BookmarkDto>> GetAllBookmarkDtos(int userId, FilterDto filter)
|
|
{
|
|
var query = _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId)
|
|
.OrderBy(x => x.Created)
|
|
.AsNoTracking();
|
|
|
|
if (string.IsNullOrEmpty(filter.SeriesNameQuery))
|
|
return await query
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
|
|
var seriesNameQueryNormalized = filter.SeriesNameQuery.ToNormalized();
|
|
var filterSeriesQuery = query.Join(_context.Series, b => b.SeriesId, s => s.Id, (bookmark, series) => new
|
|
{
|
|
bookmark,
|
|
series
|
|
})
|
|
.Where(o => (EF.Functions.Like(o.series.Name, $"%{filter.SeriesNameQuery}%"))
|
|
|| (o.series.OriginalName != null && EF.Functions.Like(o.series.OriginalName, $"%{filter.SeriesNameQuery}%"))
|
|
|| (o.series.LocalizedName != null && EF.Functions.Like(o.series.LocalizedName, $"%{filter.SeriesNameQuery}%"))
|
|
|| (EF.Functions.Like(o.series.NormalizedName, $"%{seriesNameQueryNormalized}%"))
|
|
);
|
|
|
|
query = filterSeriesQuery.Select(o => o.bookmark);
|
|
|
|
|
|
return await query
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Fetches the UserId by API Key. This does not include any extra information
|
|
/// </summary>
|
|
/// <param name="apiKey"></param>
|
|
/// <returns></returns>
|
|
public async Task<int> GetUserIdByApiKeyAsync(string apiKey)
|
|
{
|
|
return await _context.AppUser
|
|
.Where(u => u.ApiKey != null && u.ApiKey.Equals(apiKey))
|
|
.Select(u => u.Id)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
|
|
|
|
public async Task<IEnumerable<MemberDto>> GetEmailConfirmedMemberDtosAsync(bool emailConfirmed = true)
|
|
{
|
|
return await _context.Users
|
|
.Where(u => (emailConfirmed && u.EmailConfirmed) || !emailConfirmed)
|
|
.Include(x => x.Libraries)
|
|
.Include(r => r.UserRoles)
|
|
.ThenInclude(r => r.Role)
|
|
.OrderBy(u => u.UserName)
|
|
.Select(u => new MemberDto
|
|
{
|
|
Id = u.Id,
|
|
Username = u.UserName,
|
|
Email = u.Email,
|
|
Created = u.Created,
|
|
LastActive = u.LastActive,
|
|
Roles = u.UserRoles.Select(r => r.Role.Name).ToList(),
|
|
IsPending = !u.EmailConfirmed,
|
|
AgeRestriction = new AgeRestrictionDto()
|
|
{
|
|
AgeRating = u.AgeRestriction,
|
|
IncludeUnknowns = u.AgeRestrictionIncludeUnknowns
|
|
},
|
|
Libraries = u.Libraries.Select(l => new LibraryDto
|
|
{
|
|
Name = l.Name,
|
|
Type = l.Type,
|
|
LastScanned = l.LastScanned,
|
|
Folders = l.Folders.Select(x => x.Path).ToList()
|
|
}).ToList()
|
|
})
|
|
.AsSplitQuery()
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
}
|