fix: Target messages for chat markers via StanzaId in MUC rooms (refs #…

…60)
prose-im · Mar 4, 2024 · 1d4a1a6 · 1d4a1a6
1 parent 3228ca5
commit 1d4a1a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/crates/prose-core-client/src/domain/messaging/models/message.rs b/crates/prose-core-client/src/domain/messaging/models/message.rs
@@ -8,7 +8,7 @@ use std::collections::HashMap;
 use chrono::{DateTime, Utc};
 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
-use tracing::{error, warn};
+use tracing::{error, info, warn};
 
 use prose_utils::id_string;
 
@@ -117,7 +117,10 @@ impl Message {
                 MessageTargetId::MessageId(ref id) => id,
                 MessageTargetId::StanzaId(stanza_id) => {
                     let Some(id) = stanza_to_id_map.get(&stanza_id) else {
-                        error!("Could not resolve StanzaId '{stanza_id}' to a MessageId");
+                        info!(
+                            "Could not resolve StanzaId '{stanza_id}' to a MessageId \n{:?}\n{:?}",
+                            stanza_to_id_map, messages_map
+                        );
                         continue;
                     };
                     id

diff --git a/crates/prose-core-client/src/domain/messaging/models/message_parser.rs b/crates/prose-core-client/src/domain/messaging/models/message_parser.rs
@@ -144,14 +144,20 @@ impl TryFrom<&Message> for TargetedPayload {
 
         if let Some(marker) = message.received_marker() {
             return Ok(TargetedPayload {
-                target: Some(MessageTargetId::MessageId(marker.id.as_ref().into())),
+                target: Some(match message.type_ {
+                    MessageType::Groupchat => MessageTargetId::StanzaId(marker.id.as_ref().into()),
+                    _ => MessageTargetId::MessageId(marker.id.as_ref().into()),
+                }),
                 payload: Payload::DeliveryReceipt,
             });
         }
 
         if let Some(marker) = message.displayed_marker() {
             return Ok(TargetedPayload {
-                target: Some(MessageTargetId::MessageId(marker.id.as_ref().into())),
+                target: Some(match message.type_ {
+                    MessageType::Groupchat => MessageTargetId::StanzaId(marker.id.as_ref().into()),
+                    _ => MessageTargetId::MessageId(marker.id.as_ref().into()),
+                }),
                 payload: Payload::ReadReceipt,
             });
         }