Resolve merge

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"

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