Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-08-09 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix duplicate photos on levels

Browse source
This commit is contained in:
Slendy 2023-04-14 16:45:56 -05:00
commit c558d5aebf
No known key found for this signature in database
GPG key ID: 7288D68361B91428
1 changed files with 25 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

60
ProjectLighthouse/Types/Serialization/GamePhoto.cs
View file

@ -24,13 +24,6 @@ public class GamePhoto : ILbpSerializable, INeedsPreparationForSerialization
[XmlElement("author")] [XmlElement("author")]
public string AuthorUsername { get; set; } = ""; public string AuthorUsername { get; set; } = "";
[XmlElement("slot")]
public PhotoSlot? LevelInfo;
[XmlArray("subjects")]
[XmlArrayItem("subject")]
public List<GamePhotoSubject>? Subjects;
// Uses seconds instead of milliseconds for some reason // Uses seconds instead of milliseconds for some reason
[XmlAttribute("timestamp")] [XmlAttribute("timestamp")]
public long Timestamp { get; set; } public long Timestamp { get; set; }
@ -47,47 +40,44 @@ public class GamePhoto : ILbpSerializable, INeedsPreparationForSerialization
[XmlElement("plan")] [XmlElement("plan")]
public string PlanHash { get; set; } = ""; public string PlanHash { get; set; } = "";
[XmlElement("slot")]
public PhotoSlot? LevelInfo { get; set; }
[XmlArray("subjects")]
[XmlArrayItem("subject")]
public List<GamePhotoSubject>? Subjects { get; set; }
public async Task PrepareSerialization(DatabaseContext database) public async Task PrepareSerialization(DatabaseContext database)
{ {
if (this.LevelInfo?.SlotId == 0) this.LevelInfo = null;
// Fetch slot data // Fetch slot data
if (this.LevelInfo != null) if (this.LevelInfo != null)
{ {
var partialSlot = await database.Slots.Where(s => s.SlotId == this.LevelInfo.SlotId) this.LevelInfo = await database.Slots.Where(s => s.SlotId == this.LevelInfo.SlotId)
.Select(s => new .Select(s => new
{ {
s.InternalSlotId, s.InternalSlotId,
s.Type, s.Type,
}) })
.Select(s => new PhotoSlot
{
SlotId = s.Type == SlotType.User ? this.LevelInfo.SlotId : s.InternalSlotId,
SlotType = s.Type,
})
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
// Don't send level info if it's not a user or developer slot
if (partialSlot?.Type is not (SlotType.Developer or SlotType.User))
{
this.LevelInfo = null;
}
else
{
this.LevelInfo.SlotType = partialSlot.Type;
if (partialSlot.Type == SlotType.Developer) this.LevelInfo.SlotId = partialSlot.InternalSlotId;
}
// Fetch creator username
this.AuthorUsername = await database.Users.Where(u => u.UserId == this.CreatorId)
.Select(u => u.Username)
.FirstOrDefaultAsync() ?? "";
// Fetch photo subject usernames
foreach (GamePhotoSubject photoSubject in this.Subjects ?? Enumerable.Empty<GamePhotoSubject>())
{
photoSubject.Username = await database.Users.Where(u => u.UserId == photoSubject.UserId)
.Select(u => u.Username)
.FirstOrDefaultAsync() ?? "";
}
} }
// Fetch creator username
this.AuthorUsername = await database.Users.Where(u => u.UserId == this.CreatorId)
.Select(u => u.Username)
.FirstOrDefaultAsync() ?? "";
// Fetch photo subject usernames
foreach (GamePhotoSubject photoSubject in this.Subjects ?? Enumerable.Empty<GamePhotoSubject>())
{
photoSubject.Username = await database.Users.Where(u => u.UserId == photoSubject.UserId)
.Select(u => u.Username)
.FirstOrDefaultAsync() ?? "";
}
} }
public static GamePhoto CreateFromEntity(PhotoEntity entity) => public static GamePhoto CreateFromEntity(PhotoEntity entity) =>