AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New Year Bugs (#2513)

Browse source
This commit is contained in:
Joe Milazzo 2024-01-02 18:53:10 -06:00 • committed by GitHub
parent fcacd67d71
commit 5dfcccba7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 230 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

7
API/Controllers/AccountController.cs
View file

@ -318,19 +318,18 @@ public class AccountController : BaseApiController
[HttpPost("reset-api-key")]
public async Task<ActionResult<string>> ResetApiKey()
{
var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
if (user == null) throw new KavitaUnauthenticatedUserException();
var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()) ?? throw new KavitaUnauthenticatedUserException();
user.ApiKey = HashUtil.ApiKey();
if (_unitOfWork.HasChanges() && await _unitOfWork.CommitAsync())
{
await _eventHub.SendMessageToAsync(MessageFactory.UserUpdate,
MessageFactory.UserUpdateEvent(user.Id, user.UserName), user.Id);
return Ok(user.ApiKey);
}
await _unitOfWork.RollbackAsync();
return BadRequest(await _localizationService.Translate(User.GetUserId(), "unable-to-reset-key"));
}

8
API/Controllers/ReviewController.cs
View file

@ -55,8 +55,10 @@ public class ReviewController : BaseApiController
public async Task<ActionResult<IEnumerable<UserReviewDto>>> GetReviews(int seriesId)
{
var userId = User.GetUserId();
var username = User.GetUsername();
var userRatings = (await _unitOfWork.UserRepository.GetUserRatingDtosForSeriesAsync(seriesId, userId))
.Where(r => !string.IsNullOrEmpty(r.Body) && !string.IsNullOrEmpty(r.Tagline))
.Where(r => !string.IsNullOrEmpty(r.Body))
.OrderByDescending(review => review.Username.Equals(username) ? 1 : 0)
.ToList();
if (!await _licenseService.HasActiveLicense())
{
@ -139,7 +141,7 @@ public class ReviewController : BaseApiController
var rating = ratingBuilder
.WithBody(dto.Body)
.WithSeriesId(dto.SeriesId)
.WithTagline(dto.Tagline)
.WithTagline(string.Empty)
.Build();
if (rating.Id == 0)
@ -152,7 +154,7 @@ public class ReviewController : BaseApiController
BackgroundJob.Enqueue(() =>
_scrobblingService.ScrobbleReviewUpdate(user.Id, dto.SeriesId, dto.Tagline, dto.Body));
_scrobblingService.ScrobbleReviewUpdate(user.Id, dto.SeriesId, string.Empty, dto.Body));
return Ok(_mapper.Map<UserReviewDto>(rating));
}
}