From c5c89fae05dd11f9b94710339df7a9b588012c21 Mon Sep 17 00:00:00 2001
From: Ruben Bimberg <ruben.bimberg@mni.thm.de>
Date: Mon, 11 Oct 2021 19:45:01 +0200
Subject: [PATCH] Resolve merge
---
.../shared/comment-list/comment-list.component.html | 2 +-
src/app/components/shared/comment-list/comment-list.filter.ts | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 75723dcb8..935914fba 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -272,7 +272,7 @@
[parseVote]="getVote(current)"
[userRole]="userRole"
[moderator]="false"
- [isFromModerator]="moderatorIds.includes(current.creatorId)"
+ [isFromModerator]="filter.moderatorAccountIds.has(current.creatorId)"
[isFromOwner]="room.ownerId === current.creatorId"
[user]="user"
[disabled]="!commentsEnabled"
diff --git a/src/app/components/shared/comment-list/comment-list.filter.ts b/src/app/components/shared/comment-list/comment-list.filter.ts
index 016fe74c8..bc544b0ae 100644
--- a/src/app/components/shared/comment-list/comment-list.filter.ts
+++ b/src/app/components/shared/comment-list/comment-list.filter.ts
@@ -113,6 +113,10 @@ export class CommentListFilter {
return !!this.threshold;
}
+ get moderatorAccountIds() {
+ return this.moderatorIds;
+ }
+
filterCommentsBySearch(comments: Comment[]): Comment[] {
const search = this.currentSearch.toLowerCase();
return comments
--
GitLab