From 715a79438ccb4f95f802d8998cb98d8d58b41f58 Mon Sep 17 00:00:00 2001
From: Anton Sotkov <anton@sotkov.com>
Date: Tue, 6 Jan 2026 14:45:33 +0200
Subject: [PATCH] fix: prefer chat GUID for chat_id sends

---
 Sources/IMsgCore/MessageSender.swift   | 2 +-
 Tests/IMsgCoreTests/UtilityTests.swift | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Sources/IMsgCore/MessageSender.swift b/Sources/IMsgCore/MessageSender.swift
index 5321283..7eeff3e 100644
--- a/Sources/IMsgCore/MessageSender.swift
+++ b/Sources/IMsgCore/MessageSender.swift
@@ -51,7 +51,7 @@ public struct MessageSender {
 
   public func send(_ options: MessageSendOptions) throws {
     var resolved = options
-    let chatTarget = resolved.chatIdentifier.isEmpty ? resolved.chatGUID : resolved.chatIdentifier
+    let chatTarget = resolved.chatGUID.isEmpty ? resolved.chatIdentifier : resolved.chatGUID
     let useChat = !chatTarget.isEmpty
     if useChat == false {
       if resolved.region.isEmpty { resolved.region = "US" }
diff --git a/Tests/IMsgCoreTests/UtilityTests.swift b/Tests/IMsgCoreTests/UtilityTests.swift
index 99c7db0..5d72e0c 100644
--- a/Tests/IMsgCoreTests/UtilityTests.swift
+++ b/Tests/IMsgCoreTests/UtilityTests.swift
@@ -139,7 +139,7 @@ func messageSenderBuildsArguments() throws {
 }
 
 @Test
-func messageSenderUsesChatIdentifier() throws {
+func messageSenderUsesChatGuidWhenProvided() throws {
   var captured: [String] = []
   let sender = MessageSender(runner: { _, args in
     captured = args
@@ -155,7 +155,7 @@ func messageSenderUsesChatIdentifier() throws {
       chatGUID: "ignored-guid"
     )
   )
-  #expect(captured[5] == "iMessage;+;chat123")
+  #expect(captured[5] == "ignored-guid")
   #expect(captured[6] == "1")
   #expect(captured[4] == "1")
 }