From b3a0894221edc35778304765138278e4b7c66148 Mon Sep 17 00:00:00 2001
From: Chris Beck <beck.ct@gmail.com>
Date: Fri, 5 Dec 2025 11:38:42 -0700
Subject: [PATCH] add sender id to VerifiedSignalMessage

---
 signal-gateway/src/gateway/mod.rs     |  7 ++++++-
 signal-gateway/src/message_handler.rs | 14 ++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/signal-gateway/src/gateway/mod.rs b/signal-gateway/src/gateway/mod.rs
index 33bfbd1..a7b3c5c 100644
--- a/signal-gateway/src/gateway/mod.rs
+++ b/signal-gateway/src/gateway/mod.rs
@@ -471,7 +471,12 @@ impl Gateway {
 
             self.handle_gateway_command(cmd).await
         } else if let Some(handler) = &self.message_handler {
-            let msg = VerifiedSignalMessage::new(data.message.clone(), data.timestamp);
+            let msg = VerifiedSignalMessage {
+                message: data.message.clone(),
+                timestamp: data.timestamp,
+                sender_uuid: msg.source_uuid.clone(),
+                group_id: data.group_info.as_ref().map(|g| g.group_id.clone()),
+            };
             handler.handle_verified_signal_message(msg, &GatewayContext).await
         } else {
             Err((501u16, "No message handler configured".into()))
diff --git a/signal-gateway/src/message_handler.rs b/signal-gateway/src/message_handler.rs
index acb50db..d45bcec 100644
--- a/signal-gateway/src/message_handler.rs
+++ b/signal-gateway/src/message_handler.rs
@@ -14,16 +14,10 @@ pub struct VerifiedSignalMessage {
     pub message: String,
     /// The timestamp of the message (milliseconds since Unix epoch).
     pub timestamp: u64,
-}
-
-impl VerifiedSignalMessage {
-    /// Create a new verified signal message.
-    pub fn new(message: impl Into<String>, timestamp: u64) -> Self {
-        Self {
-            message: message.into(),
-            timestamp,
-        }
-    }
+    /// The UUID of the sender.
+    pub sender_uuid: String,
+    /// The group ID if this message was sent to a group.
+    pub group_id: Option<String>,
 }
 
 /// Context for message handler operations.