Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-16 02:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Add proper relationships to Comments (#838)

Browse source 
* Add specific foreign keys for comment targets

* Remove inheritdoc tags from migration

* Fix punctuation of deleted comment message and add mod deletion message

* Fix broken merge

* Cleanup comment queries
This commit is contained in:
Josh 2023-08-24 13:58:03 -05:00 • committed by GitHub
parent 9cb9fb62e4
commit a316c866c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 192 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ProjectLighthouse.Servers.GameServer/Controllers/CommentController.cs
View file

@ -64,12 +64,16 @@ public class CommentController : ControllerBase
PaginationData pageData = this.Request.GetPaginationData();
IQueryable<CommentEntity> baseQuery = this.database.Comments.Where(c => c.Type == type);
if (type == CommentType.Level)
{
targetId = await this.database.Slots.Where(s => s.SlotId == slotId)
.Where(s => s.CommentsEnabled && !s.Hidden)
.Select(s => s.SlotId)
.FirstOrDefaultAsync();
baseQuery = baseQuery.Where(c => c.TargetSlotId == targetId);
}
else
{
@ -77,6 +81,8 @@ public class CommentController : ControllerBase
.Where(u => u.CommentsEnabled)
.Select(u => u.UserId)
.FirstOrDefaultAsync();
baseQuery = baseQuery.Where(c => c.TargetUserId == targetId);
}
if (targetId == 0) return this.NotFound();
@ -86,11 +92,10 @@ public class CommentController : ControllerBase
where blockedProfile.UserId == token.UserId
select blockedProfile.BlockedUserId).ToListAsync();
List<GameComment> comments = (await this.database.Comments.Where(p => p.TargetId == targetId && p.Type == type)
.OrderByDescending(p => p.Timestamp)
.Where(p => !blockedUsers.Contains(p.PosterUserId))
List<GameComment> comments = (await baseQuery.OrderByDescending(c => c.Timestamp)
.Where(c => !blockedUsers.Contains(c.PosterUserId))
.Include(c => c.Poster)
.Where(p => p.Poster.PermissionLevel != PermissionLevel.Banned)
.Where(c => c.Poster.PermissionLevel != PermissionLevel.Banned)
.ApplyPagination(pageData)
.ToListAsync()).ToSerializableList(c => GameComment.CreateFromEntity(c, token.UserId));
@ -164,15 +169,15 @@ public class CommentController : ControllerBase
bool canDelete;
if (comment.Type == CommentType.Profile)
{
canDelete = comment.PosterUserId == token.UserId || comment.TargetId == token.UserId;
canDelete = comment.PosterUserId == token.UserId || comment.TargetUserId == token.UserId;
}
else
{
if (slotType == "developer") slotId = await SlotHelper.GetPlaceholderSlotId(this.database, slotId, SlotType.Developer);
if (slotId != comment.TargetId) return this.BadRequest();
if (slotId != comment.TargetSlotId) return this.BadRequest();
int slotCreator = await this.database.Slots.Where(s => s.SlotId == comment.TargetId)
int slotCreator = await this.database.Slots.Where(s => s.SlotId == comment.TargetSlotId)
.Where(s => s.CommentsEnabled)
.Select(s => s.CreatorId)
.FirstOrDefaultAsync();