Compare commits

..

No commits in common. "main" and "0.6.4" have entirely different histories.
main ... 0.6.4

5 changed files with 19 additions and 117 deletions

View File

@ -5,66 +5,10 @@ Changelog
(unreleased) (unreleased)
------------ ------------
Fix
~~~
- Improved Spotify auth check flow, refs NOISSUE. [Simon Diesenreiter]
0.6.8 (2025-07-20)
------------------
Fix
~~~
- Improved Spotify auth check flow, refs NOISSUE. [Simon Diesenreiter]
Other
~~~~~
0.6.7 (2025-07-20)
------------------
Fix
~~~
- Attempted bugfix for crashing process on invalid spotify access token,
refs NOISSUE. [Simon Diesenreiter]
Other
~~~~~
0.6.6 (2025-07-20)
------------------
Fix
~~~
- Add additional logging, refs NOISSUE. [Simon Diesenreiter]
Other
~~~~~
0.6.5 (2025-07-20)
------------------
Fix
~~~
- Configurable Cron schedules, refs NOISSUE. [Simon Diesenreiter]
Other
~~~~~
0.6.4 (2025-07-20)
------------------
Fix Fix
~~~ ~~~
- Better data model for liked songs, refs NOISSUE. [Simon Diesenreiter] - Better data model for liked songs, refs NOISSUE. [Simon Diesenreiter]
Other
~~~~~
0.6.3 (2025-07-20) 0.6.3 (2025-07-20)
------------------ ------------------

View File

@ -33,13 +33,6 @@ public class AppConfiguration
CrewGroup = $"cn={userGroupName},ou=groups,dc=disi,dc=dev", CrewGroup = $"cn={userGroupName},ou=groups,dc=disi,dc=dev",
ManagerGroup = $"cn={managersGroupName},ou=groups,dc=disi,dc=dev" ManagerGroup = $"cn={managersGroupName},ou=groups,dc=disi,dc=dev"
}; };
this.UserCheckTimerSchedule = Environment.GetEnvironmentVariable("USER_CHECK_TIMER_SCHEDULE") ?? "*/1 * * * *";
this.LikePlaylistCheckTimerSchedule = Environment.GetEnvironmentVariable("LIKE_PLAYLIST_CHECK_TIMER_SCHEDULE") ?? "*/10 * * * *";
this.UserIntroCheckTimerSchedule = Environment.GetEnvironmentVariable("USER_INTRO_TIMER_SCHEDULE") ?? "*/1 * * * *";
this.PickOfTheDayCheckTimerSchedule = Environment.GetEnvironmentVariable("PICK_OF_THE_DAY_TIMER_SCHEDULE") ?? "0 8 * * *";
this.LdapAssociationTimerSchedule = Environment.GetEnvironmentVariable("LDAP_ASSOCIATION_TIMER_SCHEDULE") ?? "*/10 * * * *";
this.MessageSyncTimerSchedule = Environment.GetEnvironmentVariable("MESSAGE_SYNC_TIMER_SCHEDULE") ?? "*/10 * * * *";
} }
public string SignalAPIEndpointUri public string SignalAPIEndpointUri
@ -116,34 +109,4 @@ public class AppConfiguration
{ {
get; private set; get; private set;
} }
public string UserCheckTimerSchedule
{
get; private set;
}
public string LikePlaylistCheckTimerSchedule
{
get; private set;
}
public string UserIntroCheckTimerSchedule
{
get; private set;
}
public string PickOfTheDayCheckTimerSchedule
{
get; private set;
}
public string LdapAssociationTimerSchedule
{
get; private set;
}
public string MessageSyncTimerSchedule
{
get; private set;
}
} }

View File

