Get the user id from the platform, so now we can identify the user in the playlists customData.owner field
This commit is contained in:
+26
-20
@@ -47,7 +47,7 @@ namespace Setlist
|
||||
return;
|
||||
}
|
||||
|
||||
var entries = new List<(string Title, bool HasSyncUrl, string BeatLeaderGuid)>();
|
||||
var entries = new List<(string Title, bool HasSyncUrl, string BeatLeaderGuid, string OwnerId)>();
|
||||
foreach (var playlist in playlists)
|
||||
{
|
||||
var hasSyncUrl = false;
|
||||
@@ -58,26 +58,22 @@ namespace Setlist
|
||||
hasSyncUrl = !string.IsNullOrWhiteSpace(url);
|
||||
}
|
||||
|
||||
string ownerId = null;
|
||||
if (playlist.TryGetCustomData("owner", out var ownerObj) && ownerObj is string o)
|
||||
{
|
||||
ownerId = string.IsNullOrWhiteSpace(o) ? null : o.Trim();
|
||||
}
|
||||
|
||||
string blGuid = null;
|
||||
if (hasSyncUrl && BeatLeaderPlaylistOwnership.TryExtractBeatLeaderPlaylistGuid(syncUrl, out var g))
|
||||
{
|
||||
blGuid = g;
|
||||
}
|
||||
|
||||
entries.Add((playlist.Title, hasSyncUrl, blGuid));
|
||||
entries.Add((playlist.Title, hasSyncUrl, blGuid, ownerId));
|
||||
}
|
||||
|
||||
if (entries.Any(e => e.BeatLeaderGuid != null))
|
||||
{
|
||||
BeatLeaderPlaylistOwnership.ScheduleVerifyAndLog(entries, Log);
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var e in entries)
|
||||
{
|
||||
Log.Info(FormatPlaylistLogLine(e.Title, e.HasSyncUrl, e.BeatLeaderGuid, ownedGuids: null));
|
||||
}
|
||||
}
|
||||
BeatLeaderPlaylistOwnership.ScheduleVerifyAndLog(entries, Log);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -94,31 +90,41 @@ namespace Setlist
|
||||
string title,
|
||||
bool hasSyncUrl,
|
||||
string beatLeaderGuid,
|
||||
string ownerId,
|
||||
string platformUserId,
|
||||
HashSet<string> ownedGuids)
|
||||
{
|
||||
string ownerPart;
|
||||
var ownerToken = string.IsNullOrEmpty(ownerId) ? "owner=n/a" : $"owner={ownerId}";
|
||||
|
||||
string confirmPart;
|
||||
if (!hasSyncUrl)
|
||||
{
|
||||
ownerPart = "beatLeaderOwnerConfirmed=n/a (no sync URL)";
|
||||
confirmPart = "beatLeaderOwnerConfirmed=n/a (no sync URL)";
|
||||
}
|
||||
else if (string.IsNullOrEmpty(beatLeaderGuid))
|
||||
{
|
||||
ownerPart = "beatLeaderOwnerConfirmed=n/a (sync URL is not a BeatLeader playlist)";
|
||||
confirmPart = "beatLeaderOwnerConfirmed=n/a (sync URL is not a BeatLeader playlist)";
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(ownerId)
|
||||
&& !string.IsNullOrEmpty(platformUserId)
|
||||
&& string.Equals(ownerId, platformUserId, StringComparison.Ordinal))
|
||||
{
|
||||
confirmPart = "beatLeaderOwnerConfirmed=true (owner matches platform user id)";
|
||||
}
|
||||
else if (ownedGuids == null)
|
||||
{
|
||||
ownerPart = "beatLeaderOwnerConfirmed=unknown (BeatLeader /user/playlists did not succeed; see prior log line)";
|
||||
confirmPart = "beatLeaderOwnerConfirmed=unknown (BeatLeader /user/playlists did not succeed; see prior log line)";
|
||||
}
|
||||
else if (ownedGuids.Contains(beatLeaderGuid))
|
||||
{
|
||||
ownerPart = "beatLeaderOwnerConfirmed=true";
|
||||
confirmPart = "beatLeaderOwnerConfirmed=true";
|
||||
}
|
||||
else
|
||||
{
|
||||
ownerPart = "beatLeaderOwnerConfirmed=false";
|
||||
confirmPart = "beatLeaderOwnerConfirmed=false";
|
||||
}
|
||||
|
||||
return $"Playlist \"{title}\": hasSyncUrl={hasSyncUrl}, {ownerPart}";
|
||||
return $"Playlist \"{title}\": hasSyncUrl={hasSyncUrl}, {ownerToken}, {confirmPart}";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user