stopping user from creating dms with themselves and duplicates dms

Author: annniiieee

chathaven/backend/src/controllers/conversationsController.ts

@@ -64,7 +64,9 @@ export const createDirectMessages = async (req: Request, res: Response) => {
     // See if there are any common conversationIds in their directMessages arrays
     const existingConversation = await Conversation.findOne({
       conversationId: {
-        $in: creator.directMessages.concat(addedUser.directMessages),
+        $in: creator.directMessages.filter((id) =>
+          addedUser.directMessages.includes(id)
+        ),
       },
     });
 

chathaven/frontend/src/app/components/chat/component/channelSideBar/channelSideBar.component.ts

@@ -82,6 +82,12 @@ export class ChannelSidebarComponent implements OnInit, OnDestroy {
         ? this.refreshDirectMessageList()
         : this.refreshChannelList();
     });
+
+    // ADD THIS
+    this.dataService.refreshDirectMessages$.subscribe(() => {
+      this.refreshDirectMessageList();
+    });
+
     this.dataService.currentTeamId.subscribe((teamId) => {
       this.selectedTeamId = teamId;
     });
@@ -575,4 +581,4 @@ export class ChannelSidebarComponent implements OnInit, OnDestroy {
       return this.selectedChannelId ? conversationId : '';
     }
   }
-}
+}

chathaven/frontend/src/app/components/chat/component/informationSideBar/informationSideBar.component.ts

@@ -105,10 +105,12 @@ export class InformationSidebarComponent implements OnInit, OnDestroy {
   // Lifecycle Hooks
   async ngOnInit() {
     this.loginUser = this.userService.getUser();
-
-    if (!this.loginUser) {
-      console.error('User not found');
-    }
+      if (!this.loginUser) {
+        this.loginUser = await this.userService.user$.toPromise();
+      }
+      if (!this.loginUser) {
+        console.error('User not found');
+      }
   }
 
   ngOnDestroy() {
@@ -344,20 +346,41 @@ export class InformationSidebarComponent implements OnInit, OnDestroy {
   async createCoversation(memberId: string) {
     const sender = this.loginUser;
     const receiver = await this.backendService.getUserById(memberId);
+
     if (sender && receiver?.userId) {
       const conversationName = `${sender.username}, ${receiver.username}`;
-      const conversationId = await this.backendService.createDirectMessages(
-        conversationName,
-        sender.userId,
-        receiver.userId
-      );
-      this.dataService.selectTeam('');
-      this.dataService.selectChannel('');
-      if (conversationId) {
-        this.dataService.selectConversation(conversationId.conversationId);
+
+      try {
+        const conversation = await this.backendService.createDirectMessages(
+          conversationName,
+          sender.userId,
+          receiver.userId
+        );
+
+        if (conversation?.conversationId) {
+          this.dataService.selectTeam('');
+          this.dataService.selectChannel('');
+          this.dataService.selectConversation(conversation.conversationId);
+
+          // Trigger refresh of Direct Message list
+          this.dataService.triggerDirectMessagesRefresh();
+
+          this.dataService.toggleIsDirectMessage(true);
+
+          await this.refreshList(); // Optional: refresh inbox/requests after DM created
+
+          alert('Direct Message successfully created');
+        } else {
+          alert('Failed to create conversation');
+        }
+      } catch (error) {
+        console.error('Error creating conversation:', error);
+        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+        alert(`Failed to create conversation: ${errorMessage}`);
       }
-      this.dataService.toggleIsDirectMessage(true);
-      alert('Direct Messages successfully created');
+    } else {
+      console.error('Sender or Receiver not found');
+      alert('Failed to create conversation: Sender or Receiver not found');
     }
   }
 
@@ -643,4 +666,4 @@ export class InformationSidebarComponent implements OnInit, OnDestroy {
     this.isInputFocused = false;
     this.onSearchQueryChange();
   }
-}
+}

chathaven/frontend/src/services/data.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Subject } from 'rxjs';
 
 @Injectable()
 export class DataService {
@@ -24,6 +24,10 @@ export class DataService {
   private messageIdSource = new BehaviorSubject<string>('');
   selectedMessageId = this.messageIdSource.asObservable();
 
+  // ADD THIS FOR DM REFRESH
+  private refreshDirectMessagesSource = new Subject<void>();
+  refreshDirectMessages$ = this.refreshDirectMessagesSource.asObservable();
+
   selectTeam(selectedTeamId: string) {
     this.teamId.next(selectedTeamId);
   }
@@ -59,4 +63,9 @@ export class DataService {
   selectMessage(messageId: string) {
     this.messageIdSource.next(messageId);
   }
-}
+
+  // ADD THIS FUNCTION TO TRIGGER REFRESH
+  triggerDirectMessagesRefresh() {
+    this.refreshDirectMessagesSource.next();
+  }
+}