@ -32,7 +32,7 @@ var app = builder.Build();
var logger = app.Logger; var logger = app.Logger;
logger.LogTrace("Setting up user check timer"); logger.LogTrace("Setting up user check timer");
var userCheckTimer = new CronTimer(AppConfiguration.Instance.UserCheckTimerSchedule, "Europe/Vienna", includingSeconds: false); var userCheckTimer = new CronTimer("*/1 * * * *", "Europe/Vienna", includingSeconds: false);
userCheckTimer.OnOccurence += async (s, ea) => userCheckTimer.OnOccurence += async (s, ea) =>
{ {
var signalIntegration = app.Services.GetService<SignalIntegration>(); var signalIntegration = app.Services.GetService<SignalIntegration>();
@ -72,7 +72,7 @@ userCheckTimer.OnOccurence += async (s, ea) =>
}; };
logger.LogTrace("Setting up liked songs playlist creation timer"); logger.LogTrace("Setting up liked songs playlist creation timer");
var likePlaylistCheckTimer = new CronTimer(AppConfiguration.Instance.LikePlaylistCheckTimerSchedule, "Europe/Vienna", includingSeconds: false); var likePlaylistCheckTimer = new CronTimer("*/30 * * * *", "Europe/Vienna", includingSeconds: false);
likePlaylistCheckTimer.OnOccurence += async (s, ea) => likePlaylistCheckTimer.OnOccurence += async (s, ea) =>
{ {
var spotifyApiClient = app.Services.GetService<SpotifyApiClient>(); var spotifyApiClient = app.Services.GetService<SpotifyApiClient>();
@ -86,25 +86,20 @@ likePlaylistCheckTimer.OnOccurence += async (s, ea) =>
{ {
if (!await spotifyApiClient.IsUserAuthenticatedAsync(user)) if (!await spotifyApiClient.IsUserAuthenticatedAsync(user))
{ {
logger.LogWarning($"User {user.LdapUserName} is not authorized with Spotify - skipping playlist sync"); continue;
} }
else
{
var foundPlaylist = dci.SmartPlaylistDefinitions?.Where(p => p.CreatedBy == user).ToList().Where(p => p.IsThisUsersLikedSongsPlaylist).SingleOrDefault(); var foundPlaylist = dci.SmartPlaylistDefinitions?.Where(p => p.CreatedBy == user).ToList().Where(p => p.IsThisUsersLikedSongsPlaylist).SingleOrDefault();
if (foundPlaylist == null) if (foundPlaylist == null)
{ {
logger.LogWarning($"Creating liked songs playlist for user {user.LdapUserName}"); var title = $"{user.PreferredName}'s liked Songs";
var title = $"{user.PreferredName}'s liked songs";
var description = $"A collection of the songs liked by {user.PreferredName} on their 'Song of the day' server instance."; var description = $"A collection of the songs liked by {user.PreferredName} on their 'Song of the day' server instance.";
// playlist does not exist yet, creating it // playlist does not exist yet, creating it
var newPlaylist = await (await spotifyApiClient.WithUserAuthorizationAsync(user)).CreateSpotifyPlaylist(title, description, false, true, user); var newPlaylist = await (await spotifyApiClient.WithUserAuthorizationAsync(user)).CreateSpotifyPlaylist(title, description, false, true, user);
await playlistSynchronizer.SynchronizePlaylistAsync(newPlaylist); await playlistSynchronizer.SynchronizePlaylistAsync(newPlaylist);
needsSaving = true; needsSaving = true;
} }
logger.LogWarning($"Syncing playlists for user {user.LdapUserName}");
await playlistSynchronizer.SynchronizeUserPlaylistsAsync(user); await playlistSynchronizer.SynchronizeUserPlaylistsAsync(user);
} }
}
if (needsSaving) if (needsSaving)
{ {
@ -114,7 +109,7 @@ likePlaylistCheckTimer.OnOccurence += async (s, ea) =>
}; };
logger.LogTrace("Setting up user intro timer"); logger.LogTrace("Setting up user intro timer");
var userIntroTimer = new CronTimer(AppConfiguration.Instance.UserIntroCheckTimerSchedule, "Europe/Vienna", includingSeconds: false); var userIntroTimer = new CronTimer("*/1 * * * *", "Europe/Vienna", includingSeconds: false);
userIntroTimer.OnOccurence += async (s, ea) => userIntroTimer.OnOccurence += async (s, ea) =>
{ {
var dci = DataContext.Instance; var dci = DataContext.Instance;
@ -143,7 +138,7 @@ userIntroTimer.OnOccurence += async (s, ea) =>
logger.LogTrace("Setting up pick of the day timer"); logger.LogTrace("Setting up pick of the day timer");
var pickOfTheDayTimer = new CronTimer(AppConfiguration.Instance.PickOfTheDayCheckTimerSchedule, "Europe/Vienna", includingSeconds: false); var pickOfTheDayTimer = new CronTimer("0 8 * * *", "Europe/Vienna", includingSeconds: false);
pickOfTheDayTimer.OnOccurence += async (s, ea) => pickOfTheDayTimer.OnOccurence += async (s, ea) =>
{ {
var dci = DataContext.Instance; var dci = DataContext.Instance;
@ -217,7 +212,7 @@ var startUserAssociationProcess = async (User userToAssociate) =>
}; };
logger.LogTrace("Setting up LdapAssociation timer"); logger.LogTrace("Setting up LdapAssociation timer");
var ldapAssociationTimer = new CronTimer(AppConfiguration.Instance.LdapAssociationTimerSchedule, "Europe/Vienna", includingSeconds: false); var ldapAssociationTimer = new CronTimer("*/10 * * * *", "Europe/Vienna", includingSeconds: false);
ldapAssociationTimer.OnOccurence += async (s, ea) => ldapAssociationTimer.OnOccurence += async (s, ea) =>
{ {
var dci = DataContext.Instance; var dci = DataContext.Instance;
@ -246,7 +241,7 @@ ldapAssociationTimer.OnOccurence += async (s, ea) =>
}; };
logger.LogTrace("Setting up MessageSync timer"); logger.LogTrace("Setting up MessageSync timer");
var messageSyncTimer = new CronTimer(AppConfiguration.Instance.MessageSyncTimerSchedule, "Europe/Vienna", includingSeconds: false); var messageSyncTimer = new CronTimer("*/10 * * * *", "Europe/Vienna", includingSeconds: false);
messageSyncTimer.OnOccurence += async (s, ea) => messageSyncTimer.OnOccurence += async (s, ea) =>
{ {
var signalIntegration = app.Services.GetService<SignalIntegration>(); var signalIntegration = app.Services.GetService<SignalIntegration>();

View File

@ -110,7 +110,7 @@ public class SpotifyApiClient
public async Task<string> GetValidAuthorizationTokenAsync(User user) public async Task<string> GetValidAuthorizationTokenAsync(User user)
{ {
if (string.IsNullOrEmpty(user.SpotifyAuthAccessToken) || string.IsNullOrEmpty(user.SpotifyAuthRefreshToken)) if (string.IsNullOrEmpty(user.SpotifyAuthAccessToken))
{ {
// user either never connected Spotify or we failed to refresh token - user needs to re-authenticate // user either never connected Spotify or we failed to refresh token - user needs to re-authenticate
return string.Empty; return string.Empty;

View File

@ -1 +1 @@
0.6.9 0.6.4