Skip to content

Commit 894b49b

Browse files
majora2007therobbiedavisweblateHavokdandaydreamrabbit
authored
v0.8.3.2 - A Small Hotfix (#3194)
Co-authored-by: Robbie Davis <[email protected]> Co-authored-by: Weblate (bot) <[email protected]> Co-authored-by: Havokdan <[email protected]> Co-authored-by: daydreamrabbit <[email protected]> Co-authored-by: 無情天 <[email protected]>
1 parent 77de5cc commit 894b49b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+307
-241
lines changed

API/Controllers/OPDSController.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -549,12 +549,15 @@ public async Task<IActionResult> GetReadingLists(string apiKey, [FromQuery] int
549549
Id = readingListDto.Id.ToString(),
550550
Title = readingListDto.Title,
551551
Summary = readingListDto.Summary,
552-
Links = new List<FeedLink>()
553-
{
554-
CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation, $"{prefix}{apiKey}/reading-list/{readingListDto.Id}"),
555-
CreateLink(FeedLinkRelation.Image, FeedLinkType.Image, $"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}"),
556-
CreateLink(FeedLinkRelation.Thumbnail, FeedLinkType.Image, $"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}")
557-
}
552+
Links =
553+
[
554+
CreateLink(FeedLinkRelation.SubSection, FeedLinkType.AtomNavigation,
555+
$"{prefix}{apiKey}/reading-list/{readingListDto.Id}"),
556+
CreateLink(FeedLinkRelation.Image, FeedLinkType.Image,
557+
$"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}"),
558+
CreateLink(FeedLinkRelation.Thumbnail, FeedLinkType.Image,
559+
$"{baseUrl}api/image/readinglist-cover?readingListId={readingListDto.Id}&apiKey={apiKey}")
560+
]
558561
});
559562
}
560563

@@ -573,7 +576,7 @@ private static UserParams GetUserParams(int pageNumber)
573576

574577
[HttpGet("{apiKey}/reading-list/{readingListId}")]
575578
[Produces("application/xml")]
576-
public async Task<IActionResult> GetReadingListItems(int readingListId, string apiKey)
579+
public async Task<IActionResult> GetReadingListItems(int readingListId, string apiKey, [FromQuery] int pageNumber = 0)
577580
{
578581
var userId = await GetUser(apiKey);
579582
if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds)
@@ -592,7 +595,7 @@ public async Task<IActionResult> GetReadingListItems(int readingListId, string a
592595
var feed = CreateFeed(readingList.Title + " " + await _localizationService.Translate(userId, "reading-list"), $"{apiKey}/reading-list/{readingListId}", apiKey, prefix);
593596
SetFeedId(feed, $"reading-list-{readingListId}");
594597

595-
var items = (await _unitOfWork.ReadingListRepository.GetReadingListItemDtosByIdAsync(readingListId, userId)).ToList();
598+
var items = await _unitOfWork.ReadingListRepository.GetReadingListItemDtosByIdAsync(readingListId, userId);
596599
foreach (var item in items)
597600
{
598601
var chapterDto = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(item.ChapterId);

API/Controllers/SettingsController.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public async Task<ActionResult<ServerSettingDto>> UpdateSettings(ServerSettingDt
345345

346346
if (updateBookmarks)
347347
{
348-
BackgroundJob.Enqueue(() => UpdateBookmarkDirectory(originalBookmarkDirectory, bookmarkDirectory));
348+
UpdateBookmarkDirectory(originalBookmarkDirectory, bookmarkDirectory);
349349
}
350350

351351
if (updateSettingsDto.EnableFolderWatching)
@@ -371,6 +371,7 @@ public async Task<ActionResult<ServerSettingDto>> UpdateSettings(ServerSettingDt
371371
return Ok(updateSettingsDto);
372372
}
373373

374+
374375
private void UpdateBookmarkDirectory(string originalBookmarkDirectory, string bookmarkDirectory)
375376
{
376377
_directoryService.ExistOrCreate(bookmarkDirectory);

API/DTOs/Account/ConfirmEmailDto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ConfirmEmailDto
99
[Required]
1010
public string Token { get; set; } = default!;
1111
[Required]
12-
[StringLength(32, MinimumLength = 6)]
12+
[StringLength(256, MinimumLength = 6)]
1313
public string Password { get; set; } = default!;
1414
[Required]
1515
public string Username { get; set; } = default!;

API/DTOs/Account/ConfirmPasswordResetDto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ public class ConfirmPasswordResetDto
99
[Required]
1010
public string Token { get; set; } = default!;
1111
[Required]
12-
[StringLength(32, MinimumLength = 6)]
12+
[StringLength(256, MinimumLength = 6)]
1313
public string Password { get; set; } = default!;
1414
}

API/DTOs/Account/ResetPasswordDto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ResetPasswordDto
1313
/// The new password
1414
/// </summary>
1515
[Required]
16-
[StringLength(32, MinimumLength = 6)]
16+
[StringLength(256, MinimumLength = 6)]
1717
public string Password { get; init; } = default!;
1818
/// <summary>
1919
/// The old, existing password. If an admin is performing the change, this is not required. Otherwise, it is.

API/DTOs/RegisterDto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ public class RegisterDto
1111
/// </summary>
1212
public string Email { get; init; } = default!;
1313
[Required]
14-
[StringLength(32, MinimumLength = 6)]
14+
[StringLength(256, MinimumLength = 6)]
1515
public string Password { get; set; } = default!;
1616
}

API/Services/CacheService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ public IEnumerable<FileDimensionDto> GetCachedFileDimensions(string cachePath)
119119
}
120120

121121
_logger.LogDebug("File Dimensions call for {Length} images took {Time}ms", dimensions.Count, sw.ElapsedMilliseconds);
122+
122123
return dimensions;
123124
}
124125

Kavita.Common/Kavita.Common.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<TargetFramework>net8.0</TargetFramework>
44
<Company>kavitareader.com</Company>
55
<Product>Kavita</Product>
6-
<AssemblyVersion>0.8.3.1</AssemblyVersion>
6+
<AssemblyVersion>0.8.3.2</AssemblyVersion>
77
<NeutralLanguage>en</NeutralLanguage>
88
<TieredPGO>true</TieredPGO>
99
</PropertyGroup>
@@ -20,4 +20,4 @@
2020
</PackageReference>
2121
<PackageReference Include="xunit.assert" Version="2.9.0" />
2222
</ItemGroup>
23-
</Project>
23+
</Project>

UI/Web/src/_card-item-common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ $image-width: 160px;
168168
font-size: 0.8rem;
169169
margin: 0;
170170
text-align: center;
171-
max-width: 110px;
171+
max-width: 98px;
172172

173173
a {
174174
overflow: hidden;

UI/Web/src/app/_single-module/card-actionables/card-actionables.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
padding: var(--bs-dropdown-item-padding-y) 0;
2828
}
2929

30+
.btn {
31+
padding: 5px;
32+
}
33+
3034
// Robbie added this but it broke most of the uses
3135
//.dropdown-toggle {
3236
// padding-top: 0;

0 commit comments

Comments
 (0)