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

Conflicts

Browse source
This commit is contained in:
Joseph Milazzo 2023-12-10 13:01:46 -06:00
parent 880361685b
commit ca548e8634
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
API/Controllers/AccountController.cs
View file

@ -595,7 +595,7 @@ public class AccountController : BaseApiController
if (string.IsNullOrEmpty(dto.Email))
return BadRequest(await _localizationService.Translate(userId, "invalid-payload"));
_logger.LogInformation("{User} is inviting {Email} to the server", User.GetUsername(), dto.Email);
_logger.LogInformation("{User} is inviting {Email} to the server", adminUser.UserName, dto.Email);
// Check if there is an existing invite
var emailValidationErrors = await _accountService.ValidateEmail(dto.Email);
@ -701,7 +701,7 @@ public class AccountController : BaseApiController
BackgroundJob.Enqueue(() => _emailService.SendConfirmationEmail(new ConfirmationEmailDto()
{
EmailAddress = dto.Email,
InvitingUser = User.GetUsername(),
InvitingUser = adminUser.UserName,
ServerConfirmationLink = emailLink
}));
}

2
API/Helpers/SmartFilterHelper.cs
View file

@ -133,7 +133,7 @@ public static class SmartFilterHelper
var sortFieldPart = parts.FirstOrDefault(part => part.StartsWith(SortFieldKey));
var isAscendingPart = parts.FirstOrDefault(part => part.StartsWith(IsAscendingKey));
var isAscending = isAscendingPart?.Substring(11).Equals("true", StringComparison.OrdinalIgnoreCase) ?? false;
var isAscending = isAscendingPart?.Trim().Replace(IsAscendingKey, string.Empty).Equals("true", StringComparison.OrdinalIgnoreCase) ?? false;
if (sortFieldPart == null)
{
return new SortOptions();