Skip to content

Commit 301e90f

Browse files
committed
Fix compilation
1 parent 5da24dd commit 301e90f

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

Refresh.Core/Extensions/PhotoExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public static SerializedPhoto FromGamePhoto(GamePhoto photo, DataContext dataCon
1919
MediumHash = dataContext.Database.GetAssetFromHash(photo.MediumAsset.AssetHash)?.GetAsPhoto(dataContext.Game, dataContext) ?? photo.MediumAsset.AssetHash,
2020
SmallHash = dataContext.Database.GetAssetFromHash(photo.SmallAsset.AssetHash)?.GetAsPhoto(dataContext.Game, dataContext) ?? photo.SmallAsset.AssetHash,
2121
PlanHash = photo.PlanHash,
22-
PhotoSubjects = new List<SerializedPhotoSubject>(photo.Subjects.Count),
22+
PhotoSubjects = [],
2323
};
2424

25-
foreach (GamePhotoSubject subject in photo.Subjects)
25+
foreach (GamePhotoSubject subject in dataContext.Database.GetSubjectsInPhoto(photo).ToList())
2626
{
2727
SerializedPhotoSubject newSubject = new()
2828
{

Refresh.Interfaces.Game/Types/Activity/SerializedEvents/SerializedEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public abstract class SerializedEvent : IDataConvertableFrom<SerializedEvent, Ev
7777
case EventType.LevelPlay:
7878
return SerializedLevelPlayEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!));
7979
case EventType.PhotoUpload:
80-
return SerializedPhotoUploadEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!), photo!);
80+
return SerializedPhotoUploadEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!), photo!, dataContext);
8181
case EventType.LevelScore:
8282
return SerializedScoreSubmitEvent.FromSerializedLevelEvent(FromOldLevelEvent(old, level!), score!);
8383
case EventType.NewsPost:

Refresh.Interfaces.Game/Types/Activity/SerializedEvents/SerializedPhotoUploadEvent.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Xml.Serialization;
2+
using Refresh.Core.Types.Data;
23
using Refresh.Database.Models.Photos;
34

45
namespace Refresh.Interfaces.Game.Types.Activity.SerializedEvents;
@@ -8,7 +9,7 @@ public class SerializedPhotoUploadEvent : SerializedLevelEvent
89
[XmlElement("photo_id")] public int PhotoId { get; set; }
910
[XmlElement("user_in_photo")] public List<string> UsersInPhoto = [];
1011

11-
public static SerializedPhotoUploadEvent? FromSerializedLevelEvent(SerializedLevelEvent? e, GamePhoto? photo)
12+
public static SerializedPhotoUploadEvent? FromSerializedLevelEvent(SerializedLevelEvent? e, GamePhoto? photo, DataContext dataContext)
1213
{
1314
if (e == null || photo == null)
1415
return null;
@@ -21,7 +22,7 @@ public class SerializedPhotoUploadEvent : SerializedLevelEvent
2122
Type = e.Type,
2223

2324
PhotoId = photo.PhotoId,
24-
UsersInPhoto = photo.Subjects.Select(s => s.DisplayName).ToList(),
25+
UsersInPhoto = dataContext.Database.GetSubjectsInPhoto(photo).Select(s => s.DisplayName).ToList(),
2526
};
2627
}
2728
}

0 commit comments

Comments
 (0)