fix: chat scroll fix

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

@@ -44,7 +44,6 @@ export class DirectCallService {
   private readonly users = this.store.selectSignal(selectAllUsers);
   private readonly sessionsSignal = signal<DirectCallSession[]>([]);
   private readonly mobileOverlayCallId = signal<string | null>(null);
-  private readonly pendingIncomingCallEvents: DirectCallEventPayload[] = [];
 
   readonly sessions = computed(() => this.sessionsSignal());
   readonly activeSessions = computed(() => this.sessions().filter((session) => session.status !== 'ended'));
@@ -86,18 +85,6 @@ export class DirectCallService {
       }
     });
 
-    effect(() => {
-      if (!this.currentUserId() || this.pendingIncomingCallEvents.length === 0) {
-        return;
-      }
-
-      const pendingEvents = this.pendingIncomingCallEvents.splice(0);
-
-      for (const payload of pendingEvents) {
-        void this.handleIncomingCallEvent(payload);
-      }
-    });
-
     effect(() => {
       const session = this.currentSession();
 
@@ -172,7 +159,7 @@ export class DirectCallService {
     }
 
     const existing = this.sessionById(conversation.id);
-    const session = existing && existing.status !== 'ended' ? existing : this.createSession({
+    const session = existing ?? this.createSession({
       callId: conversation.id,
       conversationId: conversation.id,
       createdAt: Date.now(),
@@ -184,14 +171,6 @@ export class DirectCallService {
 
     this.upsertSession(session);
     this.currentSession.set(session);
-
-    await this.directMessages.recordCallStarted(
-      session.conversationId,
-      meParticipant,
-      Object.values(session.participants).map((participant) => participant.profile),
-      session.createdAt
-    );
-
     await this.joinCall(session.callId, false);
     this.sendCallEvent(peerParticipant.userId, 'ring', session);
     await this.openCallView(session.callId);
@@ -257,8 +236,6 @@ export class DirectCallService {
   }
 
   declineIncomingCall(callId: string): void {
-    this.audio.stop(AppSound.Call);
-
     const session = this.sessionById(callId);
 
     if (!session || session.status === 'ended') {
@@ -276,6 +253,8 @@ export class DirectCallService {
         status: 'ended' as const
       };
 
+    this.audio.stop(AppSound.Call);
+
     if (meId) {
       this.broadcastCallEvent('leave', session);
     }
@@ -406,29 +385,18 @@ export class DirectCallService {
   }
 
   private async handleIncomingCallEvent(payload: DirectCallEventPayload): Promise<void> {
-    const currentUserIds = this.currentUserIds();
     const meId = this.currentUserId();
 
-    if (!meId) {
-      this.pendingIncomingCallEvents.push(payload);
+    if (!meId || payload.sender.userId === meId) {
       return;
     }
 
-    if (currentUserIds.has(payload.sender.userId)) {
-      return;
-    }
-
-    if (!this.callPayloadIncludesAnyParticipant(payload, currentUserIds)) {
+    if (!this.callPayloadIncludesParticipant(payload, meId)) {
       return;
     }
 
     const participants = this.callParticipantsFromPayload(payload);
     const existing = this.sessionById(payload.callId);
-
-    if (this.isStaleRingForEndedSession(payload, existing)) {
-      return;
-    }
-
     const incomingSession = this.createSession({
       callId: payload.callId,
       conversationId: payload.conversationId,
@@ -456,22 +424,14 @@ export class DirectCallService {
 
     if (payload.action === 'ring') {
       await this.ensureCallConversation(session);
-      await this.directMessages.recordCallStarted(
-        session.conversationId,
-        payload.sender,
-        Object.values(session.participants).map((participant) => participant.profile),
-        session.createdAt
-      );
 
-      const latestSession = this.sessionById(session.callId);
-
-      if (latestSession && this.shouldPlayIncomingCallAlert(latestSession)) {
+      if (this.shouldAlertIncomingCall(session)) {
         this.audio.playLoop(AppSound.Call);
       } else {
         this.audio.stop(AppSound.Call);
       }
 
-      if (latestSession && this.shouldPlayIncomingCallAlert(latestSession)) {
+      if (this.shouldAlertIncomingCall(session)) {
         await this.showIncomingNotification(payload.sender.displayName, payload.callId);
       }
 
@@ -515,14 +475,6 @@ export class DirectCallService {
 
     this.upsertSession(session);
     this.currentSession.set(session);
-
-    await this.directMessages.recordCallStarted(
-      session.conversationId,
-      meParticipant,
-      Object.values(session.participants).map((participant) => participant.profile),
-      session.createdAt
-    );
-
     await this.joinCall(session.callId, false);
     this.broadcastCallEvent('ring', this.sessionById(session.callId) ?? session);
     await this.router.navigate(['/call', session.callId]);
@@ -759,15 +711,9 @@ export class DirectCallService {
     ]);
   }
 
-  private callPayloadIncludesAnyParticipant(payload: DirectCallEventPayload, participantIds: Set<string>): boolean {
-    return payload.participantIds.some((participantId) => participantIds.has(participantId))
-      || (payload.participants ?? []).some((participant) => participantIds.has(participant.userId));
-  }
-
-  private isStaleRingForEndedSession(payload: DirectCallEventPayload, existing: DirectCallSession | null): boolean {
-    return payload.action === 'ring'
-      && existing?.status === 'ended'
-      && payload.createdAt <= existing.createdAt;
+  private callPayloadIncludesParticipant(payload: DirectCallEventPayload, participantId: string): boolean {
+    return payload.participantIds.includes(participantId)
+      || (payload.participants ?? []).some((participant) => participant.userId === participantId);
   }
 
   private groupConversationTitle(session: DirectCallSession): string {
@@ -921,10 +867,6 @@ export class DirectCallService {
     return session.status !== 'connected' && !this.isDoNotDisturb();
   }
 
-  private shouldPlayIncomingCallAlert(session: DirectCallSession): boolean {
-    return this.shouldAlertIncomingCall(session) && this.incomingCall()?.callId === session.callId;
-  }
-
   private isDoNotDisturb(): boolean {
     return this.currentUser()?.status === 'busy';
   }
@@ -981,25 +923,6 @@ export class DirectCallService {
     return user ? this.userKey(user) : null;
   }
 
-  private currentUserIds(): Set<string> {
-    const ids = new Set<string>();
-    const user = this.currentUser();
-
-    if (user?.id) {
-      ids.add(user.id);
-    }
-
-    if (user?.oderId) {
-      ids.add(user.oderId);
-    }
-
-    if (user?.peerId) {
-      ids.add(user.peerId);
-    }
-
-    return ids;
-  }
-
   private requireCurrentUser(): User {
     const user = this.currentUser();