From 1733dda6cd8776092b86fbbeb541d49e4576e8f2 Mon Sep 17 00:00:00 2001
From: jack <212554440+jackjackbits@users.noreply.github.com>
Date: Mon, 15 Sep 2025 21:58:39 +0200
Subject: [PATCH] Ignore self when presenting message actions (#625)

Co-authored-by: jack <jackjackbits@users.noreply.github.com>
---
 bitchat/ViewModels/ChatViewModel.swift | 33 ++++++++++++++++++++++++--
 bitchat/Views/ContentView.swift        |  7 +++++-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/bitchat/ViewModels/ChatViewModel.swift b/bitchat/ViewModels/ChatViewModel.swift
index 6451a9b9..b62080eb 100644
--- a/bitchat/ViewModels/ChatViewModel.swift
+++ b/bitchat/ViewModels/ChatViewModel.swift
@@ -1467,7 +1467,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
     private func sendGeohash(ch: GeohashChannel, content: String) {
         do {
             let identity = try NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash)
-            
+
             let event = try NostrProtocol.createEphemeralGeohashEvent(
                 content: content,
                 geohash: ch.geohash,
@@ -1486,9 +1486,11 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
             } else {
                 NostrRelayManager.shared.sendEvent(event, to: targetRelays)
             }
-            
+
             // Track ourselves as active participant
             recordGeoParticipant(pubkeyHex: identity.publicKeyHex)
+            let shortKey = "nostr:" + identity.publicKeyHex.prefix(TransportConfig.nostrShortKeyDisplayLength)
+            nostrKeyMapping[shortKey] = identity.publicKeyHex
             SecureLogger.debug("GeoTeleport: sent geo message pub=\(identity.publicKeyHex.prefix(8))… teleported=\(LocationChannelManager.shared.teleported)", category: .session)
             
             // If we tagged this as teleported, also mark our pubkey in teleportedGeo for UI
@@ -1884,6 +1886,33 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
         geohashPeople = people
     }
 
+    @MainActor
+    func isSelfSender(peerID: String?, displayName: String?) -> Bool {
+        guard let peerID else { return false }
+        if peerID == meshService.myPeerID { return true }
+        let lowerPeer = peerID.lowercased()
+        guard lowerPeer.hasPrefix("nostr") else { return false }
+
+        if let mapped = nostrKeyMapping[peerID]?.lowercased(),
+           let gh = currentGeohash,
+           let myIdentity = try? NostrIdentityBridge.deriveIdentity(forGeohash: gh) {
+            if mapped == myIdentity.publicKeyHex.lowercased() { return true }
+        }
+
+        if let gh = currentGeohash,
+           let myIdentity = try? NostrIdentityBridge.deriveIdentity(forGeohash: gh) {
+            let myLower = myIdentity.publicKeyHex.lowercased()
+            let shortLen = TransportConfig.nostrShortKeyDisplayLength
+            let shortKey = "nostr:" + myLower.prefix(shortLen)
+            if lowerPeer == shortKey { return true }
+            let suffix = myIdentity.publicKeyHex.suffix(4)
+            let expected = (nickname + "#" + suffix).lowercased()
+            if let display = displayName?.lowercased(), display == expected { return true }
+        }
+
+        return false
+    }
+
     private func startGeoParticipantsTimer() {
         stopGeoParticipantsTimer()
         geoParticipantsTimer = Timer.scheduledTimer(withTimeInterval: 30.0, repeats: true) { [weak self] _ in
diff --git a/bitchat/Views/ContentView.swift b/bitchat/Views/ContentView.swift
index 4b47d810..84b0cd7e 100644
--- a/bitchat/Views/ContentView.swift
+++ b/bitchat/Views/ContentView.swift
@@ -462,7 +462,12 @@ struct ContentView: View {
                         selectedMessageSender = viewModel.messages.last(where: { $0.senderPeerID == peerID && $0.sender != "system" })?.sender
                     }
                 }
-                showMessageActions = true
+                if viewModel.isSelfSender(peerID: selectedMessageSenderID, displayName: selectedMessageSender) {
+                    selectedMessageSender = nil
+                    selectedMessageSenderID = nil
+                } else {
+                    showMessageActions = true
+                }
             }
             .onOpenURL { url in
                 guard url.scheme == "bitchat", url.host == "geohash" else { return }