fix: Improve plugin ui entry points, Fix chat scroll, fix notifications, fix user rights

toju-app/src/app/domains/direct-message/application/services/direct-message.service.ts

@@ -17,6 +17,9 @@ import {
   advanceDirectMessageStatus,
   createDirectConversation,
   createGroupConversation,
+  directMessageConversationIncludesUser,
+  directMessageEventIncludesUser,
+  directMessageSyncIncludesUser,
   getDirectConversationId,
   isGroupDirectConversation,
   updateMessageStatusInConversation,
@@ -464,6 +467,11 @@ export class DirectMessageService {
   private async handleIncomingMessage(payload: DirectMessageEventPayload): Promise<void> {
     const ownerId = this.getCurrentUserIdOrThrow();
     const currentUser = this.requireCurrentUser();
+
+    if (!directMessageEventIncludesUser(payload, ownerId) || payload.sender.userId === ownerId || payload.message.senderId === ownerId) {
+      return;
+    }
+
     const currentParticipant = toDirectMessageParticipant(currentUser);
     const sender = payload.sender;
     const conversationId = payload.message.conversationId
@@ -528,7 +536,11 @@ export class DirectMessageService {
 
   private async handleIncomingMutation(payload: DirectMessageMutationEventPayload): Promise<void> {
     const ownerId = this.getCurrentUserIdOrThrow();
-    const conversation = await this.requireConversation(ownerId, payload.conversationId);
+    const conversation = await this.findConversation(ownerId, payload.conversationId);
+
+    if (!conversation || !directMessageConversationIncludesUser(conversation, ownerId)) {
+      return;
+    }
 
     await this.persistConversation(ownerId, this.applyMutation(conversation, payload));
   }
@@ -540,6 +552,14 @@ export class DirectMessageService {
       return;
     }
 
+    const conversation = this.conversationsSignal().find((entry) => entry.id === payload.conversationId);
+
+    if (!conversation
+      || !directMessageConversationIncludesUser(conversation, currentUserId)
+      || !directMessageConversationIncludesUser(conversation, payload.sender.userId)) {
+      return;
+    }
+
     if (!payload.isTyping) {
       this.typingEntriesSignal.update((entries) => entries.filter((entry) =>
         !(entry.conversationId === payload.conversationId && entry.userId === payload.sender.userId)
@@ -566,10 +586,12 @@ export class DirectMessageService {
   private async handleIncomingSyncRequest(payload: DirectMessageSyncRequestEventPayload): Promise<void> {
     const ownerId = this.getCurrentUserIdOrThrow();
     const currentUser = this.requireCurrentUser();
-    const conversation = this.conversationsSignal().find((entry) => entry.id === payload.conversationId)
-      ?? await this.repository.getConversation(ownerId, payload.conversationId);
+    const conversation = await this.findConversation(ownerId, payload.conversationId);
 
-    if (!conversation || payload.sender.userId === ownerId) {
+    if (!conversation
+      || payload.sender.userId === ownerId
+      || !directMessageConversationIncludesUser(conversation, ownerId)
+      || !directMessageConversationIncludesUser(conversation, payload.sender.userId)) {
       return;
     }
 
@@ -596,6 +618,10 @@ export class DirectMessageService {
       return;
     }
 
+    if (!directMessageSyncIncludesUser(payload, ownerId) || !directMessageSyncIncludesUser(payload, payload.sender.userId)) {
+      return;
+    }
+
     const existingConversation = this.conversationsSignal().find((conversation) => conversation.id === payload.conversationId)
       ?? await this.repository.getConversation(ownerId, payload.conversationId)
       ?? (payload.conversationKind === 'group' || payload.participants.length > 2
@@ -863,10 +889,7 @@ export class DirectMessageService {
   }
 
   private async requireConversation(ownerId: string, conversationId: string): Promise<DirectMessageConversation> {
-    await this.loadForOwner(ownerId);
-
-    const conversation = this.conversationsSignal().find((entry) => entry.id === conversationId)
-      ?? await this.repository.getConversation(ownerId, conversationId);
+    const conversation = await this.findConversation(ownerId, conversationId);
 
     if (!conversation) {
       throw new Error('Direct message conversation not found.');
@@ -875,6 +898,13 @@ export class DirectMessageService {
     return conversation;
   }
 
+  private async findConversation(ownerId: string, conversationId: string): Promise<DirectMessageConversation | null> {
+    await this.loadForOwner(ownerId);
+
+    return this.conversationsSignal().find((entry) => entry.id === conversationId)
+      ?? await this.repository.getConversation(ownerId, conversationId);
+  }
+
   private requireCurrentUser(): User {
     const currentUser = this.currentUser();