From cc2f231d166e8725f8b5c46b208c52619fe84eff Mon Sep 17 00:00:00 2001
From: jack <jackjackbits@users.noreply.github.com>
Date: Tue, 8 Jul 2025 04:07:06 +0200
Subject: [PATCH] Fix screenshot notifications and remove 'private:' from UI

- Screenshot notifications now properly appear as system messages
- Send messages directly via mesh service to avoid local echo
- Remove 'private:' prefix from private chat header
- Keep only lock icon and peer name in private chat header
---
 bitchat/ViewModels/ChatViewModel.swift | 16 +++++++++++-----
 bitchat/Views/ContentView.swift        |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bitchat/ViewModels/ChatViewModel.swift b/bitchat/ViewModels/ChatViewModel.swift
index d1d54595..71f54b24 100644
--- a/bitchat/ViewModels/ChatViewModel.swift
+++ b/bitchat/ViewModels/ChatViewModel.swift
@@ -1073,10 +1073,11 @@ class ChatViewModel: ObservableObject {
         if let peerID = selectedPrivateChatPeer {
             // In private chat - send to the other person
             if let peerNickname = meshService.getPeerNicknames()[peerID] {
+                // Send the message directly without going through sendPrivateMessage to avoid local echo
                 meshService.sendPrivateMessage(screenshotMessage, to: peerID, recipientNickname: peerNickname)
             }
             
-            // Also show locally
+            // Show local notification immediately as system message
             let localNotification = BitchatMessage(
                 sender: "system",
                 content: "you took a screenshot",
@@ -1094,9 +1095,14 @@ class ChatViewModel: ObservableObject {
             
         } else if let channel = currentChannel {
             // In a channel - send to channel
-            meshService.sendMessage(screenshotMessage, channel: channel)
+            // Check if channel is password protected and encrypt if needed
+            if let channelKey = channelKeys[channel] {
+                meshService.sendEncryptedChannelMessage(screenshotMessage, mentions: [], channel: channel, channelKey: channelKey)
+            } else {
+                meshService.sendMessage(screenshotMessage, mentions: [], channel: channel)
+            }
             
-            // Also show locally
+            // Show local notification immediately as system message
             let localNotification = BitchatMessage(
                 sender: "system",
                 content: "you took a screenshot",
@@ -1113,9 +1119,9 @@ class ChatViewModel: ObservableObject {
             
         } else {
             // In public chat - send to everyone
-            meshService.sendMessage(screenshotMessage)
+            meshService.sendMessage(screenshotMessage, mentions: [], channel: nil)
             
-            // Also show locally
+            // Show local notification immediately as system message
             let localNotification = BitchatMessage(
                 sender: "system",
                 content: "you took a screenshot",
diff --git a/bitchat/Views/ContentView.swift b/bitchat/Views/ContentView.swift
index d0065c47..23e21ed8 100644
--- a/bitchat/Views/ContentView.swift
+++ b/bitchat/Views/ContentView.swift
@@ -190,7 +190,7 @@ struct ContentView: View {
                     Image(systemName: "lock.fill")
                         .font(.system(size: 14))
                         .foregroundColor(Color.orange)
-                    Text("private: \(privatePeerNick)")
+                    Text("\(privatePeerNick)")
                         .font(.system(size: 16, weight: .medium, design: .monospaced))
                         .foregroundColor(Color.orange)
                 }