SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix spotify presence lease again

Browse Source
This commit is contained in:
LittleSheep
2025-11-02 16:25:36 +08:00
parent bfa9bedeea
commit 091fbd857e
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
DysonNetwork.Pass/Account/Presences/SpotifyPresenceService.cs
View File

@@ -23,9 +23,7 @@ public class SpotifyPresenceService(
.ToListAsync(); .ToListAsync();
foreach (var connection in userConnections) foreach (var connection in userConnections)
{
await UpdateSpotifyPresenceAsync(connection.Account); await UpdateSpotifyPresenceAsync(connection.Account);
}
} }
/// <summary> /// <summary>
@@ -59,7 +57,7 @@ public class SpotifyPresenceService(
// Get currently playing track // Get currently playing track
var currentlyPlaying = await spotify.Player.GetCurrentlyPlaying(new PlayerCurrentlyPlayingRequest()); var currentlyPlaying = await spotify.Player.GetCurrentlyPlaying(new PlayerCurrentlyPlayingRequest());
if (currentlyPlaying?.Item == null || currentlyPlaying.IsPlaying == false) if (currentlyPlaying?.Item == null || !currentlyPlaying.IsPlaying)
{ {
// Nothing playing or paused, remove the presence // Nothing playing or paused, remove the presence
await RemoveSpotifyPresenceAsync(account.Id); await RemoveSpotifyPresenceAsync(account.Id);
@@ -68,24 +66,31 @@ public class SpotifyPresenceService(
var presenceActivity = ParseCurrentlyPlayingToPresenceActivity(account.Id, currentlyPlaying); var presenceActivity = ParseCurrentlyPlayingToPresenceActivity(account.Id, currentlyPlaying);
// Update or create the presence activity // Try to update existing activity first
await accountEventService.UpdateActivityByManualId( var updatedActivity = await accountEventService.UpdateActivityByManualId(
"spotify", "spotify",
account.Id, account.Id,
activity => UpdateActivityWithPresenceData,
{ 5
activity.Type = PresenceType.Music;
activity.Title = presenceActivity.Title;
activity.Subtitle = presenceActivity.Subtitle;
activity.Caption = presenceActivity.Caption;
activity.LargeImage = presenceActivity.LargeImage;
activity.SmallImage = presenceActivity.SmallImage;
activity.TitleUrl = presenceActivity.TitleUrl;
activity.SubtitleUrl = presenceActivity.SubtitleUrl;
activity.Meta = presenceActivity.Meta;
},
10 // 10 minute lease
); );
// If update failed (no existing activity), create a new one
if (updatedActivity == null)
await accountEventService.SetActivity(presenceActivity, 5);
// Local function to avoid capturing external variables in lambda
void UpdateActivityWithPresenceData(SnPresenceActivity activity)
{
activity.Type = PresenceType.Music;
activity.Title = presenceActivity.Title;
activity.Subtitle = presenceActivity.Subtitle;
activity.Caption = presenceActivity.Caption;
activity.LargeImage = presenceActivity.LargeImage;
activity.SmallImage = presenceActivity.SmallImage;
activity.TitleUrl = presenceActivity.TitleUrl;
activity.SubtitleUrl = presenceActivity.SubtitleUrl;
activity.Meta = presenceActivity.Meta;
}
} }
catch (Exception ex) catch (Exception ex)
{ {