mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-24 22:45:19 +00:00
* Unified notices: merge board pins and location notes into one sheet One pin icon in the header now opens a single Notices sheet with a geo/mesh scope toggle, replacing the separate board, location-notes, and mesh-only note buttons: - geo tab: current geohash's notices — mesh-synced board posts merged and deduped with Nostr kind-1 location notes, with per-item mesh/net source badges. Scope follows the selected location channel, or the device's building geohash when chatting on mesh. - mesh tab: mesh-local board only (fully offline). - One composer: geo posts go to the board and bridge to Nostr (existing bridge), so mesh and internet see the same notice. - Merged delete: tombstoning an own board post now also retracts the bridged Nostr copy via NIP-09 (new createDeleteEvent, bridged event ids tracked in BoardManager); own Nostr-only notes are deletable too. - LocationNotesManager accepts any channel-precision geohash (1-12 chars), not just building-level. BoardView and LocationNotesView are superseded by NoticesView. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Notices round 2: honest composer, friendlier copy, new-pin chat alerts - Urgent + expiry controls now appear on the mesh tab only: the bridged Nostr copy of a geo post carries neither, so relay-side readers would never see them. Geo posts default to non-urgent with 7-day expiry, and the bridged note now gets a NIP-40 expiration tag so honoring relays drop it in step with the board copy. - Geo tab explainer reuses the original location-notes description (keeps its 29 existing translations); mesh tab gets a new plain- language description. - New-pin chat alerts, fully local (no wire traffic): BoardStore fires postArrivals for posts newly accepted from the wire; BoardAlertsModel filters own posts, dedups by postID, and for urgent pins created within the last 30 minutes emits one system line into the matching timeline (geo pin -> that geohash's chat, mesh pin -> mesh chat), collapsing simultaneous arrivals into a count line. - Routine pins light up the header: the pin icon tints orange whenever the current scope has notices at all, and fills (pin.fill) while unseen new pins are waiting; opening the sheet clears them. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * i18n: translate the unified-notices strings into all 28 non-English locales Adds the 13 new notices keys (sheet title, geo/mesh tabs, mesh description, source badges, urgent alert lines, button tooltip and accessibility strings) to the string catalog with translations for every locale the app ships. The geo tab already reuses the fully translated location_notes.description; this covers the rest. Insertion preserves the catalog's case-insensitive key order, so the diff is purely additive. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Address Codex review: panic-wipe reset, scoped badge clear, geohash-aware dedupe - BoardStore.wipe() now emits didWipe; BoardAlertsModel subscribes and resets, so a panic wipe drops pending urgent lines (which could otherwise re-append pre-wipe content into chat after the collapse flush), unseen badge scopes, and handled-post history. - Opening the notices sheet clears unseen badges only for the scopes it actually shows (mesh + current geo scope); pins for other geohash channels keep their badge until visited. - LocationNotesManager.Note now retains the matched g tag, and the bridged-copy dedupe requires the note's geohash to equal the board post's — a same-text note from a neighboring cell is no longer swallowed as a duplicate. 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>
310 lines
12 KiB
Swift
310 lines
12 KiB
Swift
import BitLogger
|
|
import Combine
|
|
import Foundation
|
|
|
|
/// Dependencies for location notes, allowing tests to stub relay/identity behavior.
|
|
struct LocationNotesDependencies {
|
|
typealias RelayLookup = @MainActor (_ geohash: String, _ count: Int) -> [String]
|
|
typealias Subscribe = @MainActor (_ filter: NostrFilter, _ id: String, _ relays: [String], _ handler: @escaping (NostrEvent) -> Void, _ onEOSE: (() -> Void)?) -> Void
|
|
typealias Unsubscribe = @MainActor (_ id: String) -> Void
|
|
typealias SendEvent = @MainActor (_ event: NostrEvent, _ relayUrls: [String]) -> Void
|
|
|
|
var relayLookup: RelayLookup
|
|
var subscribe: Subscribe
|
|
var unsubscribe: Unsubscribe
|
|
var sendEvent: SendEvent
|
|
var deriveIdentity: (_ geohash: String) throws -> NostrIdentity
|
|
var now: () -> Date
|
|
// Fires when the geo relay directory refreshes; used to retry after "no relays".
|
|
var relayDirectoryUpdates: AnyPublisher<Void, Never> = Empty(completeImmediately: false).eraseToAnyPublisher()
|
|
|
|
private static let idBridge = NostrIdentityBridge()
|
|
|
|
static let live = LocationNotesDependencies(
|
|
relayLookup: { geohash, count in
|
|
GeoRelayDirectory.shared.closestRelays(toGeohash: geohash, count: count)
|
|
},
|
|
subscribe: { filter, id, relays, handler, onEOSE in
|
|
NostrRelayManager.shared.subscribe(
|
|
filter: filter,
|
|
id: id,
|
|
relayUrls: relays,
|
|
handler: handler,
|
|
onEOSE: onEOSE
|
|
)
|
|
},
|
|
unsubscribe: { id in
|
|
NostrRelayManager.shared.unsubscribe(id: id)
|
|
},
|
|
sendEvent: { event, relays in
|
|
NostrRelayManager.shared.sendEvent(event, to: relays)
|
|
},
|
|
deriveIdentity: { geohash in
|
|
try idBridge.deriveIdentity(forGeohash: geohash)
|
|
},
|
|
now: { Date() },
|
|
relayDirectoryUpdates: NotificationCenter.default
|
|
.publisher(for: .geoRelayDirectoryDidRefresh)
|
|
.map { _ in () }
|
|
.eraseToAnyPublisher()
|
|
)
|
|
}
|
|
|
|
/// Persistent location notes (Nostr kind 1) scoped to a building-level geohash (precision 8).
|
|
/// Subscribes to and publishes notes for a given geohash and provides a send API.
|
|
@MainActor
|
|
final class LocationNotesManager: ObservableObject {
|
|
enum State: Equatable {
|
|
case idle
|
|
case loading
|
|
case ready
|
|
case noRelays
|
|
}
|
|
|
|
struct Note: Identifiable, Equatable {
|
|
let id: String
|
|
let pubkey: String
|
|
let content: String
|
|
let createdAt: Date
|
|
let nickname: String?
|
|
/// The matched `g` tag: the cell the note was posted to, which can be
|
|
/// a neighbor of the subscribed geohash.
|
|
let geohash: String
|
|
|
|
var displayName: String {
|
|
let suffix = String(pubkey.suffix(4))
|
|
if let nick = nickname?.trimmedOrNilIfEmpty {
|
|
return "\(nick)#\(suffix)"
|
|
}
|
|
return "anon#\(suffix)"
|
|
}
|
|
}
|
|
|
|
@Published private(set) var notes: [Note] = [] // reverse-chron sorted
|
|
@Published private(set) var geohash: String
|
|
@Published private(set) var initialLoadComplete: Bool = false
|
|
@Published private(set) var state: State = .loading
|
|
@Published private(set) var errorMessage: String?
|
|
/// Public key of our per-geohash Nostr identity; identifies our own notes.
|
|
private var ownPubkey: String?
|
|
private var subscriptionID: String?
|
|
private var noteIDs = Set<String>() // O(1) duplicate detection
|
|
private var directoryUpdateCancellable: AnyCancellable?
|
|
private let dependencies: LocationNotesDependencies
|
|
private let maxNotesInMemory = 500 // Defensive cap (relay limit is 200)
|
|
|
|
private enum Strings {
|
|
static let noRelays = String(localized: "location_notes.error.no_relays", comment: "Shown when no geo relays are available near the selected location")
|
|
|
|
static func failedToSend(_ detail: String) -> String {
|
|
String(
|
|
format: String(localized: "location_notes.error.failed_to_send", comment: "Shown when a location note fails to send"),
|
|
locale: .current,
|
|
detail
|
|
)
|
|
}
|
|
}
|
|
|
|
init(geohash: String, dependencies: LocationNotesDependencies = .live) {
|
|
let norm = geohash.lowercased()
|
|
self.geohash = norm
|
|
self.dependencies = dependencies
|
|
if !Geohash.isValidGeohash(norm) {
|
|
SecureLogger.warning("LocationNotesManager: invalid geohash '\(norm)' (expected 1-12 valid base32 chars)", category: .session)
|
|
}
|
|
ownPubkey = (try? dependencies.deriveIdentity(norm))?.publicKeyHex
|
|
subscribe()
|
|
// The relay directory may load after init (remote fetch over Tor);
|
|
// retry automatically instead of staying stuck on "no relays".
|
|
directoryUpdateCancellable = dependencies.relayDirectoryUpdates
|
|
.sink { [weak self] in
|
|
Task { @MainActor [weak self] in
|
|
guard let self, self.state == .noRelays else { return }
|
|
self.subscribe()
|
|
}
|
|
}
|
|
}
|
|
|
|
func setGeohash(_ newGeohash: String) {
|
|
let norm = newGeohash.lowercased()
|
|
guard norm != geohash else { return }
|
|
guard Geohash.isValidGeohash(norm) else {
|
|
SecureLogger.warning("LocationNotesManager: rejecting invalid geohash '\(norm)' (expected 1-12 valid base32 chars)", category: .session)
|
|
return
|
|
}
|
|
if let sub = subscriptionID {
|
|
dependencies.unsubscribe(sub)
|
|
subscriptionID = nil
|
|
}
|
|
// Set loading state before clearing to prevent empty state flicker
|
|
state = .loading
|
|
initialLoadComplete = false
|
|
errorMessage = nil
|
|
geohash = norm
|
|
ownPubkey = (try? dependencies.deriveIdentity(norm))?.publicKeyHex
|
|
notes.removeAll()
|
|
noteIDs.removeAll()
|
|
subscribe()
|
|
}
|
|
|
|
func refresh() {
|
|
if let sub = subscriptionID {
|
|
dependencies.unsubscribe(sub)
|
|
subscriptionID = nil
|
|
}
|
|
// Set loading state before clearing to prevent empty state flicker
|
|
state = .loading
|
|
initialLoadComplete = false
|
|
errorMessage = nil
|
|
notes.removeAll()
|
|
noteIDs.removeAll()
|
|
subscribe()
|
|
}
|
|
|
|
func clearError() {
|
|
errorMessage = nil
|
|
}
|
|
|
|
private func subscribe() {
|
|
state = .loading
|
|
errorMessage = nil
|
|
if let sub = subscriptionID {
|
|
dependencies.unsubscribe(sub)
|
|
subscriptionID = nil
|
|
}
|
|
let subID = "locnotes-\(geohash)-\(UUID().uuidString.prefix(8))"
|
|
let relays = dependencies.relayLookup(geohash, TransportConfig.nostrGeoRelayCount)
|
|
guard !relays.isEmpty else {
|
|
subscriptionID = nil
|
|
initialLoadComplete = true
|
|
state = .noRelays
|
|
errorMessage = Strings.noRelays
|
|
SecureLogger.warning("LocationNotesManager: no geo relays for geohash=\(geohash)", category: .session)
|
|
return
|
|
}
|
|
|
|
subscriptionID = subID
|
|
initialLoadComplete = false
|
|
|
|
// Subscribe to center + 8 neighbors (± 1 grid)
|
|
let neighbors = Geohash.neighbors(of: geohash)
|
|
let allGeohashes = [geohash] + neighbors
|
|
let filter = NostrFilter.geohashNotes(allGeohashes, since: nil, limit: 200)
|
|
|
|
// Build a set of valid geohashes for tag matching (includes all 9 cells)
|
|
let validGeohashes = Set(allGeohashes.map { $0.lowercased() })
|
|
|
|
dependencies.subscribe(filter, subID, relays, { [weak self] event in
|
|
guard let self = self else { return }
|
|
guard event.kind == NostrProtocol.EventKind.textNote.rawValue else { return }
|
|
// Ensure matching tag - accept any of our 9 geohashes
|
|
guard let matchedGeohash = event.tags.first(where: { tag in
|
|
tag.count >= 2 && tag[0].lowercased() == "g" && validGeohashes.contains(tag[1].lowercased())
|
|
})?[1].lowercased() else { return }
|
|
guard !self.noteIDs.contains(event.id) else { return }
|
|
self.noteIDs.insert(event.id)
|
|
let nick = event.tags.first(where: { $0.first?.lowercased() == "n" && $0.count >= 2 })?.dropFirst().first
|
|
let ts = Date(timeIntervalSince1970: TimeInterval(event.created_at))
|
|
let note = Note(id: event.id, pubkey: event.pubkey, content: event.content, createdAt: ts, nickname: nick, geohash: matchedGeohash)
|
|
self.notes.append(note)
|
|
self.notes.sort { $0.createdAt > $1.createdAt }
|
|
self.enforceMemoryCap()
|
|
self.state = .ready
|
|
}, { [weak self] in
|
|
guard let self = self else { return }
|
|
self.initialLoadComplete = true
|
|
if self.state != .noRelays {
|
|
self.state = .ready
|
|
}
|
|
})
|
|
}
|
|
|
|
/// Send a location note for the current geohash using the per-geohash identity.
|
|
func send(content: String, nickname: String) {
|
|
guard let trimmed = content.trimmedOrNilIfEmpty else { return }
|
|
let relays = dependencies.relayLookup(geohash, TransportConfig.nostrGeoRelayCount)
|
|
guard !relays.isEmpty else {
|
|
state = .noRelays
|
|
errorMessage = Strings.noRelays
|
|
SecureLogger.warning("LocationNotesManager: send blocked, no geo relays for geohash=\(geohash)", category: .session)
|
|
return
|
|
}
|
|
do {
|
|
let id = try dependencies.deriveIdentity(geohash)
|
|
let event = try NostrProtocol.createGeohashTextNote(
|
|
content: trimmed,
|
|
geohash: geohash,
|
|
senderIdentity: id,
|
|
nickname: nickname
|
|
)
|
|
dependencies.sendEvent(event, relays)
|
|
// Optimistic local-echo
|
|
let echo = Note(
|
|
id: event.id,
|
|
pubkey: id.publicKeyHex,
|
|
content: trimmed,
|
|
createdAt: Date(timeIntervalSince1970: TimeInterval(event.created_at)),
|
|
nickname: nickname,
|
|
geohash: geohash
|
|
)
|
|
self.noteIDs.insert(event.id)
|
|
self.notes.insert(echo, at: 0)
|
|
self.enforceMemoryCap()
|
|
self.state = .ready
|
|
self.errorMessage = nil
|
|
} catch {
|
|
SecureLogger.error("LocationNotesManager: failed to send note: \(error)", category: .session)
|
|
errorMessage = Strings.failedToSend(error.localizedDescription)
|
|
}
|
|
}
|
|
|
|
/// Whether the note was published by this device's identity for the
|
|
/// current geohash (and can therefore be deleted with NIP-09).
|
|
func isOwnNote(_ note: Note) -> Bool {
|
|
guard let ownPubkey else { return false }
|
|
return note.pubkey == ownPubkey
|
|
}
|
|
|
|
/// Requests NIP-09 deletion of one of our own notes and removes it locally.
|
|
@discardableResult
|
|
func delete(note: Note) -> Bool {
|
|
guard isOwnNote(note) else { return false }
|
|
let relays = dependencies.relayLookup(geohash, TransportConfig.nostrGeoRelayCount)
|
|
guard !relays.isEmpty else {
|
|
state = .noRelays
|
|
errorMessage = Strings.noRelays
|
|
return false
|
|
}
|
|
do {
|
|
let identity = try dependencies.deriveIdentity(geohash)
|
|
let deletion = try NostrProtocol.createDeleteEvent(ofEventID: note.id, senderIdentity: identity)
|
|
dependencies.sendEvent(deletion, relays)
|
|
// Keep the id in noteIDs so a relay replay can't resurrect it.
|
|
notes.removeAll { $0.id == note.id }
|
|
return true
|
|
} catch {
|
|
SecureLogger.error("LocationNotesManager: failed to delete note: \(error)", category: .session)
|
|
return false
|
|
}
|
|
}
|
|
|
|
/// Enforces defensive memory cap on notes array (keeps newest).
|
|
private func enforceMemoryCap() {
|
|
if notes.count > maxNotesInMemory {
|
|
let removed = notes.count - maxNotesInMemory
|
|
notes = Array(notes.prefix(maxNotesInMemory))
|
|
SecureLogger.debug("LocationNotesManager: trimmed \(removed) old notes (cap: \(maxNotesInMemory))", category: .session)
|
|
}
|
|
}
|
|
|
|
/// Explicitly cancel subscription and release resources.
|
|
func cancel() {
|
|
if let sub = subscriptionID {
|
|
dependencies.unsubscribe(sub)
|
|
subscriptionID = nil
|
|
}
|
|
state = .idle
|
|
errorMessage = nil
|
|
}
|
|
}
|