From ea77a0bcfeb4b339f0da882af858647a87b8e555 Mon Sep 17 00:00:00 2001
From: Michael Neale <michael.neale@gmail.com>
Date: Thu, 4 Jun 2026 15:18:46 +1000
Subject: [PATCH] fix(merge): reconcile build_message custom_emoji_tags arg +
 dedup tauri allow attr

Post-merge fixes for desktop-tauri compile (clippy compiles tests):
- build_message gained custom_emoji_tags param from main; pass &[] in the
  three serverless test/helper call sites (channels_tests, encrypted)
- remove duplicate #[allow(too_many_arguments)] left by the merge
---
 desktop/src-tauri/src/commands/channels_tests.rs | 3 ++-
 desktop/src-tauri/src/commands/messages.rs       | 1 -
 desktop/src-tauri/src/encrypted.rs               | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/desktop/src-tauri/src/commands/channels_tests.rs b/desktop/src-tauri/src/commands/channels_tests.rs
index 612937227d..129a0de0e0 100644
--- a/desktop/src-tauri/src/commands/channels_tests.rs
+++ b/desktop/src-tauri/src/commands/channels_tests.rs
@@ -397,6 +397,7 @@ async fn serverless_burst_no_rate_limit() {
             None,
             &[],
             &[],
+            &[],
         )
         .expect("build message");
         let resp = submit_event(builder, &state)
@@ -469,7 +470,7 @@ async fn serverless_live_subscription_multi_relay() {
 
     // 2. Publish a message (multi-relay fanout — lands wherever accepts).
     let builder =
-        crate::events::build_message(channel, &secret, None, &[], &[]).expect("build message");
+        crate::events::build_message(channel, &secret, None, &[], &[], &[]).expect("build message");
     let resp = submit_event(builder, &state).await.expect("publish");
     eprintln!(
         "published: accepted={} msg={:?}",
diff --git a/desktop/src-tauri/src/commands/messages.rs b/desktop/src-tauri/src/commands/messages.rs
index b639ecf6cc..117682bf0e 100644
--- a/desktop/src-tauri/src/commands/messages.rs
+++ b/desktop/src-tauri/src/commands/messages.rs
@@ -406,7 +406,6 @@ async fn resolve_thread_ref(
 // arg count is idiomatic here rather than a struct.
 #[allow(clippy::too_many_arguments)]
 #[tauri::command]
-#[allow(clippy::too_many_arguments)]
 pub async fn send_channel_message(
     channel_id: String,
     content: String,
diff --git a/desktop/src-tauri/src/encrypted.rs b/desktop/src-tauri/src/encrypted.rs
index 9d256ba9c1..d2b80916f6 100644
--- a/desktop/src-tauri/src/encrypted.rs
+++ b/desktop/src-tauri/src/encrypted.rs
@@ -325,7 +325,8 @@ mod tests {
 
         // Build the rumor exactly as the command does for an encrypted reply.
         let builder =
-            events::build_message(channel, "threaded reply", Some(&thread_ref), &[], &[]).unwrap();
+            events::build_message(channel, "threaded reply", Some(&thread_ref), &[], &[], &[])
+                .unwrap();
         let rumor = builder.build(a.public_key());
 
         let recipients = [a.public_key(), b.public_key()];