Compare commits

..

No commits in common. "887a8a7b6a5ece13dd41bf44bb5cfad65d26998f" and "c0bee8fd3cbb775d8beab2172c28ed7594196f59" have entirely different histories.

11 changed files with 20 additions and 34 deletions

View File

@ -5,15 +5,6 @@ Changelog
(unreleased) (unreleased)
------------ ------------
Fix
~~~
- Fix formatting, refs NOISSUE. [Simon Diesenreiter]
- URL type, refs NOISSUE. [simon]
0.4.0 (2025-06-04)
------------------
Fix Fix
~~~ ~~~
- Some cleanup and fixing runtime bugs, refs NOISSUE. [Simon - Some cleanup and fixing runtime bugs, refs NOISSUE. [Simon
@ -283,10 +274,6 @@ Other
0.1.9 (2025-04-15) 0.1.9 (2025-04-15)
------------------ ------------------
0.1.8 (2025-04-15)
------------------
Fix Fix
~~~ ~~~
- Additional debug outputs refs NOISSUE. [Simon Diesenreiter] - Additional debug outputs refs NOISSUE. [Simon Diesenreiter]

View File

@ -3,10 +3,10 @@ using song_of_the_day;
public class LinkPreviewAttachment public class LinkPreviewAttachment
{ {
public required string Url { get; set; } public string Url { get; set; }
public required string Title { get; set; } public string Title { get; set; }
public required string Description { get; set; } public string Description { get; set; }
public required string Base64Image { get; set; } public string Base64Image { get; set; }
} }
public class SignalIntegration public class SignalIntegration

View File

@ -17,14 +17,13 @@ public class IndexModel : PageModel
[BindProperty] [BindProperty]
public List<SongSuggestion> SongSuggestions { get; set; } = new List<SongSuggestion>(); public List<SongSuggestion> SongSuggestions { get; set; } = new List<SongSuggestion>();
public Task OnGet() public async Task OnGet()
{ {
using var dci = DataContext.Instance; using var dci = DataContext.Instance;
SongSuggestions = dci.SongSuggestions.OrderByDescending(s => s.Date) this.SongSuggestions = dci.SongSuggestions.OrderByDescending(s => s.Date)
.Take(50) .Take(50)
.Include(s => s.Song) .Include(s => s.Song)
.Include(s => s.User) .Include(s => s.User)
.ToList(); .ToList();
return Task.CompletedTask; }
}
} }

View File

@ -1,6 +1,6 @@
public class SongPartialModel public class SongPartialModel
{ {
public required Song InnerSong { get; set; } public Song InnerSong { get; set; }
public string? Artist => InnerSong.Artist; public string? Artist => InnerSong.Artist;

View File

@ -40,7 +40,7 @@ public class SongSubmissionModel : PageModel
public bool IsPageReadonly { get; set; } = false; public bool IsPageReadonly { get; set; } = false;
[BindProperty] [BindProperty]
public SuggestionHelper? SuggestionHelper { get; set; } = null; public SuggestionHelper SuggestionHelper { get; set; } = null;
[BindProperty] [BindProperty]
public List<SongSuggestion> UserSongSubmissions { get; set; } = []; public List<SongSuggestion> UserSongSubmissions { get; set; } = [];

View File

@ -24,7 +24,7 @@ public class UnclaimedPhoneNumbersModel : PageModel
{ {
using (var dci = DataContext.Instance) using (var dci = DataContext.Instance)
{ {
this.UnclaimedUsers = dci.Users == null ? new List<User>() : dci.Users.Where(u => string.IsNullOrEmpty(u.LdapUserName)).ToList(); this.UnclaimedUsers = dci.Users == null ? new List<User>(): dci.Users.Where(u => string.IsNullOrEmpty(u.LdapUserName)).ToList();
} }
} }

View File

@ -1,6 +1,6 @@
public class Base64UrlImageBuilder public class Base64UrlImageBuilder
{ {
public required string ContentType { set; get; } public string ContentType { set; get; }
public string Url public string Url
{ {
@ -13,7 +13,7 @@ public class Base64UrlImageBuilder
} }
} }
private required string FileContents { get; set; } private string FileContents { get; set; }
public override string ToString() public override string ToString()
{ {

View File

@ -8,7 +8,7 @@ public class SpotifyValidator : UriBasedSongValidatorBase
public override string UriValidatorRegex => @"^(https?://)?open.spotify.com/track/([a-zA-Z0-9_-]{22})(\?si=[a-zA-Z0-9_-]+)?$"; public override string UriValidatorRegex => @"^(https?://)?open.spotify.com/track/([a-zA-Z0-9_-]{22})(\?si=[a-zA-Z0-9_-]+)?$";
public SpotifyValidator(ILogger _logger, SpotifyApiClient spotifyApiClient) : base(_logger, spotifyApiClient) public SpotifyValidator(ILogger _logger, SpotifyApiClient spotifyApiClient) : base(_logger, spotifyApiClient)
{ } {}
public override Task<bool> CanExtractSongMetadataAsync(Uri songUri) public override Task<bool> CanExtractSongMetadataAsync(Uri songUri)
{ {

View File

@ -5,7 +5,7 @@ public abstract class UriBasedSongValidatorBase : SongValidatorBase
public abstract string UriValidatorRegex { get; } public abstract string UriValidatorRegex { get; }
public UriBasedSongValidatorBase(ILogger logger, SpotifyApiClient spotifyApiClient) : base(logger, spotifyApiClient) public UriBasedSongValidatorBase(ILogger logger, SpotifyApiClient spotifyApiClient) : base(logger, spotifyApiClient)
{ } {}
public Match GetUriMatch(Uri songUri) public Match GetUriMatch(Uri songUri)
{ {

View File

@ -6,7 +6,7 @@ using YouTubeMusicAPI.Client;
public class YoutubeValidator : UriBasedSongValidatorBase public class YoutubeValidator : UriBasedSongValidatorBase
{ {
private YouTubeMusicClient youtubeClient; private YouTubeMusicClient youtubeClient;
public YoutubeValidator(ILogger logger, SpotifyApiClient spotifyApiClient) : base(logger, spotifyApiClient) public YoutubeValidator(ILogger logger, SpotifyApiClient spotifyApiClient) : base(logger, spotifyApiClient)
{ {
youtubeClient = new("AT"); youtubeClient = new("AT");
@ -14,9 +14,9 @@ public class YoutubeValidator : UriBasedSongValidatorBase
public override string UriValidatorRegex => @"^(https?://)?(www\.)?(youtube\.com/watch\?v=|youtu\.be/)([a-zA-Z0-9_-]{11})"; public override string UriValidatorRegex => @"^(https?://)?(www\.)?(youtube\.com/watch\?v=|youtu\.be/)([a-zA-Z0-9_-]{11})";
public override Task<bool> CanExtractSongMetadataAsync(Uri songUri) public override async Task<bool> CanExtractSongMetadataAsync(Uri songUri)
{ {
return Task.FromResult(this.CanValidateUri(songUri)); return this.CanValidateUri(songUri);
} }
public override SongProvider GetSongProvider() public override SongProvider GetSongProvider()

View File

@ -1 +1 @@
0.4.1 0.4.0