Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-05-14 13:52:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix photos with me and admin granted slots

Browse source
This commit is contained in:
Slendy 2022-09-02 21:52:41 -05:00
parent d916a11ae7
commit fddef506c8
No known key found for this signature in database
GPG key ID: 7288D68361B91428
4 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ProjectLighthouse.Servers.GameServer/Controllers/Resources/PhotosController.cs
View file

@ -200,7 +200,7 @@ public class PhotosController : ControllerBase
p.PhotoId,
p.PhotoSubjectCollection,
}).ToList();
List<int> photoIds = (from v in list where photoSubjectIds.Any(ps => v.PhotoSubjectCollection.Contains(ps.ToString())) select v.PhotoId).ToList();
List<int> photoIds = (from v in list where photoSubjectIds.Any(ps => v.PhotoSubjectCollection.Split(",").Contains(ps.ToString())) select v.PhotoId).ToList();
string response = Enumerable.Aggregate(
this.database.Photos.Where(p => photoIds.Any(id => p.PhotoId == id) && p.CreatorId != targetUserId)
@ -221,7 +221,13 @@ public class PhotosController : ControllerBase
Photo? photo = await this.database.Photos.FirstOrDefaultAsync(p => p.PhotoId == id);
if (photo == null) return this.NotFound();
if (photo.CreatorId != token.UserId) return this.StatusCode(401, "");
// If user isn't photo creator then check if they own the level
if (photo.CreatorId != token.UserId)
{
Slot? photoSlot = await this.database.Slots.FirstOrDefaultAsync(s => s.SlotId == photo.SlotId && s.Type == SlotType.User);
if (photoSlot == null || photoSlot.CreatorId != token.UserId) return this.StatusCode(401, "");
}
foreach (string idStr in photo.PhotoSubjectIds)
{
if (!int.TryParse(idStr, out int subjectId)) throw new InvalidCastException(idStr + " is not a valid number.");