aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author1hitsong <3330318+1hitsong@users.noreply.github.com>2022-09-10 14:29:38 -0400
committer1hitsong <3330318+1hitsong@users.noreply.github.com>2022-09-10 14:29:38 -0400
commit23ec35d3965e950f710c7cf6294145c601a6885b (patch)
treea7b9d9adedea1015aba7bd5309272c984bf35afa
parent2e260e5319b0b58290a1e30a28886c69d5a65325 (diff)
parentd24444b6d3a2e973d50edc2a8a1d01a433db645e (diff)
Merge remote-tracking branch 'origin/lyric-lrc-file-support' into lyric-lrc-file-support
-rw-r--r--Jellyfin.Api/Controllers/UserLibraryController.cs12
-rw-r--r--Jellyfin.Api/Models/UserDtos/Lyrics.cs2
2 files changed, 3 insertions, 11 deletions
diff --git a/Jellyfin.Api/Controllers/UserLibraryController.cs b/Jellyfin.Api/Controllers/UserLibraryController.cs
index afd4013ed..ed8a98d23 100644
--- a/Jellyfin.Api/Controllers/UserLibraryController.cs
+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs
@@ -401,11 +401,7 @@ namespace Jellyfin.Api.Controllers
if (user == null)
{
- List<Lyrics> lyricsList = new List<Lyrics>
- {
- new Lyrics { Error = "User Not Found" }
- };
- return NotFound(new { Results = lyricsList.ToArray() });
+ return NotFound();
}
var item = itemId.Equals(default)
@@ -414,11 +410,7 @@ namespace Jellyfin.Api.Controllers
if (item == null)
{
- List<Lyrics> lyricsList = new List<Lyrics>
- {
- new Lyrics { Error = "Requested Item Not Found" }
- };
- return NotFound(new { Results = lyricsList.ToArray() });
+ return NotFound();
}
var result = ItemHelper.GetLyricData(item);
diff --git a/Jellyfin.Api/Models/UserDtos/Lyrics.cs b/Jellyfin.Api/Models/UserDtos/Lyrics.cs
index df1b5d08a..cd548eb03 100644
--- a/Jellyfin.Api/Models/UserDtos/Lyrics.cs
+++ b/Jellyfin.Api/Models/UserDtos/Lyrics.cs
@@ -11,7 +11,7 @@ namespace Jellyfin.Api.Models.UserDtos
public double? Start { get; set; }
/// <summary>
- /// Gets or sets the test.
+ /// Gets or sets the text.
/// </summary>
public string? Text { get; set; }