mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-24 23:45:18 +00:00
* Empty-mesh liveliness: nearby conversations, echoes, wave action, dead drops, radar The empty mesh timeline was a dead end: a grey zero and "nobody in range yet". This turns it into a live surface and gives the app pull when the mesh wakes up: - Nearest conversation: background geohash sampling now tracks actual chat messages (not just presence) per regional channel; the empty state surfaces the busiest nearby conversation with a preview, one tap to join (GeohashChatActivityTracker, fed from GeoPresenceTracker). - Echoes: the carried 6h store-and-forward window renders as dimmed "heard here earlier" rows at launch (new Transport collectArchivedPublicMessages -> GossipSyncManager snapshot, decoded with signature-derived nicknames; content-identity dedup guards against re-synced duplicates). - Wave: the "bitchatters nearby" notification gains a "wave" quick action that broadcasts a mesh 👋 straight from the notification, even backgrounded (first UNNotificationCategory in the app). - Dead drops: /drop pins a note to the current building geohash as a kind-1 location note with a 24h NIP-40 expiry; expired notes are now dropped client-side at ingest; the notices sheet shows "fades in Xh"; a "location notes" toggle plus location-permission controls live in app info (also fixes the duplicated Voice section). - Radar: an ambient sonar animation shows the radio scanning, with a privacy-safe daily tally ("N devices passed within range today" via salted per-day hashes) and a "notes left here" hint that opens the notices geo tab. All new user-facing strings ship in all 29 locales. 1403 tests green, including new suites for the activity tracker, sightings tally, and note expiry/drop publishing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Review round: app-info polish, urgent/expiry parity, centered radar, pin fill, Codex P2s - App info: LOCATION header uppercased like sibling sections; location notes and live voice descriptions shortened (29 locales); redundant "location access granted" line removed. - Notices parity: urgent + expiry controls now show on the geo tab too; the bridged Nostr note carries ["t","urgent"] and NIP-40 so relay-side readers see both; urgent parsed back from incoming notes. - Radar moved from the top of the empty state to the center of the chat area, below the help text (empty state fills the visible height). - Header pin fills whenever the scope has notices (was: only unseen), and Nostr-only nearby notes now light it too. - Codex P2 fixes: notification completion deferred until the wave action is handled (background suspension dropped the send); NIP-40 notes now prune on a timer when they expire while displayed; the location-notes kill switch retargets the nearby-notes counter immediately. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Hide macOS segmented picker's built-in label in notices composer (duplicate 'expires in') Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Geo notes: permanent (∞) expiry default, urgent stays mesh-only - Geo expiry picker gains ∞ as the default: a permanent note posts as a pure relay note (no NIP-40 tag, no mesh-board copy — a board copy must fade within days, contradicting the ∞ the user picked). 1/3/7d keep the board + bridged-note path with NIP-40. - The notes manager is now owned by the notices sheet (not the list) so the composer local-echoes ∞ notes into the list; it revives via refresh() after a tab-switch cancel, and its expiry-prune timer survives cancel (weak self, dies with the instance). - Urgent toggle returns to mesh-only per review — notes are ambient; the read-side urgent-tag parse stays so tagged notes still render. - macOS: hide the segmented picker's built-in label (duplicate "expires in"). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Clearing the mesh timeline dismisses echoes for good; tighter divider copy Triple-tap /clear emptied the timeline but the next launch re-seeded "heard here earlier" from the persisted archive. A MeshEchoSettings watermark now records the clear; only messages heard after it come back (the archive itself still carries everything for peers' sync). The echo dedup keys reset with it, and panic wipe drops the watermark. Divider copy tightened to "heard here earlier · last 6h" (29 locales). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Echoes visual polish: tinted history block, radar-captioned tally, ambient footer Device-test feedback on the echoes screen: - Archived echoes now sit on a subtle tinted background (secondary at 8%) in addition to the dim, so "heard here earlier" reads as one distinct block; the divider carries the echo ID prefix to join it. - "N devices passed within range today" moves out of the narration lines to sit centered under the radar as its caption. - When the timeline holds only echoes/system lines, a compact ambient footer (small radar + tally + live hints) renders below the history instead of the whole ambient layer vanishing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Notes strip persists above the mesh chat; leaner empty-state narration - The 📍 "notes left here" line was empty-state-only, so starting a conversation hid it. It is now a tappable strip pinned above the mesh timeline whenever unexpired notes exist at this place (opens the notices geo tab); the nearby-notes counter runs for the whole mesh timeline, not just the empty state. - Empty state narration drops "nobody in range yet..." (the radar and the sightings caption already say it) and the nearby-conversation hint moves below the help line instead of splitting the narration. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Radar means searching: hide the sweep once mesh peers are connected or reachable Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
221 lines
9.1 KiB
Swift
221 lines
9.1 KiB
Swift
import BitFoundation
|
|
import BitLogger
|
|
import Foundation
|
|
import SwiftUI
|
|
|
|
/// The narrow surface `GeoPresenceTracker` needs from its owner.
|
|
///
|
|
/// Split out of `ChatNostrContext`: member names are shared with the sibling
|
|
/// component contexts so `ChatViewModel` provides a single witness for each.
|
|
@MainActor
|
|
protocol GeoPresenceContext: AnyObject {
|
|
var activeChannel: ChannelID { get }
|
|
/// Per-geohash notification cooldown: geohash -> last notify time.
|
|
var lastGeoNotificationAt: [String: Date] { get set }
|
|
var geoNicknames: [String: String] { get }
|
|
var teleportedGeoCount: Int { get }
|
|
|
|
func deriveNostrIdentity(forGeohash geohash: String) throws -> NostrIdentity
|
|
func isNostrBlocked(pubkeyHexLowercased: String) -> Bool
|
|
func parseMentions(from content: String) -> [String]
|
|
|
|
func recordGeoParticipant(pubkeyHex: String, geohash: String)
|
|
func geoParticipantCount(for geohash: String) -> Int
|
|
func markGeoTeleported(_ pubkeyHexLowercased: String)
|
|
|
|
/// Appends a geohash message if absent (single-writer store intent).
|
|
/// Returns `true` when stored.
|
|
@discardableResult
|
|
func appendGeohashMessageIfAbsent(_ message: BitchatMessage, toGeohash geohash: String) -> Bool
|
|
|
|
/// Posts the sampled-geohash-activity local notification.
|
|
func notifyGeohashActivity(geohash: String, bodyPreview: String)
|
|
}
|
|
|
|
extension ChatViewModel: GeoPresenceContext {
|
|
// `activeChannel`, `lastGeoNotificationAt`, `geoNicknames`, the Nostr
|
|
// identity/blocking members, and the
|
|
// `appendGeohashMessageIfAbsent(_:toGeohash:)` store intent already have
|
|
// witnesses on `ChatViewModel`. The members below flatten nested service
|
|
// accesses into intent-named calls.
|
|
|
|
var teleportedGeoCount: Int {
|
|
locationPresenceStore.teleportedGeo.count
|
|
}
|
|
|
|
func recordGeoParticipant(pubkeyHex: String, geohash: String) {
|
|
participantTracker.recordParticipant(pubkeyHex: pubkeyHex, geohash: geohash)
|
|
}
|
|
|
|
func geoParticipantCount(for geohash: String) -> Int {
|
|
participantTracker.participantCount(for: geohash)
|
|
}
|
|
|
|
func markGeoTeleported(_ pubkeyHexLowercased: String) {
|
|
locationPresenceStore.markTeleported(pubkeyHexLowercased)
|
|
}
|
|
|
|
func notifyGeohashActivity(geohash: String, bodyPreview: String) {
|
|
NotificationService.shared.sendGeohashActivityNotification(geohash: geohash, bodyPreview: bodyPreview)
|
|
}
|
|
}
|
|
|
|
/// Geohash presence bookkeeping that is independent of relay subscriptions:
|
|
/// teleport-tag detection and marking, the sampling-event LRU dedup, and the
|
|
/// per-geohash notification cooldown for sampled activity.
|
|
final class GeoPresenceTracker {
|
|
private weak var context: (any GeoPresenceContext)?
|
|
private var recentGeoSamplingEventIDs = Set<String>()
|
|
private var recentGeoSamplingEventIDOrder: [String] = []
|
|
|
|
init(context: any GeoPresenceContext) {
|
|
self.context = context
|
|
}
|
|
|
|
/// True when the event carries a `["t", "teleport"]` tag.
|
|
static func hasTeleportTag(_ event: NostrEvent) -> Bool {
|
|
event.tags.contains { tag in
|
|
tag.count >= 2 && tag[0].lowercased() == "t" && tag[1].lowercased() == "teleport"
|
|
}
|
|
}
|
|
|
|
/// Marks a peer teleported on a follow-up main-actor hop (keeps the
|
|
/// inbound hot path free of presence-store writes).
|
|
@MainActor
|
|
func scheduleMarkPeerTeleported(_ key: String, logged: Bool) {
|
|
Task { @MainActor [weak context] in
|
|
guard let context else { return }
|
|
context.markGeoTeleported(key)
|
|
if logged {
|
|
SecureLogger.info(
|
|
"GeoTeleport: mark peer teleported key=\(key.prefix(8))… total=\(context.teleportedGeoCount)",
|
|
category: .session
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
@MainActor
|
|
func subscribeNostrEvent(_ event: NostrEvent, gh: String) {
|
|
guard let context else { return }
|
|
guard (event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue
|
|
|| event.kind == NostrProtocol.EventKind.geohashPresence.rawValue)
|
|
else {
|
|
return
|
|
}
|
|
guard event.isValidSignature() else { return }
|
|
guard shouldProcessGeoSamplingEvent(event.id) else { return }
|
|
|
|
let existingCount = context.geoParticipantCount(for: gh)
|
|
context.recordGeoParticipant(pubkeyHex: event.pubkey, geohash: gh)
|
|
|
|
guard let content = event.content.trimmedOrNilIfEmpty else { return }
|
|
if context.isNostrBlocked(pubkeyHexLowercased: event.pubkey.lowercased()) { return }
|
|
if let my = try? context.deriveNostrIdentity(forGeohash: gh),
|
|
my.publicKeyHex.lowercased() == event.pubkey.lowercased() {
|
|
return
|
|
}
|
|
|
|
// Non-empty content on a sampled event means an actual chat message
|
|
// (presence events are empty) — feed the nearby-conversation hint.
|
|
GeohashChatActivityTracker.shared.recordChatMessage(
|
|
geohash: gh,
|
|
senderName: Self.sampledSenderName(for: event, context: context),
|
|
content: content,
|
|
timestamp: Date(timeIntervalSince1970: TimeInterval(event.created_at))
|
|
)
|
|
|
|
guard existingCount == 0 else { return }
|
|
|
|
let eventTime = Date(timeIntervalSince1970: TimeInterval(event.created_at))
|
|
if Date().timeIntervalSince(eventTime) > 30 { return }
|
|
|
|
#if os(iOS)
|
|
guard UIApplication.shared.applicationState == .active else { return }
|
|
if case .location(let channel) = context.activeChannel, channel.geohash == gh { return }
|
|
#elseif os(macOS)
|
|
guard NSApplication.shared.isActive else { return }
|
|
if case .location(let channel) = context.activeChannel, channel.geohash == gh { return }
|
|
#endif
|
|
|
|
cooldownPerGeohash(gh, content: content, event: event)
|
|
}
|
|
|
|
/// Attribution for a sampled event: the event's own `n` tag wins (the
|
|
/// active-channel nickname table only covers the selected geohash),
|
|
/// falling back to the table, then "anon", always suffixed with the
|
|
/// pubkey tail like every other geohash display name.
|
|
@MainActor
|
|
static func sampledSenderName(for event: NostrEvent, context: any GeoPresenceContext) -> String {
|
|
let suffix = String(event.pubkey.suffix(4))
|
|
let tagNick = event.tags.first { $0.count >= 2 && $0[0].lowercased() == "n" }?[1]
|
|
let nick = tagNick?.trimmedOrNilIfEmpty
|
|
?? context.geoNicknames[event.pubkey.lowercased()]?.trimmedOrNilIfEmpty
|
|
return (nick ?? "anon") + "#" + suffix
|
|
}
|
|
|
|
@MainActor
|
|
func cooldownPerGeohash(_ gh: String, content: String, event: NostrEvent) {
|
|
guard let context else { return }
|
|
let now = Date()
|
|
let last = context.lastGeoNotificationAt[gh] ?? .distantPast
|
|
if now.timeIntervalSince(last) < TransportConfig.uiGeoNotifyCooldownSeconds { return }
|
|
|
|
let preview: String = {
|
|
let maxLen = TransportConfig.uiGeoNotifySnippetMaxLen
|
|
if content.count <= maxLen { return content }
|
|
let idx = content.index(content.startIndex, offsetBy: maxLen)
|
|
return String(content[..<idx]) + "…"
|
|
}()
|
|
|
|
Task { @MainActor [weak context] in
|
|
guard let context else { return }
|
|
context.lastGeoNotificationAt[gh] = now
|
|
let senderSuffix = String(event.pubkey.suffix(4))
|
|
let nick = context.geoNicknames[event.pubkey.lowercased()]
|
|
let senderName = (nick?.isEmpty == false ? nick! : "anon") + "#" + senderSuffix
|
|
|
|
let rawTs = Date(timeIntervalSince1970: TimeInterval(event.created_at))
|
|
let ts = min(rawTs, Date())
|
|
let mentions = context.parseMentions(from: content)
|
|
let message = BitchatMessage(
|
|
id: event.id,
|
|
sender: senderName,
|
|
content: content,
|
|
timestamp: ts,
|
|
isRelay: false,
|
|
senderPeerID: PeerID(nostr: event.pubkey),
|
|
mentions: mentions.isEmpty ? nil : mentions
|
|
)
|
|
if context.appendGeohashMessageIfAbsent(message, toGeohash: gh) {
|
|
context.notifyGeohashActivity(geohash: gh, bodyPreview: preview)
|
|
}
|
|
}
|
|
}
|
|
|
|
/// First-seen check for sampled geohash events with LRU eviction so the
|
|
/// dedup set stays bounded across long sampling sessions.
|
|
func shouldProcessGeoSamplingEvent(_ eventID: String) -> Bool {
|
|
guard !eventID.isEmpty else { return true }
|
|
guard recentGeoSamplingEventIDs.insert(eventID).inserted else {
|
|
return false
|
|
}
|
|
recentGeoSamplingEventIDOrder.append(eventID)
|
|
|
|
let cap = TransportConfig.geoSamplingEventLRUCap
|
|
if recentGeoSamplingEventIDOrder.count > cap {
|
|
let removeCount = recentGeoSamplingEventIDOrder.count - cap
|
|
for staleID in recentGeoSamplingEventIDOrder.prefix(removeCount) {
|
|
recentGeoSamplingEventIDs.remove(staleID)
|
|
}
|
|
recentGeoSamplingEventIDOrder.removeFirst(removeCount)
|
|
}
|
|
return true
|
|
}
|
|
|
|
func clearGeoSamplingEventDedup() {
|
|
recentGeoSamplingEventIDs.removeAll()
|
|
recentGeoSamplingEventIDOrder.removeAll()
|
|
}
|
|
}
|