From 46e1116bc5b8f7b4515684708306fdff338ee82c Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Tue, 8 Jul 2025 18:25:44 +0200
Subject: [PATCH] Fix internal/external group id issue

---
 apps/bridge-worker/tasks/fetch-signal-messages.ts             | 4 +++-
 .../src/app/controllers/channels_cdr_signal_controller.rb     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/bridge-worker/tasks/fetch-signal-messages.ts b/apps/bridge-worker/tasks/fetch-signal-messages.ts
index aa1a612..14602f6 100644
--- a/apps/bridge-worker/tasks/fetch-signal-messages.ts
+++ b/apps/bridge-worker/tasks/fetch-signal-messages.ts
@@ -82,7 +82,9 @@ const processMessage = async ({
     dataMessage?.groupV2?.id ||
     dataMessage?.groupContext?.id ||
     dataMessage?.groupInfo?.groupId;
-  const toRecipient = groupId ?? phoneNumber;
+  const toRecipient = groupId
+    ? `group.${Buffer.from(groupId).toString("base64")}`
+    : phoneNumber;
 
   const primaryMessage = {
     token: id,
diff --git a/packages/zammad-addon-bridge/src/app/controllers/channels_cdr_signal_controller.rb b/packages/zammad-addon-bridge/src/app/controllers/channels_cdr_signal_controller.rb
index 010de95..aa822a6 100644
--- a/packages/zammad-addon-bridge/src/app/controllers/channels_cdr_signal_controller.rb
+++ b/packages/zammad-addon-bridge/src/app/controllers/channels_cdr_signal_controller.rb
@@ -231,7 +231,7 @@ class ChannelsCdrSignalController < ApplicationController
               Rails.logger.info "  - stored_chat_id: #{stored_chat_id}"
               Rails.logger.info "  - incoming_group_id: #{receiver_phone_number}"
 
-              matches = receiver_phone_number == chat_id
+              matches = receiver_phone_number == stored_chat_id
               Rails.logger.info "  - MATCH: #{matches}"
 
               matches