Compare commits

..
Author SHA1 Message Date
f5caa1751a Add base localization infrastructure and externalize strings (#670)
* Add base localization infrastructure and externalize strings

* Add Spanish localization scaffolding with translations

* Add machine translations for expanded locales

---------

Co-authored-by: jack <jackjackbits@users.noreply.github.com>
2025-09-24 15:12:42 +02:00
jack de906cb97c Refresh typography and channel sheet styling 2025-09-24 12:32:11 +02:00
Mattia MarcheseandGitHub a41ec65f58 Include mermaid diagrams for packet structures (#666)
Added mermaid diagrams for BitchatPacket and BitchatMessage structures.
2025-09-24 12:18:25 +02:00
1fd2da18f5 Improve BLE relay reliability (#665)
Co-authored-by: jack <jackjackbits@users.noreply.github.com>
2025-09-23 21:09:22 +02:00
c49a1b264e Support Dynamic Type across chat surfaces (#664)
Co-authored-by: jack <jackjackbits@users.noreply.github.com>
2025-09-23 19:56:16 +02:00
leoperegrinoandGitHub 10c0391eaf enforce https in noiseprotocol.org url (#661) 2025-09-23 14:08:48 +02:00
3a94b57341 Fix BLE stream crashes and gossip sync races (#663)
* Handle long BLE packets safely

* Keep BLE stream aligned after partial drops

---------

Co-authored-by: jack <jackjackbits@users.noreply.github.com>
2025-09-23 14:06:13 +02:00
f8f780d2d6 Refine location notes UI and align sheet layouts (#660)
Co-authored-by: jack <jackjackbits@users.noreply.github.com>
2025-09-21 14:56:20 +02:00
jackandGitHub c837afb818 Remove unused handshake coordinator and identity placeholders (#656) 2025-09-21 13:20:21 +02:00
IslamandGitHub 47ef82f01a Refactor 2/n: ChatViewModel's Geohash Subscription (#635)
* Extract `processNostrMessage` into a function

* `updateChannelActivityTimeThenSend` function

* Break down / flatten `beginGeohashSampling`

* Extract `subscribeNostrEvent` into a function

* Break down / flatten `resubscribeCurrentGeohash`
2025-09-21 12:46:28 +02:00
jack d1e5ce21a7 Enable default relays when location permission granted 2025-09-21 12:43:27 +02:00
GitHub Action f2c1bb2131 Automated update of relay data - Sun Sep 21 06:04:25 UTC 2025 2025-09-21 06:04:25 +00:00
96 changed files with 6497 additions and 1841 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
MARKETING_VERSION = 1.4.2 MARKETING_VERSION = 1.4.3
CURRENT_PROJECT_VERSION = 1 CURRENT_PROJECT_VERSION = 1
IPHONEOS_DEPLOYMENT_TARGET = 16.0 IPHONEOS_DEPLOYMENT_TARGET = 16.0
+9 -2
View File
@@ -9,7 +9,7 @@ A decentralized peer-to-peer messaging app with dual transport architecture: loc
📲 [App Store](https://apps.apple.com/us/app/bitchat-mesh/id6748219622) 📲 [App Store](https://apps.apple.com/us/app/bitchat-mesh/id6748219622)
> [!WARNING] > [!WARNING]
> Private messages have not received external security review and may contain vulnerabilities. Do not use for sensitive use cases, and do not rely on its security until it has been reviewed. Now uses the [Noise Protocol](http://www.noiseprotocol.org) for identity and encryption. Public local chat (the main feature) has no security concerns. > Private messages have not received external security review and may contain vulnerabilities. Do not use for sensitive use cases, and do not rely on its security until it has been reviewed. Now uses the [Noise Protocol](https://www.noiseprotocol.org) for identity and encryption. Public local chat (the main feature) has no security concerns.
## License ## License
@@ -22,7 +22,7 @@ This project is released into the public domain. See the [LICENSE](LICENSE) file
- **Intelligent Message Routing**: Automatically chooses best transport (Bluetooth → Nostr fallback) - **Intelligent Message Routing**: Automatically chooses best transport (Bluetooth → Nostr fallback)
- **Decentralized Mesh Network**: Automatic peer discovery and multi-hop message relay over Bluetooth LE - **Decentralized Mesh Network**: Automatic peer discovery and multi-hop message relay over Bluetooth LE
- **Privacy First**: No accounts, no phone numbers, no persistent identifiers - **Privacy First**: No accounts, no phone numbers, no persistent identifiers
- **Private Message End-to-End Encryption**: [Noise Protocol](http://noiseprotocol.org) for mesh, NIP-17 for Nostr - **Private Message End-to-End Encryption**: [Noise Protocol](https://noiseprotocol.org) for mesh, NIP-17 for Nostr
- **IRC-Style Commands**: Familiar `/slap`, `/msg`, `/who` style interface - **IRC-Style Commands**: Familiar `/slap`, `/msg`, `/who` style interface
- **Universal App**: Native support for iOS and macOS - **Universal App**: Native support for iOS and macOS
- **Emergency Wipe**: Triple-tap to instantly clear all data - **Emergency Wipe**: Triple-tap to instantly clear all data
@@ -116,3 +116,10 @@ For detailed protocol documentation, see the [Technical Whitepaper](WHITEPAPER.m
Want to try this on macos: `just run` will set it up and run from source. Want to try this on macos: `just run` will set it up and run from source.
Run `just clean` afterwards to restore things to original state for mobile app building and development. Run `just clean` afterwards to restore things to original state for mobile app building and development.
## Localization
- Base app resources live under `bitchat/Localization/Base.lproj/`. Add new copy to `Localizable.strings` and plural rules to `Localizable.stringsdict`.
- Share extension strings are separate in `bitchatShareExtension/Localization/Base.lproj/Localizable.strings`.
- Prefer keys that describe intent (`app_info.features.offline.title`) and reuse existing ones where possible.
- Run `xcodebuild -project bitchat.xcodeproj -scheme "bitchat (macOS)" -configuration Debug CODE_SIGNING_ALLOWED=NO build` to compile-check any localization updates.
+41
View File
@@ -184,6 +184,28 @@ To minimize bandwidth, `BitchatPacket`s are serialized into a compact binary for
**Padding:** All packets are padded to the next standard block size (256, 512, 1024, or 2048 bytes) using a PKCS#7-style scheme to obscure the true message length from network observers. **Padding:** All packets are padded to the next standard block size (256, 512, 1024, or 2048 bytes) using a PKCS#7-style scheme to obscure the true message length from network observers.
```mermaid
---
config:
theme: dark
---
---
title: "BitchatPacket"
---
packet
+8: "Version"
+8: "Type"
+8: "TTL"
+64: "Timestamp"
+8: "Flags"
+16: "Payload Length"
+64: "Sender ID"
+64: "Recipient ID (optional)"
+48: "Payload (variable)"
+64: "Signature (optional)"
```
_A representation of the sizes of the fields in `BitchatPacket`_
### 6.2. Application Message Format (`BitchatMessage`) ### 6.2. Application Message Format (`BitchatMessage`)
For packets of type `message`, the payload is a binary-serialized `BitchatMessage` containing the chat content. For packets of type `message`, the payload is a binary-serialized `BitchatMessage` containing the chat content.
@@ -198,6 +220,25 @@ For packets of type `message`, the payload is a binary-serialized `BitchatMessag
| Original Sender | 1 + len (opt)| Nickname of the original sender if the message is a relay. | | Original Sender | 1 + len (opt)| Nickname of the original sender if the message is a relay. |
| Recipient Nickname | 1 + len (opt)| Nickname of the recipient for private messages. | | Recipient Nickname | 1 + len (opt)| Nickname of the recipient for private messages. |
```mermaid
---
config:
theme: dark
---
---
title: "BitchatMessage"
---
packet
+8: "Flags"
+64: "Timestamp"
+24: "ID (variable)"
+32: "Sender (variable)"
+32: "Content (variable)"
+32: "Original Sender (variable) (optional)"
+32: "Recipient Nickname (variable) (optional)"
```
_A representation of the sizes of the fields in `BitchatMessage`_
--- ---
## 7. Message Routing and Propagation ## 7. Message Routing and Propagation
+13
View File
@@ -304,6 +304,19 @@
knownRegions = ( knownRegions = (
Base, Base,
en, en,
es,
ar,
de,
fr,
he,
id,
it,
ja,
ne,
"pt-BR",
ru,
uk,
"zh-Hans",
); );
mainGroup = 18198ED912AAF495D8AF7763; mainGroup = 18198ED912AAF495D8AF7763;
minimizedProjectReferenceProxies = 1; minimizedProjectReferenceProxies = 1;
+1 -18
View File
@@ -87,7 +87,7 @@ import Foundation
/// Represents the ephemeral layer of identity - short-lived peer IDs that provide network privacy. /// Represents the ephemeral layer of identity - short-lived peer IDs that provide network privacy.
/// These IDs rotate periodically to prevent tracking while maintaining cryptographic relationships. /// These IDs rotate periodically to prevent tracking while maintaining cryptographic relationships.
struct EphemeralIdentity { struct EphemeralIdentity {
let peer: Peer // 8 random bytes let peerID: String // 8 random bytes
let sessionStart: Date let sessionStart: Date
var handshakeState: HandshakeState var handshakeState: HandshakeState
} }
@@ -158,23 +158,6 @@ struct IdentityCache: Codable {
var version: Int = 1 var version: Int = 1
} }
// MARK: - Identity Resolution
enum IdentityHint {
case unknown
case likelyKnown(fingerprint: String)
case ambiguous(candidates: Set<String>)
case verified(fingerprint: String)
}
// MARK: - Pending Actions
struct PendingActions {
var toggleFavorite: Bool?
var setTrustLevel: TrustLevel?
var setPetname: String?
}
// //
// MARK: - Migration Support // MARK: - Migration Support
@@ -103,7 +103,7 @@ protocol SecureIdentityStateManagerProtocol {
// MARK: Cryptographic Identities // MARK: Cryptographic Identities
func upsertCryptographicIdentity(fingerprint: String, noisePublicKey: Data, signingPublicKey: Data?, claimedNickname: String?) func upsertCryptographicIdentity(fingerprint: String, noisePublicKey: Data, signingPublicKey: Data?, claimedNickname: String?)
func getCryptoIdentitiesByPeerIDPrefix(_ peer: Peer) -> [CryptographicIdentity] func getCryptoIdentitiesByPeerIDPrefix(_ peerID: String) -> [CryptographicIdentity]
func updateSocialIdentity(_ identity: SocialIdentity) func updateSocialIdentity(_ identity: SocialIdentity)
// MARK: Favorites Management // MARK: Favorites Management
@@ -121,12 +121,12 @@ protocol SecureIdentityStateManagerProtocol {
func getBlockedNostrPubkeys() -> Set<String> func getBlockedNostrPubkeys() -> Set<String>
// MARK: Ephemeral Session Management // MARK: Ephemeral Session Management
func registerEphemeralSession(peer: Peer, handshakeState: HandshakeState) func registerEphemeralSession(peerID: String, handshakeState: HandshakeState)
func updateHandshakeState(peer: Peer, state: HandshakeState) func updateHandshakeState(peerID: String, state: HandshakeState)
// MARK: Cleanup // MARK: Cleanup
func clearAllIdentityData() func clearAllIdentityData()
func removeEphemeralSession(peer: Peer) func removeEphemeralSession(peerID: String)
// MARK: Verification // MARK: Verification
func setVerified(fingerprint: String, verified: Bool) func setVerified(fingerprint: String, verified: Bool)
@@ -143,7 +143,7 @@ final class SecureIdentityStateManager: SecureIdentityStateManagerProtocol {
private let encryptionKeyName = "identityCacheEncryptionKey" private let encryptionKeyName = "identityCacheEncryptionKey"
// In-memory state // In-memory state
private var ephemeralSessions: [Peer: EphemeralIdentity] = [:] private var ephemeralSessions: [String: EphemeralIdentity] = [:]
private var cryptographicIdentities: [String: CryptographicIdentity] = [:] private var cryptographicIdentities: [String: CryptographicIdentity] = [:]
private var cache: IdentityCache = IdentityCache() private var cache: IdentityCache = IdentityCache()
@@ -321,11 +321,11 @@ final class SecureIdentityStateManager: SecureIdentityStateManagerProtocol {
} }
/// Find cryptographic identities whose fingerprint prefix matches a peerID (16-hex) short ID /// Find cryptographic identities whose fingerprint prefix matches a peerID (16-hex) short ID
func getCryptoIdentitiesByPeerIDPrefix(_ peer: Peer) -> [CryptographicIdentity] { func getCryptoIdentitiesByPeerIDPrefix(_ peerID: String) -> [CryptographicIdentity] {
queue.sync { queue.sync {
// Defensive: ensure hex and correct length // Defensive: ensure hex and correct length
guard peer.isShort, peer.id.allSatisfy({ $0.isHexDigit }) else { return [] } guard peerID.count == 16, peerID.allSatisfy({ $0.isHexDigit }) else { return [] }
return cryptographicIdentities.values.filter { $0.fingerprint.hasPrefix(peer.id) } return cryptographicIdentities.values.filter { $0.fingerprint.hasPrefix(peerID) }
} }
} }
@@ -455,19 +455,19 @@ final class SecureIdentityStateManager: SecureIdentityStateManagerProtocol {
// MARK: - Ephemeral Session Management // MARK: - Ephemeral Session Management
func registerEphemeralSession(peer: Peer, handshakeState: HandshakeState = .none) { func registerEphemeralSession(peerID: String, handshakeState: HandshakeState = .none) {
queue.async(flags: .barrier) { queue.async(flags: .barrier) {
self.ephemeralSessions[peer] = EphemeralIdentity( self.ephemeralSessions[peerID] = EphemeralIdentity(
peer: peer, peerID: peerID,
sessionStart: Date(), sessionStart: Date(),
handshakeState: handshakeState handshakeState: handshakeState
) )
} }
} }
func updateHandshakeState(peer: Peer, state: HandshakeState) { func updateHandshakeState(peerID: String, state: HandshakeState) {
queue.async(flags: .barrier) { queue.async(flags: .barrier) {
self.ephemeralSessions[peer]?.handshakeState = state self.ephemeralSessions[peerID]?.handshakeState = state
// If handshake completed, update last interaction // If handshake completed, update last interaction
if case .completed(let fingerprint) = state { if case .completed(let fingerprint) = state {
@@ -493,9 +493,9 @@ final class SecureIdentityStateManager: SecureIdentityStateManagerProtocol {
} }
} }
func removeEphemeralSession(peer: Peer) { func removeEphemeralSession(peerID: String) {
queue.async(flags: .barrier) { queue.async(flags: .barrier) {
self.ephemeralSessions.removeValue(forKey: peer) self.ephemeralSessions.removeValue(forKey: peerID)
} }
} }
@@ -0,0 +1,192 @@
/*
Localizable.strings
Bitchat
Base English localization entries. Keep keys sorted alphabetically.
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "close";
"app_info.done" = "DONE";
"app_info.features.encryption.description" = "private messages encrypted with noise protocol";
"app_info.features.encryption.title" = "end-to-end encryption";
"app_info.features.extended_range.description" = "messages relay through peers, going the distance";
"app_info.features.extended_range.title" = "extended range";
"app_info.features.favorites.description" = "get notified when your favorite people join";
"app_info.features.favorites.title" = "favorites";
"app_info.features.geohash.description" = "geohash channels to chat with people in nearby regions over decentralized anonymous relays";
"app_info.features.geohash.title" = "local channels";
"app_info.features.mentions.description" = "use @nickname to notify specific people";
"app_info.features.mentions.title" = "mentions";
"app_info.features.offline.description" = "works without internet using Bluetooth low energy";
"app_info.features.offline.title" = "offline communication";
"app_info.features.title" = "FEATURES";
"app_info.how_to_use.change_channels" = "• tap #mesh to change channels";
"app_info.how_to_use.clear_chat" = "• triple-tap chat to clear";
"app_info.how_to_use.commands" = "• type / for commands";
"app_info.how_to_use.open_sidebar" = "• tap people icon for sidebar";
"app_info.how_to_use.set_nickname" = "• set your nickname by tapping it";
"app_info.how_to_use.start_dm" = "• tap a peer's name to start a DM";
"app_info.how_to_use.title" = "HOW TO USE";
"app_info.privacy.ephemeral.description" = "new peer ID generated regularly";
"app_info.privacy.ephemeral.title" = "ephemeral identity";
"app_info.privacy.no_tracking.description" = "no servers, accounts, or data collection";
"app_info.privacy.no_tracking.title" = "no tracking";
"app_info.privacy.panic.description" = "triple-tap logo to instantly clear all data";
"app_info.privacy.panic.title" = "panic mode";
"app_info.privacy.title" = "PRIVACY";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "private message security has not yet been fully audited. do not use for critical situations until this warning disappears.";
"app_info.warning.title" = "WARNING";
"common.cancel" = "cancel";
"common.close" = "close";
"common.copy" = "copy";
"common.ok" = "OK";
"common.toggle.off" = "off";
"common.toggle.on" = "on";
"common.unknown" = "unknown";
"content.accessibility.add_favorite" = "add to favorites";
"content.accessibility.available_nostr" = "available via Nostr";
"content.accessibility.back_to_main_chat" = "back to main chat";
"content.accessibility.connected_mesh" = "connected via mesh";
"content.accessibility.encryption_status" = "encryption status: %@";
"content.accessibility.location_channels" = "location channels";
"content.accessibility.location_notes" = "location notes for this place";
"content.accessibility.open_unread_private_chat" = "open unread private chat";
"content.accessibility.private_chat_header" = "private chat with %@";
"content.accessibility.reachable_mesh" = "reachable via mesh";
"content.accessibility.remove_favorite" = "remove from favorites";
"content.accessibility.send_hint_empty" = "enter a message to send";
"content.accessibility.send_hint_ready" = "double tap to send";
"content.accessibility.send_message" = "send message";
"content.accessibility.toggle_bookmark" = "toggle bookmark for #%@";
"content.accessibility.toggle_favorite_hint" = "double tap to toggle favorite status";
"content.accessibility.view_fingerprint_hint" = "tap to view encryption fingerprint";
"content.actions.block" = "block";
"content.actions.direct_message" = "direct message";
"content.actions.hug" = "hug";
"content.actions.mention" = "mention";
"content.actions.slap" = "slap";
"content.actions.title" = "actions";
"content.alert.bluetooth_required.off" = "bluetooth is turned off. please turn on bluetooth in settings to use bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat needs bluetooth permission to connect with nearby devices. please enable bluetooth access in settings.";
"content.alert.bluetooth_required.settings" = "settings";
"content.alert.bluetooth_required.title" = "bluetooth required";
"content.alert.bluetooth_required.unsupported" = "this device does not support bluetooth. bitchat requires bluetooth to function.";
"content.alert.screenshot.message" = "screenshots of location channels will reveal your location. think before sharing publicly.";
"content.alert.screenshot.title" = "heads up";
"content.commands.block" = "block or list blocked peers";
"content.commands.clear" = "clear chat messages";
"content.commands.favorite" = "add to favorites";
"content.commands.hug" = "send someone a warm hug";
"content.commands.message" = "send private message";
"content.commands.slap" = "slap someone with a trout";
"content.commands.unblock" = "unblock a peer";
"content.commands.unfavorite" = "remove from favorites";
"content.commands.who" = "see who's online";
"content.delivery.delivered_members" = "delivered to %1$d of %2$d members";
"content.delivery.delivered_to" = "delivered to %@";
"content.delivery.failed" = "failed: %@";
"content.delivery.read_by" = "read by %@";
"content.delivery.reason.blocked" = "user is blocked";
"content.delivery.reason.self" = "cannot message yourself";
"content.delivery.reason.send_error" = "send error";
"content.delivery.reason.unknown_recipient" = "unknown recipient";
"content.delivery.reason.unreachable" = "peer not reachable";
"content.header.people" = "PEOPLE";
"content.help.verification" = "verification: show my QR or scan a friend";
"content.input.message_placeholder" = "type a message...";
"content.input.nickname_placeholder" = "nickname";
"content.location.enable" = "enable location";
"content.message.copy" = "copy message";
"content.message.show_less" = "show less";
"content.message.show_more" = "show more";
"content.notes.location_unavailable" = "location unavailable";
"content.notes.title" = "notes";
"content.payment.cashu" = "pay via cashu";
"content.payment.lightning" = "pay via lightning";
"encryption.accessibility.establishing" = "establishing encryption";
"encryption.accessibility.failed" = "encryption failed";
"encryption.accessibility.not_encrypted" = "not encrypted";
"encryption.accessibility.secured" = "encrypted";
"encryption.accessibility.verified" = "encrypted and verified";
"encryption.status.establishing" = "sstablishing encryption...";
"encryption.status.failed" = "encryption failed";
"encryption.status.not_encrypted" = "not encrypted";
"encryption.status.secured" = "encrypted";
"encryption.status.verified" = "encrypted & verified";
"fingerprint.action.mark_verified" = "mark as verified";
"fingerprint.action.remove_verification" = "remove verification";
"fingerprint.badge.not_verified" = "⚠️ NOT VERIFIED";
"fingerprint.badge.verified" = "✓ VERIFIED";
"fingerprint.handshake_pending" = "not available - handshake in progress";
"fingerprint.message.verified" = "uou have verified this person's identity.";
"fingerprint.message.verify_hint" = "compare these fingerprints with %@ using a secure channel.";
"fingerprint.their_label" = "their fingerprint:";
"fingerprint.title" = "security verification";
"fingerprint.your_label" = "your fingerprint:";
"geohash_people.action.block" = "block";
"geohash_people.action.unblock" = "unblock";
"geohash_people.none_nearby" = "nobody around...";
"geohash_people.tooltip.blocked" = "blocked in geohash";
"geohash_people.you_suffix" = " (you)";
"location_channels.action.open_settings" = "open settings";
"location_channels.action.remove_access" = "remove location access";
"location_channels.action.request_permissions" = "get location and my geohashes";
"location_channels.action.teleport" = "teleport";
"location_channels.bookmarked_section_title" = "bookmarked";
"location_channels.description" = "chat with people near you using geohash channels. only a coarse geohash is shared, never exact GPS. your IP address is hidden by routing all traffic over tor.";
"location_channels.error.invalid_geohash" = "invalid geohash";
"location_channels.loading_nearby" = "finding nearby channels…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "location permission denied. enable in settings to use location channels.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#location channels";
"location_channels.tor.subtitle" = "hides your IP for location channels. recommended: on.";
"location_channels.tor.title" = "tor routing";
"location_levels.block" = "block";
"location_levels.building" = "building";
"location_levels.city" = "city";
"location_levels.neighborhood" = "neighborhood";
"location_levels.province" = "province";
"location_levels.region" = "region";
"location_notes.action.dismiss" = "dismiss";
"location_notes.action.retry" = "retry";
"location_notes.description" = "add short permanent notes to this location for other visitors to find.";
"location_notes.empty_subtitle" = "be the first to add one for this spot.";
"location_notes.empty_title" = "no notes yet";
"location_notes.error.failed_to_send" = "failed to send note. %@";
"location_notes.error.no_relays" = "no geo relays available near this location. try again soon.";
"location_notes.loading_notes" = "loading notes…";
"location_notes.loading_recent" = "loading recent notes…";
"location_notes.no_relays_nearby" = "no geo relays nearby";
"location_notes.placeholder" = "add a note for this place";
"location_notes.relays_paused" = "geo relays unavailable; notes paused";
"location_notes.relays_retry_hint" = "notes rely on geo relays. check connection and try again.";
"mesh_peers.tooltip.new_messages" = "new messages";
"system.chat.blocked" = "cannot start chat with %@: person is blocked.";
"system.chat.requires_favorite" = "cannot start chat with %@: mutual favorite required for offline messaging.";
"system.common.user" = "user";
"system.dm.blocked_generic" = "cannot send message: person is blocked.";
"system.dm.blocked_recipient" = "cannot send message to %@: person is blocked.";
"system.dm.unreachable" = "cannot send message to %@ - peer is not reachable via mesh or nostr.";
"system.geohash.blocked" = "blocked %@ in geohash chats";
"system.geohash.unblocked" = "unblocked %@ in geohash chats";
"system.location.not_in_channel" = "cannot send: not in a location channel";
"system.location.send_failed" = "failed to send to location channel";
"system.tor.dev_bypass" = "development build: Tor bypass enabled.";
"system.tor.restarted" = "tor restarted. network routing restored.";
"system.tor.restarting" = "tor restarting to recover connectivity...";
"system.tor.started" = "tor started. routing all chats via tor for IP privacy.";
"system.tor.starting" = "starting tor...";
"verification.my_qr.accessibility_label" = "verification QR code";
"verification.my_qr.title" = "scan to verify me";
"verification.my_qr.unavailable" = "QR unavailable";
"verification.scan.paste_prompt" = "paste QR content to validate:";
"verification.scan.prompt_friend" = "scan a friend's QR";
"verification.scan.status.invalid" = "invalid or expired QR payload";
"verification.scan.status.no_peer" = "could not find matching peer";
"verification.scan.status.requested" = "verification requested for %@";
"verification.scan.validate" = "validate";
"verification.sheet.title" = "VERIFY";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d note</string>
<key>other</key>
<string>%d notes</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d person</string>
<key>other</key>
<string>%d people</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d person</string>
<key>other</key>
<string>%d people</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Arabic)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "إغلاق";
"app_info.done" = "تم";
"app_info.features.encryption.description" = "الرسائل الخاصة مشفرة ببروتوكول noise";
"app_info.features.encryption.title" = "تشفير طرف لطرف";
"app_info.features.extended_range.description" = "يُعاد تمرير الرسائل بين الأقران لتصل لمسافات أبعد";
"app_info.features.extended_range.title" = "نطاق ممتد";
"app_info.features.favorites.description" = "تلقَّ تنبيهات عندما ينضم أحباؤك";
"app_info.features.favorites.title" = "المفضلة";
"app_info.features.geohash.description" = "قنوات geohash للدردشة مع أشخاص قريبين عبر مرحلات لامركزية مجهولة";
"app_info.features.geohash.title" = "قنوات محلية";
"app_info.features.mentions.description" = "استخدم @nickname لتنبيه أشخاص محددين";
"app_info.features.mentions.title" = "إشارات";
"app_info.features.offline.description" = "يعمل بدون إنترنت باستخدام bluetooth منخفض الطاقة";
"app_info.features.offline.title" = "تواصل بدون اتصال";
"app_info.features.title" = "مزايا";
"app_info.how_to_use.change_channels" = "• اضغط #mesh لتغيير القناة";
"app_info.how_to_use.clear_chat" = "• اضغط الدردشة ثلاث مرات للمسح";
"app_info.how_to_use.commands" = "• اكتب / لعرض الأوامر";
"app_info.how_to_use.open_sidebar" = "• اضغط أيقونة الأشخاص لفتح الشريط الجانبي";
"app_info.how_to_use.set_nickname" = "• اضبط لقبك بلمسه";
"app_info.how_to_use.start_dm" = "• اضغط اسم القرين لبدء رسائل خاصة";
"app_info.how_to_use.title" = "طريقة الاستخدام";
"app_info.privacy.ephemeral.description" = "يُولد معرف قرين جديد بانتظام";
"app_info.privacy.ephemeral.title" = "هوية مؤقتة";
"app_info.privacy.no_tracking.description" = "لا خوادم أو حسابات أو جمع بيانات";
"app_info.privacy.no_tracking.title" = "لا تتبع";
"app_info.privacy.panic.description" = "اضغط الشعار ثلاث مرات لمسح كل البيانات فوراً";
"app_info.privacy.panic.title" = "وضع الذعر";
"app_info.privacy.title" = "خصوصية";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "أمان الرسائل الخاصة لم يتم تدقيقه بالكامل بعد. لا تستخدمها في الحالات الحرجة حتى يختفي هذا التحذير.";
"app_info.warning.title" = "تحذير";
"common.cancel" = "إلغاء";
"common.close" = "إغلاق";
"common.copy" = "نسخ";
"common.ok" = "موافق";
"common.toggle.off" = "إيقاف";
"common.toggle.on" = "تشغيل";
"common.unknown" = "غير معروف";
"content.accessibility.add_favorite" = "إضافة إلى المفضلة";
"content.accessibility.available_nostr" = "متاح عبر nostr";
"content.accessibility.back_to_main_chat" = "عودة إلى الدردشة الرئيسية";
"content.accessibility.connected_mesh" = "متصل عبر mesh";
"content.accessibility.encryption_status" = "حالة التشفير: %@";
"content.accessibility.location_channels" = "قنوات الموقع";
"content.accessibility.location_notes" = "ملاحظات الموقع لهذا المكان";
"content.accessibility.open_unread_private_chat" = "فتح دردشة خاصة غير مقروءة";
"content.accessibility.private_chat_header" = "دردشة خاصة مع %@";
"content.accessibility.reachable_mesh" = "قابل للوصول عبر mesh";
"content.accessibility.remove_favorite" = "إزالة من المفضلة";
"content.accessibility.send_hint_empty" = "أدخل رسالة للإرسال";
"content.accessibility.send_hint_ready" = "اضغط مرتين للإرسال";
"content.accessibility.send_message" = "إرسال رسالة";
"content.accessibility.toggle_bookmark" = "تبديل الإشارة لـ #%@";
"content.accessibility.toggle_favorite_hint" = "اضغط مرتين لتبديل حالة المفضلة";
"content.accessibility.view_fingerprint_hint" = "اضغط لمشاهدة بصمة التشفير";
"content.actions.block" = "حظر";
"content.actions.direct_message" = "رسالة مباشرة";
"content.actions.hug" = "عناق";
"content.actions.mention" = "ذكر";
"content.actions.slap" = "صفعة";
"content.actions.title" = "إجراءات";
"content.alert.bluetooth_required.off" = "bluetooth متوقف. فعّل bluetooth في الإعدادات لاستخدام bitchat.";
"content.alert.bluetooth_required.permission" = "تحتاج bitchat إلى إذن bluetooth للاتصال بالأجهزة القريبة. فعّل الوصول في الإعدادات.";
"content.alert.bluetooth_required.settings" = "الإعدادات";
"content.alert.bluetooth_required.title" = "مطلوب bluetooth";
"content.alert.bluetooth_required.unsupported" = "هذا الجهاز لا يدعم bluetooth. يحتاج bitchat إلى bluetooth للعمل.";
"content.alert.screenshot.message" = "لقطات قنوات الموقع تكشف موقعك. فكر قبل المشاركة علناً.";
"content.alert.screenshot.title" = "تنبيه";
"content.commands.block" = "حظر أو عرض المحظورين";
"content.commands.clear" = "مسح رسائل الدردشة";
"content.commands.favorite" = "إضافة للمفضلة";
"content.commands.hug" = "إرسال عناق دافئ";
"content.commands.message" = "إرسال رسالة خاصة";
"content.commands.slap" = "صفع شخص بسمكة تراوت";
"content.commands.unblock" = "إلغاء حظر قرين";
"content.commands.unfavorite" = "إزالة من المفضلة";
"content.commands.who" = "عرض من هو متصل";
"content.delivery.delivered_members" = "تم التسليم إلى %1$d من %2$d عضو";
"content.delivery.delivered_to" = "سُلّم إلى %@";
"content.delivery.failed" = "فشل: %@";
"content.delivery.read_by" = "قُرِئ بواسطة %@";
"content.delivery.reason.blocked" = "المستخدم محظور";
"content.delivery.reason.self" = "لا يمكن الإرسال لنفسك";
"content.delivery.reason.send_error" = "خطأ في الإرسال";
"content.delivery.reason.unknown_recipient" = "مستلم غير معروف";
"content.delivery.reason.unreachable" = "القرين غير متاح";
"content.header.people" = "أشخاص";
"content.help.verification" = "التحقق: عرض رمز qr الخاص بي أو مسح صديق";
"content.input.message_placeholder" = "اكتب رسالة...";
"content.input.nickname_placeholder" = "لقب";
"content.location.enable" = "تفعيل الموقع";
"content.message.copy" = "نسخ الرسالة";
"content.message.show_less" = "عرض أقل";
"content.message.show_more" = "عرض المزيد";
"content.notes.location_unavailable" = "الموقع غير متاح";
"content.notes.title" = "ملاحظات";
"content.payment.cashu" = "الدفع عبر cashu";
"content.payment.lightning" = "الدفع عبر lightning";
"encryption.accessibility.establishing" = "جار إعداد التشفير";
"encryption.accessibility.failed" = "فشل التشفير";
"encryption.accessibility.not_encrypted" = "غير مشفر";
"encryption.accessibility.secured" = "مشفر";
"encryption.accessibility.verified" = "مشفر ومُتحقق";
"encryption.status.establishing" = "جار إعداد التشفير...";
"encryption.status.failed" = "فشل التشفير";
"encryption.status.not_encrypted" = "غير مشفر";
"encryption.status.secured" = "مشفر";
"encryption.status.verified" = "مشفر ومُتحقق";
"fingerprint.action.mark_verified" = "وضع علامة تم التحقق";
"fingerprint.action.remove_verification" = "إزالة التحقق";
"fingerprint.badge.not_verified" = "⚠️ غير مُتحقق";
"fingerprint.badge.verified" = "✓ مُتحقق";
"fingerprint.handshake_pending" = "غير متاح - جار تنفيذ handshake";
"fingerprint.message.verified" = "لقد تحققت من هوية هذا الشخص.";
"fingerprint.message.verify_hint" = "قارن هذه البصمات مع %@ عبر قناة آمنة.";
"fingerprint.their_label" = "بصمتهم:";
"fingerprint.title" = "تحقق الأمان";
"fingerprint.your_label" = "بصمتك:";
"geohash_people.action.block" = "حظر";
"geohash_people.action.unblock" = "إلغاء الحظر";
"geohash_people.none_nearby" = "لا أحد قريب...";
"geohash_people.tooltip.blocked" = "محظور في geohash";
"geohash_people.you_suffix" = " (أنت)";
"location_channels.action.open_settings" = "فتح الإعدادات";
"location_channels.action.remove_access" = "إزالة صلاحية الموقع";
"location_channels.action.request_permissions" = "جلب موقعي و geohash";
"location_channels.action.teleport" = "انتقال فوري";
"location_channels.bookmarked_section_title" = "محفوظ";
"location_channels.description" = "تحدث مع أشخاص قريبين عبر قنوات geohash. نشارك geohash تقريبي فقط، وليس gps الدقيق. يتم إخفاء عنوان ip لأن كل المرور يمر عبر tor.";
"location_channels.error.invalid_geohash" = "geohash غير صالح";
"location_channels.loading_nearby" = "جار البحث عن قنوات قريبة…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "تم رفض إذن الموقع. فعّله في الإعدادات لاستخدام قنوات الموقع.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#قنوات الموقع";
"location_channels.tor.subtitle" = "يخفي ip لقنوات الموقع. الموصى به: تشغيل.";
"location_channels.tor.title" = "توجيه tor";
"location_levels.block" = "مربع";
"location_levels.building" = "مبنى";
"location_levels.city" = "مدينة";
"location_levels.neighborhood" = "حي";
"location_levels.province" = "مقاطعة";
"location_levels.region" = "منطقة";
"location_notes.action.dismiss" = "إغلاق";
"location_notes.action.retry" = "إعادة المحاولة";
"location_notes.description" = "أضف ملاحظات قصيرة دائمة لهذا المكان ليجدها الآخرون.";
"location_notes.empty_subtitle" = "كن أول من يضيف هنا.";
"location_notes.empty_title" = "لا توجد ملاحظات بعد";
"location_notes.error.failed_to_send" = "تعذر إرسال الملاحظة. %@";
"location_notes.error.no_relays" = "لا توجد مرحلات جغرافية قريبة من هذا المكان. حاول لاحقاً.";
"location_notes.loading_notes" = "جار تحميل الملاحظات…";
"location_notes.loading_recent" = "جار تحميل الملاحظات الحديثة…";
"location_notes.no_relays_nearby" = "لا مرحلات جغرافية قريبة";
"location_notes.placeholder" = "أضف ملاحظة لهذا المكان";
"location_notes.relays_paused" = "المرحلات الجغرافية غير متاحة؛ الملاحظات متوقفة";
"location_notes.relays_retry_hint" = "الملاحظات تعتمد على المرحلات الجغرافية. تحقق من الاتصال ثم أعد المحاولة.";
"mesh_peers.tooltip.new_messages" = "رسائل جديدة";
"system.chat.blocked" = "لا يمكن بدء دردشة مع %@: المستخدم محظور.";
"system.chat.requires_favorite" = "لا يمكن بدء دردشة مع %@: يجب أن تكونا مفضلين متبادلين للتشغيل بدون اتصال.";
"system.common.user" = "مستخدم";
"system.dm.blocked_generic" = "تعذر الإرسال: المستخدم محظور.";
"system.dm.blocked_recipient" = "لا يمكن الإرسال إلى %@: المستخدم محظور.";
"system.dm.unreachable" = "لا يمكن الإرسال إلى %@: المستلم غير متاح عبر mesh أو nostr.";
"system.geohash.blocked" = "تم حظر %@ في محادثات geohash";
"system.geohash.unblocked" = "تم إلغاء حظر %@ في محادثات geohash";
"system.location.not_in_channel" = "تعذر الإرسال: لست داخل قناة موقع";
"system.location.send_failed" = "تعذر الإرسال إلى قناة الموقع";
"system.tor.dev_bypass" = "بناء تطوير: تجاوز tor مفعل.";
"system.tor.restarted" = "tor أُعيد تشغيله. تمت استعادة التوجيه.";
"system.tor.restarting" = "tor يعاد تشغيله لاستعادة الاتصال...";
"system.tor.started" = "tor يعمل. كل الدردشة تمر عبر tor للخصوصية.";
"system.tor.starting" = "يتم تشغيل tor...";
"verification.my_qr.accessibility_label" = "رمز qr للتحقق";
"verification.my_qr.title" = "امسح للتحقق مني";
"verification.my_qr.unavailable" = "qr غير متاح";
"verification.scan.paste_prompt" = "الصق محتوى qr للتحقق:";
"verification.scan.prompt_friend" = "امسح qr لصديق";
"verification.scan.status.invalid" = "qr غير صالح أو منتهٍ";
"verification.scan.status.no_peer" = "لم يتم العثور على قرين مطابق";
"verification.scan.status.requested" = "تم طلب التحقق لـ %@";
"verification.scan.validate" = "تحقق";
"verification.sheet.title" = "تحقق";
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>zero</key>
<string>%d ملاحظات</string>
<key>one</key>
<string>%d ملاحظة</string>
<key>two</key>
<string>%d ملاحظتان</string>
<key>few</key>
<string>%d ملاحظات</string>
<key>many</key>
<string>%d ملاحظة</string>
<key>other</key>
<string>%d ملاحظة</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>zero</key>
<string>%d أشخاص</string>
<key>one</key>
<string>%d شخص</string>
<key>two</key>
<string>%d شخصان</string>
<key>few</key>
<string>%d أشخاص</string>
<key>many</key>
<string>%d شخص</string>
<key>other</key>
<string>%d شخص</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>zero</key>
<string>%d أشخاص</string>
<key>one</key>
<string>%d شخص</string>
<key>two</key>
<string>%d شخصان</string>
<key>few</key>
<string>%d أشخاص</string>
<key>many</key>
<string>%d شخص</string>
<key>other</key>
<string>%d شخص</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (German)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "schließen";
"app_info.done" = "FERTIG";
"app_info.features.encryption.description" = "private nachrichten werden mit dem noise-protokoll verschlüsselt";
"app_info.features.encryption.title" = "end-to-end-verschlüsselung";
"app_info.features.extended_range.description" = "nachrichten werden zwischen peers weitergeleitet und reichen weiter";
"app_info.features.extended_range.title" = "erweiterte reichweite";
"app_info.features.favorites.description" = "erhalte hinweise, wenn deine lieblingsmenschen online kommen";
"app_info.features.favorites.title" = "favoriten";
"app_info.features.geohash.description" = "geohash-kanäle zum chatten mit menschen in der nähe über dezentrale anonyme relays";
"app_info.features.geohash.title" = "lokale kanäle";
"app_info.features.mentions.description" = "nutze @nickname, um bestimmte personen zu benachrichtigen";
"app_info.features.mentions.title" = "erwähnungen";
"app_info.features.offline.description" = "funktioniert ohne internet per bluetooth low energy";
"app_info.features.offline.title" = "offline-kommunikation";
"app_info.features.title" = "FUNKTIONEN";
"app_info.how_to_use.change_channels" = "• tippe auf #mesh, um den kanal zu wechseln";
"app_info.how_to_use.clear_chat" = "• tippe den chat dreimal, um ihn zu leeren";
"app_info.how_to_use.commands" = "• tippe /, um befehle zu sehen";
"app_info.how_to_use.open_sidebar" = "• tippe auf das personen-icon, um die seitenleiste zu öffnen";
"app_info.how_to_use.set_nickname" = "• tippe auf deinen nickname, um ihn zu ändern";
"app_info.how_to_use.start_dm" = "• tippe auf den namen eines peers, um eine pn zu starten";
"app_info.how_to_use.title" = "SO FUNKTIONIERT'S";
"app_info.privacy.ephemeral.description" = "neue peer-id wird regelmäßig erzeugt";
"app_info.privacy.ephemeral.title" = "flüchtige identität";
"app_info.privacy.no_tracking.description" = "keine server, konten oder datensammlung";
"app_info.privacy.no_tracking.title" = "kein tracking";
"app_info.privacy.panic.description" = "tippe dreimal auf das logo, um alle daten sofort zu löschen";
"app_info.privacy.panic.title" = "panikmodus";
"app_info.privacy.title" = "PRIVATSPHÄRE";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "die sicherheit privater nachrichten wurde noch nicht vollständig geprüft. nutze sie nicht für kritische situationen, solange dieser hinweis erscheint.";
"app_info.warning.title" = "WARNUNG";
"common.cancel" = "abbrechen";
"common.close" = "schließen";
"common.copy" = "kopieren";
"common.ok" = "OK";
"common.toggle.off" = "aus";
"common.toggle.on" = "an";
"common.unknown" = "unbekannt";
"content.accessibility.add_favorite" = "zu favoriten hinzufügen";
"content.accessibility.available_nostr" = "verfügbar über nostr";
"content.accessibility.back_to_main_chat" = "zurück zum hauptchat";
"content.accessibility.connected_mesh" = "verbunden über mesh";
"content.accessibility.encryption_status" = "verschlüsselungsstatus: %@";
"content.accessibility.location_channels" = "kanäle für standorte";
"content.accessibility.location_notes" = "standortnotizen für diesen ort";
"content.accessibility.open_unread_private_chat" = "ungelesene privatnachricht öffnen";
"content.accessibility.private_chat_header" = "privatchat mit %@";
"content.accessibility.reachable_mesh" = "erreichbar über mesh";
"content.accessibility.remove_favorite" = "aus favoriten entfernen";
"content.accessibility.send_hint_empty" = "gib eine nachricht zum senden ein";
"content.accessibility.send_hint_ready" = "doppelt tippen zum senden";
"content.accessibility.send_message" = "nachricht senden";
"content.accessibility.toggle_bookmark" = "bookmark für #%@ umschalten";
"content.accessibility.toggle_favorite_hint" = "doppelt tippen, um favoritenstatus zu wechseln";
"content.accessibility.view_fingerprint_hint" = "tippe, um den verschlüsselungs-fingerprint zu sehen";
"content.actions.block" = "blockieren";
"content.actions.direct_message" = "direktnachricht";
"content.actions.hug" = "umarmen";
"content.actions.mention" = "erwähnen";
"content.actions.slap" = "ohrfeige";
"content.actions.title" = "aktionen";
"content.alert.bluetooth_required.off" = "bluetooth ist ausgeschaltet. aktiviere bluetooth in den einstellungen, um bitchat zu verwenden.";
"content.alert.bluetooth_required.permission" = "bitchat benötigt bluetooth-berechtigung, um sich mit geräten in der nähe zu verbinden. erlaube den zugriff in den einstellungen.";
"content.alert.bluetooth_required.settings" = "einstellungen";
"content.alert.bluetooth_required.title" = "bluetooth erforderlich";
"content.alert.bluetooth_required.unsupported" = "dieses gerät unterstützt kein bluetooth. bitchat benötigt bluetooth zum funktionieren.";
"content.alert.screenshot.message" = "screenshots von standortkanälen verraten deinen standort. überleg dir das teilen vorher gut.";
"content.alert.screenshot.title" = "achtung";
"content.commands.block" = "blocked peers anzeigen oder blockieren";
"content.commands.clear" = "chatnachrichten löschen";
"content.commands.favorite" = "zu favoriten hinzufügen";
"content.commands.hug" = "eine warme umarmung senden";
"content.commands.message" = "privatnachricht senden";
"content.commands.slap" = "jemandem eine forelle um die ohren schlagen";
"content.commands.unblock" = "peer entsperren";
"content.commands.unfavorite" = "aus favoriten entfernen";
"content.commands.who" = "sehen, wer online ist";
"content.delivery.delivered_members" = "zugestellt an %1$d von %2$d mitgliedern";
"content.delivery.delivered_to" = "zugestellt an %@";
"content.delivery.failed" = "fehlgeschlagen: %@";
"content.delivery.read_by" = "gelesen von %@";
"content.delivery.reason.blocked" = "nutzer blockiert";
"content.delivery.reason.self" = "kann nicht an dich selbst senden";
"content.delivery.reason.send_error" = "sende-fehler";
"content.delivery.reason.unknown_recipient" = "unbekannter empfänger";
"content.delivery.reason.unreachable" = "peer nicht erreichbar";
"content.header.people" = "PERSONEN";
"content.help.verification" = "verifizierung: meinen qr zeigen oder freund scannen";
"content.input.message_placeholder" = "nachricht eingeben...";
"content.input.nickname_placeholder" = "nickname";
"content.location.enable" = "standort aktivieren";
"content.message.copy" = "nachricht kopieren";
"content.message.show_less" = "weniger anzeigen";
"content.message.show_more" = "mehr anzeigen";
"content.notes.location_unavailable" = "standort nicht verfügbar";
"content.notes.title" = "notizen";
"content.payment.cashu" = "per cashu bezahlen";
"content.payment.lightning" = "per lightning bezahlen";
"encryption.accessibility.establishing" = "verschlüsselung wird aufgebaut";
"encryption.accessibility.failed" = "verschlüsselung fehlgeschlagen";
"encryption.accessibility.not_encrypted" = "nicht verschlüsselt";
"encryption.accessibility.secured" = "verschlüsselt";
"encryption.accessibility.verified" = "verschlüsselt und verifiziert";
"encryption.status.establishing" = "verschlüsselung wird aufgebaut...";
"encryption.status.failed" = "verschlüsselung fehlgeschlagen";
"encryption.status.not_encrypted" = "nicht verschlüsselt";
"encryption.status.secured" = "verschlüsselt";
"encryption.status.verified" = "verschlüsselt und verifiziert";
"fingerprint.action.mark_verified" = "als verifiziert markieren";
"fingerprint.action.remove_verification" = "verifizierung entfernen";
"fingerprint.badge.not_verified" = "⚠️ NICHT VERIFIZIERT";
"fingerprint.badge.verified" = "✓ VERIFIZIERT";
"fingerprint.handshake_pending" = "nicht verfügbar handshake läuft";
"fingerprint.message.verified" = "du hast die identität dieser person verifiziert.";
"fingerprint.message.verify_hint" = "vergleiche diese fingerabdrücke mit %@ über einen sicheren kanal.";
"fingerprint.their_label" = "deren fingerabdruck:";
"fingerprint.title" = "sicherheitsverifizierung";
"fingerprint.your_label" = "dein fingerabdruck:";
"geohash_people.action.block" = "blockieren";
"geohash_people.action.unblock" = "entsperren";
"geohash_people.none_nearby" = "niemand in der nähe...";
"geohash_people.tooltip.blocked" = "in geohash blockiert";
"geohash_people.you_suffix" = " (du)";
"location_channels.action.open_settings" = "einstellungen öffnen";
"location_channels.action.remove_access" = "standortzugriff entfernen";
"location_channels.action.request_permissions" = "standort und geohash abrufen";
"location_channels.action.teleport" = "teleportieren";
"location_channels.bookmarked_section_title" = "gespeichert";
"location_channels.description" = "chatte mit menschen in deiner nähe über geohash-kanäle. geteilt wird nur ein grober geohash, niemals exakte gps-daten. deine ip bleibt verborgen, weil der gesamte verkehr über tor läuft.";
"location_channels.error.invalid_geohash" = "ungültiger geohash";
"location_channels.loading_nearby" = "suche nach kanälen in der nähe…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "standortberechtigung verweigert. aktiviere sie in den einstellungen für standortkanäle.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#standort-kanäle";
"location_channels.tor.subtitle" = "verbirgt deine ip für standortkanäle. empfohlen: an.";
"location_channels.tor.title" = "tor-routing";
"location_levels.block" = "block";
"location_levels.building" = "gebäude";
"location_levels.city" = "stadt";
"location_levels.neighborhood" = "viertel";
"location_levels.province" = "bundesland";
"location_levels.region" = "region";
"location_notes.action.dismiss" = "schließen";
"location_notes.action.retry" = "erneut versuchen";
"location_notes.description" = "füge diesem ort kurze dauerhafte notizen hinzu, damit andere sie finden.";
"location_notes.empty_subtitle" = "sei die erste person, die hier eine notiz hinterlässt.";
"location_notes.empty_title" = "noch keine notizen";
"location_notes.error.failed_to_send" = "notiz konnte nicht gesendet werden. %@";
"location_notes.error.no_relays" = "keine geo-relays in der nähe verfügbar. versuch es später erneut.";
"location_notes.loading_notes" = "notizen werden geladen…";
"location_notes.loading_recent" = "aktuelle notizen werden geladen…";
"location_notes.no_relays_nearby" = "keine geo-relays in der nähe";
"location_notes.placeholder" = "notiz für diesen ort hinzufügen";
"location_notes.relays_paused" = "geo-relays nicht verfügbar; notizen pausiert";
"location_notes.relays_retry_hint" = "notizen hängen von geo-relays ab. prüfe die verbindung und versuch es erneut.";
"mesh_peers.tooltip.new_messages" = "neue nachrichten";
"system.chat.blocked" = "chat mit %@ kann nicht gestartet werden: nutzer blockiert.";
"system.chat.requires_favorite" = "chat mit %@ kann nicht gestartet werden: gegenseitige favoriten für offline nötig.";
"system.common.user" = "nutzer";
"system.dm.blocked_generic" = "senden nicht möglich: nutzer blockiert.";
"system.dm.blocked_recipient" = "senden an %@ nicht möglich: nutzer blockiert.";
"system.dm.unreachable" = "senden an %@ nicht möglich: empfänger über mesh oder nostr nicht erreichbar.";
"system.geohash.blocked" = "%@ wurde in geohash-chats blockiert";
"system.geohash.unblocked" = "%@ wurde in geohash-chats entsperrt";
"system.location.not_in_channel" = "senden fehlgeschlagen: du bist nicht in einem standortkanal";
"system.location.send_failed" = "konnte nicht an den standortkanal senden";
"system.tor.dev_bypass" = "dev-build: tor-bypass aktiv.";
"system.tor.restarted" = "tor wurde neu gestartet. routing wiederhergestellt.";
"system.tor.restarting" = "tor startet neu, um die verbindung herzustellen...";
"system.tor.started" = "tor läuft. der gesamte chat wird über tor geleitet.";
"system.tor.starting" = "tor wird gestartet...";
"verification.my_qr.accessibility_label" = "verifizierungs-qr-code";
"verification.my_qr.title" = "scanne, um mich zu verifizieren";
"verification.my_qr.unavailable" = "qr nicht verfügbar";
"verification.scan.paste_prompt" = "füge den qr-inhalt zum prüfen ein:";
"verification.scan.prompt_friend" = "scanne den qr eines freundes";
"verification.scan.status.invalid" = "qr ungültig oder abgelaufen";
"verification.scan.status.no_peer" = "kein passender peer gefunden";
"verification.scan.status.requested" = "verifizierung für %@ angefordert";
"verification.scan.validate" = "prüfen";
"verification.sheet.title" = "VERIFIZIEREN";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d notiz</string>
<key>other</key>
<string>%d notizen</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d person</string>
<key>other</key>
<string>%d personen</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d person</string>
<key>other</key>
<string>%d personen</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Spanish)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "cerrar";
"app_info.done" = "LISTO";
"app_info.features.encryption.description" = "mensajes privados cifrados con el protocolo Noise";
"app_info.features.encryption.title" = "cifrado de extremo a extremo";
"app_info.features.extended_range.description" = "los mensajes se retransmiten entre pares y llegan lejos";
"app_info.features.extended_range.title" = "alcance ampliado";
"app_info.features.favorites.description" = "recibe avisos cuando tus personas favoritas se conecten";
"app_info.features.favorites.title" = "favoritos";
"app_info.features.geohash.description" = "canales geohash para chatear con personas en regiones cercanas a través de relays descentralizados anónimos";
"app_info.features.geohash.title" = "canales locales";
"app_info.features.mentions.description" = "usa @nickname para avisar a personas concretas";
"app_info.features.mentions.title" = "menciones";
"app_info.features.offline.description" = "funciona sin internet utilizando Bluetooth de bajo consumo";
"app_info.features.offline.title" = "comunicación sin conexión";
"app_info.features.title" = "FUNCIONES";
"app_info.how_to_use.change_channels" = "• toca #mesh para cambiar de canal";
"app_info.how_to_use.clear_chat" = "• toca tres veces el chat para limpiarlo";
"app_info.how_to_use.commands" = "• escribe / para ver los comandos";
"app_info.how_to_use.open_sidebar" = "• toca el ícono de personas para abrir la barra lateral";
"app_info.how_to_use.set_nickname" = "• define tu apodo tocándolo";
"app_info.how_to_use.start_dm" = "• toca el nombre de un participante para iniciar un MD";
"app_info.how_to_use.title" = "CÓMO USARLO";
"app_info.privacy.ephemeral.description" = "nuevo ID de peer generado periódicamente";
"app_info.privacy.ephemeral.title" = "identidad efímera";
"app_info.privacy.no_tracking.description" = "sin servidores, cuentas ni recopilación de datos";
"app_info.privacy.no_tracking.title" = "sin seguimiento";
"app_info.privacy.panic.description" = "toca el logotipo tres veces para borrar todos los datos al instante";
"app_info.privacy.panic.title" = "modo pánico";
"app_info.privacy.title" = "PRIVACIDAD";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "la seguridad de los mensajes privados aún no ha sido auditada por completo. no lo uses en situaciones críticas hasta que este aviso desaparezca.";
"app_info.warning.title" = "ADVERTENCIA";
"common.cancel" = "cancelar";
"common.close" = "cerrar";
"common.copy" = "copiar";
"common.ok" = "aceptar";
"common.toggle.off" = "desactivado";
"common.toggle.on" = "activado";
"common.unknown" = "desconocido";
"content.accessibility.add_favorite" = "agregar a favoritos";
"content.accessibility.available_nostr" = "disponible vía Nostr";
"content.accessibility.back_to_main_chat" = "volver al chat principal";
"content.accessibility.connected_mesh" = "conectado por mesh";
"content.accessibility.encryption_status" = "estado de cifrado: %@";
"content.accessibility.location_channels" = "canales de ubicación";
"content.accessibility.location_notes" = "notas de ubicación de este lugar";
"content.accessibility.open_unread_private_chat" = "abrir chat privado sin leer";
"content.accessibility.private_chat_header" = "chat privado con %@";
"content.accessibility.reachable_mesh" = "disponible por mesh";
"content.accessibility.remove_favorite" = "quitar de favoritos";
"content.accessibility.send_hint_empty" = "introduce un mensaje para enviarlo";
"content.accessibility.send_hint_ready" = "toca dos veces para enviar";
"content.accessibility.send_message" = "enviar mensaje";
"content.accessibility.toggle_bookmark" = "alternar marcador para #%@";
"content.accessibility.toggle_favorite_hint" = "toca dos veces para alternar el estado de favorito";
"content.accessibility.view_fingerprint_hint" = "toca para ver la huella de cifrado";
"content.actions.block" = "bloquear";
"content.actions.direct_message" = "mensaje directo";
"content.actions.hug" = "abrazo";
"content.actions.mention" = "mencionar";
"content.actions.slap" = "bofetada";
"content.actions.title" = "acciones";
"content.alert.bluetooth_required.off" = "bluetooth está desactivado. Actívalo en Ajustes para usar BitChat.";
"content.alert.bluetooth_required.permission" = "bitChat necesita permiso de Bluetooth para conectarse con dispositivos cercanos. Habilita el acceso en Ajustes.";
"content.alert.bluetooth_required.settings" = "ajustes";
"content.alert.bluetooth_required.title" = "se requiere Bluetooth";
"content.alert.bluetooth_required.unsupported" = "este dispositivo no admite Bluetooth. BitChat necesita Bluetooth para funcionar.";
"content.alert.screenshot.message" = "las capturas de pantalla de los canales de ubicación revelarán tu ubicación. Piensa antes de compartirlas públicamente.";
"content.alert.screenshot.title" = "atención";
"content.commands.block" = "bloquear o listar usuarios bloqueados";
"content.commands.clear" = "borrar los mensajes del chat";
"content.commands.favorite" = "agregar a favoritos";
"content.commands.hug" = "enviar un abrazo caluroso";
"content.commands.message" = "enviar mensaje privado";
"content.commands.slap" = "abofetear a alguien con una trucha";
"content.commands.unblock" = "desbloquear a un usuario";
"content.commands.unfavorite" = "quitar de favoritos";
"content.commands.who" = "ver quién está en línea";
"content.delivery.delivered_members" = "entregado a %1$d de %2$d miembros";
"content.delivery.delivered_to" = "entregado a %@";
"content.delivery.failed" = "falló: %@";
"content.delivery.read_by" = "leído por %@";
"content.delivery.reason.blocked" = "el usuario está bloqueado";
"content.delivery.reason.self" = "no puedes enviarte mensajes a ti mismo";
"content.delivery.reason.send_error" = "error al enviar";
"content.delivery.reason.unknown_recipient" = "destinatario desconocido";
"content.delivery.reason.unreachable" = "el destinatario no es alcanzable";
"content.header.people" = "PERSONAS";
"content.help.verification" = "verificación: mostrar mi QR o escanear a un amigo";
"content.input.message_placeholder" = "escribe un mensaje...";
"content.input.nickname_placeholder" = "apodo";
"content.location.enable" = "activar ubicación";
"content.message.copy" = "copiar mensaje";
"content.message.show_less" = "mostrar menos";
"content.message.show_more" = "mostrar más";
"content.notes.location_unavailable" = "ubicación no disponible";
"content.notes.title" = "notas";
"content.payment.cashu" = "pagar con Cashu";
"content.payment.lightning" = "pagar con Lightning";
"encryption.accessibility.establishing" = "estableciendo cifrado";
"encryption.accessibility.failed" = "cifrado fallido";
"encryption.accessibility.not_encrypted" = "sin cifrar";
"encryption.accessibility.secured" = "cifrado";
"encryption.accessibility.verified" = "cifrado y verificado";
"encryption.status.establishing" = "estableciendo cifrado...";
"encryption.status.failed" = "cifrado fallido";
"encryption.status.not_encrypted" = "sin cifrar";
"encryption.status.secured" = "cifrado";
"encryption.status.verified" = "cifrado y verificado";
"fingerprint.action.mark_verified" = "marcar como verificado";
"fingerprint.action.remove_verification" = "eliminar verificación";
"fingerprint.badge.not_verified" = "⚠️ NO VERIFICADO";
"fingerprint.badge.verified" = "✓ VERIFICADO";
"fingerprint.handshake_pending" = "no disponible: el handshake está en curso";
"fingerprint.message.verified" = "has verificado la identidad de esta persona.";
"fingerprint.message.verify_hint" = "compara estas huellas con %@ mediante un canal seguro.";
"fingerprint.their_label" = "huella de la otra persona:";
"fingerprint.title" = "verificación de seguridad";
"fingerprint.your_label" = "tu huella:";
"geohash_people.action.block" = "bloquear";
"geohash_people.action.unblock" = "desbloquear";
"geohash_people.none_nearby" = "nadie cerca...";
"geohash_people.tooltip.blocked" = "bloqueado en geohash";
"geohash_people.you_suffix" = " (tú)";
"location_channels.action.open_settings" = "abrir ajustes";
"location_channels.action.remove_access" = "eliminar acceso a la ubicación";
"location_channels.action.request_permissions" = "obtener mi ubicación y mis geohashes";
"location_channels.action.teleport" = "teletransportar";
"location_channels.bookmarked_section_title" = "marcados";
"location_channels.description" = "chatea con personas cercanas usando canales geohash. Solo se comparte un geohash aproximado, nunca GPS exacto. Tu IP se oculta al enrutar todo el tráfico por Tor.";
"location_channels.error.invalid_geohash" = "geohash no válido";
"location_channels.loading_nearby" = "buscando canales cercanos…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "permiso de ubicación denegado. Actívalo en Ajustes para usar los canales de ubicación.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#canales de ubicación";
"location_channels.tor.subtitle" = "oculta tu IP para los canales de ubicación. Recomendado: activado.";
"location_channels.tor.title" = "enrutamiento Tor";
"location_levels.block" = "bloque";
"location_levels.building" = "edificio";
"location_levels.city" = "ciudad";
"location_levels.neighborhood" = "barrio";
"location_levels.province" = "provincia";
"location_levels.region" = "región";
"location_notes.action.dismiss" = "descartar";
"location_notes.action.retry" = "reintentar";
"location_notes.description" = "añade notas permanentes cortas sobre este lugar para que otras personas las encuentren.";
"location_notes.empty_subtitle" = "sé la primera persona en añadir una en este lugar.";
"location_notes.empty_title" = "aún no hay notas";
"location_notes.error.failed_to_send" = "no se pudo enviar la nota. %@";
"location_notes.error.no_relays" = "no hay relays geográficos disponibles cerca de este lugar. Inténtalo de nuevo pronto.";
"location_notes.loading_notes" = "cargando notas…";
"location_notes.loading_recent" = "cargando notas recientes…";
"location_notes.no_relays_nearby" = "no hay relays geográficos cercanos";
"location_notes.placeholder" = "añade una nota para este lugar";
"location_notes.relays_paused" = "relays geográficos no disponibles; notas en pausa";
"location_notes.relays_retry_hint" = "las notas dependen de los relays geográficos. Comprueba la conexión e inténtalo de nuevo.";
"mesh_peers.tooltip.new_messages" = "nuevos mensajes";
"system.chat.blocked" = "no se puede iniciar un chat con %@: el usuario está bloqueado.";
"system.chat.requires_favorite" = "no se puede iniciar un chat con %@: necesitas ser favoritos mutuos para mensajería sin conexión.";
"system.common.user" = "usuario";
"system.dm.blocked_generic" = "no se puede enviar el mensaje: el usuario está bloqueado.";
"system.dm.blocked_recipient" = "no se puede enviar un mensaje a %@: el usuario está bloqueado.";
"system.dm.unreachable" = "no se puede enviar un mensaje a %@: el destinatario no es alcanzable por mesh ni Nostr.";
"system.geohash.blocked" = "se bloqueó a %@ en los chats geohash";
"system.geohash.unblocked" = "se desbloqueó a %@ en los chats geohash";
"system.location.not_in_channel" = "no se puede enviar: no estás en un canal de ubicación";
"system.location.send_failed" = "no se pudo enviar al canal de ubicación";
"system.tor.dev_bypass" = "compilación de desarrollo: bypass de Tor activado.";
"system.tor.restarted" = "tor se reinició. Se restauró el enrutamiento de la red.";
"system.tor.restarting" = "tor se está reiniciando para recuperar la conectividad...";
"system.tor.started" = "tor se inició. Todo el chat se enruta por Tor para privacidad.";
"system.tor.starting" = "iniciando Tor...";
"verification.my_qr.accessibility_label" = "código QR de verificación";
"verification.my_qr.title" = "escanea para verificarme";
"verification.my_qr.unavailable" = "QR no disponible";
"verification.scan.paste_prompt" = "pega el contenido del QR para validarlo:";
"verification.scan.prompt_friend" = "escanea el QR de un amigo";
"verification.scan.status.invalid" = "QR inválido o caducado";
"verification.scan.status.no_peer" = "no se encontró un peer coincidente";
"verification.scan.status.requested" = "se solicitó la verificación de %@";
"verification.scan.validate" = "validar";
"verification.sheet.title" = "VERIFICAR";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d nota</string>
<key>other</key>
<string>%d notas</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d persona</string>
<key>other</key>
<string>%d personas</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d persona</string>
<key>other</key>
<string>%d personas</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (French)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "fermer";
"app_info.done" = "TERMINÉ";
"app_info.features.encryption.description" = "messages privés chiffrés avec le protocole noise";
"app_info.features.encryption.title" = "chiffrement de bout en bout";
"app_info.features.extended_range.description" = "messages relayés entre pairs pour aller plus loin";
"app_info.features.extended_range.title" = "portée étendue";
"app_info.features.favorites.description" = "reçois une alerte quand tes personnes favorites arrivent";
"app_info.features.favorites.title" = "favoris";
"app_info.features.geohash.description" = "canaux geohash pour discuter avec des personnes proches via des relais décentralisés anonymes";
"app_info.features.geohash.title" = "canaux locaux";
"app_info.features.mentions.description" = "utilise @nickname pour avertir des personnes précises";
"app_info.features.mentions.title" = "mentions";
"app_info.features.offline.description" = "fonctionne sans internet avec le bluetooth basse énergie";
"app_info.features.offline.title" = "communication hors ligne";
"app_info.features.title" = "FONCTIONNALITÉS";
"app_info.how_to_use.change_channels" = "• tape sur #mesh pour changer de canal";
"app_info.how_to_use.clear_chat" = "• tape trois fois sur le chat pour le vider";
"app_info.how_to_use.commands" = "• tape / pour voir les commandes";
"app_info.how_to_use.open_sidebar" = "• tape sur l'icône personnes pour ouvrir la barre latérale";
"app_info.how_to_use.set_nickname" = "• règle ton pseudo en le touchant";
"app_info.how_to_use.start_dm" = "• tape sur le nom d'un pair pour démarrer un mp";
"app_info.how_to_use.title" = "MODE D'EMPLOI";
"app_info.privacy.ephemeral.description" = "nouvel id de pair généré régulièrement";
"app_info.privacy.ephemeral.title" = "identité éphémère";
"app_info.privacy.no_tracking.description" = "sans serveurs, comptes ni collecte de données";
"app_info.privacy.no_tracking.title" = "sans suivi";
"app_info.privacy.panic.description" = "tape trois fois sur le logo pour tout effacer instantanément";
"app_info.privacy.panic.title" = "mode panique";
"app_info.privacy.title" = "CONFIDENTIALITÉ";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "la sécurité des messages privés n'a pas encore été entièrement auditée. n'utilise pas pour des situations critiques tant que cet avertissement reste.";
"app_info.warning.title" = "AVERTISSEMENT";
"common.cancel" = "annuler";
"common.close" = "fermer";
"common.copy" = "copier";
"common.ok" = "OK";
"common.toggle.off" = "désactivé";
"common.toggle.on" = "activé";
"common.unknown" = "inconnu";
"content.accessibility.add_favorite" = "ajouter aux favoris";
"content.accessibility.available_nostr" = "disponible via nostr";
"content.accessibility.back_to_main_chat" = "retour au chat principal";
"content.accessibility.connected_mesh" = "connecté via mesh";
"content.accessibility.encryption_status" = "état du chiffrement : %@";
"content.accessibility.location_channels" = "canaux de localisation";
"content.accessibility.location_notes" = "notes de localisation pour cet endroit";
"content.accessibility.open_unread_private_chat" = "ouvrir le chat privé non lu";
"content.accessibility.private_chat_header" = "chat privé avec %@";
"content.accessibility.reachable_mesh" = "joignable via mesh";
"content.accessibility.remove_favorite" = "retirer des favoris";
"content.accessibility.send_hint_empty" = "saisis un message à envoyer";
"content.accessibility.send_hint_ready" = "tape deux fois pour envoyer";
"content.accessibility.send_message" = "envoyer le message";
"content.accessibility.toggle_bookmark" = "basculer le favori pour #%@";
"content.accessibility.toggle_favorite_hint" = "tape deux fois pour basculer le statut favori";
"content.accessibility.view_fingerprint_hint" = "tape pour voir l'empreinte de chiffrement";
"content.actions.block" = "bloquer";
"content.actions.direct_message" = "message direct";
"content.actions.hug" = "câlin";
"content.actions.mention" = "mentionner";
"content.actions.slap" = "gifle";
"content.actions.title" = "actions";
"content.alert.bluetooth_required.off" = "bluetooth est désactivé. active le bluetooth dans réglages pour utiliser bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat a besoin de l'autorisation bluetooth pour se connecter aux appareils proches. active l'accès dans réglages.";
"content.alert.bluetooth_required.settings" = "réglages";
"content.alert.bluetooth_required.title" = "bluetooth requis";
"content.alert.bluetooth_required.unsupported" = "cet appareil ne prend pas en charge le bluetooth. bitchat en a besoin pour fonctionner.";
"content.alert.screenshot.message" = "les captures des canaux de localisation révéleront ta position. réfléchis avant de partager publiquement.";
"content.alert.screenshot.title" = "attention";
"content.commands.block" = "bloquer ou lister les pairs bloqués";
"content.commands.clear" = "effacer les messages du chat";
"content.commands.favorite" = "ajouter aux favoris";
"content.commands.hug" = "envoyer un câlin chaleureux";
"content.commands.message" = "envoyer un message privé";
"content.commands.slap" = "gifler quelqu'un avec une truite";
"content.commands.unblock" = "débloquer un pair";
"content.commands.unfavorite" = "retirer des favoris";
"content.commands.who" = "voir qui est en ligne";
"content.delivery.delivered_members" = "livré à %1$d sur %2$d membres";
"content.delivery.delivered_to" = "livré à %@";
"content.delivery.failed" = "échec : %@";
"content.delivery.read_by" = "lu par %@";
"content.delivery.reason.blocked" = "utilisateur bloqué";
"content.delivery.reason.self" = "impossible d'envoyer à toi-même";
"content.delivery.reason.send_error" = "erreur d'envoi";
"content.delivery.reason.unknown_recipient" = "destinataire inconnu";
"content.delivery.reason.unreachable" = "pair injoignable";
"content.header.people" = "PERSONNES";
"content.help.verification" = "vérification : afficher mon qr ou scanner un ami";
"content.input.message_placeholder" = "écris un message...";
"content.input.nickname_placeholder" = "pseudo";
"content.location.enable" = "activer la localisation";
"content.message.copy" = "copier le message";
"content.message.show_less" = "afficher moins";
"content.message.show_more" = "afficher plus";
"content.notes.location_unavailable" = "localisation indisponible";
"content.notes.title" = "notes";
"content.payment.cashu" = "payer via cashu";
"content.payment.lightning" = "payer via lightning";
"encryption.accessibility.establishing" = "établissement du chiffrement";
"encryption.accessibility.failed" = "chiffrement échoué";
"encryption.accessibility.not_encrypted" = "non chiffré";
"encryption.accessibility.secured" = "chiffré";
"encryption.accessibility.verified" = "chiffré et vérifié";
"encryption.status.establishing" = "mise en place du chiffrement...";
"encryption.status.failed" = "chiffrement échoué";
"encryption.status.not_encrypted" = "non chiffré";
"encryption.status.secured" = "chiffré";
"encryption.status.verified" = "chiffré et vérifié";
"fingerprint.action.mark_verified" = "marquer comme vérifié";
"fingerprint.action.remove_verification" = "retirer la vérification";
"fingerprint.badge.not_verified" = "⚠️ NON VÉRIFIÉ";
"fingerprint.badge.verified" = "✓ VÉRIFIÉ";
"fingerprint.handshake_pending" = "indisponible - handshake en cours";
"fingerprint.message.verified" = "tu as vérifié l'identité de cette personne.";
"fingerprint.message.verify_hint" = "compare ces empreintes avec %@ via un canal sécurisé.";
"fingerprint.their_label" = "leur empreinte :";
"fingerprint.title" = "vérification de sécurité";
"fingerprint.your_label" = "ton empreinte :";
"geohash_people.action.block" = "bloquer";
"geohash_people.action.unblock" = "débloquer";
"geohash_people.none_nearby" = "personne à proximité...";
"geohash_people.tooltip.blocked" = "bloqué dans geohash";
"geohash_people.you_suffix" = " (toi)";
"location_channels.action.open_settings" = "ouvrir réglages";
"location_channels.action.remove_access" = "retirer l'accès localisation";
"location_channels.action.request_permissions" = "obtenir ma localisation et mes geohash";
"location_channels.action.teleport" = "téléporter";
"location_channels.bookmarked_section_title" = "enregistrés";
"location_channels.description" = "discute avec les personnes proches grâce aux canaux geohash. seul un geohash grossier est partagé, jamais de gps exact. ton ip reste cachée car tout le trafic passe par tor.";
"location_channels.error.invalid_geohash" = "geohash invalide";
"location_channels.loading_nearby" = "recherche de canaux proches…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "autorisation de localisation refusée. active-la dans réglages pour utiliser les canaux.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#canaux localisation";
"location_channels.tor.subtitle" = "cache ton ip pour les canaux localisation. recommandé : activé.";
"location_channels.tor.title" = "routage tor";
"location_levels.block" = "bloc";
"location_levels.building" = "bâtiment";
"location_levels.city" = "ville";
"location_levels.neighborhood" = "quartier";
"location_levels.province" = "province";
"location_levels.region" = "région";
"location_notes.action.dismiss" = "ignorer";
"location_notes.action.retry" = "réessayer";
"location_notes.description" = "ajoute de courtes notes permanentes ici pour aider les autres.";
"location_notes.empty_subtitle" = "sois la première personne à en ajouter ici.";
"location_notes.empty_title" = "pas encore de notes";
"location_notes.error.failed_to_send" = "impossible d'envoyer la note. %@";
"location_notes.error.no_relays" = "aucun relais géo disponible près d'ici. réessaie bientôt.";
"location_notes.loading_notes" = "chargement des notes…";
"location_notes.loading_recent" = "chargement des notes récentes…";
"location_notes.no_relays_nearby" = "aucun relais géo à proximité";
"location_notes.placeholder" = "ajoute une note pour cet endroit";
"location_notes.relays_paused" = "relais géo indisponibles ; notes en pause";
"location_notes.relays_retry_hint" = "les notes dépendent des relais géo. vérifie la connexion et réessaie.";
"mesh_peers.tooltip.new_messages" = "nouveaux messages";
"system.chat.blocked" = "impossible de démarrer un chat avec %@ : utilisateur bloqué.";
"system.chat.requires_favorite" = "impossible de démarrer un chat avec %@ : favoris mutuels requis pour le hors ligne.";
"system.common.user" = "utilisateur";
"system.dm.blocked_generic" = "envoi impossible : utilisateur bloqué.";
"system.dm.blocked_recipient" = "impossible d'envoyer à %@ : utilisateur bloqué.";
"system.dm.unreachable" = "impossible d'envoyer à %@ : destinataire injoignable via mesh ou nostr.";
"system.geohash.blocked" = "%@ a été bloqué dans les chats geohash";
"system.geohash.unblocked" = "%@ a été débloqué dans les chats geohash";
"system.location.not_in_channel" = "envoi impossible : tu n'es pas dans un canal localisation";
"system.location.send_failed" = "envoi au canal localisation impossible";
"system.tor.dev_bypass" = "build de développement : bypass tor actif.";
"system.tor.restarted" = "tor a redémarré. routage restauré.";
"system.tor.restarting" = "tor redémarre pour rétablir la connectivité...";
"system.tor.started" = "tor a démarré. tout le chat passe par tor pour la confidentialité.";
"system.tor.starting" = "lancement de tor...";
"verification.my_qr.accessibility_label" = "code qr de vérification";
"verification.my_qr.title" = "scanne pour me vérifier";
"verification.my_qr.unavailable" = "qr indisponible";
"verification.scan.paste_prompt" = "colle le contenu du qr pour valider :";
"verification.scan.prompt_friend" = "scanne le qr d'un ami";
"verification.scan.status.invalid" = "qr invalide ou expiré";
"verification.scan.status.no_peer" = "aucun pair correspondant trouvé";
"verification.scan.status.requested" = "vérification demandée pour %@";
"verification.scan.validate" = "valider";
"verification.sheet.title" = "VÉRIFIER";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d note</string>
<key>other</key>
<string>%d notes</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d personne</string>
<key>other</key>
<string>%d personnes</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d personne</string>
<key>other</key>
<string>%d personnes</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Hebrew)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "סגור";
"app_info.done" = "בוצע";
"app_info.features.encryption.description" = "הודעות פרטיות מוצפנות בפרוטוקול noise";
"app_info.features.encryption.title" = "הצפנה מקצה לקצה";
"app_info.features.extended_range.description" = "הודעות משודרות בין עמיתים ומגיעות רחוק יותר";
"app_info.features.extended_range.title" = "טווח מורחב";
"app_info.features.favorites.description" = "קבל התראות כשהאנשים המועדפים שלך מצטרפים";
"app_info.features.favorites.title" = "מועדפים";
"app_info.features.geohash.description" = "ערוצי geohash לשיחה עם אנשים קרובים דרך ממסרים אנונימיים מבוזרים";
"app_info.features.geohash.title" = "ערוצים מקומיים";
"app_info.features.mentions.description" = "השתמש ב-@nickname כדי להתריע לאנשים ספציפיים";
"app_info.features.mentions.title" = "אזכורים";
"app_info.features.offline.description" = "עובד בלי אינטרנט באמצעות bluetooth בתצריכת אנרגיה נמוכה";
"app_info.features.offline.title" = "תקשורת לא מקוונת";
"app_info.features.title" = "יכולות";
"app_info.how_to_use.change_channels" = "• הקש על #mesh כדי להחליף ערוץ";
"app_info.how_to_use.clear_chat" = "• הקש שלוש פעמים על הצ'אט כדי לנקות";
"app_info.how_to_use.commands" = "• הקלד / כדי לראות פקודות";
"app_info.how_to_use.open_sidebar" = "• הקש על אייקון האנשים כדי לפתוח סרגל צד";
"app_info.how_to_use.set_nickname" = "• הקש על הכינוי שלך כדי לעדכן";
"app_info.how_to_use.start_dm" = "• הקש על שם עמית כדי להתחיל הודעה פרטית";
"app_info.how_to_use.title" = "איך להשתמש";
"app_info.privacy.ephemeral.description" = "מזהה עמית חדש נוצר באופן קבוע";
"app_info.privacy.ephemeral.title" = "זהות זמנית";
"app_info.privacy.no_tracking.description" = "אין שרתים, חשבונות או איסוף נתונים";
"app_info.privacy.no_tracking.title" = "ללא מעקב";
"app_info.privacy.panic.description" = "הקש על הלוגו שלוש פעמים למחיקת כל הנתונים מייד";
"app_info.privacy.panic.title" = "מצב בהלה";
"app_info.privacy.title" = "פרטיות";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "אבטחת ההודעות הפרטיות עדיין לא נבדקה במלואה. אל תשתמש למצבים קריטיים עד שהאזהרה תיעלם.";
"app_info.warning.title" = "אזהרה";
"common.cancel" = "ביטול";
"common.close" = "סגור";
"common.copy" = "העתק";
"common.ok" = "OK";
"common.toggle.off" = "כבוי";
"common.toggle.on" = "פעיל";
"common.unknown" = "לא ידוע";
"content.accessibility.add_favorite" = "הוסף למועדפים";
"content.accessibility.available_nostr" = "זמין דרך nostr";
"content.accessibility.back_to_main_chat" = "חזרה לצ'אט הראשי";
"content.accessibility.connected_mesh" = "מחובר דרך mesh";
"content.accessibility.encryption_status" = "מצב הצפנה: %@";
"content.accessibility.location_channels" = "ערוצי מיקום";
"content.accessibility.location_notes" = "הערות מיקום למקום הזה";
"content.accessibility.open_unread_private_chat" = "פתח צ'אט פרטי שלא נקרא";
"content.accessibility.private_chat_header" = "צ'אט פרטי עם %@";
"content.accessibility.reachable_mesh" = "זמין דרך mesh";
"content.accessibility.remove_favorite" = "הסר מהמועדפים";
"content.accessibility.send_hint_empty" = "הזן הודעה לשליחה";
"content.accessibility.send_hint_ready" = "הקש פעמיים לשליחה";
"content.accessibility.send_message" = "שלח הודעה";
"content.accessibility.toggle_bookmark" = "החלף סימנייה עבור #%@";
"content.accessibility.toggle_favorite_hint" = "הקש פעמיים כדי להחליף מצב מועדפים";
"content.accessibility.view_fingerprint_hint" = "הקש להצגת טביעת ההצפנה";
"content.actions.block" = "חסום";
"content.actions.direct_message" = "הודעה ישירה";
"content.actions.hug" = "חיבוק";
"content.actions.mention" = "אזכור";
"content.actions.slap" = "סטירה";
"content.actions.title" = "פעולות";
"content.alert.bluetooth_required.off" = "bluetooth כבוי. הפעל bluetooth בהגדרות כדי להשתמש ב-bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat צריכה הרשאת bluetooth כדי להתחבר למכשירים קרובים. אפשר גישה בהגדרות.";
"content.alert.bluetooth_required.settings" = "הגדרות";
"content.alert.bluetooth_required.title" = "נדרש bluetooth";
"content.alert.bluetooth_required.unsupported" = "המכשיר הזה לא תומך ב-bluetooth. bitchat זקוקה ל-bluetooth כדי לעבוד.";
"content.alert.screenshot.message" = "צילומי מסך של ערוצי מיקום יחשפו את מיקומך. חשב לפני שיתוף פומבי.";
"content.alert.screenshot.title" = "שים לב";
"content.commands.block" = "חסום או הצג עמיתים חסומים";
"content.commands.clear" = "נקה הודעות צ'אט";
"content.commands.favorite" = "הוסף למועדפים";
"content.commands.hug" = "שלח חיבוק חם";
"content.commands.message" = "שלח הודעה פרטית";
"content.commands.slap" = "תן למישהו סטירת פורל";
"content.commands.unblock" = "בטל חסימה לעמית";
"content.commands.unfavorite" = "הסר מהמועדפים";
"content.commands.who" = "ראה מי מחובר";
"content.delivery.delivered_members" = "נמסר ל-%1$d מתוך %2$d חברים";
"content.delivery.delivered_to" = "נמסר ל-%@";
"content.delivery.failed" = "נכשל: %@";
"content.delivery.read_by" = "נקרא על ידי %@";
"content.delivery.reason.blocked" = "המשתמש חסום";
"content.delivery.reason.self" = "אי אפשר לשלוח לעצמך";
"content.delivery.reason.send_error" = "שגיאת שליחה";
"content.delivery.reason.unknown_recipient" = "נמען לא ידוע";
"content.delivery.reason.unreachable" = "עמית לא זמין";
"content.header.people" = "אנשים";
"content.help.verification" = "אימות: הצג את ה-qr שלי או סרוק חבר";
"content.input.message_placeholder" = "כתוב הודעה...";
"content.input.nickname_placeholder" = "כינוי";
"content.location.enable" = "הפעל מיקום";
"content.message.copy" = "העתק הודעה";
"content.message.show_less" = "הצג פחות";
"content.message.show_more" = "הצג עוד";
"content.notes.location_unavailable" = "המיקום לא זמין";
"content.notes.title" = "הערות";
"content.payment.cashu" = "תשלום דרך cashu";
"content.payment.lightning" = "תשלום דרך lightning";
"encryption.accessibility.establishing" = "הצפנה בהקמה";
"encryption.accessibility.failed" = "הצפנה נכשלה";
"encryption.accessibility.not_encrypted" = "לא מוצפן";
"encryption.accessibility.secured" = "מוצפן";
"encryption.accessibility.verified" = "מוצפן ומאומת";
"encryption.status.establishing" = "מקימים הצפנה...";
"encryption.status.failed" = "הצפנה נכשלה";
"encryption.status.not_encrypted" = "לא מוצפן";
"encryption.status.secured" = "מוצפן";
"encryption.status.verified" = "מוצפן ומאומת";
"fingerprint.action.mark_verified" = "סמן כמאומת";
"fingerprint.action.remove_verification" = "הסר אימות";
"fingerprint.badge.not_verified" = "⚠️ לא מאומת";
"fingerprint.badge.verified" = "✓ מאומת";
"fingerprint.handshake_pending" = "לא זמין - handshake מתבצע";
"fingerprint.message.verified" = "אישרת את זהותו של האדם הזה.";
"fingerprint.message.verify_hint" = "השווה את הטביעות עם %@ בערוץ מאובטח.";
"fingerprint.their_label" = "הטבעת שלהם:";
"fingerprint.title" = "אימות אבטחה";
"fingerprint.your_label" = "הטבעת שלך:";
"geohash_people.action.block" = "חסום";
"geohash_people.action.unblock" = "בטל חסימה";
"geohash_people.none_nearby" = "אין אף אחד בסביבה...";
"geohash_people.tooltip.blocked" = "חסום ב-geohash";
"geohash_people.you_suffix" = " (אתה)";
"location_channels.action.open_settings" = "פתח הגדרות";
"location_channels.action.remove_access" = "הסר גישת מיקום";
"location_channels.action.request_permissions" = "קבל את המיקום וה-geohash שלי";
"location_channels.action.teleport" = "טלפורט";
"location_channels.bookmarked_section_title" = "שמורים";
"location_channels.description" = "שוחח עם אנשים קרובים בערוצי geohash. משתף רק geohash גס, אף פעם לא gps מדויק. כתובת ה-ip מוסתרת כי כל התעבורה עוברת דרך tor.";
"location_channels.error.invalid_geohash" = "geohash לא תקף";
"location_channels.loading_nearby" = "מחפש ערוצים קרובים…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "הרשאת מיקום נדחתה. אפשר בהגדרות כדי להשתמש בערוצי מיקום.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#ערוצי מיקום";
"location_channels.tor.subtitle" = "מסתיר את ה-ip שלך לערוצי מיקום. מומלץ: פעיל.";
"location_channels.tor.title" = "ניתוב tor";
"location_levels.block" = "בלוק";
"location_levels.building" = "מבנה";
"location_levels.city" = "עיר";
"location_levels.neighborhood" = "שכונה";
"location_levels.province" = "מחוז";
"location_levels.region" = "אזור";
"location_notes.action.dismiss" = "סגור";
"location_notes.action.retry" = "ניסיון שוב";
"location_notes.description" = "הוסף הערות קצרות וקבועות למקום הזה כדי שאחרים ימצאו.";
"location_notes.empty_subtitle" = "היה הראשון להוסיף כאן.";
"location_notes.empty_title" = "אין הערות עדיין";
"location_notes.error.failed_to_send" = "לא ניתן לשלוח את ההערה. %@";
"location_notes.error.no_relays" = "אין ממסרי geo זמינים בקרבת מקום. נסה שוב מאוחר יותר.";
"location_notes.loading_notes" = "טוען הערות…";
"location_notes.loading_recent" = "טוען הערות אחרונות…";
"location_notes.no_relays_nearby" = "אין ממסרי geo קרובים";
"location_notes.placeholder" = "הוסף הערה למקום הזה";
"location_notes.relays_paused" = "ממסרי geo אינם זמינים; הערות הושהו";
"location_notes.relays_retry_hint" = "הערות תלויות בממסרי geo. בדוק את החיבור ונסה שוב.";
"mesh_peers.tooltip.new_messages" = "הודעות חדשות";
"system.chat.blocked" = "לא ניתן להתחיל צ'אט עם %@: המשתמש חסום.";
"system.chat.requires_favorite" = "לא ניתן להתחיל צ'אט עם %@: נדרשים מועדפים הדדיים לאופליין.";
"system.common.user" = "משתמש";
"system.dm.blocked_generic" = "אי אפשר לשלוח: המשתמש חסום.";
"system.dm.blocked_recipient" = "אי אפשר לשלוח ל-%@: המשתמש חסום.";
"system.dm.unreachable" = "אי אפשר לשלוח ל-%@: הנמען אינו נגיש דרך mesh או nostr.";
"system.geohash.blocked" = "%@ נחסם בצ'אטי geohash";
"system.geohash.unblocked" = "%@ הוסר מהחסימה בצ'אטי geohash";
"system.location.not_in_channel" = "אי אפשר לשלוח: אינך בערוץ מיקום";
"system.location.send_failed" = "השליחה לערוץ המיקום נכשלה";
"system.tor.dev_bypass" = "בנייה לפיתוח: עקיפת tor פעילה.";
"system.tor.restarted" = "tor הופעל מחדש. הניתוב שוחזר.";
"system.tor.restarting" = "tor מופעל מחדש להשבת החיבור...";
"system.tor.started" = "tor פעיל. כל הצ'אט עובר דרך tor לפרטיות.";
"system.tor.starting" = "tor מופעל...";
"verification.my_qr.accessibility_label" = "קוד qr לאימות";
"verification.my_qr.title" = "סרוק כדי לאמת";
"verification.my_qr.unavailable" = "qr לא זמין";
"verification.scan.paste_prompt" = "הדבק תוכן qr לאימות:";
"verification.scan.prompt_friend" = "סרוק qr של חבר";
"verification.scan.status.invalid" = "qr לא תקף או שפג תוקפו";
"verification.scan.status.no_peer" = "לא נמצא עמית תואם";
"verification.scan.status.requested" = "התבקש אימות עבור %@";
"verification.scan.validate" = "אשר";
"verification.sheet.title" = "אימות";
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d הערה</string>
<key>two</key>
<string>%d הערות</string>
<key>many</key>
<string>%d הערות</string>
<key>other</key>
<string>%d הערות</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d אדם</string>
<key>two</key>
<string>%d אנשים</string>
<key>many</key>
<string>%d אנשים</string>
<key>other</key>
<string>%d אנשים</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d אדם</string>
<key>two</key>
<string>%d אנשים</string>
<key>many</key>
<string>%d אנשים</string>
<key>other</key>
<string>%d אנשים</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Indonesian)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "tutup";
"app_info.done" = "SELESAI";
"app_info.features.encryption.description" = "pesan pribadi dienkripsi dengan protokol noise";
"app_info.features.encryption.title" = "enkripsi ujung ke ujung";
"app_info.features.extended_range.description" = "pesan diteruskan antar peer sehingga jangkauannya lebih jauh";
"app_info.features.extended_range.title" = "jangkauan diperluas";
"app_info.features.favorites.description" = "dapatkan notifikasi saat orang favoritmu bergabung";
"app_info.features.favorites.title" = "favorit";
"app_info.features.geohash.description" = "kanal geohash untuk ngobrol dengan orang di wilayah sekitar lewat relay anonim terdesentralisasi";
"app_info.features.geohash.title" = "kanal lokal";
"app_info.features.mentions.description" = "pakai @nickname untuk memberi tahu orang tertentu";
"app_info.features.mentions.title" = "mention";
"app_info.features.offline.description" = "bekerja tanpa internet memakai bluetooth low energy";
"app_info.features.offline.title" = "komunikasi offline";
"app_info.features.title" = "FITUR";
"app_info.how_to_use.change_channels" = "• ketuk #mesh untuk ganti kanal";
"app_info.how_to_use.clear_chat" = "• ketuk chat tiga kali untuk menghapus";
"app_info.how_to_use.commands" = "• ketik / untuk melihat perintah";
"app_info.how_to_use.open_sidebar" = "• ketuk ikon orang untuk membuka sidebar";
"app_info.how_to_use.set_nickname" = "• atur nama panggilanmu dengan mengetuknya";
"app_info.how_to_use.start_dm" = "• ketuk nama peer untuk mulai dm";
"app_info.how_to_use.title" = "CARA PAKAI";
"app_info.privacy.ephemeral.description" = "id peer baru dibuat secara berkala";
"app_info.privacy.ephemeral.title" = "identitas sementara";
"app_info.privacy.no_tracking.description" = "tanpa server, akun, atau pengumpulan data";
"app_info.privacy.no_tracking.title" = "tanpa pelacakan";
"app_info.privacy.panic.description" = "ketuk logo tiga kali untuk langsung menghapus semua data";
"app_info.privacy.panic.title" = "mode panik";
"app_info.privacy.title" = "PRIVASI";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "keamanan pesan pribadi belum diaudit sepenuhnya. jangan dipakai untuk situasi kritis sampai peringatan ini hilang.";
"app_info.warning.title" = "PERINGATAN";
"common.cancel" = "batal";
"common.close" = "tutup";
"common.copy" = "salin";
"common.ok" = "OK";
"common.toggle.off" = "mati";
"common.toggle.on" = "nyala";
"common.unknown" = "tidak diketahui";
"content.accessibility.add_favorite" = "tambah ke favorit";
"content.accessibility.available_nostr" = "tersedia melalui nostr";
"content.accessibility.back_to_main_chat" = "kembali ke chat utama";
"content.accessibility.connected_mesh" = "terhubung lewat mesh";
"content.accessibility.encryption_status" = "status enkripsi: %@";
"content.accessibility.location_channels" = "kanal lokasi";
"content.accessibility.location_notes" = "catatan lokasi untuk tempat ini";
"content.accessibility.open_unread_private_chat" = "buka chat pribadi belum dibaca";
"content.accessibility.private_chat_header" = "chat pribadi dengan %@";
"content.accessibility.reachable_mesh" = "dapat dijangkau lewat mesh";
"content.accessibility.remove_favorite" = "hapus dari favorit";
"content.accessibility.send_hint_empty" = "masukkan pesan untuk dikirim";
"content.accessibility.send_hint_ready" = "ketuk dua kali untuk mengirim";
"content.accessibility.send_message" = "kirim pesan";
"content.accessibility.toggle_bookmark" = "ubah penanda untuk #%@";
"content.accessibility.toggle_favorite_hint" = "ketuk dua kali untuk mengubah status favorit";
"content.accessibility.view_fingerprint_hint" = "ketuk untuk melihat sidik enkripsi";
"content.actions.block" = "blokir";
"content.actions.direct_message" = "pesan langsung";
"content.actions.hug" = "peluk";
"content.actions.mention" = "sebut";
"content.actions.slap" = "tampar";
"content.actions.title" = "aksi";
"content.alert.bluetooth_required.off" = "bluetooth dimatikan. aktifkan bluetooth di pengaturan untuk memakai bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat memerlukan izin bluetooth untuk terhubung dengan perangkat dekat. aktifkan akses di pengaturan.";
"content.alert.bluetooth_required.settings" = "pengaturan";
"content.alert.bluetooth_required.title" = "butuh bluetooth";
"content.alert.bluetooth_required.unsupported" = "perangkat ini tidak mendukung bluetooth. bitchat memerlukan bluetooth untuk berjalan.";
"content.alert.screenshot.message" = "tangkapan layar kanal lokasi akan mengungkap lokasimu. pikirkan dulu sebelum membagikannya.";
"content.alert.screenshot.title" = "perhatian";
"content.commands.block" = "blokir atau lihat peer yang diblokir";
"content.commands.clear" = "hapus pesan chat";
"content.commands.favorite" = "tambah ke favorit";
"content.commands.hug" = "kirim pelukan hangat";
"content.commands.message" = "kirim pesan pribadi";
"content.commands.slap" = "tampar seseorang dengan ikan trout";
"content.commands.unblock" = "buka blokir peer";
"content.commands.unfavorite" = "hapus dari favorit";
"content.commands.who" = "lihat siapa yang online";
"content.delivery.delivered_members" = "terkirim ke %1$d dari %2$d anggota";
"content.delivery.delivered_to" = "terkirim ke %@";
"content.delivery.failed" = "gagal: %@";
"content.delivery.read_by" = "dibaca oleh %@";
"content.delivery.reason.blocked" = "pengguna diblokir";
"content.delivery.reason.self" = "tidak bisa kirim ke diri sendiri";
"content.delivery.reason.send_error" = "kesalahan pengiriman";
"content.delivery.reason.unknown_recipient" = "penerima tidak dikenal";
"content.delivery.reason.unreachable" = "peer tidak dapat dijangkau";
"content.header.people" = "ORANG";
"content.help.verification" = "verifikasi: tampilkan qr-ku atau pindai teman";
"content.input.message_placeholder" = "ketik pesan...";
"content.input.nickname_placeholder" = "nama panggilan";
"content.location.enable" = "aktifkan lokasi";
"content.message.copy" = "salin pesan";
"content.message.show_less" = "tampilkan lebih sedikit";
"content.message.show_more" = "tampilkan lebih banyak";
"content.notes.location_unavailable" = "lokasi tidak tersedia";
"content.notes.title" = "catatan";
"content.payment.cashu" = "bayar via cashu";
"content.payment.lightning" = "bayar via lightning";
"encryption.accessibility.establishing" = "menyiapkan enkripsi";
"encryption.accessibility.failed" = "enkripsi gagal";
"encryption.accessibility.not_encrypted" = "tidak terenkripsi";
"encryption.accessibility.secured" = "terenkripsi";
"encryption.accessibility.verified" = "terenkripsi dan terverifikasi";
"encryption.status.establishing" = "menyiapkan enkripsi...";
"encryption.status.failed" = "enkripsi gagal";
"encryption.status.not_encrypted" = "tidak terenkripsi";
"encryption.status.secured" = "terenkripsi";
"encryption.status.verified" = "terenkripsi dan terverifikasi";
"fingerprint.action.mark_verified" = "tandai sebagai terverifikasi";
"fingerprint.action.remove_verification" = "hapus verifikasi";
"fingerprint.badge.not_verified" = "⚠️ BELUM TERVERIFIKASI";
"fingerprint.badge.verified" = "✓ TERVERIFIKASI";
"fingerprint.handshake_pending" = "tidak tersedia - handshake sedang berlangsung";
"fingerprint.message.verified" = "kamu sudah memverifikasi identitas orang ini.";
"fingerprint.message.verify_hint" = "bandingkan sidik ini dengan %@ lewat kanal aman.";
"fingerprint.their_label" = "sidik mereka:";
"fingerprint.title" = "verifikasi keamanan";
"fingerprint.your_label" = "sidikmu:";
"geohash_people.action.block" = "blokir";
"geohash_people.action.unblock" = "buka blokir";
"geohash_people.none_nearby" = "tidak ada siapa pun...";
"geohash_people.tooltip.blocked" = "diblokir di geohash";
"geohash_people.you_suffix" = " (kamu)";
"location_channels.action.open_settings" = "buka pengaturan";
"location_channels.action.remove_access" = "cabut akses lokasi";
"location_channels.action.request_permissions" = "ambil lokasiku dan geohash";
"location_channels.action.teleport" = "teleport";
"location_channels.bookmarked_section_title" = "disimpan";
"location_channels.description" = "ngobrol dengan orang terdekat lewat kanal geohash. hanya geohash kasar yang dibagikan, tidak pernah gps tepat. alamat ip-mu tersembunyi karena seluruh trafik lewat tor.";
"location_channels.error.invalid_geohash" = "geohash tidak valid";
"location_channels.loading_nearby" = "mencari kanal sekitar…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "izin lokasi ditolak. aktifkan di pengaturan untuk memakai kanal lokasi.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#kanal lokasi";
"location_channels.tor.subtitle" = "menyembunyikan ip-mu untuk kanal lokasi. disarankan: aktif.";
"location_channels.tor.title" = "perutean tor";
"location_levels.block" = "blok";
"location_levels.building" = "gedung";
"location_levels.city" = "kota";
"location_levels.neighborhood" = "lingkungan";
"location_levels.province" = "provinsi";
"location_levels.region" = "wilayah";
"location_notes.action.dismiss" = "tutup";
"location_notes.action.retry" = "coba lagi";
"location_notes.description" = "tambahkan catatan permanen singkat di tempat ini agar orang lain menemukannya.";
"location_notes.empty_subtitle" = "jadilah orang pertama yang menambahkannya di sini.";
"location_notes.empty_title" = "belum ada catatan";
"location_notes.error.failed_to_send" = "tidak bisa mengirim catatan. %@";
"location_notes.error.no_relays" = "tidak ada relay geo tersedia dekat sini. coba lagi nanti.";
"location_notes.loading_notes" = "memuat catatan…";
"location_notes.loading_recent" = "memuat catatan terbaru…";
"location_notes.no_relays_nearby" = "tidak ada relay geo di dekatmu";
"location_notes.placeholder" = "tambahkan catatan untuk tempat ini";
"location_notes.relays_paused" = "relay geo tidak tersedia; catatan dijeda";
"location_notes.relays_retry_hint" = "catatan bergantung pada relay geo. cek koneksi lalu coba lagi.";
"mesh_peers.tooltip.new_messages" = "pesan baru";
"system.chat.blocked" = "tidak bisa mulai chat dengan %@: pengguna diblokir.";
"system.chat.requires_favorite" = "tidak bisa mulai chat dengan %@: butuh favorit bersama untuk offline.";
"system.common.user" = "pengguna";
"system.dm.blocked_generic" = "tidak bisa mengirim: pengguna diblokir.";
"system.dm.blocked_recipient" = "tidak bisa mengirim ke %@: pengguna diblokir.";
"system.dm.unreachable" = "tidak bisa mengirim ke %@: penerima tidak dapat dijangkau lewat mesh atau nostr.";
"system.geohash.blocked" = "%@ diblokir di chat geohash";
"system.geohash.unblocked" = "%@ dibuka blokirnya di chat geohash";
"system.location.not_in_channel" = "gagal mengirim: kamu tidak berada di kanal lokasi";
"system.location.send_failed" = "gagal mengirim ke kanal lokasi";
"system.tor.dev_bypass" = "build pengembangan: bypass tor aktif.";
"system.tor.restarted" = "tor dimulai ulang. perutean dipulihkan.";
"system.tor.restarting" = "tor sedang dimulai ulang untuk memulihkan konektivitas...";
"system.tor.started" = "tor berjalan. seluruh chat dirutekan lewat tor demi privasi.";
"system.tor.starting" = "menjalankan tor...";
"verification.my_qr.accessibility_label" = "kode qr verifikasi";
"verification.my_qr.title" = "pindai untuk verifikasi";
"verification.my_qr.unavailable" = "qr tidak tersedia";
"verification.scan.paste_prompt" = "tempel konten qr untuk validasi:";
"verification.scan.prompt_friend" = "pindai qr teman";
"verification.scan.status.invalid" = "qr tidak valid atau kedaluwarsa";
"verification.scan.status.no_peer" = "tidak ada peer yang cocok";
"verification.scan.status.requested" = "verifikasi diminta untuk %@";
"verification.scan.validate" = "validasi";
"verification.sheet.title" = "VERIFIKASI";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d catatan</string>
<key>other</key>
<string>%d catatan</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d orang</string>
<key>other</key>
<string>%d orang</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d orang</string>
<key>other</key>
<string>%d orang</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Italian)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "chiudi";
"app_info.done" = "FATTO";
"app_info.features.encryption.description" = "messaggi privati cifrati con il protocollo noise";
"app_info.features.encryption.title" = "crittografia end-to-end";
"app_info.features.extended_range.description" = "i messaggi vengono inoltrati tra peer per arrivare più lontano";
"app_info.features.extended_range.title" = "portata estesa";
"app_info.features.favorites.description" = "ricevi avvisi quando entrano le tue persone preferite";
"app_info.features.favorites.title" = "preferiti";
"app_info.features.geohash.description" = "canali geohash per chattare con persone vicine tramite relay anonimi decentralizzati";
"app_info.features.geohash.title" = "canali locali";
"app_info.features.mentions.description" = "usa @nickname per avvisare persone specifiche";
"app_info.features.mentions.title" = "menzioni";
"app_info.features.offline.description" = "funziona senza internet usando bluetooth a basso consumo";
"app_info.features.offline.title" = "comunicazione offline";
"app_info.features.title" = "FUNZIONI";
"app_info.how_to_use.change_channels" = "• tocca #mesh per cambiare canale";
"app_info.how_to_use.clear_chat" = "• tocca tre volte la chat per svuotarla";
"app_info.how_to_use.commands" = "• digita / per vedere i comandi";
"app_info.how_to_use.open_sidebar" = "• tocca l'icona persone per aprire la barra laterale";
"app_info.how_to_use.set_nickname" = "• imposta il tuo nickname toccandolo";
"app_info.how_to_use.start_dm" = "• tocca il nome di un peer per avviare un dm";
"app_info.how_to_use.title" = "COME SI USA";
"app_info.privacy.ephemeral.description" = "nuovo id peer generato regolarmente";
"app_info.privacy.ephemeral.title" = "identità effimera";
"app_info.privacy.no_tracking.description" = "niente server, account o raccolta dati";
"app_info.privacy.no_tracking.title" = "senza tracciamento";
"app_info.privacy.panic.description" = "tocca il logo tre volte per cancellare subito tutti i dati";
"app_info.privacy.panic.title" = "modalità panico";
"app_info.privacy.title" = "PRIVACY";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "la sicurezza dei messaggi privati non è stata ancora auditata completamente. non usarli in situazioni critiche finché questo avviso resta.";
"app_info.warning.title" = "AVVISO";
"common.cancel" = "annulla";
"common.close" = "chiudi";
"common.copy" = "copia";
"common.ok" = "OK";
"common.toggle.off" = "spento";
"common.toggle.on" = "acceso";
"common.unknown" = "sconosciuto";
"content.accessibility.add_favorite" = "aggiungi ai preferiti";
"content.accessibility.available_nostr" = "disponibile via nostr";
"content.accessibility.back_to_main_chat" = "torna alla chat principale";
"content.accessibility.connected_mesh" = "connesso tramite mesh";
"content.accessibility.encryption_status" = "stato crittografia: %@";
"content.accessibility.location_channels" = "canali posizione";
"content.accessibility.location_notes" = "note di posizione per questo posto";
"content.accessibility.open_unread_private_chat" = "apri chat privata non letta";
"content.accessibility.private_chat_header" = "chat privata con %@";
"content.accessibility.reachable_mesh" = "raggiungibile via mesh";
"content.accessibility.remove_favorite" = "rimuovi dai preferiti";
"content.accessibility.send_hint_empty" = "inserisci un messaggio da inviare";
"content.accessibility.send_hint_ready" = "tocca due volte per inviare";
"content.accessibility.send_message" = "invia messaggio";
"content.accessibility.toggle_bookmark" = "cambia segnalibro per #%@";
"content.accessibility.toggle_favorite_hint" = "tocca due volte per cambiare stato preferito";
"content.accessibility.view_fingerprint_hint" = "tocca per vedere l'impronta di cifratura";
"content.actions.block" = "blocca";
"content.actions.direct_message" = "messaggio diretto";
"content.actions.hug" = "abbraccia";
"content.actions.mention" = "menziona";
"content.actions.slap" = "schiaffo";
"content.actions.title" = "azioni";
"content.alert.bluetooth_required.off" = "bluetooth è disattivato. attiva bluetooth nelle impostazioni per usare bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat richiede l'autorizzazione bluetooth per collegarsi ai dispositivi vicini. abilita l'accesso nelle impostazioni.";
"content.alert.bluetooth_required.settings" = "impostazioni";
"content.alert.bluetooth_required.title" = "serve bluetooth";
"content.alert.bluetooth_required.unsupported" = "questo dispositivo non supporta bluetooth. bitchat richiede bluetooth per funzionare.";
"content.alert.screenshot.message" = "gli screenshot dei canali posizione rivelano la tua posizione. pensaci prima di condividerli.";
"content.alert.screenshot.title" = "attenzione";
"content.commands.block" = "blocca o mostra i peer bloccati";
"content.commands.clear" = "svuota la chat";
"content.commands.favorite" = "aggiungi ai preferiti";
"content.commands.hug" = "invia un caldo abbraccio";
"content.commands.message" = "invia messaggio privato";
"content.commands.slap" = "schiaffeggia qualcuno con una trota";
"content.commands.unblock" = "sblocca un peer";
"content.commands.unfavorite" = "rimuovi dai preferiti";
"content.commands.who" = "vedi chi è online";
"content.delivery.delivered_members" = "consegnato a %1$d di %2$d membri";
"content.delivery.delivered_to" = "consegnato a %@";
"content.delivery.failed" = "non riuscito: %@";
"content.delivery.read_by" = "letto da %@";
"content.delivery.reason.blocked" = "utente bloccato";
"content.delivery.reason.self" = "impossibile inviarti il messaggio";
"content.delivery.reason.send_error" = "errore di invio";
"content.delivery.reason.unknown_recipient" = "destinatario sconosciuto";
"content.delivery.reason.unreachable" = "peer irraggiungibile";
"content.header.people" = "PERSONE";
"content.help.verification" = "verifica: mostra il mio qr o scansiona un amico";
"content.input.message_placeholder" = "scrivi un messaggio...";
"content.input.nickname_placeholder" = "nickname";
"content.location.enable" = "attiva posizione";
"content.message.copy" = "copia messaggio";
"content.message.show_less" = "mostra meno";
"content.message.show_more" = "mostra di più";
"content.notes.location_unavailable" = "posizione non disponibile";
"content.notes.title" = "note";
"content.payment.cashu" = "paga con cashu";
"content.payment.lightning" = "paga con lightning";
"encryption.accessibility.establishing" = "avvio crittografia";
"encryption.accessibility.failed" = "crittografia fallita";
"encryption.accessibility.not_encrypted" = "non crittografato";
"encryption.accessibility.secured" = "crittografato";
"encryption.accessibility.verified" = "crittografato e verificato";
"encryption.status.establishing" = "avvio della crittografia...";
"encryption.status.failed" = "crittografia fallita";
"encryption.status.not_encrypted" = "non crittografato";
"encryption.status.secured" = "crittografato";
"encryption.status.verified" = "crittografato e verificato";
"fingerprint.action.mark_verified" = "segna come verificato";
"fingerprint.action.remove_verification" = "rimuovi verifica";
"fingerprint.badge.not_verified" = "⚠️ NON VERIFICATO";
"fingerprint.badge.verified" = "✓ VERIFICATO";
"fingerprint.handshake_pending" = "non disponibile - handshake in corso";
"fingerprint.message.verified" = "hai verificato l'identità di questa persona.";
"fingerprint.message.verify_hint" = "confronta queste impronte con %@ tramite un canale sicuro.";
"fingerprint.their_label" = "impronta loro:";
"fingerprint.title" = "verifica di sicurezza";
"fingerprint.your_label" = "tua impronta:";
"geohash_people.action.block" = "blocca";
"geohash_people.action.unblock" = "sblocca";
"geohash_people.none_nearby" = "nessuno nei dintorni...";
"geohash_people.tooltip.blocked" = "bloccato su geohash";
"geohash_people.you_suffix" = " (tu)";
"location_channels.action.open_settings" = "apri impostazioni";
"location_channels.action.remove_access" = "revoca accesso alla posizione";
"location_channels.action.request_permissions" = "ottieni la mia posizione e i geohash";
"location_channels.action.teleport" = "teletrasporto";
"location_channels.bookmarked_section_title" = "salvati";
"location_channels.description" = "chatta con le persone vicine tramite canali geohash. condividiamo solo geohash approssimativi, mai il gps esatto. il tuo ip resta nascosto perché tutto il traffico passa da tor.";
"location_channels.error.invalid_geohash" = "geohash non valido";
"location_channels.loading_nearby" = "ricerca canali vicini…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "autorizzazione posizione negata. abilitala nelle impostazioni per usare i canali.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#canali posizione";
"location_channels.tor.subtitle" = "nasconde il tuo ip per i canali posizione. consigliato: attivo.";
"location_channels.tor.title" = "instradamento tor";
"location_levels.block" = "isolato";
"location_levels.building" = "edificio";
"location_levels.city" = "città";
"location_levels.neighborhood" = "quartiere";
"location_levels.province" = "provincia";
"location_levels.region" = "regione";
"location_notes.action.dismiss" = "chiudi";
"location_notes.action.retry" = "riprova";
"location_notes.description" = "aggiungi brevi note permanenti su questo luogo per chi verrà.";
"location_notes.empty_subtitle" = "fai tu la prima nota qui.";
"location_notes.empty_title" = "ancora nessuna nota";
"location_notes.error.failed_to_send" = "impossibile inviare la nota. %@";
"location_notes.error.no_relays" = "nessun relay geo disponibile qui vicino. riprova presto.";
"location_notes.loading_notes" = "caricamento note…";
"location_notes.loading_recent" = "caricamento note recenti…";
"location_notes.no_relays_nearby" = "nessun relay geo vicino";
"location_notes.placeholder" = "aggiungi una nota per questo posto";
"location_notes.relays_paused" = "relay geo non disponibili; note in pausa";
"location_notes.relays_retry_hint" = "le note dipendono dai relay geo. controlla la connessione e riprova.";
"mesh_peers.tooltip.new_messages" = "nuovi messaggi";
"system.chat.blocked" = "impossibile avviare una chat con %@: utente bloccato.";
"system.chat.requires_favorite" = "impossibile avviare una chat con %@: servono preferiti reciproci per l'offline.";
"system.common.user" = "utente";
"system.dm.blocked_generic" = "invio non riuscito: utente bloccato.";
"system.dm.blocked_recipient" = "impossibile inviare a %@: utente bloccato.";
"system.dm.unreachable" = "impossibile inviare a %@: destinatario irraggiungibile via mesh o nostr.";
"system.geohash.blocked" = "%@ è stato bloccato nei chat geohash";
"system.geohash.unblocked" = "%@ è stato sbloccato nei chat geohash";
"system.location.not_in_channel" = "invio fallito: non sei in un canale posizione";
"system.location.send_failed" = "impossibile inviare al canale posizione";
"system.tor.dev_bypass" = "build di sviluppo: bypass tor attivo.";
"system.tor.restarted" = "tor è stato riavviato. instradamento ripristinato.";
"system.tor.restarting" = "tor si sta riavviando per ripristinare la connettività...";
"system.tor.started" = "tor è avviato. tutta la chat passa da tor per la privacy.";
"system.tor.starting" = "avvio tor...";
"verification.my_qr.accessibility_label" = "codice qr di verifica";
"verification.my_qr.title" = "scansiona per verificarmi";
"verification.my_qr.unavailable" = "qr non disponibile";
"verification.scan.paste_prompt" = "incolla il contenuto del qr per convalidare:";
"verification.scan.prompt_friend" = "scansiona il qr di un amico";
"verification.scan.status.invalid" = "qr non valido o scaduto";
"verification.scan.status.no_peer" = "nessun peer corrispondente trovato";
"verification.scan.status.requested" = "verifica richiesta per %@";
"verification.scan.validate" = "convalida";
"verification.sheet.title" = "VERIFICA";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d nota</string>
<key>other</key>
<string>%d note</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d persona</string>
<key>other</key>
<string>%d persone</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d persona</string>
<key>other</key>
<string>%d persone</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Japanese)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "閉じる";
"app_info.done" = "完了";
"app_info.features.encryption.description" = "プライベートメッセージはnoiseプロトコルで暗号化されます";
"app_info.features.encryption.title" = "エンドツーエンド暗号";
"app_info.features.extended_range.description" = "メッセージはピア間でリレーされより遠くに届きます";
"app_info.features.extended_range.title" = "拡張レンジ";
"app_info.features.favorites.description" = "お気に入りの人が参加したら通知を受け取れます";
"app_info.features.favorites.title" = "お気に入り";
"app_info.features.geohash.description" = "geohashチャンネルで近くの人と匿名分散リレー越しにチャット";
"app_info.features.geohash.title" = "ローカルチャンネル";
"app_info.features.mentions.description" = "@nicknameで特定の人に通知";
"app_info.features.mentions.title" = "メンション";
"app_info.features.offline.description" = "bluetooth low energyでインターネットなしでも動作";
"app_info.features.offline.title" = "オフライン通信";
"app_info.features.title" = "機能";
"app_info.how_to_use.change_channels" = "• #meshをタップしてチャンネルを切り替え";
"app_info.how_to_use.clear_chat" = "• チャットを3回タップするとクリア";
"app_info.how_to_use.commands" = "• /を入力してコマンド表示";
"app_info.how_to_use.open_sidebar" = "• 人アイコンをタップしてサイドバーを開く";
"app_info.how_to_use.set_nickname" = "• ニックネームをタップして設定";
"app_info.how_to_use.start_dm" = "• ピアの名前をタップしてdm開始";
"app_info.how_to_use.title" = "使い方";
"app_info.privacy.ephemeral.description" = "新しいpeer idが定期的に生成されます";
"app_info.privacy.ephemeral.title" = "一時的なアイデンティティ";
"app_info.privacy.no_tracking.description" = "サーバーもアカウントもデータ収集もなし";
"app_info.privacy.no_tracking.title" = "追跡なし";
"app_info.privacy.panic.description" = "ロゴを3回タップすると全データを即削除";
"app_info.privacy.panic.title" = "パニックモード";
"app_info.privacy.title" = "プライバシー";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "プライベートメッセージの安全性はまだ完全に監査されていません。この警告が消えるまで重要な場面では使わないでください。";
"app_info.warning.title" = "警告";
"common.cancel" = "キャンセル";
"common.close" = "閉じる";
"common.copy" = "コピー";
"common.ok" = "OK";
"common.toggle.off" = "オフ";
"common.toggle.on" = "オン";
"common.unknown" = "不明";
"content.accessibility.add_favorite" = "お気に入りに追加";
"content.accessibility.available_nostr" = "nostrで利用可能";
"content.accessibility.back_to_main_chat" = "メインチャットに戻る";
"content.accessibility.connected_mesh" = "mesh経由で接続";
"content.accessibility.encryption_status" = "暗号状態: %@";
"content.accessibility.location_channels" = "ロケーションチャンネル";
"content.accessibility.location_notes" = "この場所のロケーションノート";
"content.accessibility.open_unread_private_chat" = "未読のプライベートチャットを開く";
"content.accessibility.private_chat_header" = "%@とのプライベートチャット";
"content.accessibility.reachable_mesh" = "meshで到達可能";
"content.accessibility.remove_favorite" = "お気に入りから削除";
"content.accessibility.send_hint_empty" = "送信するメッセージを入力";
"content.accessibility.send_hint_ready" = "ダブルタップで送信";
"content.accessibility.send_message" = "メッセージ送信";
"content.accessibility.toggle_bookmark" = "#%@のブックマークを切り替え";
"content.accessibility.toggle_favorite_hint" = "ダブルタップでお気に入り状態を切り替え";
"content.accessibility.view_fingerprint_hint" = "暗号フィンガープリントを見る";
"content.actions.block" = "ブロック";
"content.actions.direct_message" = "ダイレクトメッセージ";
"content.actions.hug" = "ハグ";
"content.actions.mention" = "メンション";
"content.actions.slap" = "ビンタ";
"content.actions.title" = "アクション";
"content.alert.bluetooth_required.off" = "bluetoothがオフです。設定でbluetoothをオンにしてbitchatを使ってください。";
"content.alert.bluetooth_required.permission" = "bitchatは近くのデバイスと接続するためbluetooth権限が必要です。設定でアクセスを有効にしてください。";
"content.alert.bluetooth_required.settings" = "設定";
"content.alert.bluetooth_required.title" = "bluetoothが必要";
"content.alert.bluetooth_required.unsupported" = "このデバイスはbluetoothをサポートしていません。bitchatにはbluetoothが必要です。";
"content.alert.screenshot.message" = "ロケーションチャンネルのスクリーンショットはあなたの場所を明かします。公開前によく考えてください。";
"content.alert.screenshot.title" = "注意";
"content.commands.block" = "ブロックまたはブロック済みを表示";
"content.commands.clear" = "チャットをクリア";
"content.commands.favorite" = "お気に入りに追加";
"content.commands.hug" = "あたたかいハグを送る";
"content.commands.message" = "プライベートメッセージを送る";
"content.commands.slap" = "誰かをトラウトでたたく";
"content.commands.unblock" = "ピアのブロックを解除";
"content.commands.unfavorite" = "お気に入りから外す";
"content.commands.who" = "オンラインの人を見る";
"content.delivery.delivered_members" = "%2$d人中%1$d人に配信";
"content.delivery.delivered_to" = "%@に配信";
"content.delivery.failed" = "失敗: %@";
"content.delivery.read_by" = "%@が既読";
"content.delivery.reason.blocked" = "ユーザーをブロック中";
"content.delivery.reason.self" = "自分には送れません";
"content.delivery.reason.send_error" = "送信エラー";
"content.delivery.reason.unknown_recipient" = "不明な宛先";
"content.delivery.reason.unreachable" = "ピアに到達できません";
"content.header.people" = "ユーザー";
"content.help.verification" = "検証: 自分のqrを表示するか友達をスキャン";
"content.input.message_placeholder" = "メッセージを入力...";
"content.input.nickname_placeholder" = "ニックネーム";
"content.location.enable" = "位置情報を有効化";
"content.message.copy" = "メッセージをコピー";
"content.message.show_less" = "表示を減らす";
"content.message.show_more" = "さらに表示";
"content.notes.location_unavailable" = "位置情報を取得できません";
"content.notes.title" = "ノート";
"content.payment.cashu" = "cashuで支払う";
"content.payment.lightning" = "lightningで支払う";
"encryption.accessibility.establishing" = "暗号を確立しています";
"encryption.accessibility.failed" = "暗号に失敗";
"encryption.accessibility.not_encrypted" = "未暗号";
"encryption.accessibility.secured" = "暗号化済み";
"encryption.accessibility.verified" = "暗号化し検証済み";
"encryption.status.establishing" = "暗号を確立中...";
"encryption.status.failed" = "暗号に失敗";
"encryption.status.not_encrypted" = "未暗号";
"encryption.status.secured" = "暗号化済み";
"encryption.status.verified" = "暗号化し検証済み";
"fingerprint.action.mark_verified" = "検証済みにする";
"fingerprint.action.remove_verification" = "検証を削除";
"fingerprint.badge.not_verified" = "⚠️ 未検証";
"fingerprint.badge.verified" = "✓ 検証済み";
"fingerprint.handshake_pending" = "利用不可 - handshake進行中";
"fingerprint.message.verified" = "この人の身元を確認しました。";
"fingerprint.message.verify_hint" = "これらのフィンガープリントを%@と安全なチャネルで比較";
"fingerprint.their_label" = "相手のフィンガープリント:";
"fingerprint.title" = "セキュリティ検証";
"fingerprint.your_label" = "あなたのフィンガープリント:";
"geohash_people.action.block" = "ブロック";
"geohash_people.action.unblock" = "ブロック解除";
"geohash_people.none_nearby" = "近くに誰もいません...";
"geohash_people.tooltip.blocked" = "geohashでブロック中";
"geohash_people.you_suffix" = " (あなた)";
"location_channels.action.open_settings" = "設定を開く";
"location_channels.action.remove_access" = "位置アクセスを解除";
"location_channels.action.request_permissions" = "位置情報とgeohashを取得";
"location_channels.action.teleport" = "テレポート";
"location_channels.bookmarked_section_title" = "保存済み";
"location_channels.description" = "geohashチャンネルで近くの人と会話。共有されるのはざっくりしたgeohashだけで正確なgpsは含みません。全トラフィックをtor経由にすることであなたのipを隠します。";
"location_channels.error.invalid_geohash" = "無効なgeohash";
"location_channels.loading_nearby" = "近くのチャンネルを検索中…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "位置情報の許可が拒否されました。チャンネルを使うには設定で許可してください。";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#ロケーションチャンネル";
"location_channels.tor.subtitle" = "ロケーションチャンネル用にipを隠します。推奨: オン";
"location_channels.tor.title" = "torルーティング";
"location_levels.block" = "ブロック";
"location_levels.building" = "建物";
"location_levels.city" = "都市";
"location_levels.neighborhood" = "近所";
"location_levels.province" = "州";
"location_levels.region" = "地域";
"location_notes.action.dismiss" = "閉じる";
"location_notes.action.retry" = "再試行";
"location_notes.description" = "他の人が見つけられるようこの場所に短いノートを追加";
"location_notes.empty_subtitle" = "ここで最初のノートを残そう。";
"location_notes.empty_title" = "ノートはまだありません";
"location_notes.error.failed_to_send" = "ノートを送信できませんでした。%@";
"location_notes.error.no_relays" = "近くに利用できるジオリレーがありません。後で再試行してください。";
"location_notes.loading_notes" = "ノートを読み込み中…";
"location_notes.loading_recent" = "最新ノートを読み込み中…";
"location_notes.no_relays_nearby" = "近くにジオリレーなし";
"location_notes.placeholder" = "この場所のノートを追加";
"location_notes.relays_paused" = "ジオリレーが利用不可: ノート一時停止";
"location_notes.relays_retry_hint" = "ノートはジオリレーに依存します。接続を確認して再試行してください。";
"mesh_peers.tooltip.new_messages" = "新しいメッセージ";
"system.chat.blocked" = "%@とはチャットできません: ユーザーをブロック中。";
"system.chat.requires_favorite" = "%@とはチャットできません: オフラインには相互のお気に入りが必要です。";
"system.common.user" = "ユーザー";
"system.dm.blocked_generic" = "送信できません: ユーザーをブロック中。";
"system.dm.blocked_recipient" = "%@に送れません: ユーザーをブロック中。";
"system.dm.unreachable" = "%@に送れません: 受信者はmeshやnostrで到達できません。";
"system.geohash.blocked" = "%@をgeohashチャットでブロックしました";
"system.geohash.unblocked" = "%@のgeohashチャットでのブロックを解除しました";
"system.location.not_in_channel" = "送信失敗: ロケーションチャンネルに参加していません";
"system.location.send_failed" = "ロケーションチャンネルに送信できませんでした";
"system.tor.dev_bypass" = "開発ビルド: torバイパスが有効です。";
"system.tor.restarted" = "torを再起動しました。ルーティングを復旧。";
"system.tor.restarting" = "接続回復のためtorを再起動しています...";
"system.tor.started" = "torを起動しました。全チャットをtor経由で配信します。";
"system.tor.starting" = "torを起動中...";
"verification.my_qr.accessibility_label" = "検証用qrコード";
"verification.my_qr.title" = "スキャンして確認";
"verification.my_qr.unavailable" = "qrは利用不可";
"verification.scan.paste_prompt" = "確認するqr内容を貼り付け:";
"verification.scan.prompt_friend" = "友達のqrをスキャン";
"verification.scan.status.invalid" = "qrが無効または期限切れ";
"verification.scan.status.no_peer" = "該当するピアが見つかりません";
"verification.scan.status.requested" = "%@の検証をリクエストしました";
"verification.scan.validate" = "確認";
"verification.sheet.title" = "確認";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d件のノート</string>
<key>other</key>
<string>%d件のノート</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d人</string>
<key>other</key>
<string>%d人</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d人</string>
<key>other</key>
<string>%d人</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Nepali)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "बन्द";
"app_info.done" = "सम्पन्न";
"app_info.features.encryption.description" = "व्यक्तिगत सन्देशहरू noise प्रोटोकलले सङ्केत गर्छ";
"app_info.features.encryption.title" = "एन्ड-टु-एन्ड सङ्केत";
"app_info.features.extended_range.description" = "सन्देशहरू सहकर्मीमार्फत रिले भएर टाढासम्म पुग्छन्";
"app_info.features.extended_range.title" = "विस्तारित पहुँच";
"app_info.features.favorites.description" = "तिम्रा मनपर्ने मानिस जोडिएपछि सूचनाहरू पाऊ";
"app_info.features.favorites.title" = "मनपर्ने";
"app_info.features.geohash.description" = "geohash च्यानलहरूले नजिकका व्यक्तिसँग विकेन्द्रित गोप्य रिलेबाट कुराकानी गर्न मद्दत गर्छ";
"app_info.features.geohash.title" = "स्थानीय च्यानल";
"app_info.features.mentions.description" = "विशेष व्यक्तिलाई सूचित गर्न @nickname प्रयोग गर";
"app_info.features.mentions.title" = "उल्लेख";
"app_info.features.offline.description" = "bluetooth low energy प्रयोग गरेर इन्टरनेट बिना काम गर्छ";
"app_info.features.offline.title" = "अफलाइन सञ्चार";
"app_info.features.title" = "विशेषता";
"app_info.how_to_use.change_channels" = "• च्यानल बदल्न #mesh ट्याप गर";
"app_info.how_to_use.clear_chat" = "• च्याट खाली गर्न तीन पटक ट्याप गर";
"app_info.how_to_use.commands" = "• आदेशहरू हेर्न / टाइप गर";
"app_info.how_to_use.open_sidebar" = "• साइडबार खोल्न मान्छे आइकन ट्याप गर";
"app_info.how_to_use.set_nickname" = "• आफ्नो उपनाममा ट्याप गरेर मिलाऊ";
"app_info.how_to_use.start_dm" = "• dm सुरु गर्न कुनै सहकर्मीको नाम ट्याप गर";
"app_info.how_to_use.title" = "प्रयोग गर्ने तरिका";
"app_info.privacy.ephemeral.description" = "नयाँ peer id नियमित रूपमा सिर्जना हुन्छ";
"app_info.privacy.ephemeral.title" = "क्षणिक पहिचान";
"app_info.privacy.no_tracking.description" = "सर्भर, खाताहरू वा तथ्याङ्क सङ्कलन छैन";
"app_info.privacy.no_tracking.title" = "ट्र्याकिङ छैन";
"app_info.privacy.panic.description" = "लगो तीन पटक ट्याप गर्दा सबै डाटा तुरुन्त मेटिन्छ";
"app_info.privacy.panic.title" = "घबराहट मोड";
"app_info.privacy.title" = "गोपनीयता";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "व्यक्तिगत सन्देशको सुरक्षा पूर्ण रूपमा अडिट भएको छैन। यो चेतावनी हट्दासम्म गम्भीर अवस्थामा प्रयोग नगर्नु।";
"app_info.warning.title" = "चेतावनी";
"common.cancel" = "रद्द";
"common.close" = "बन्द";
"common.copy" = "प्रतिलिपि";
"common.ok" = "ठिक";
"common.toggle.off" = "अफ";
"common.toggle.on" = "अन";
"common.unknown" = "अज्ञात";
"content.accessibility.add_favorite" = "मनपर्नेमा थप";
"content.accessibility.available_nostr" = "nostr मार्फत उपलब्ध";
"content.accessibility.back_to_main_chat" = "मुख्य च्याटमा फर्क";
"content.accessibility.connected_mesh" = "mesh मार्फत जडान";
"content.accessibility.encryption_status" = "सङ्केतको अवस्था: %@";
"content.accessibility.location_channels" = "स्थान च्यानल";
"content.accessibility.location_notes" = "यस ठाउँका स्थान नोटहरू";
"content.accessibility.open_unread_private_chat" = "नपढिएको निजी च्याट खोल";
"content.accessibility.private_chat_header" = "%@ सँग निजी च्याट";
"content.accessibility.reachable_mesh" = "mesh मार्फत पहुँचयोग्य";
"content.accessibility.remove_favorite" = "मनपर्नेबाट हटाउ";
"content.accessibility.send_hint_empty" = "पठाउन सन्देश लेख";
"content.accessibility.send_hint_ready" = "पठाउन दोहोरो ट्याप गर";
"content.accessibility.send_message" = "सन्देश पठाउ";
"content.accessibility.toggle_bookmark" = "#%@ का लागि बुकमार्क बदल";
"content.accessibility.toggle_favorite_hint" = "मनपर्ने स्थिति बदल्न दोहोरो ट्याप गर";
"content.accessibility.view_fingerprint_hint" = "सङ्केत फिङ्गरप्रिन्ट हेर्न ट्याप गर";
"content.actions.block" = "ब्लक";
"content.actions.direct_message" = "प्रत्यक्ष सन्देश";
"content.actions.hug" = "अँगालो";
"content.actions.mention" = "उल्लेख";
"content.actions.slap" = "थप्पड";
"content.actions.title" = "कार्य";
"content.alert.bluetooth_required.off" = "bluetooth बन्द छ। bitchat प्रयोग गर्न bluetooth सेटिङमा अन गर।";
"content.alert.bluetooth_required.permission" = "bitchat लाई नजिकका उपकरणसँग जडान हुन bluetooth अनुमति चाहिन्छ। सेटिङमा पहुँच सक्षम गर।";
"content.alert.bluetooth_required.settings" = "सेटिङ";
"content.alert.bluetooth_required.title" = "bluetooth आवश्यक";
"content.alert.bluetooth_required.unsupported" = "यो उपकरणले bluetooth समर्थन गर्दैन। bitchat चलाउन bluetooth चाहिन्छ।";
"content.alert.screenshot.message" = "स्थान च्यानलको स्क्रिनसटले तिम्रो स्थान खुलाउँछ। सार्वजनिकरूपमा बाँड्नु अघि सोच।";
"content.alert.screenshot.title" = "ध्यान";
"content.commands.block" = "ब्लक गर वा ब्लक गरिएको सूची देखाउ";
"content.commands.clear" = "च्याट सन्देश खाली गर";
"content.commands.favorite" = "मनपर्नेमा थप";
"content.commands.hug" = "न्यानो अँगालो पठाउ";
"content.commands.message" = "निजी सन्देश पठाउ";
"content.commands.slap" = "कसैलाई ट्राउटले थप्पड दे";
"content.commands.unblock" = "पीयर अनब्लक गर";
"content.commands.unfavorite" = "मनपर्नेबाट हटाउ";
"content.commands.who" = "अनलाइन को-को छन् हेर्नु";
"content.delivery.delivered_members" = "%2$d सदस्यमध्ये %1$d जनालाई पुर्याइयो";
"content.delivery.delivered_to" = "%@ लाई पुर्याइयो";
"content.delivery.failed" = "असफल: %@";
"content.delivery.read_by" = "%@ ले पढ्यो";
"content.delivery.reason.blocked" = "प्रयोगकर्ता ब्लक गरिएको";
"content.delivery.reason.self" = "आफूलाई पठाउन मिल्दैन";
"content.delivery.reason.send_error" = "पठाउने त्रुटि";
"content.delivery.reason.unknown_recipient" = "अज्ञात प्राप्तकर्ता";
"content.delivery.reason.unreachable" = "पीयर पहुँचयोग्य छैन";
"content.header.people" = "मानिस";
"content.help.verification" = "प्रमाणीकरण: मेरो qr देखाउ वा साथी स्क्यान गर";
"content.input.message_placeholder" = "सन्देश टाइप गर...";
"content.input.nickname_placeholder" = "उपनाम";
"content.location.enable" = "स्थान सक्षम गर";
"content.message.copy" = "सन्देश प्रतिलिपि गर";
"content.message.show_less" = "थोरै देखाउ";
"content.message.show_more" = "थप देखाउ";
"content.notes.location_unavailable" = "स्थान उपलब्ध छैन";
"content.notes.title" = "नोट";
"content.payment.cashu" = "cashu मार्फत तिर्नु";
"content.payment.lightning" = "lightning मार्फत तिर्नु";
"encryption.accessibility.establishing" = "सङ्केत सेट हुँदै";
"encryption.accessibility.failed" = "सङ्केत असफल";
"encryption.accessibility.not_encrypted" = "सङ्केत छैन";
"encryption.accessibility.secured" = "सङ्केत गरिएको";
"encryption.accessibility.verified" = "सङ्केत र प्रमाणित";
"encryption.status.establishing" = "सङ्केत सेट गर्दै...";
"encryption.status.failed" = "सङ्केत असफल";
"encryption.status.not_encrypted" = "सङ्केत छैन";
"encryption.status.secured" = "सङ्केत गरिएको";
"encryption.status.verified" = "सङ्केत र प्रमाणित";
"fingerprint.action.mark_verified" = "प्रमाणित चिन्ह लगाउ";
"fingerprint.action.remove_verification" = "प्रमाणीकरण हटाउ";
"fingerprint.badge.not_verified" = "⚠️ प्रमाणित छैन";
"fingerprint.badge.verified" = "✓ प्रमाणित";
"fingerprint.handshake_pending" = "उपलब्ध छैन - handshake हुँदै";
"fingerprint.message.verified" = "तिमीले यस व्यक्तिको पहिचान प्रमाणित गरेको छौ.";
"fingerprint.message.verify_hint" = "यी फिङ्गरप्रिन्टहरू %@ सँग सुरक्षित च्यानलमा तुलना गर।";
"fingerprint.their_label" = "उनको फिङ्गरप्रिन्ट:";
"fingerprint.title" = "सुरक्षा प्रमाणीकरण";
"fingerprint.your_label" = "तिम्रो फिङ्गरप्रिन्ट:";
"geohash_people.action.block" = "ब्लक";
"geohash_people.action.unblock" = "अनब्लक";
"geohash_people.none_nearby" = "वरिपरि कोही छैन...";
"geohash_people.tooltip.blocked" = "geohash मा ब्लक";
"geohash_people.you_suffix" = " (तिमी)";
"location_channels.action.open_settings" = "सेटिङ खोल";
"location_channels.action.remove_access" = "स्थान पहुँच हटाउ";
"location_channels.action.request_permissions" = "मेरो स्थान र geohash प्राप्त गर";
"location_channels.action.teleport" = "टेलिपोर्ट";
"location_channels.bookmarked_section_title" = "बुकमार्क";
"location_channels.description" = "geohash च्यानलबाट नजिकका मानिससँग कुरा गर। केवल मोटामो geohash साझा हुन्छ, कहिल्यै सहि gps होइन। सबै ट्राफिक tor मार्फत गएका कारण तिम्रो ip लुकेको हुन्छ।";
"location_channels.error.invalid_geohash" = "अवैध geohash";
"location_channels.loading_nearby" = "नजिकका च्यानल खोज्दै…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "स्थान अनुमति अस्वीकार। स्थान च्यानल प्रयोग गर्न सेटिङमा सक्षम गर।";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#स्थान च्यानल";
"location_channels.tor.subtitle" = "स्थान च्यानलका लागि तिम्रो ip लुकाउँछ। सिफारिस: अन।";
"location_channels.tor.title" = "tor रूटिङ";
"location_levels.block" = "ब्लक";
"location_levels.building" = "भवन";
"location_levels.city" = "सहर";
"location_levels.neighborhood" = "छिमेक";
"location_levels.province" = "प्रदेश";
"location_levels.region" = "क्षेत्र";
"location_notes.action.dismiss" = "बन्द गर";
"location_notes.action.retry" = "फेरि प्रयास गर";
"location_notes.description" = "अन्यले भेटून् भनी यस स्थानमा छोटो स्थायी नोट थप।";
"location_notes.empty_subtitle" = "यस ठाउँमा नोट थप्ने पहिलो व्यक्ती बन।";
"location_notes.empty_title" = "अहिले नोट छैन";
"location_notes.error.failed_to_send" = "नोट पठाउन सकेन। %@";
"location_notes.error.no_relays" = "यस स्थान नजिक georelay उपलब्ध छैन। केही बेरपछि प्रयास गर।";
"location_notes.loading_notes" = "नोट लोड हुँदै…";
"location_notes.loading_recent" = "हालैका नोट लोड गर्दै…";
"location_notes.no_relays_nearby" = "नजिक georelay छैन";
"location_notes.placeholder" = "यस स्थानका लागि नोट थप";
"location_notes.relays_paused" = "georelay उपलब्ध छैन; नोट रोकिएको";
"location_notes.relays_retry_hint" = "नोट georelay मा निर्भर छन्। जडान जाँच गरेर फेरि प्रयास गर.";
"mesh_peers.tooltip.new_messages" = "नयाँ सन्देश";
"system.chat.blocked" = "%@ सँग च्याट सुरु गर्न मिलेन: प्रयोगकर्ता ब्लक गरिएको";
"system.chat.requires_favorite" = "%@ सँग च्याट सुरु गर्न मिलेन: अफलाइनका लागि दुवै मनपर्ने हुनुपर्छ";
"system.common.user" = "प्रयोगकर्ता";
"system.dm.blocked_generic" = "पठाउन मिलेन: प्रयोगकर्ता ब्लक";
"system.dm.blocked_recipient" = "%@ लाई पठाउन मिलेन: प्रयोगकर्ता ब्लक";
"system.dm.unreachable" = "%@ लाई पठाउन मिलेन: प्राप्तकर्ता mesh वा nostr बाट उपलब्ध छैन";
"system.geohash.blocked" = "%@ लाई geohash च्याटमा ब्लक गरियो";
"system.geohash.unblocked" = "%@ लाई geohash च्याटमा अनब्लक गरियो";
"system.location.not_in_channel" = "पठाउन मिलेन: तिमी स्थान च्यानलमा छैनौ";
"system.location.send_failed" = "स्थान च्यानलमा पठाउन सकेन";
"system.tor.dev_bypass" = "डेभ बिल्ड: tor बाइपास सक्षम।";
"system.tor.restarted" = "tor फेरि सुरु भयो। रूटिङ पुनःस्थापित।";
"system.tor.restarting" = "tor जडान फर्काउन पुनः सुरु हुँदैछ...";
"system.tor.started" = "tor सुरु भयो। गोपनीयताका लागि पूरा च्याट tor मार्फत जान्छ।";
"system.tor.starting" = "tor सुरु हुँदै...";
"verification.my_qr.accessibility_label" = "प्रमाणीकरण qr कोड";
"verification.my_qr.title" = "मलाई प्रमाणित गर्न स्क्यान गर";
"verification.my_qr.unavailable" = "qr उपलब्ध छैन";
"verification.scan.paste_prompt" = "प्रमाणित गर्न qr सामग्री पेस्ट गर:";
"verification.scan.prompt_friend" = "साथीको qr स्क्यान गर";
"verification.scan.status.invalid" = "qr अवैध या म्याद सकिएको";
"verification.scan.status.no_peer" = "मिल्ने peer फेला परेन";
"verification.scan.status.requested" = "%@ को लागि प्रमाणीकरण अनुरोध भयो";
"verification.scan.validate" = "प्रमाणित गर";
"verification.sheet.title" = "प्रमाणित";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d नोट</string>
<key>other</key>
<string>%d नोटहरू</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d व्यक्ति</string>
<key>other</key>
<string>%d व्यक्तिहरू</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d व्यक्ति</string>
<key>other</key>
<string>%d व्यक्तिहरू</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Portuguese - Brazil)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "fechar";
"app_info.done" = "CONCLUÍDO";
"app_info.features.encryption.description" = "mensagens privadas criptografadas com o protocolo noise";
"app_info.features.encryption.title" = "criptografia ponto a ponto";
"app_info.features.extended_range.description" = "mensagens retransmitidas entre pares para alcançar mais longe";
"app_info.features.extended_range.title" = "alcance estendido";
"app_info.features.favorites.description" = "receba avisos quando suas pessoas favoritas entrarem";
"app_info.features.favorites.title" = "favoritos";
"app_info.features.geohash.description" = "canais geohash para conversar com pessoas em regiões próximas por relays descentralizados anônimos";
"app_info.features.geohash.title" = "canais locais";
"app_info.features.mentions.description" = "use @nickname para notificar pessoas específicas";
"app_info.features.mentions.title" = "menções";
"app_info.features.offline.description" = "funciona sem internet usando bluetooth de baixa energia";
"app_info.features.offline.title" = "comunicação offline";
"app_info.features.title" = "RECURSOS";
"app_info.how_to_use.change_channels" = "• toque #mesh para trocar de canal";
"app_info.how_to_use.clear_chat" = "• toque o chat três vezes para limpar";
"app_info.how_to_use.commands" = "• digite / para ver comandos";
"app_info.how_to_use.open_sidebar" = "• toque o ícone de pessoas para abrir a barra lateral";
"app_info.how_to_use.set_nickname" = "• defina seu apelido tocando nele";
"app_info.how_to_use.start_dm" = "• toque o nome de um par para iniciar um dm";
"app_info.how_to_use.title" = "COMO USAR";
"app_info.privacy.ephemeral.description" = "novo id de peer gerado regularmente";
"app_info.privacy.ephemeral.title" = "identidade efêmera";
"app_info.privacy.no_tracking.description" = "sem servidores, contas ou coleta de dados";
"app_info.privacy.no_tracking.title" = "sem rastreamento";
"app_info.privacy.panic.description" = "toque o logo três vezes para limpar todos os dados instantaneamente";
"app_info.privacy.panic.title" = "modo pânico";
"app_info.privacy.title" = "PRIVACIDADE";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "a segurança das mensagens privadas ainda não foi totalmente auditada. não use em situações críticas até que este aviso desapareça.";
"app_info.warning.title" = "AVISO";
"common.cancel" = "cancelar";
"common.close" = "fechar";
"common.copy" = "copiar";
"common.ok" = "OK";
"common.toggle.off" = "desligado";
"common.toggle.on" = "ligado";
"common.unknown" = "desconhecido";
"content.accessibility.add_favorite" = "adicionar aos favoritos";
"content.accessibility.available_nostr" = "disponível via nostr";
"content.accessibility.back_to_main_chat" = "voltar ao chat principal";
"content.accessibility.connected_mesh" = "conectado por mesh";
"content.accessibility.encryption_status" = "status da criptografia: %@";
"content.accessibility.location_channels" = "canais de localização";
"content.accessibility.location_notes" = "notas de localização deste lugar";
"content.accessibility.open_unread_private_chat" = "abrir chat privado não lido";
"content.accessibility.private_chat_header" = "chat privado com %@";
"content.accessibility.reachable_mesh" = "alcançável por mesh";
"content.accessibility.remove_favorite" = "remover dos favoritos";
"content.accessibility.send_hint_empty" = "digite uma mensagem para enviar";
"content.accessibility.send_hint_ready" = "toque duas vezes para enviar";
"content.accessibility.send_message" = "enviar mensagem";
"content.accessibility.toggle_bookmark" = "alternar favorito para #%@";
"content.accessibility.toggle_favorite_hint" = "toque duas vezes para alternar status de favorito";
"content.accessibility.view_fingerprint_hint" = "toque para ver a impressão de criptografia";
"content.actions.block" = "bloquear";
"content.actions.direct_message" = "mensagem direta";
"content.actions.hug" = "abraço";
"content.actions.mention" = "mencionar";
"content.actions.slap" = "tapa";
"content.actions.title" = "ações";
"content.alert.bluetooth_required.off" = "bluetooth está desligado. ative o bluetooth em ajustes para usar bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat precisa de permissão de bluetooth para conectar com dispositivos próximos. habilite o acesso em ajustes.";
"content.alert.bluetooth_required.settings" = "ajustes";
"content.alert.bluetooth_required.title" = "bluetooth necessário";
"content.alert.bluetooth_required.unsupported" = "este dispositivo não suporta bluetooth. bitchat precisa de bluetooth para funcionar.";
"content.alert.screenshot.message" = "capturas de canais de localização revelam sua localização. pense antes de compartilhar publicamente.";
"content.alert.screenshot.title" = "atenção";
"content.commands.block" = "bloquear ou listar pares bloqueados";
"content.commands.clear" = "limpar mensagens do chat";
"content.commands.favorite" = "adicionar aos favoritos";
"content.commands.hug" = "enviar um abraço quente";
"content.commands.message" = "enviar mensagem privada";
"content.commands.slap" = "dar um tapa em alguém com uma truta";
"content.commands.unblock" = "desbloquear um par";
"content.commands.unfavorite" = "remover dos favoritos";
"content.commands.who" = "ver quem está online";
"content.delivery.delivered_members" = "entregue a %1$d de %2$d membros";
"content.delivery.delivered_to" = "entregue para %@";
"content.delivery.failed" = "falhou: %@";
"content.delivery.read_by" = "lido por %@";
"content.delivery.reason.blocked" = "usuário bloqueado";
"content.delivery.reason.self" = "não é possível enviar mensagem para si mesmo";
"content.delivery.reason.send_error" = "erro ao enviar";
"content.delivery.reason.unknown_recipient" = "destinatário desconhecido";
"content.delivery.reason.unreachable" = "par inalcançável";
"content.header.people" = "PESSOAS";
"content.help.verification" = "verificação: mostrar meu qr ou escanear um amigo";
"content.input.message_placeholder" = "digite uma mensagem...";
"content.input.nickname_placeholder" = "apelido";
"content.location.enable" = "habilitar localização";
"content.message.copy" = "copiar mensagem";
"content.message.show_less" = "mostrar menos";
"content.message.show_more" = "mostrar mais";
"content.notes.location_unavailable" = "localização indisponível";
"content.notes.title" = "notas";
"content.payment.cashu" = "pagar via cashu";
"content.payment.lightning" = "pagar via lightning";
"encryption.accessibility.establishing" = "estabelecendo criptografia";
"encryption.accessibility.failed" = "falha na criptografia";
"encryption.accessibility.not_encrypted" = "não criptografado";
"encryption.accessibility.secured" = "criptografado";
"encryption.accessibility.verified" = "criptografado e verificado";
"encryption.status.establishing" = "estabelecendo criptografia...";
"encryption.status.failed" = "falha na criptografia";
"encryption.status.not_encrypted" = "não criptografado";
"encryption.status.secured" = "criptografado";
"encryption.status.verified" = "criptografado e verificado";
"fingerprint.action.mark_verified" = "marcar como verificado";
"fingerprint.action.remove_verification" = "remover verificação";
"fingerprint.badge.not_verified" = "⚠️ NÃO VERIFICADO";
"fingerprint.badge.verified" = "✓ VERIFICADO";
"fingerprint.handshake_pending" = "indisponível - handshake em andamento";
"fingerprint.message.verified" = "você verificou a identidade dessa pessoa.";
"fingerprint.message.verify_hint" = "compare essas impressões com %@ usando um canal seguro.";
"fingerprint.their_label" = "impressão digital deles:";
"fingerprint.title" = "verificação de segurança";
"fingerprint.your_label" = "sua impressão digital:";
"geohash_people.action.block" = "bloquear";
"geohash_people.action.unblock" = "desbloquear";
"geohash_people.none_nearby" = "ninguém por perto...";
"geohash_people.tooltip.blocked" = "bloqueado em geohash";
"geohash_people.you_suffix" = " (você)";
"location_channels.action.open_settings" = "abrir ajustes";
"location_channels.action.remove_access" = "remover acesso à localização";
"location_channels.action.request_permissions" = "obter localização e meus geohashes";
"location_channels.action.teleport" = "teletransportar";
"location_channels.bookmarked_section_title" = "marcados";
"location_channels.description" = "converse com pessoas próximas usando canais geohash. apenas um geohash grosseiro é compartilhado, nunca gps exato. seu ip fica oculto ao rotear todo o tráfego por tor.";
"location_channels.error.invalid_geohash" = "geohash inválido";
"location_channels.loading_nearby" = "procurando canais próximos…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "permissão de localização negada. habilite em ajustes para usar canais de localização.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#canais de localização";
"location_channels.tor.subtitle" = "oculta seu ip para canais de localização. recomendado: ligado.";
"location_channels.tor.title" = "roteamento tor";
"location_levels.block" = "quadra";
"location_levels.building" = "prédio";
"location_levels.city" = "cidade";
"location_levels.neighborhood" = "bairro";
"location_levels.province" = "estado";
"location_levels.region" = "região";
"location_notes.action.dismiss" = "dispensar";
"location_notes.action.retry" = "tentar novamente";
"location_notes.description" = "adicione notas curtas permanentes neste local para outras pessoas encontrarem.";
"location_notes.empty_subtitle" = "seja a primeira pessoa a adicionar uma aqui.";
"location_notes.empty_title" = "nenhuma nota ainda";
"location_notes.error.failed_to_send" = "não foi possível enviar a nota. %@";
"location_notes.error.no_relays" = "nenhum relay geográfico disponível perto deste local. tente novamente em breve.";
"location_notes.loading_notes" = "carregando notas…";
"location_notes.loading_recent" = "carregando notas recentes…";
"location_notes.no_relays_nearby" = "nenhum relay geográfico próximo";
"location_notes.placeholder" = "adicione uma nota para este lugar";
"location_notes.relays_paused" = "relays geográficos indisponíveis; notas pausadas";
"location_notes.relays_retry_hint" = "notas dependem de relays geográficos. verifique a conexão e tente de novo.";
"mesh_peers.tooltip.new_messages" = "novas mensagens";
"system.chat.blocked" = "não é possível iniciar chat com %@: usuário bloqueado.";
"system.chat.requires_favorite" = "não é possível iniciar chat com %@: vocês precisam ser favoritos mútuos para mensagens offline.";
"system.common.user" = "usuário";
"system.dm.blocked_generic" = "não foi possível enviar: usuário bloqueado.";
"system.dm.blocked_recipient" = "não é possível enviar mensagem para %@: usuário bloqueado.";
"system.dm.unreachable" = "não é possível enviar mensagem para %@: destinatário inalcançável por mesh ou nostr.";
"system.geohash.blocked" = "%@ foi bloqueado nos chats geohash";
"system.geohash.unblocked" = "%@ foi desbloqueado nos chats geohash";
"system.location.not_in_channel" = "não foi possível enviar: você não está em um canal de localização";
"system.location.send_failed" = "não foi possível enviar para o canal de localização";
"system.tor.dev_bypass" = "compilação de desenvolvimento: bypass de tor ativo.";
"system.tor.restarted" = "tor reiniciou. roteamento restaurado.";
"system.tor.restarting" = "tor está reiniciando para recuperar conectividade...";
"system.tor.started" = "tor iniciou. todo o chat é roteado por tor para privacidade.";
"system.tor.starting" = "iniciando tor...";
"verification.my_qr.accessibility_label" = "código qr de verificação";
"verification.my_qr.title" = "escaneie para me verificar";
"verification.my_qr.unavailable" = "qr indisponível";
"verification.scan.paste_prompt" = "cole o conteúdo do qr para validar:";
"verification.scan.prompt_friend" = "escaneie o qr de um amigo";
"verification.scan.status.invalid" = "qr inválido ou expirado";
"verification.scan.status.no_peer" = "nenhum peer correspondente encontrado";
"verification.scan.status.requested" = "verificação solicitada para %@";
"verification.scan.validate" = "validar";
"verification.sheet.title" = "VERIFICAR";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d nota</string>
<key>other</key>
<string>%d notas</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d pessoa</string>
<key>other</key>
<string>%d pessoas</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d pessoa</string>
<key>other</key>
<string>%d pessoas</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Russian)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "закрыть";
"app_info.done" = "ГОТОВО";
"app_info.features.encryption.description" = "личные сообщения шифруются протоколом noise";
"app_info.features.encryption.title" = "сквозное шифрование";
"app_info.features.extended_range.description" = "сообщения ретранслируются между пирами и уходят дальше";
"app_info.features.extended_range.title" = "расширенный радиус";
"app_info.features.favorites.description" = "получай уведомления, когда подключаются любимые люди";
"app_info.features.favorites.title" = "избранное";
"app_info.features.geohash.description" = "каналы geohash для чата с людьми поблизости через децентрализованные анонимные реле";
"app_info.features.geohash.title" = "локальные каналы";
"app_info.features.mentions.description" = "используй @nickname, чтобы уведомить конкретных людей";
"app_info.features.mentions.title" = "упоминания";
"app_info.features.offline.description" = "работает без интернета через bluetooth low energy";
"app_info.features.offline.title" = "офлайн-связь";
"app_info.features.title" = "ВОЗМОЖНОСТИ";
"app_info.how_to_use.change_channels" = "• нажми #mesh, чтобы сменить канал";
"app_info.how_to_use.clear_chat" = "• тройной тап по чату очистит его";
"app_info.how_to_use.commands" = "• введи /, чтобы увидеть команды";
"app_info.how_to_use.open_sidebar" = "• нажми на иконку людей, чтобы открыть боковое меню";
"app_info.how_to_use.set_nickname" = "• коснись своего ника, чтобы изменить его";
"app_info.how_to_use.start_dm" = "• нажми имя пользователя, чтобы начать лс";
"app_info.how_to_use.title" = "КАК ИСПОЛЬЗОВАТЬ";
"app_info.privacy.ephemeral.description" = "новый id пира создаётся регулярно";
"app_info.privacy.ephemeral.title" = "эфемерная личность";
"app_info.privacy.no_tracking.description" = "без серверов, аккаунтов и сбора данных";
"app_info.privacy.no_tracking.title" = "без трекинга";
"app_info.privacy.panic.description" = "тройной тап по логотипу мгновенно очищает все данные";
"app_info.privacy.panic.title" = "режим паники";
"app_info.privacy.title" = "КОНФИДЕНЦИАЛЬНОСТЬ";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "безопасность приватных сообщений ещё не прошла полный аудит. не используй для критичных случаев, пока предупреждение не исчезнет.";
"app_info.warning.title" = "ПРЕДУПРЕЖДЕНИЕ";
"common.cancel" = "отмена";
"common.close" = "закрыть";
"common.copy" = "копировать";
"common.ok" = "OK";
"common.toggle.off" = "выкл";
"common.toggle.on" = "вкл";
"common.unknown" = "неизвестно";
"content.accessibility.add_favorite" = "добавить в избранное";
"content.accessibility.available_nostr" = "доступно через nostr";
"content.accessibility.back_to_main_chat" = "назад в основной чат";
"content.accessibility.connected_mesh" = "подключено через mesh";
"content.accessibility.encryption_status" = "статус шифрования: %@";
"content.accessibility.location_channels" = "каналы локации";
"content.accessibility.location_notes" = "заметки для этого места";
"content.accessibility.open_unread_private_chat" = "открыть непрочитанный приватный чат";
"content.accessibility.private_chat_header" = "приватный чат с %@";
"content.accessibility.reachable_mesh" = "достижим через mesh";
"content.accessibility.remove_favorite" = "убрать из избранного";
"content.accessibility.send_hint_empty" = "введи сообщение для отправки";
"content.accessibility.send_hint_ready" = "дважды тапни, чтобы отправить";
"content.accessibility.send_message" = "отправить сообщение";
"content.accessibility.toggle_bookmark" = "переключить закладку для #%@";
"content.accessibility.toggle_favorite_hint" = "дважды тапни, чтобы переключить статус избранного";
"content.accessibility.view_fingerprint_hint" = "нажми, чтобы увидеть криптографический отпечаток";
"content.actions.block" = "заблокировать";
"content.actions.direct_message" = "личное сообщение";
"content.actions.hug" = "обнять";
"content.actions.mention" = "упомянуть";
"content.actions.slap" = "дать леща";
"content.actions.title" = "действия";
"content.alert.bluetooth_required.off" = "bluetooth выключен. включи bluetooth в настройках, чтобы использовать bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat нужен доступ к bluetooth, чтобы соединяться с ближайшими устройствами. включи разрешение в настройках.";
"content.alert.bluetooth_required.settings" = "настройки";
"content.alert.bluetooth_required.title" = "bluetooth обязателен";
"content.alert.bluetooth_required.unsupported" = "это устройство не поддерживает bluetooth. bitchat нужен bluetooth для работы.";
"content.alert.screenshot.message" = "скриншоты каналов местоположения раскроют твою позицию. подумай, прежде чем делиться публично.";
"content.alert.screenshot.title" = "внимание";
"content.commands.block" = "заблокировать или показать заблокированных";
"content.commands.clear" = "очистить чат";
"content.commands.favorite" = "добавить в избранное";
"content.commands.hug" = "отправить тёплое объятие";
"content.commands.message" = "отправить приватное сообщение";
"content.commands.slap" = "дать кому-то пощёчину форелью";
"content.commands.unblock" = "разблокировать пира";
"content.commands.unfavorite" = "убрать из избранного";
"content.commands.who" = "посмотреть, кто онлайн";
"content.delivery.delivered_members" = "доставлено %1$d из %2$d участников";
"content.delivery.delivered_to" = "доставлено %@";
"content.delivery.failed" = "ошибка: %@";
"content.delivery.read_by" = "прочитано %@";
"content.delivery.reason.blocked" = "пользователь заблокирован";
"content.delivery.reason.self" = "нельзя отправить себе";
"content.delivery.reason.send_error" = "ошибка отправки";
"content.delivery.reason.unknown_recipient" = "неизвестный получатель";
"content.delivery.reason.unreachable" = "пир недостижим";
"content.header.people" = "ЛЮДИ";
"content.help.verification" = "верификация: показать мой qr или сканировать друга";
"content.input.message_placeholder" = "напиши сообщение...";
"content.input.nickname_placeholder" = "ник";
"content.location.enable" = "включить локацию";
"content.message.copy" = "копировать сообщение";
"content.message.show_less" = "показать меньше";
"content.message.show_more" = "показать больше";
"content.notes.location_unavailable" = "локация недоступна";
"content.notes.title" = "заметки";
"content.payment.cashu" = "оплатить через cashu";
"content.payment.lightning" = "оплатить через lightning";
"encryption.accessibility.establishing" = "устанавливается шифрование";
"encryption.accessibility.failed" = "шифрование не удалось";
"encryption.accessibility.not_encrypted" = "не зашифровано";
"encryption.accessibility.secured" = "зашифровано";
"encryption.accessibility.verified" = "зашифровано и проверено";
"encryption.status.establishing" = "устанавливаем шифрование...";
"encryption.status.failed" = "шифрование не удалось";
"encryption.status.not_encrypted" = "не зашифровано";
"encryption.status.secured" = "зашифровано";
"encryption.status.verified" = "зашифровано и проверено";
"fingerprint.action.mark_verified" = "пометить как проверено";
"fingerprint.action.remove_verification" = "удалить проверку";
"fingerprint.badge.not_verified" = "⚠️ НЕ ПРОВЕРЕНО";
"fingerprint.badge.verified" = "✓ ПРОВЕРЕНО";
"fingerprint.handshake_pending" = "недоступно — handshake выполняется";
"fingerprint.message.verified" = "ты подтвердил личность этого человека.";
"fingerprint.message.verify_hint" = "сравни эти отпечатки с %@ по безопасному каналу.";
"fingerprint.their_label" = "их отпечаток:";
"fingerprint.title" = "проверка безопасности";
"fingerprint.your_label" = "твой отпечаток:";
"geohash_people.action.block" = "заблокировать";
"geohash_people.action.unblock" = "разблокировать";
"geohash_people.none_nearby" = "никого рядом...";
"geohash_people.tooltip.blocked" = "заблокирован в geohash";
"geohash_people.you_suffix" = " (ты)";
"location_channels.action.open_settings" = "открыть настройки";
"location_channels.action.remove_access" = "отключить доступ к локации";
"location_channels.action.request_permissions" = "получить мою локацию и geohash";
"location_channels.action.teleport" = "телепорт";
"location_channels.bookmarked_section_title" = "закреплённые";
"location_channels.description" = "общайся с людьми рядом через каналы geohash. делится только грубый geohash, без точного gps. твой ip скрывается за счёт маршрутизации трафика через tor.";
"location_channels.error.invalid_geohash" = "некорректный geohash";
"location_channels.loading_nearby" = "поиск каналов рядом…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "доступ к локации запрещён. включи разрешение в настройках, чтобы использовать каналы.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#каналы локации";
"location_channels.tor.subtitle" = "скрывает твой ip для каналов локации. рекомендуем включить.";
"location_channels.tor.title" = "маршрутизация tor";
"location_levels.block" = "квартал";
"location_levels.building" = "здание";
"location_levels.city" = "город";
"location_levels.neighborhood" = "район";
"location_levels.province" = "область";
"location_levels.region" = "регион";
"location_notes.action.dismiss" = "закрыть";
"location_notes.action.retry" = "повторить";
"location_notes.description" = "добавь короткие постоянные заметки об этом месте для других.";
"location_notes.empty_subtitle" = "стань первым, кто добавит здесь заметку.";
"location_notes.empty_title" = "заметок пока нет";
"location_notes.error.failed_to_send" = "не удалось отправить заметку. %@";
"location_notes.error.no_relays" = "рядом нет георелеев. попробуй позже.";
"location_notes.loading_notes" = "загрузка заметок…";
"location_notes.loading_recent" = "загрузка свежих заметок…";
"location_notes.no_relays_nearby" = "рядом нет георелеев";
"location_notes.placeholder" = "добавь заметку для этого места";
"location_notes.relays_paused" = "геореле недоступны; заметки приостановлены";
"location_notes.relays_retry_hint" = "заметки зависят от георелеев. проверь подключение и попробуй снова.";
"mesh_peers.tooltip.new_messages" = "новые сообщения";
"system.chat.blocked" = "нельзя начать чат с %@: пользователь заблокирован.";
"system.chat.requires_favorite" = "нельзя начать чат с %@: нужны взаимные избранные для офлайна.";
"system.common.user" = "пользователь";
"system.dm.blocked_generic" = "отправка невозможна: пользователь заблокирован.";
"system.dm.blocked_recipient" = "нельзя отправить %@: пользователь заблокирован.";
"system.dm.unreachable" = "нельзя отправить %@: адресат недоступен через mesh или nostr.";
"system.geohash.blocked" = "%@ заблокирован в geohash-чатах";
"system.geohash.unblocked" = "%@ разблокирован в geohash-чатах";
"system.location.not_in_channel" = "отправка невозможна: ты не в канале локации";
"system.location.send_failed" = "не удалось отправить в канал локации";
"system.tor.dev_bypass" = "dev-сборка: обход tor включён.";
"system.tor.restarted" = "tor перезапущен. маршрутизация восстановлена.";
"system.tor.restarting" = "tor перезапускается, чтобы вернуть связь...";
"system.tor.started" = "tor запущен. весь чат идёт через tor для приватности.";
"system.tor.starting" = "запуск tor...";
"verification.my_qr.accessibility_label" = "qr-код проверки";
"verification.my_qr.title" = "отсканируй, чтобы подтвердить меня";
"verification.my_qr.unavailable" = "qr недоступен";
"verification.scan.paste_prompt" = "вставь содержимое qr для проверки:";
"verification.scan.prompt_friend" = "отсканируй qr друга";
"verification.scan.status.invalid" = "qr недействителен или просрочен";
"verification.scan.status.no_peer" = "соответствующий пир не найден";
"verification.scan.status.requested" = "проверка запрошена для %@";
"verification.scan.validate" = "проверить";
"verification.sheet.title" = "ПРОВЕРИТЬ";
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d заметка</string>
<key>few</key>
<string>%d заметки</string>
<key>many</key>
<string>%d заметок</string>
<key>other</key>
<string>%d заметки</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d человек</string>
<key>few</key>
<string>%d человека</string>
<key>many</key>
<string>%d человек</string>
<key>other</key>
<string>%d человека</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d человек</string>
<key>few</key>
<string>%d человека</string>
<key>many</key>
<string>%d человек</string>
<key>other</key>
<string>%d человека</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Ukrainian)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "закрити";
"app_info.done" = "ГОТОВО";
"app_info.features.encryption.description" = "приватні повідомлення шифруються протоколом noise";
"app_info.features.encryption.title" = "скрізьове шифрування";
"app_info.features.extended_range.description" = "повідомлення ретранслюються між пірами й долітають далі";
"app_info.features.extended_range.title" = "розширена дальність";
"app_info.features.favorites.description" = "отримуй сповіщення, коли підключаються улюблені люди";
"app_info.features.favorites.title" = "вибране";
"app_info.features.geohash.description" = "канали geohash для спілкування з людьми поблизу через децентралізовані анонімні ретранслятори";
"app_info.features.geohash.title" = "локальні канали";
"app_info.features.mentions.description" = "використовуй @nickname, щоб сповістити конкретних людей";
"app_info.features.mentions.title" = "згадки";
"app_info.features.offline.description" = "працює без інтернету через bluetooth low energy";
"app_info.features.offline.title" = "офлайн-зв'язок";
"app_info.features.title" = "МОЖЛИВОСТІ";
"app_info.how_to_use.change_channels" = "• торкнися #mesh, щоб змінити канал";
"app_info.how_to_use.clear_chat" = "• торкни чат тричі, щоб очистити";
"app_info.how_to_use.commands" = "• введи /, щоб побачити команди";
"app_info.how_to_use.open_sidebar" = "• торкни піктограму людей, щоб відкрити бічну панель";
"app_info.how_to_use.set_nickname" = "• змінюй свій нік, торкаючись його";
"app_info.how_to_use.start_dm" = "• торкни ім'я піра, щоб почати приватний чат";
"app_info.how_to_use.title" = "ЯК КОРИСТУВАТИСЯ";
"app_info.privacy.ephemeral.description" = "новий id піра генерується регулярно";
"app_info.privacy.ephemeral.title" = "ефемерна ідентичність";
"app_info.privacy.no_tracking.description" = "жодних серверів, обліковок чи збору даних";
"app_info.privacy.no_tracking.title" = "без відстеження";
"app_info.privacy.panic.description" = "тричі торкни логотип, щоб миттєво стерти всі дані";
"app_info.privacy.panic.title" = "режим паніки";
"app_info.privacy.title" = "КОНФІДЕНЦІЙНІСТЬ";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "безпека приватних повідомлень ще не пройшла повний аудит. не використовуй для критичних ситуацій, поки це попередження не зникне.";
"app_info.warning.title" = "ПОПЕРЕДЖЕННЯ";
"common.cancel" = "скасувати";
"common.close" = "закрити";
"common.copy" = "скопіювати";
"common.ok" = "OK";
"common.toggle.off" = "вимк";
"common.toggle.on" = "увімк";
"common.unknown" = "невідомо";
"content.accessibility.add_favorite" = "додати до вибраного";
"content.accessibility.available_nostr" = "доступно через nostr";
"content.accessibility.back_to_main_chat" = "назад до основного чату";
"content.accessibility.connected_mesh" = "з'єднано через mesh";
"content.accessibility.encryption_status" = "стан шифрування: %@";
"content.accessibility.location_channels" = "канали локації";
"content.accessibility.location_notes" = "замітки про це місце";
"content.accessibility.open_unread_private_chat" = "відкрити непрочитаний приватний чат";
"content.accessibility.private_chat_header" = "приватний чат з %@";
"content.accessibility.reachable_mesh" = "досяжно через mesh";
"content.accessibility.remove_favorite" = "видалити з вибраного";
"content.accessibility.send_hint_empty" = "введи повідомлення для надсилання";
"content.accessibility.send_hint_ready" = "торкни двічі, щоб надіслати";
"content.accessibility.send_message" = "надіслати повідомлення";
"content.accessibility.toggle_bookmark" = "перемкнути закладку для #%@";
"content.accessibility.toggle_favorite_hint" = "торкни двічі, щоб змінити статус вибраного";
"content.accessibility.view_fingerprint_hint" = "торкни, щоб переглянути криптографічний відбиток";
"content.actions.block" = "заблокувати";
"content.actions.direct_message" = "приватне повідомлення";
"content.actions.hug" = "обійняти";
"content.actions.mention" = "згадати";
"content.actions.slap" = "ляпас";
"content.actions.title" = "дії";
"content.alert.bluetooth_required.off" = "bluetooth вимкнений. увімкни bluetooth у налаштуваннях, щоб користуватися bitchat.";
"content.alert.bluetooth_required.permission" = "bitchat потребує дозволу bluetooth для з'єднання з пристроями поруч. ввімкни доступ у налаштуваннях.";
"content.alert.bluetooth_required.settings" = "налаштування";
"content.alert.bluetooth_required.title" = "потрібен bluetooth";
"content.alert.bluetooth_required.unsupported" = "цей пристрій не підтримує bluetooth. bitchat потрібен bluetooth для роботи.";
"content.alert.screenshot.message" = "скріншоти каналів локації розкриють твоє місце. подумай, перш ніж ділитися публічно.";
"content.alert.screenshot.title" = "увага";
"content.commands.block" = "заблокувати або показати заблокованих";
"content.commands.clear" = "очистити чат";
"content.commands.favorite" = "додати до вибраного";
"content.commands.hug" = "відправити теплі обійми";
"content.commands.message" = "надіслати приватне повідомлення";
"content.commands.slap" = "лупнути когось фореллю";
"content.commands.unblock" = "розблокувати піра";
"content.commands.unfavorite" = "видалити з вибраного";
"content.commands.who" = "подивитися, хто онлайн";
"content.delivery.delivered_members" = "доставлено %1$d з %2$d учасників";
"content.delivery.delivered_to" = "доставлено %@";
"content.delivery.failed" = "не вдалося: %@";
"content.delivery.read_by" = "прочитано %@";
"content.delivery.reason.blocked" = "користувач заблокований";
"content.delivery.reason.self" = "не можна надіслати собі";
"content.delivery.reason.send_error" = "помилка надсилання";
"content.delivery.reason.unknown_recipient" = "невідомий одержувач";
"content.delivery.reason.unreachable" = "пір недосяжний";
"content.header.people" = "ЛЮДИ";
"content.help.verification" = "верифікація: показати мій qr або сканувати друга";
"content.input.message_placeholder" = "напиши повідомлення...";
"content.input.nickname_placeholder" = "нік";
"content.location.enable" = "увімкнути локацію";
"content.message.copy" = "скопіювати повідомлення";
"content.message.show_less" = "показати менше";
"content.message.show_more" = "показати більше";
"content.notes.location_unavailable" = "локація недоступна";
"content.notes.title" = "замітки";
"content.payment.cashu" = "оплатити через cashu";
"content.payment.lightning" = "оплатити через lightning";
"encryption.accessibility.establishing" = "встановлюється шифрування";
"encryption.accessibility.failed" = "шифрування не вдалося";
"encryption.accessibility.not_encrypted" = "не зашифровано";
"encryption.accessibility.secured" = "зашифровано";
"encryption.accessibility.verified" = "зашифровано та перевірено";
"encryption.status.establishing" = "встановлюємо шифрування...";
"encryption.status.failed" = "шифрування не вдалося";
"encryption.status.not_encrypted" = "не зашифровано";
"encryption.status.secured" = "зашифровано";
"encryption.status.verified" = "зашифровано та перевірено";
"fingerprint.action.mark_verified" = "позначити як перевірено";
"fingerprint.action.remove_verification" = "зняти перевірку";
"fingerprint.badge.not_verified" = "⚠️ НЕ ПЕРЕВІРЕНО";
"fingerprint.badge.verified" = "✓ ПЕРЕВІРЕНО";
"fingerprint.handshake_pending" = "недоступно — handshake триває";
"fingerprint.message.verified" = "ти підтвердив особу цієї людини.";
"fingerprint.message.verify_hint" = "порівняй ці відбитки з %@ у безпечному каналі.";
"fingerprint.their_label" = "їхній відбиток:";
"fingerprint.title" = "перевірка безпеки";
"fingerprint.your_label" = "твій відбиток:";
"geohash_people.action.block" = "заблокувати";
"geohash_people.action.unblock" = "розблокувати";
"geohash_people.none_nearby" = "поруч нікого...";
"geohash_people.tooltip.blocked" = "заблоковано в geohash";
"geohash_people.you_suffix" = " (ти)";
"location_channels.action.open_settings" = "відкрити налаштування";
"location_channels.action.remove_access" = "відключити доступ до локації";
"location_channels.action.request_permissions" = "отримати мою локацію та geohash";
"location_channels.action.teleport" = "телепорт";
"location_channels.bookmarked_section_title" = "закладені";
"location_channels.description" = "спілкуйся з людьми поруч у каналах geohash. передається лише грубий geohash, без точного gps. твій ip приховується, бо весь трафік йде через tor.";
"location_channels.error.invalid_geohash" = "некоректний geohash";
"location_channels.loading_nearby" = "пошук каналів поруч…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "доступ до локації заборонено. увімкни дозвіл у налаштуваннях, щоб користуватися каналами.";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#канали локації";
"location_channels.tor.subtitle" = "приховує твій ip для каналів локації. рекомендовано ввімкнути.";
"location_channels.tor.title" = "маршрутизація tor";
"location_levels.block" = "квартал";
"location_levels.building" = "будівля";
"location_levels.city" = "місто";
"location_levels.neighborhood" = "район";
"location_levels.province" = "область";
"location_levels.region" = "регіон";
"location_notes.action.dismiss" = "закрити";
"location_notes.action.retry" = "повторити";
"location_notes.description" = "додай короткі постійні замітки про це місце для інших.";
"location_notes.empty_subtitle" = "стань першим, хто додасть тут замітку.";
"location_notes.empty_title" = "заміток ще немає";
"location_notes.error.failed_to_send" = "не вдалося надіслати замітку. %@";
"location_notes.error.no_relays" = "поруч немає гео-релеїв. спробуй пізніше.";
"location_notes.loading_notes" = "завантаження заміток…";
"location_notes.loading_recent" = "завантаження свіжих заміток…";
"location_notes.no_relays_nearby" = "немає гео-релеїв поблизу";
"location_notes.placeholder" = "додай замітку для цього місця";
"location_notes.relays_paused" = "гео-релеї недоступні; замітки призупинено";
"location_notes.relays_retry_hint" = "замітки залежать від гео-релеїв. перевір з'єднання й спробуй ще раз.";
"mesh_peers.tooltip.new_messages" = "нові повідомлення";
"system.chat.blocked" = "не можна почати чат з %@: користувач заблокований.";
"system.chat.requires_favorite" = "не можна почати чат з %@: потрібне взаємне вибране для офлайна.";
"system.common.user" = "користувач";
"system.dm.blocked_generic" = "не вдалося надіслати: користувач заблокований.";
"system.dm.blocked_recipient" = "неможливо надіслати %@: користувач заблокований.";
"system.dm.unreachable" = "неможливо надіслати %@: одержувач недосяжний через mesh або nostr.";
"system.geohash.blocked" = "%@ заблоковано в geohash-чатах";
"system.geohash.unblocked" = "%@ розблоковано в geohash-чатах";
"system.location.not_in_channel" = "не вдалося надіслати: ти не в каналі локації";
"system.location.send_failed" = "не вдалося надіслати в канал локації";
"system.tor.dev_bypass" = "dev-збірка: обхід tor увімкнено.";
"system.tor.restarted" = "tor перезапущено. маршрутизацію відновлено.";
"system.tor.restarting" = "tor перезапускається, щоб відновити підключення...";
"system.tor.started" = "tor запущено. увесь чат іде через tor для приватності.";
"system.tor.starting" = "запуск tor...";
"verification.my_qr.accessibility_label" = "qr-код підтвердження";
"verification.my_qr.title" = "скануй, щоб підтвердити мене";
"verification.my_qr.unavailable" = "qr недоступний";
"verification.scan.paste_prompt" = "встав вміст qr для перевірки:";
"verification.scan.prompt_friend" = "скануй qr друга";
"verification.scan.status.invalid" = "qr недійсний або прострочений";
"verification.scan.status.no_peer" = "відповідний пір не знайдений";
"verification.scan.status.requested" = "перевірка запитана для %@";
"verification.scan.validate" = "перевірити";
"verification.sheet.title" = "ПЕРЕВІРИТИ";
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d замітка</string>
<key>few</key>
<string>%d замітки</string>
<key>many</key>
<string>%d заміток</string>
<key>other</key>
<string>%d замітки</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d людина</string>
<key>few</key>
<string>%d людини</string>
<key>many</key>
<string>%d людей</string>
<key>other</key>
<string>%d людини</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d людина</string>
<key>few</key>
<string>%d людини</string>
<key>many</key>
<string>%d людей</string>
<key>other</key>
<string>%d людини</string>
</dict>
</dict>
</dict>
</plist>
@@ -0,0 +1,190 @@
/*
Localizable.strings
bitchat (Simplified Chinese)
*/
"app_info.app_name" = "bitchat";
"app_info.close" = "关闭";
"app_info.done" = "完成";
"app_info.features.encryption.description" = "私密消息使用 noise 协议加密";
"app_info.features.encryption.title" = "端到端加密";
"app_info.features.extended_range.description" = "消息通过同伴中继,传得更远";
"app_info.features.extended_range.title" = "扩展范围";
"app_info.features.favorites.description" = "你喜欢的人加入时立刻提醒";
"app_info.features.favorites.title" = "收藏";
"app_info.features.geohash.description" = "geohash 频道让你通过去中心化匿名中继与附近地区的人聊天";
"app_info.features.geohash.title" = "本地频道";
"app_info.features.mentions.description" = "使用 @nickname 提醒特定的人";
"app_info.features.mentions.title" = "提及";
"app_info.features.offline.description" = "利用低功耗 bluetooth 离线工作";
"app_info.features.offline.title" = "离线通信";
"app_info.features.title" = "功能";
"app_info.how_to_use.change_channels" = "• 轻点 #mesh 切换频道";
"app_info.how_to_use.clear_chat" = "• 三击聊天即可清除";
"app_info.how_to_use.commands" = "• 输入 / 查看指令";
"app_info.how_to_use.open_sidebar" = "• 轻点人物图标打开侧栏";
"app_info.how_to_use.set_nickname" = "• 轻点昵称即可设置";
"app_info.how_to_use.start_dm" = "• 轻点同伴名字开始 dm";
"app_info.how_to_use.title" = "使用方法";
"app_info.privacy.ephemeral.description" = "定期生成新的 peer id";
"app_info.privacy.ephemeral.title" = "临时身份";
"app_info.privacy.no_tracking.description" = "无服务器、无账号、无数据收集";
"app_info.privacy.no_tracking.title" = "无跟踪";
"app_info.privacy.panic.description" = "三击标志立即清除全部数据";
"app_info.privacy.panic.title" = "紧急模式";
"app_info.privacy.title" = "隐私";
"app_info.tagline" = "sidegroupchat";
"app_info.warning.message" = "私信安全尚未完全审计。在此警告消失前不要用于关键情境。";
"app_info.warning.title" = "警告";
"common.cancel" = "取消";
"common.close" = "关闭";
"common.copy" = "复制";
"common.ok" = "确定";
"common.toggle.off" = "关闭";
"common.toggle.on" = "开启";
"common.unknown" = "未知";
"content.accessibility.add_favorite" = "加入收藏";
"content.accessibility.available_nostr" = "通过 Nostr 可用";
"content.accessibility.back_to_main_chat" = "返回主聊天";
"content.accessibility.connected_mesh" = "通过 mesh 已连接";
"content.accessibility.encryption_status" = "加密状态:%@";
"content.accessibility.location_channels" = "位置频道";
"content.accessibility.location_notes" = "此位置的笔记";
"content.accessibility.open_unread_private_chat" = "打开未读私聊";
"content.accessibility.private_chat_header" = "与 %@ 的私聊";
"content.accessibility.reachable_mesh" = "可通过 mesh 到达";
"content.accessibility.remove_favorite" = "移出收藏";
"content.accessibility.send_hint_empty" = "输入要发送的消息";
"content.accessibility.send_hint_ready" = "双击发送";
"content.accessibility.send_message" = "发送消息";
"content.accessibility.toggle_bookmark" = "切换 #%@ 的书签";
"content.accessibility.toggle_favorite_hint" = "双击切换收藏状态";
"content.accessibility.view_fingerprint_hint" = "轻点查看加密指纹";
"content.actions.block" = "屏蔽";
"content.actions.direct_message" = "私信";
"content.actions.hug" = "拥抱";
"content.actions.mention" = "提及";
"content.actions.slap" = "拍打";
"content.actions.title" = "操作";
"content.alert.bluetooth_required.off" = "bluetooth 已关闭。请在设置中开启以使用 bitchat。";
"content.alert.bluetooth_required.permission" = "bitchat 需要 bluetooth 权限以连接附近设备。请在设置中启用访问。";
"content.alert.bluetooth_required.settings" = "设置";
"content.alert.bluetooth_required.title" = "需要 bluetooth";
"content.alert.bluetooth_required.unsupported" = "此设备不支持 bluetooth。bitchat 需要 bluetooth 才能运行。";
"content.alert.screenshot.message" = "位置频道的截图会暴露你的位置。公开分享前请三思。";
"content.alert.screenshot.title" = "注意";
"content.commands.block" = "屏蔽或查看已屏蔽的同伴";
"content.commands.clear" = "清除聊天消息";
"content.commands.favorite" = "加入收藏";
"content.commands.hug" = "送出温暖拥抱";
"content.commands.message" = "发送私信";
"content.commands.slap" = "用鳟鱼拍某人";
"content.commands.unblock" = "取消屏蔽同伴";
"content.commands.unfavorite" = "移出收藏";
"content.commands.who" = "查看谁在线";
"content.delivery.delivered_members" = "已送达 %2$d 人中的 %1$d 人";
"content.delivery.delivered_to" = "已送达 %@";
"content.delivery.failed" = "失败:%@";
"content.delivery.read_by" = "已读:%@";
"content.delivery.reason.blocked" = "用户已被屏蔽";
"content.delivery.reason.self" = "不能给自己发消息";
"content.delivery.reason.send_error" = "发送错误";
"content.delivery.reason.unknown_recipient" = "未知收件人";
"content.delivery.reason.unreachable" = "同伴不可达";
"content.header.people" = "成员";
"content.help.verification" = "验证:展示我的 qr 或扫描好友";
"content.input.message_placeholder" = "输入消息...";
"content.input.nickname_placeholder" = "昵称";
"content.location.enable" = "启用位置";
"content.message.copy" = "复制消息";
"content.message.show_less" = "收起";
"content.message.show_more" = "展开";
"content.notes.location_unavailable" = "位置不可用";
"content.notes.title" = "笔记";
"content.payment.cashu" = "通过 cashu 支付";
"content.payment.lightning" = "通过 lightning 支付";
"encryption.accessibility.establishing" = "正在建立加密";
"encryption.accessibility.failed" = "加密失败";
"encryption.accessibility.not_encrypted" = "未加密";
"encryption.accessibility.secured" = "已加密";
"encryption.accessibility.verified" = "已加密并验证";
"encryption.status.establishing" = "正在建立加密...";
"encryption.status.failed" = "加密失败";
"encryption.status.not_encrypted" = "未加密";
"encryption.status.secured" = "已加密";
"encryption.status.verified" = "已加密并验证";
"fingerprint.action.mark_verified" = "标记为已验证";
"fingerprint.action.remove_verification" = "移除验证";
"fingerprint.badge.not_verified" = "⚠️ 未验证";
"fingerprint.badge.verified" = "✓ 已验证";
"fingerprint.handshake_pending" = "暂不可用 - handshake 进行中";
"fingerprint.message.verified" = "你已经核实了此人的身份。";
"fingerprint.message.verify_hint" = "通过安全渠道与 %@ 比对这些指纹。";
"fingerprint.their_label" = "对方指纹:";
"fingerprint.title" = "安全验证";
"fingerprint.your_label" = "你的指纹:";
"geohash_people.action.block" = "屏蔽";
"geohash_people.action.unblock" = "取消屏蔽";
"geohash_people.none_nearby" = "附近没人...";
"geohash_people.tooltip.blocked" = "在 geohash 中已屏蔽";
"geohash_people.you_suffix" = " (你)";
"location_channels.action.open_settings" = "打开设置";
"location_channels.action.remove_access" = "移除位置访问";
"location_channels.action.request_permissions" = "获取位置和我的 geohash";
"location_channels.action.teleport" = "瞬移";
"location_channels.bookmarked_section_title" = "已收藏";
"location_channels.description" = "使用 geohash 频道与附近的人聊天。只会共享粗略 geohash,从不泄露精确 GPS。所有流量通过 tor 路由来隐藏你的 IP。";
"location_channels.error.invalid_geohash" = "无效的 geohash";
"location_channels.loading_nearby" = "正在寻找附近频道…";
"location_channels.mesh_label" = "mesh";
"location_channels.permission_denied" = "位置权限被拒。请在设置中启用以使用位置频道。";
"location_channels.subtitle_prefix" = "#%@ • %@";
"location_channels.subtitle_with_name" = "%1$@ • %2$@";
"location_channels.title" = "#位置频道";
"location_channels.tor.subtitle" = "为位置频道隐藏你的 IP。推荐:开启。";
"location_channels.tor.title" = "tor 路由";
"location_levels.block" = "街区";
"location_levels.building" = "楼栋";
"location_levels.city" = "城市";
"location_levels.neighborhood" = "社区";
"location_levels.province" = "省份";
"location_levels.region" = "区域";
"location_notes.action.dismiss" = "关闭";
"location_notes.action.retry" = "重试";
"location_notes.description" = "为此地点添加简短的常驻笔记,方便其他访客发现。";
"location_notes.empty_subtitle" = "成为这里的第一条笔记。";
"location_notes.empty_title" = "尚无笔记";
"location_notes.error.failed_to_send" = "无法发送笔记。%@";
"location_notes.error.no_relays" = "附近没有可用的地理中继。稍后再试。";
"location_notes.loading_notes" = "正在加载笔记…";
"location_notes.loading_recent" = "正在加载最新笔记…";
"location_notes.no_relays_nearby" = "附近没有地理中继";
"location_notes.placeholder" = "为此地点添加笔记";
"location_notes.relays_paused" = "地理中继不可用;笔记已暂停";
"location_notes.relays_retry_hint" = "笔记依赖地理中继。检查连接后再试。";
"mesh_peers.tooltip.new_messages" = "新消息";
"system.chat.blocked" = "无法与 %@ 开始聊天:用户已被屏蔽。";
"system.chat.requires_favorite" = "无法与 %@ 开始聊天:离线消息需要互相关注。";
"system.common.user" = "用户";
"system.dm.blocked_generic" = "无法发送:用户已被屏蔽。";
"system.dm.blocked_recipient" = "无法向 %@ 发送:用户已被屏蔽。";
"system.dm.unreachable" = "无法向 %@ 发送:对方无法通过 mesh 或 Nostr 到达。";
"system.geohash.blocked" = "已在 geohash 聊天中屏蔽 %@";
"system.geohash.unblocked" = "已在 geohash 聊天中解除屏蔽 %@";
"system.location.not_in_channel" = "发送失败:你不在位置频道中";
"system.location.send_failed" = "无法发送到位置频道";
"system.tor.dev_bypass" = "开发构建:tor 绕过已启用。";
"system.tor.restarted" = "tor 已重启。网络路由已恢复。";
"system.tor.restarting" = "tor 正在重启以恢复连接...";
"system.tor.started" = "tor 已启动。所有聊天通过 tor 路由以保护 IP。";
"system.tor.starting" = "正在启动 tor...";
"verification.my_qr.accessibility_label" = "验证 QR 码";
"verification.my_qr.title" = "扫描验证我";
"verification.my_qr.unavailable" = "QR 不可用";
"verification.scan.paste_prompt" = "粘贴 QR 内容以验证:";
"verification.scan.prompt_friend" = "扫描好友的 QR";
"verification.scan.status.invalid" = "QR 无效或已过期";
"verification.scan.status.no_peer" = "未找到匹配的同伴";
"verification.scan.status.requested" = "已请求 %@ 的验证";
"verification.scan.validate" = "验证";
"verification.sheet.title" = "验证";
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>location_notes.header</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>#%@ • %#@note_count@</string>
<key>note_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d 条笔记</string>
<key>other</key>
<string>%d 条笔记</string>
</dict>
</dict>
<key>location_channels.row_title</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%@ [%#@people_count@]</string>
<key>people_count</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d 人</string>
<key>other</key>
<string>%d 人</string>
</dict>
</dict>
<key>content.accessibility.people_count</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@people@</string>
<key>people</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>one</key>
<string>%d 人</string>
<key>other</key>
<string>%d 人</string>
</dict>
</dict>
</dict>
</plist>
+10 -23
View File
@@ -21,7 +21,7 @@ final class BitchatMessage: Codable {
let originalSender: String? let originalSender: String?
let isPrivate: Bool let isPrivate: Bool
let recipientNickname: String? let recipientNickname: String?
let senderPeer: Peer? let senderPeerID: String?
let mentions: [String]? // Array of mentioned nicknames let mentions: [String]? // Array of mentioned nicknames
var deliveryStatus: DeliveryStatus? // Delivery tracking var deliveryStatus: DeliveryStatus? // Delivery tracking
@@ -39,23 +39,10 @@ final class BitchatMessage: Codable {
// Codable implementation // Codable implementation
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case id, sender, content, timestamp, isRelay, originalSender case id, sender, content, timestamp, isRelay, originalSender
case isPrivate, recipientNickname, mentions, deliveryStatus case isPrivate, recipientNickname, senderPeerID, mentions, deliveryStatus
case senderPeer = "senderPeerID" // backwards compatibility
} }
init( init(id: String? = nil, sender: String, content: String, timestamp: Date, isRelay: Bool, originalSender: String? = nil, isPrivate: Bool = false, recipientNickname: String? = nil, senderPeerID: String? = nil, mentions: [String]? = nil, deliveryStatus: DeliveryStatus? = nil) {
id: String? = nil,
sender: String,
content: String,
timestamp: Date,
isRelay: Bool,
originalSender: String? = nil,
isPrivate: Bool = false,
recipientNickname: String? = nil,
senderPeer: Peer? = nil,
mentions: [String]? = nil,
deliveryStatus: DeliveryStatus? = nil
) {
self.id = id ?? UUID().uuidString self.id = id ?? UUID().uuidString
self.sender = sender self.sender = sender
self.content = content self.content = content
@@ -64,7 +51,7 @@ final class BitchatMessage: Codable {
self.originalSender = originalSender self.originalSender = originalSender
self.isPrivate = isPrivate self.isPrivate = isPrivate
self.recipientNickname = recipientNickname self.recipientNickname = recipientNickname
self.senderPeer = senderPeer self.senderPeerID = senderPeerID
self.mentions = mentions self.mentions = mentions
self.deliveryStatus = deliveryStatus ?? (isPrivate ? .sending : nil) self.deliveryStatus = deliveryStatus ?? (isPrivate ? .sending : nil)
} }
@@ -82,7 +69,7 @@ extension BitchatMessage: Equatable {
lhs.originalSender == rhs.originalSender && lhs.originalSender == rhs.originalSender &&
lhs.isPrivate == rhs.isPrivate && lhs.isPrivate == rhs.isPrivate &&
lhs.recipientNickname == rhs.recipientNickname && lhs.recipientNickname == rhs.recipientNickname &&
lhs.senderPeer == rhs.senderPeer && lhs.senderPeerID == rhs.senderPeerID &&
lhs.mentions == rhs.mentions && lhs.mentions == rhs.mentions &&
lhs.deliveryStatus == rhs.deliveryStatus lhs.deliveryStatus == rhs.deliveryStatus
} }
@@ -114,7 +101,7 @@ extension BitchatMessage {
if isPrivate { flags |= 0x02 } if isPrivate { flags |= 0x02 }
if originalSender != nil { flags |= 0x04 } if originalSender != nil { flags |= 0x04 }
if recipientNickname != nil { flags |= 0x08 } if recipientNickname != nil { flags |= 0x08 }
if senderPeer != nil { flags |= 0x10 } if senderPeerID != nil { flags |= 0x10 }
if mentions != nil && !mentions!.isEmpty { flags |= 0x20 } if mentions != nil && !mentions!.isEmpty { flags |= 0x20 }
data.append(flags) data.append(flags)
@@ -164,7 +151,7 @@ extension BitchatMessage {
data.append(recipData.prefix(255)) data.append(recipData.prefix(255))
} }
if let peerData = senderPeer?.data { if let senderPeerID = senderPeerID, let peerData = senderPeerID.data(using: .utf8) {
data.append(UInt8(min(peerData.count, 255))) data.append(UInt8(min(peerData.count, 255)))
data.append(peerData.prefix(255)) data.append(peerData.prefix(255))
} }
@@ -277,11 +264,11 @@ extension BitchatMessage {
} }
} }
var senderPeer: Peer? var senderPeerID: String?
if hasSenderPeerID && offset < dataCopy.count { if hasSenderPeerID && offset < dataCopy.count {
let length = Int(dataCopy[offset]); offset += 1 let length = Int(dataCopy[offset]); offset += 1
if offset + length <= dataCopy.count { if offset + length <= dataCopy.count {
senderPeer = Peer(data: dataCopy[offset..<offset+length]) senderPeerID = String(data: dataCopy[offset..<offset+length], encoding: .utf8)
offset += length offset += length
} }
} }
@@ -315,7 +302,7 @@ extension BitchatMessage {
originalSender: originalSender, originalSender: originalSender,
isPrivate: isPrivate, isPrivate: isPrivate,
recipientNickname: recipientNickname, recipientNickname: recipientNickname,
senderPeer: senderPeer, senderPeerID: senderPeerID,
mentions: mentions mentions: mentions
) )
} }
-139
View File
@@ -1,139 +0,0 @@
//
// Peer.swift
// BitLogger
//
// This is free and unencumbered software released into the public domain.
// For more information, see <https://unlicense.org>
//
import Foundation
import struct CryptoKit.SHA256
struct Peer: Equatable, Hashable {
let id: String
}
extension Peer {
var data: Data? {
id.data(using: .utf8)
}
var isNostr: Bool {
id.hasPrefix("nostr")
}
var isNostrColon: Bool {
id.hasPrefix("nostr:")
}
}
// MARK: - Validation
extension Peer {
private enum Constants {
static let maxIDLength = 64
static let hexIDLength = 16 // 8 bytes = 16 hex chars
}
/// Validates a peer ID from any source (short 16-hex, full 64-hex, or internal alnum/-/_ up to 64)
var isValid: Bool {
// Accept short routing IDs (exact 16-hex) or Full Noise key hex (exact 64-hex)
if isShort || isNoiseKeyHex {
return true
}
// If length equals short or full but isn't valid hex, reject
if id.count == Constants.hexIDLength || id.count == Constants.maxIDLength {
return false
}
// Internal format: alphanumeric + dash/underscore up to 63 (not 16 or 64)
let validCharset = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-_"))
return !id.isEmpty &&
id.count < Constants.maxIDLength &&
id.rangeOfCharacter(from: validCharset.inverted) == nil
}
/// Short routing IDs (exact 16-hex)
var isShort: Bool {
id.count == Constants.hexIDLength && Data(hexString: id) != nil
}
/// Full Noise key hex (exact 64-hex)
var isNoiseKeyHex: Bool {
noiseKey != nil
}
/// Full Noise key (exact 64-hex) as Data
var noiseKey: Data? {
guard id.count == Constants.maxIDLength else { return nil }
return Data(hexString: id)
}
}
// MARK: - ExpressibleByStringLiteral
extension Peer: ExpressibleByStringLiteral {
init(stringLiteral value: String) {
self.init(str: value)
}
}
// MARK: - ExpressibleByStringInterpolation
extension Peer: ExpressibleByStringInterpolation {
init(extendedGraphemeClusterLiteral value: String) {
self.init(str: value)
}
}
// MARK: - Codable
extension Peer: Codable {
init(from decoder: any Decoder) throws {
id = try decoder.singleValueContainer().decode(String.self)
}
func encode(to encoder: any Encoder) throws {
var container = encoder.singleValueContainer()
try container.encode(id)
}
}
// MARK: - Convenience Inits
extension Peer {
init(str: String) {
id = str.lowercased()
}
init(str: String.SubSequence) {
self.init(str: String(str))
}
init?(data: Data) {
guard let str = String(data: data, encoding: .utf8) else {
return nil
}
self.init(str: str)
}
}
// MARK: - Noise Public Key Helpers
extension Peer {
/// Derive the stable 16-hex peer ID from a Noise static public key
init(publicKey: Data) {
let digest = SHA256.hash(data: publicKey)
let hex = digest.map { String(format: "%02x", $0) }.joined()
self.init(str: hex.prefix(16))
}
/// Returns a 16-hex short peer ID derived from a 64-hex Noise public key if needed
func toShort() -> Peer {
if id.count == Constants.maxIDLength, let data = Data(hexString: id) {
return Peer(publicKey: data)
}
return self
}
}
+1 -1
View File
@@ -79,7 +79,7 @@ struct ReadReceipt: Codable {
guard let readerIDData = dataCopy.readFixedBytes(at: &offset, count: 8) else { return nil } guard let readerIDData = dataCopy.readFixedBytes(at: &offset, count: 8) else { return nil }
let readerID = readerIDData.hexEncodedString() let readerID = readerIDData.hexEncodedString()
guard Peer(str: readerID).isValid else { return nil } guard InputValidator.validatePeerID(readerID) else { return nil }
guard let timestamp = dataCopy.readDate(at: &offset), guard let timestamp = dataCopy.readDate(at: &offset),
InputValidator.validateTimestamp(timestamp), InputValidator.validateTimestamp(timestamp),
@@ -1,358 +0,0 @@
//
// NoiseHandshakeCoordinator.swift
// bitchat
//
// This is free and unencumbered software released into the public domain.
// For more information, see <https://unlicense.org>
//
import BitLogger
import Foundation
/// Coordinates Noise handshakes to prevent race conditions and ensure reliable encryption establishment
final class NoiseHandshakeCoordinator {
// MARK: - Handshake State
enum HandshakeState: Equatable {
case idle
case waitingToInitiate(since: Date)
case initiating(attempt: Int, lastAttempt: Date)
case responding(since: Date)
case waitingForResponse(messagesSent: [Data], timeout: Date)
case established(since: Date)
case failed(reason: String, canRetry: Bool, lastAttempt: Date)
var isActive: Bool {
switch self {
case .idle, .established, .failed:
return false
default:
return true
}
}
}
// MARK: - Properties
private var handshakeStates: [String: HandshakeState] = [:]
private var handshakeQueue = DispatchQueue(label: "chat.bitchat.noise.handshake", attributes: .concurrent)
// Configuration
private let maxHandshakeAttempts = 3
private let handshakeTimeout: TimeInterval = 10.0
private let retryDelay: TimeInterval = 2.0
private let minTimeBetweenHandshakes: TimeInterval = 1.0 // Reduced from 5.0 for faster recovery
private let establishedSessionTTL: TimeInterval = 300.0 // 5 minutes - sessions older than this can be cleaned up
private let maxEstablishedSessions = 50 // Limit total established sessions
// Track handshake messages to detect duplicates
private var processedHandshakeMessages: Set<Data> = []
private let messageHistoryLimit = 100
// MARK: - Role Determination
/// Deterministically determine who should initiate the handshake
/// Lower peer ID becomes the initiator to prevent simultaneous attempts
func determineHandshakeRole(myPeerID: String, remotePeerID: String) -> NoiseRole {
// Use simple string comparison for deterministic ordering
return myPeerID < remotePeerID ? .initiator : .responder
}
/// Check if we should initiate handshake with a peer
func shouldInitiateHandshake(myPeerID: String, remotePeerID: String, forceIfStale: Bool = false) -> Bool {
return handshakeQueue.sync {
// Check if we're already in an active handshake
if let state = handshakeStates[remotePeerID], state.isActive {
// Check if the handshake is stale and we should force a new one
if forceIfStale {
switch state {
case .initiating(_, let lastAttempt):
if Date().timeIntervalSince(lastAttempt) > handshakeTimeout {
SecureLogger.warning("Forcing new handshake with \(remotePeerID) - previous stuck in initiating", category: .handshake)
return true
}
default:
break
}
}
SecureLogger.debug("Already in active handshake with \(remotePeerID), state: \(state)", category: .handshake)
return false
}
// Check role
let role = determineHandshakeRole(myPeerID: myPeerID, remotePeerID: remotePeerID)
if role != .initiator {
return false
}
// Check if we've failed recently and can't retry yet
if case .failed(_, let canRetry, let lastAttempt) = handshakeStates[remotePeerID] {
if !canRetry {
return false
}
if Date().timeIntervalSince(lastAttempt) < retryDelay {
return false
}
}
return true
}
}
/// Record that we're initiating a handshake
func recordHandshakeInitiation(peerID: String) {
handshakeQueue.async(flags: .barrier) {
let attempt = self.getCurrentAttempt(for: peerID) + 1
self.handshakeStates[peerID] = .initiating(attempt: attempt, lastAttempt: Date())
SecureLogger.info("Recording handshake initiation with \(peerID), attempt \(attempt)", category: .handshake)
}
}
/// Record that we're responding to a handshake
func recordHandshakeResponse(peerID: String) {
handshakeQueue.async(flags: .barrier) {
self.handshakeStates[peerID] = .responding(since: Date())
SecureLogger.info("Recording handshake response to \(peerID)", category: .handshake)
}
}
/// Record successful handshake completion
func recordHandshakeSuccess(peerID: String) {
handshakeQueue.async(flags: .barrier) {
self.handshakeStates[peerID] = .established(since: Date())
SecureLogger.info("Handshake successfully established with \(peerID)", category: .handshake)
}
}
/// Record handshake failure
func recordHandshakeFailure(peerID: String, reason: String) {
handshakeQueue.async(flags: .barrier) {
let attempts = self.getCurrentAttempt(for: peerID)
let canRetry = attempts < self.maxHandshakeAttempts
self.handshakeStates[peerID] = .failed(reason: reason, canRetry: canRetry, lastAttempt: Date())
SecureLogger.warning("Handshake failed with \(peerID): \(reason), canRetry: \(canRetry)", category: .handshake)
}
}
/// Check if we should accept an incoming handshake initiation
func shouldAcceptHandshakeInitiation(myPeerID: String, remotePeerID: String) -> Bool {
return handshakeQueue.sync {
// If we're already established, reject new handshakes
if case .established = handshakeStates[remotePeerID] {
SecureLogger.debug("Rejecting handshake from \(remotePeerID) - already established", category: .handshake)
return false
}
let role = determineHandshakeRole(myPeerID: myPeerID, remotePeerID: remotePeerID)
// If we're the initiator and already initiating, this is a race condition
if role == .initiator {
if case .initiating = handshakeStates[remotePeerID] {
// They shouldn't be initiating, but accept it to recover from race condition
SecureLogger.warning("Accepting handshake from \(remotePeerID) despite being initiator (race condition recovery)", category: .handshake)
return true
}
}
// If we're the responder, we should accept
return true
}
}
/// Check if this is a duplicate handshake message
func isDuplicateHandshakeMessage(_ data: Data) -> Bool {
return handshakeQueue.sync {
if processedHandshakeMessages.contains(data) {
return true
}
// Add to processed messages with size limit
if processedHandshakeMessages.count >= messageHistoryLimit {
processedHandshakeMessages.removeAll()
}
processedHandshakeMessages.insert(data)
return false
}
}
/// Get time to wait before next handshake attempt
func getRetryDelay(for peerID: String) -> TimeInterval? {
return handshakeQueue.sync {
guard let state = handshakeStates[peerID] else { return nil }
switch state {
case .failed(_, let canRetry, let lastAttempt):
if !canRetry { return nil }
let timeSinceFailure = Date().timeIntervalSince(lastAttempt)
if timeSinceFailure >= retryDelay {
return 0
}
return retryDelay - timeSinceFailure
case .initiating(_, let lastAttempt):
let timeSinceAttempt = Date().timeIntervalSince(lastAttempt)
if timeSinceAttempt >= minTimeBetweenHandshakes {
return 0
}
return minTimeBetweenHandshakes - timeSinceAttempt
default:
return nil
}
}
}
/// Reset handshake state for a peer
func resetHandshakeState(for peerID: String) {
handshakeQueue.async(flags: .barrier) {
self.handshakeStates.removeValue(forKey: peerID)
SecureLogger.debug("Reset handshake state for \(peerID)", category: .handshake)
}
}
/// Clean up stale handshake states and old established sessions
func cleanupStaleHandshakes(staleTimeout: TimeInterval = 30.0) -> [String] {
return handshakeQueue.sync {
let now = Date()
var stalePeerIDs: [String] = []
var establishedSessions: [(peerID: String, since: Date)] = []
for (peerID, state) in handshakeStates {
var isStale = false
switch state {
case .initiating(_, let lastAttempt):
if now.timeIntervalSince(lastAttempt) > staleTimeout {
isStale = true
}
case .responding(let since):
if now.timeIntervalSince(since) > staleTimeout {
isStale = true
}
case .waitingForResponse(_, let timeout):
if now > timeout {
isStale = true
}
case .established(let since):
// Track established sessions for potential cleanup
establishedSessions.append((peerID, since))
// Clean up very old established sessions
if now.timeIntervalSince(since) > establishedSessionTTL {
isStale = true
}
default:
break
}
if isStale {
stalePeerIDs.append(peerID)
SecureLogger.warning("Found stale handshake state for \(peerID): \(state)", category: .handshake)
}
}
// If we have too many established sessions, clean up the oldest ones
if establishedSessions.count > maxEstablishedSessions {
// Sort by age (oldest first)
let sortedSessions = establishedSessions.sorted { $0.since < $1.since }
let sessionsToRemove = sortedSessions.count - maxEstablishedSessions
for i in 0..<sessionsToRemove {
let peerID = sortedSessions[i].peerID
stalePeerIDs.append(peerID)
SecureLogger.info("Removing old established session for \(peerID) to maintain session limit", category: .handshake)
}
}
// Clean up stale states
for peerID in stalePeerIDs {
handshakeStates.removeValue(forKey: peerID)
}
if !stalePeerIDs.isEmpty {
SecureLogger.info("Cleaned up \(stalePeerIDs.count) stale handshake states", category: .handshake)
}
return stalePeerIDs
}
}
/// Get current handshake state
func getHandshakeState(for peerID: String) -> HandshakeState {
return handshakeQueue.sync {
return handshakeStates[peerID] ?? .idle
}
}
/// Get current retry count for a peer
func getRetryCount(for peerID: String) -> Int {
return handshakeQueue.sync {
switch handshakeStates[peerID] {
case .initiating(let attempt, _):
return attempt - 1 // Attempts start at 1, retries start at 0
default:
return 0
}
}
}
/// Increment retry count for a peer
func incrementRetryCount(for peerID: String) {
handshakeQueue.async(flags: .barrier) {
let currentAttempt = self.getCurrentAttempt(for: peerID)
self.handshakeStates[peerID] = .initiating(attempt: currentAttempt + 1, lastAttempt: Date())
}
}
// MARK: - Private Helpers
private func getCurrentAttempt(for peerID: String) -> Int {
switch handshakeStates[peerID] {
case .initiating(let attempt, _):
return attempt
case .failed(_, _, _):
// Count previous attempts
return 1 // Simplified for now
default:
return 0
}
}
/// Log current handshake states for debugging
func logHandshakeStates() {
handshakeQueue.sync {
SecureLogger.debug("=== Handshake States ===", category: .handshake)
for (peerID, state) in handshakeStates {
let stateDesc: String
switch state {
case .idle:
stateDesc = "idle"
case .waitingToInitiate(let since):
stateDesc = "waiting to initiate (since \(since))"
case .initiating(let attempt, let lastAttempt):
stateDesc = "initiating (attempt \(attempt), last: \(lastAttempt))"
case .responding(let since):
stateDesc = "responding (since: \(since))"
case .waitingForResponse(let messages, let timeout):
stateDesc = "waiting for response (\(messages.count) messages, timeout: \(timeout))"
case .established(let since):
stateDesc = "established (since \(since))"
case .failed(let reason, let canRetry, let lastAttempt):
stateDesc = "failed: \(reason) (canRetry: \(canRetry), last: \(lastAttempt))"
}
SecureLogger.debug(" \(peerID): \(stateDesc)", category: .handshake)
}
SecureLogger.debug("========================", category: .handshake)
}
}
/// Clear all handshake states - used during panic mode
func clearAllHandshakeStates() {
handshakeQueue.async(flags: .barrier) {
SecureLogger.warning("Clearing all handshake states for panic mode", category: .handshake)
self.handshakeStates.removeAll()
self.processedHandshakeMessages.removeAll()
}
}
}
+18 -13
View File
@@ -53,6 +53,11 @@ struct NoiseSecurityValidator {
static func validateHandshakeMessageSize(_ data: Data) -> Bool { static func validateHandshakeMessageSize(_ data: Data) -> Bool {
return data.count <= NoiseSecurityConstants.maxHandshakeMessageSize return data.count <= NoiseSecurityConstants.maxHandshakeMessageSize
} }
/// Validate peer ID format using unified validator
static func validatePeerID(_ peerID: String) -> Bool {
return InputValidator.validatePeerID(peerID)
}
} }
// MARK: - Enhanced Noise Session with Security // MARK: - Enhanced Noise Session with Security
@@ -132,8 +137,8 @@ final class SecureNoiseSession: NoiseSession {
// MARK: - Rate Limiter // MARK: - Rate Limiter
final class NoiseRateLimiter { final class NoiseRateLimiter {
private var handshakeTimestamps: [Peer: [Date]] = [:] // Peer -> timestamps private var handshakeTimestamps: [String: [Date]] = [:] // peerID -> timestamps
private var messageTimestamps: [Peer: [Date]] = [:] // Peer -> timestamps private var messageTimestamps: [String: [Date]] = [:] // peerID -> timestamps
// Global rate limiting // Global rate limiting
private var globalHandshakeTimestamps: [Date] = [] private var globalHandshakeTimestamps: [Date] = []
@@ -141,7 +146,7 @@ final class NoiseRateLimiter {
private let queue = DispatchQueue(label: "chat.bitchat.noise.ratelimit", attributes: .concurrent) private let queue = DispatchQueue(label: "chat.bitchat.noise.ratelimit", attributes: .concurrent)
func allowHandshake(from peer: Peer) -> Bool { func allowHandshake(from peerID: String) -> Bool {
return queue.sync(flags: .barrier) { return queue.sync(flags: .barrier) {
let now = Date() let now = Date()
let oneMinuteAgo = now.addingTimeInterval(-60) let oneMinuteAgo = now.addingTimeInterval(-60)
@@ -154,23 +159,23 @@ final class NoiseRateLimiter {
} }
// Check per-peer rate limit // Check per-peer rate limit
var timestamps = handshakeTimestamps[peer] ?? [] var timestamps = handshakeTimestamps[peerID] ?? []
timestamps = timestamps.filter { $0 > oneMinuteAgo } timestamps = timestamps.filter { $0 > oneMinuteAgo }
if timestamps.count >= NoiseSecurityConstants.maxHandshakesPerMinute { if timestamps.count >= NoiseSecurityConstants.maxHandshakesPerMinute {
SecureLogger.warning("Per-peer handshake rate limit exceeded for \(peer.id): \(timestamps.count)/\(NoiseSecurityConstants.maxHandshakesPerMinute) per minute", category: .security) SecureLogger.warning("Per-peer handshake rate limit exceeded for \(peerID): \(timestamps.count)/\(NoiseSecurityConstants.maxHandshakesPerMinute) per minute", category: .security)
return false return false
} }
// Record new handshake // Record new handshake
timestamps.append(now) timestamps.append(now)
handshakeTimestamps[peer] = timestamps handshakeTimestamps[peerID] = timestamps
globalHandshakeTimestamps.append(now) globalHandshakeTimestamps.append(now)
return true return true
} }
} }
func allowMessage(from peer: Peer) -> Bool { func allowMessage(from peerID: String) -> Bool {
return queue.sync(flags: .barrier) { return queue.sync(flags: .barrier) {
let now = Date() let now = Date()
let oneSecondAgo = now.addingTimeInterval(-1) let oneSecondAgo = now.addingTimeInterval(-1)
@@ -183,26 +188,26 @@ final class NoiseRateLimiter {
} }
// Check per-peer rate limit // Check per-peer rate limit
var timestamps = messageTimestamps[peer] ?? [] var timestamps = messageTimestamps[peerID] ?? []
timestamps = timestamps.filter { $0 > oneSecondAgo } timestamps = timestamps.filter { $0 > oneSecondAgo }
if timestamps.count >= NoiseSecurityConstants.maxMessagesPerSecond { if timestamps.count >= NoiseSecurityConstants.maxMessagesPerSecond {
SecureLogger.warning("Per-peer message rate limit exceeded for \(peer.id): \(timestamps.count)/\(NoiseSecurityConstants.maxMessagesPerSecond) per second", category: .security) SecureLogger.warning("Per-peer message rate limit exceeded for \(peerID): \(timestamps.count)/\(NoiseSecurityConstants.maxMessagesPerSecond) per second", category: .security)
return false return false
} }
// Record new message // Record new message
timestamps.append(now) timestamps.append(now)
messageTimestamps[peer] = timestamps messageTimestamps[peerID] = timestamps
globalMessageTimestamps.append(now) globalMessageTimestamps.append(now)
return true return true
} }
} }
func reset(for peer: Peer) { func reset(for peerID: String) {
queue.async(flags: .barrier) { queue.async(flags: .barrier) {
self.handshakeTimestamps.removeValue(forKey: peer) self.handshakeTimestamps.removeValue(forKey: peerID)
self.messageTimestamps.removeValue(forKey: peer) self.messageTimestamps.removeValue(forKey: peerID)
} }
} }
+1 -1
View File
@@ -100,7 +100,7 @@ struct NostrEmbeddedBitChat {
if let maybeData = Data(hexString: recipientPeerID) { if let maybeData = Data(hexString: recipientPeerID) {
if maybeData.count == 32 { if maybeData.count == 32 {
// Treat as Noise static public key; derive peerID from fingerprint // Treat as Noise static public key; derive peerID from fingerprint
return Peer(publicKey: maybeData).id return PeerIDUtils.derivePeerID(fromPublicKey: maybeData)
} else if maybeData.count == 8 { } else if maybeData.count == 8 {
// Already an 8-byte peer ID // Already an 8-byte peer ID
return recipientPeerID return recipientPeerID
+23 -10
View File
@@ -41,6 +41,8 @@ final class NostrRelayManager: ObservableObject {
@Published private(set) var isConnected = false @Published private(set) var isConnected = false
private var allowDefaultRelays: Bool = false private var allowDefaultRelays: Bool = false
private var hasMutualFavorites: Bool = false
private var hasLocationPermission: Bool = false
private var connections: [String: URLSessionWebSocketTask] = [:] private var connections: [String: URLSessionWebSocketTask] = [:]
private var subscriptions: [String: Set<String>] = [:] // relay URL -> active subscription IDs private var subscriptions: [String: Set<String>] = [:] // relay URL -> active subscription IDs
private var pendingSubscriptions: [String: [String: String]] = [:] // relay URL -> (subscription id -> encoded REQ JSON) private var pendingSubscriptions: [String: [String: String]] = [:] // relay URL -> (subscription id -> encoded REQ JSON)
@@ -82,17 +84,27 @@ final class NostrRelayManager: ObservableObject {
private var connectionGeneration: Int = 0 private var connectionGeneration: Int = 0
init() { init() {
let hasMutual = !FavoritesPersistenceService.shared.mutualFavorites.isEmpty hasMutualFavorites = !FavoritesPersistenceService.shared.mutualFavorites.isEmpty
allowDefaultRelays = hasMutual hasLocationPermission = LocationChannelManager.shared.permissionState == .authorized
if hasMutual { applyDefaultRelayPolicy(force: true)
self.relays = Self.defaultRelays.map { Relay(url: $0) }
}
// Deterministic JSON shape for outbound requests // Deterministic JSON shape for outbound requests
self.encoder.outputFormatting = .sortedKeys self.encoder.outputFormatting = .sortedKeys
FavoritesPersistenceService.shared.$mutualFavorites FavoritesPersistenceService.shared.$mutualFavorites
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] favorites in .sink { [weak self] favorites in
self?.updateDefaultRelayPolicy(hasMutual: !favorites.isEmpty) guard let self = self else { return }
self.hasMutualFavorites = !favorites.isEmpty
self.applyDefaultRelayPolicy()
}
.store(in: &cancellables)
LocationChannelManager.shared.$permissionState
.receive(on: DispatchQueue.main)
.sink { [weak self] state in
guard let self = self else { return }
let authorized = (state == .authorized)
if authorized == self.hasLocationPermission { return }
self.hasLocationPermission = authorized
self.applyDefaultRelayPolicy()
} }
.store(in: &cancellables) .store(in: &cancellables)
} }
@@ -326,10 +338,11 @@ final class NostrRelayManager: ObservableObject {
} }
} }
private func updateDefaultRelayPolicy(hasMutual: Bool) { private func applyDefaultRelayPolicy(force: Bool = false) {
guard hasMutual != allowDefaultRelays else { return } let shouldAllow = hasMutualFavorites || hasLocationPermission
allowDefaultRelays = hasMutual if !force && shouldAllow == allowDefaultRelays { return }
if hasMutual { allowDefaultRelays = shouldAllow
if shouldAllow {
var existing = Set(relays.map { $0.url }) var existing = Set(relays.map { $0.url })
for url in Self.defaultRelays where !existing.contains(url) { for url in Self.defaultRelays where !existing.contains(url) {
relays.append(Relay(url: url)) relays.append(Relay(url: url))
+13 -7
View File
@@ -23,15 +23,21 @@ enum GeohashChannelLevel: CaseIterable, Codable, Equatable {
var displayName: String { var displayName: String {
switch self { switch self {
case .building: return "Building" case .building:
case .block: return "Block" return L10n.string("location_levels.building", comment: "Name for building-level location channel")
case .neighborhood: return "Neighborhood" case .block:
case .city: return "City" return L10n.string("location_levels.block", comment: "Name for block-level location channel")
case .province: return "Province" case .neighborhood:
case .region: return "Region" return L10n.string("location_levels.neighborhood", comment: "Name for neighborhood-level location channel")
case .city:
return L10n.string("location_levels.city", comment: "Name for city-level location channel")
case .province:
return L10n.string("location_levels.province", comment: "Name for province-level location channel")
case .region:
return L10n.string("location_levels.region", comment: "Name for region-level location channel")
}
} }
} }
}
// Backward-compatible Codable for renamed cases // Backward-compatible Codable for renamed cases
extension GeohashChannelLevel { extension GeohashChannelLevel {
init(from decoder: Decoder) throws { init(from decoder: Decoder) throws {
+14
View File
@@ -0,0 +1,14 @@
import Foundation
import CryptoKit
// MARK: - Peer ID Utilities
struct PeerIDUtils {
/// Derive the stable 16-hex peer ID from a Noise static public key
static func derivePeerID(fromPublicKey publicKey: Data) -> String {
let digest = SHA256.hash(data: publicKey)
let hex = digest.map { String(format: "%02x", $0) }.joined()
return String(hex.prefix(16))
}
}
+173 -59
View File
@@ -7,6 +7,78 @@ import CryptoKit
import UIKit import UIKit
#endif #endif
struct NotificationStreamAssembler {
private var buffer = Data()
mutating func append(_ chunk: Data) -> (frames: [Data], droppedPrefixes: [UInt8], reset: Bool) {
guard !chunk.isEmpty else { return ([], [], false) }
buffer.append(chunk)
var frames: [Data] = []
var dropped: [UInt8] = []
var reset = false
let maxFrameLength = TransportConfig.blePendingWriteBufferCapBytes
let minHeaderBytes = 14 // version + type + ttl + timestamp(8) + flags + length(2)
let minFramePrefix = minHeaderBytes + BinaryProtocol.senderIDSize
while buffer.count >= minFramePrefix {
guard let first = buffer.first else { break }
if first != 1 {
dropped.append(buffer.removeFirst())
continue
}
guard buffer.count >= minHeaderBytes else { break }
let headerBytes = Array(buffer.prefix(minFramePrefix))
guard headerBytes.count == minFramePrefix else { break }
let flags = headerBytes[11]
let hasRecipient = (flags & BinaryProtocol.Flags.hasRecipient) != 0
let hasSignature = (flags & BinaryProtocol.Flags.hasSignature) != 0
let payloadLen = (Int(headerBytes[12]) << 8) | Int(headerBytes[13])
var frameLength = minFramePrefix + payloadLen
if hasRecipient { frameLength += BinaryProtocol.recipientIDSize }
if hasSignature { frameLength += BinaryProtocol.signatureSize }
guard frameLength > 0, frameLength <= maxFrameLength else {
buffer.removeAll()
reset = true
break
}
if buffer.count < frameLength {
// Check if a new frame start exists within the incomplete buffer; if so, drop leading partial bytes.
if let nextStart = buffer.dropFirst().firstIndex(of: 1) {
let dropCount = buffer.distance(from: buffer.startIndex, to: nextStart)
if dropCount > 0 {
buffer.removeFirst(dropCount)
dropped.append(1) // treat as dropped partial start
}
}
break
}
let frame = Data(buffer.prefix(frameLength))
frames.append(frame)
buffer.removeFirst(frameLength)
}
if !buffer.isEmpty, buffer.allSatisfy({ $0 == 0 }) {
buffer.removeAll(keepingCapacity: false)
}
return (frames, dropped, reset)
}
mutating func reset() {
buffer.removeAll(keepingCapacity: false)
}
}
/// BLEService Bluetooth Mesh Transport /// BLEService Bluetooth Mesh Transport
/// - Emits events exclusively via `BitchatDelegate` for UI. /// - Emits events exclusively via `BitchatDelegate` for UI.
/// - ChatViewModel must consume delegate callbacks (`didReceivePublicMessage`, `didReceiveNoisePayload`). /// - ChatViewModel must consume delegate callbacks (`didReceivePublicMessage`, `didReceiveNoisePayload`).
@@ -40,6 +112,7 @@ final class BLEService: NSObject {
var isConnecting: Bool = false var isConnecting: Bool = false
var isConnected: Bool = false var isConnected: Bool = false
var lastConnectionAttempt: Date? = nil var lastConnectionAttempt: Date? = nil
var assembler = NotificationStreamAssembler()
} }
private var peripherals: [String: PeripheralState] = [:] // UUID -> PeripheralState private var peripherals: [String: PeripheralState] = [:] // UUID -> PeripheralState
private var peerToPeripheralUUID: [String: String] = [:] // PeerID -> Peripheral UUID private var peerToPeripheralUUID: [String: String] = [:] // PeerID -> Peripheral UUID
@@ -191,7 +264,9 @@ final class BLEService: NSObject {
// MARK: - Helpers: IDs, selection, and write backpressure // MARK: - Helpers: IDs, selection, and write backpressure
private func makeMessageID(for packet: BitchatPacket) -> String { private func makeMessageID(for packet: BitchatPacket) -> String {
let senderID = packet.senderID.hexEncodedString() let senderID = packet.senderID.hexEncodedString()
return "\(senderID)-\(packet.timestamp)-\(packet.type)" let digest = SHA256.hash(data: packet.payload)
let digestPrefix = digest.prefix(4).map { String(format: "%02x", $0) }.joined()
return "\(senderID)-\(packet.timestamp)-\(packet.type)-\(digestPrefix)"
} }
private func subsetSizeForFanout(_ n: Int) -> Int { private func subsetSizeForFanout(_ n: Int) -> Int {
@@ -556,13 +631,23 @@ final class BLEService: NSObject {
func isPeerConnected(_ peerID: String) -> Bool { func isPeerConnected(_ peerID: String) -> Bool {
// Accept both 16-hex short IDs and 64-hex Noise keys // Accept both 16-hex short IDs and 64-hex Noise keys
let shortID = Peer(str: peerID).toShort().id let shortID: String = {
if peerID.count == 64, let key = Data(hexString: peerID) {
return PeerIDUtils.derivePeerID(fromPublicKey: key)
}
return peerID
}()
return collectionsQueue.sync { peers[shortID]?.isConnected ?? false } return collectionsQueue.sync { peers[shortID]?.isConnected ?? false }
} }
func isPeerReachable(_ peerID: String) -> Bool { func isPeerReachable(_ peerID: String) -> Bool {
// Accept both 16-hex short IDs and 64-hex Noise keys // Accept both 16-hex short IDs and 64-hex Noise keys
let shortID = Peer(str: peerID).toShort().id let shortID: String = {
if peerID.count == 64, let key = Data(hexString: peerID) {
return PeerIDUtils.derivePeerID(fromPublicKey: key)
}
return peerID
}()
return collectionsQueue.sync { return collectionsQueue.sync {
// Must be mesh-attached: at least one live direct link to the mesh // Must be mesh-attached: at least one live direct link to the mesh
let meshAttached = peers.values.contains { $0.isConnected } let meshAttached = peers.values.contains { $0.isConnected }
@@ -616,11 +701,10 @@ final class BLEService: NSObject {
var payload = Data([NoisePayloadType.readReceipt.rawValue]) var payload = Data([NoisePayloadType.readReceipt.rawValue])
payload.append(contentsOf: receipt.originalMessageID.utf8) payload.append(contentsOf: receipt.originalMessageID.utf8)
let peer = Peer(str: peerID) if noiseService.hasEstablishedSession(with: peerID) {
if noiseService.hasEstablishedSession(with: peer) {
SecureLogger.debug("📤 Sending READ receipt for message \(receipt.originalMessageID) to \(peerID)", category: .session) SecureLogger.debug("📤 Sending READ receipt for message \(receipt.originalMessageID) to \(peerID)", category: .session)
do { do {
let encrypted = try noiseService.encrypt(payload, for: peer) let encrypted = try noiseService.encrypt(payload, for: peerID)
let packet = BitchatPacket( let packet = BitchatPacket(
type: MessageType.noiseEncrypted.rawValue, type: MessageType.noiseEncrypted.rawValue,
senderID: myPeerIDData, senderID: myPeerIDData,
@@ -644,7 +728,7 @@ final class BLEService: NSObject {
guard let self = self else { return } guard let self = self else { return }
self.pendingNoisePayloadsAfterHandshake[peerID, default: []].append(payload) self.pendingNoisePayloadsAfterHandshake[peerID, default: []].append(payload)
} }
if !noiseService.hasSession(with: peer) { initiateNoiseHandshake(with: peerID) } if !noiseService.hasSession(with: peerID) { initiateNoiseHandshake(with: peerID) }
SecureLogger.debug("🕒 Queued READ receipt for \(peerID) until handshake completes", category: .session) SecureLogger.debug("🕒 Queued READ receipt for \(peerID) until handshake completes", category: .session)
} }
} }
@@ -665,13 +749,13 @@ final class BLEService: NSObject {
} }
private func sendNoisePayload(_ typedPayload: Data, to peerID: String) { private func sendNoisePayload(_ typedPayload: Data, to peerID: String) {
guard noiseService.hasSession(with: Peer(str: peerID)) else { guard noiseService.hasSession(with: peerID) else {
// Lazy-handshake path: queue? For now, initiate handshake and drop // Lazy-handshake path: queue? For now, initiate handshake and drop
initiateNoiseHandshake(with: peerID) initiateNoiseHandshake(with: peerID)
return return
} }
do { do {
let encrypted = try noiseService.encrypt(typedPayload, for: Peer(str: peerID)) let encrypted = try noiseService.encrypt(typedPayload, for: peerID)
let packet = BitchatPacket( let packet = BitchatPacket(
type: MessageType.noiseEncrypted.rawValue, type: MessageType.noiseEncrypted.rawValue,
senderID: myPeerIDData, senderID: myPeerIDData,
@@ -706,9 +790,9 @@ final class BLEService: NSObject {
func getNoiseSessionState(for peerID: String) -> LazyHandshakeState { func getNoiseSessionState(for peerID: String) -> LazyHandshakeState {
if noiseService.hasEstablishedSession(with: Peer(str: peerID)) { if noiseService.hasEstablishedSession(with: peerID) {
return .established return .established
} else if noiseService.hasSession(with: Peer(str: peerID)) { } else if noiseService.hasSession(with: peerID) {
return .handshaking return .handshaking
} else { } else {
return .none return .none
@@ -839,7 +923,7 @@ final class BLEService: NSObject {
SecureLogger.debug("📨 Sending PM to \(recipientID): \(content.prefix(30))...", category: .session) SecureLogger.debug("📨 Sending PM to \(recipientID): \(content.prefix(30))...", category: .session)
// Check if we have an established Noise session // Check if we have an established Noise session
if noiseService.hasEstablishedSession(with: Peer(str: recipientID)) { if noiseService.hasEstablishedSession(with: recipientID) {
// Encrypt and send // Encrypt and send
do { do {
// Create TLV-encoded private message // Create TLV-encoded private message
@@ -853,7 +937,7 @@ final class BLEService: NSObject {
var messagePayload = Data([NoisePayloadType.privateMessage.rawValue]) var messagePayload = Data([NoisePayloadType.privateMessage.rawValue])
messagePayload.append(tlvData) messagePayload.append(tlvData)
let encrypted = try noiseService.encrypt(messagePayload, for: Peer(str: recipientID)) let encrypted = try noiseService.encrypt(messagePayload, for: recipientID)
// Convert recipientID to Data (assuming it's a hex string) // Convert recipientID to Data (assuming it's a hex string)
var recipientData = Data() var recipientData = Data()
@@ -919,10 +1003,10 @@ final class BLEService: NSObject {
private func initiateNoiseHandshake(with peerID: String) { private func initiateNoiseHandshake(with peerID: String) {
// Use NoiseEncryptionService for handshake // Use NoiseEncryptionService for handshake
guard !noiseService.hasSession(with: Peer(str: peerID)) else { return } guard !noiseService.hasSession(with: peerID) else { return }
do { do {
let handshakeData = try noiseService.initiateHandshake(with: Peer(str: peerID)) let handshakeData = try noiseService.initiateHandshake(with: peerID)
// Send handshake init // Send handshake init
let packet = BitchatPacket( let packet = BitchatPacket(
@@ -972,7 +1056,7 @@ final class BLEService: NSObject {
var messagePayload = Data([NoisePayloadType.privateMessage.rawValue]) var messagePayload = Data([NoisePayloadType.privateMessage.rawValue])
messagePayload.append(tlvData) messagePayload.append(tlvData)
let encrypted = try noiseService.encrypt(messagePayload, for: Peer(str: peerID)) let encrypted = try noiseService.encrypt(messagePayload, for: peerID)
let packet = BitchatPacket( let packet = BitchatPacket(
type: MessageType.noiseEncrypted.rawValue, type: MessageType.noiseEncrypted.rawValue,
@@ -1101,6 +1185,13 @@ final class BLEService: NSObject {
// Determine last-hop link for this message to avoid echoing back // Determine last-hop link for this message to avoid echoing back
let messageID = makeMessageID(for: packet) let messageID = makeMessageID(for: packet)
let ingressLink: LinkID? = collectionsQueue.sync { ingressByMessageID[messageID]?.link } let ingressLink: LinkID? = collectionsQueue.sync { ingressByMessageID[messageID]?.link }
let directedPeerHint: String? = {
if let explicit = directedOnlyPeer { return explicit }
if let recipient = packet.recipientID?.hexEncodedString(), !recipient.isEmpty {
return recipient
}
return nil
}()
let states = snapshotPeripheralStates() let states = snapshotPeripheralStates()
var minCentralWriteLen: Int? var minCentralWriteLen: Int?
@@ -1154,7 +1245,7 @@ final class BLEService: NSObject {
// Special-case control/presence messages: do NOT subset to maximize immediate coverage // Special-case control/presence messages: do NOT subset to maximize immediate coverage
var selectedPeripheralIDs = Set(allowedPeripheralIDs) var selectedPeripheralIDs = Set(allowedPeripheralIDs)
var selectedCentralIDs = Set(allowedCentralIDs) var selectedCentralIDs = Set(allowedCentralIDs)
if directedOnlyPeer == nil if directedPeerHint == nil
&& packet.type != MessageType.fragment.rawValue && packet.type != MessageType.fragment.rawValue
&& packet.type != MessageType.announce.rawValue && packet.type != MessageType.announce.rawValue
&& packet.type != MessageType.requestSync.rawValue { && packet.type != MessageType.requestSync.rawValue {
@@ -1165,7 +1256,7 @@ final class BLEService: NSObject {
} }
// If directed and we currently have no links to forward on, spool for a short window // If directed and we currently have no links to forward on, spool for a short window
if let only = directedOnlyPeer, if let only = directedPeerHint,
selectedPeripheralIDs.isEmpty && selectedCentralIDs.isEmpty, selectedPeripheralIDs.isEmpty && selectedCentralIDs.isEmpty,
(packet.type == MessageType.noiseEncrypted.rawValue || packet.type == MessageType.noiseHandshake.rawValue) { (packet.type == MessageType.noiseEncrypted.rawValue || packet.type == MessageType.noiseHandshake.rawValue) {
spoolDirectedPacket(packet, recipientPeerID: only) spoolDirectedPacket(packet, recipientPeerID: only)
@@ -1509,7 +1600,7 @@ final class BLEService: NSObject {
// Verify that the sender's derived ID from the announced noise public key matches the packet senderID // Verify that the sender's derived ID from the announced noise public key matches the packet senderID
// This helps detect relayed or spoofed announces. Only warn in release; assert in debug. // This helps detect relayed or spoofed announces. Only warn in release; assert in debug.
let derivedFromKey = Peer(publicKey: announcement.noisePublicKey).id let derivedFromKey = PeerIDUtils.derivePeerID(fromPublicKey: announcement.noisePublicKey)
if derivedFromKey != peerID { if derivedFromKey != peerID {
SecureLogger.warning("⚠️ Announce sender mismatch: derived \(derivedFromKey.prefix(8))… vs packet \(peerID.prefix(8))", category: .security) SecureLogger.warning("⚠️ Announce sender mismatch: derived \(derivedFromKey.prefix(8))… vs packet \(peerID.prefix(8))", category: .security)
@@ -1721,7 +1812,7 @@ final class BLEService: NSObject {
// Fallback: verify signature using persisted signing key for this peerID's fingerprint prefix // Fallback: verify signature using persisted signing key for this peerID's fingerprint prefix
if let signature = packet.signature, let packetData = packet.toBinaryDataForSigning() { if let signature = packet.signature, let packetData = packet.toBinaryDataForSigning() {
// Find candidate identities by peerID prefix (16 hex) // Find candidate identities by peerID prefix (16 hex)
let candidates = identityManager.getCryptoIdentitiesByPeerIDPrefix(Peer(str: peerID)) let candidates = identityManager.getCryptoIdentitiesByPeerIDPrefix(peerID)
for candidate in candidates { for candidate in candidates {
if let signingKey = candidate.signingPublicKey, if let signingKey = candidate.signingPublicKey,
noiseService.verifySignature(signature, for: packetData, publicKey: signingKey) { noiseService.verifySignature(signature, for: packetData, publicKey: signingKey) {
@@ -1786,7 +1877,7 @@ final class BLEService: NSObject {
recipientID.hexEncodedString() == myPeerID { recipientID.hexEncodedString() == myPeerID {
// Handshake is for us // Handshake is for us
do { do {
if let response = try noiseService.processHandshakeMessage(from: Peer(str: peerID), message: packet.payload) { if let response = try noiseService.processHandshakeMessage(from: peerID, message: packet.payload) {
// Send response // Send response
let responsePacket = BitchatPacket( let responsePacket = BitchatPacket(
type: MessageType.noiseHandshake.rawValue, type: MessageType.noiseHandshake.rawValue,
@@ -1806,7 +1897,7 @@ final class BLEService: NSObject {
} catch { } catch {
SecureLogger.error("Failed to process handshake: \(error)") SecureLogger.error("Failed to process handshake: \(error)")
// Try initiating a new handshake // Try initiating a new handshake
if !noiseService.hasSession(with: Peer(str: peerID)) { if !noiseService.hasSession(with: peerID) {
initiateNoiseHandshake(with: peerID) initiateNoiseHandshake(with: peerID)
} }
} }
@@ -1831,7 +1922,7 @@ final class BLEService: NSObject {
updatePeerLastSeen(peerID) updatePeerLastSeen(peerID)
do { do {
let decrypted = try noiseService.decrypt(packet.payload, from: Peer(str: peerID)) let decrypted = try noiseService.decrypt(packet.payload, from: peerID)
guard decrypted.count > 0 else { return } guard decrypted.count > 0 else { return }
// First byte indicates the payload type // First byte indicates the payload type
@@ -1871,7 +1962,7 @@ final class BLEService: NSObject {
// We received an encrypted message before establishing a session with this peer. // We received an encrypted message before establishing a session with this peer.
// Trigger a handshake so future messages can be decrypted. // Trigger a handshake so future messages can be decrypted.
SecureLogger.debug("🔑 Encrypted message from \(peerID) without session; initiating handshake") SecureLogger.debug("🔑 Encrypted message from \(peerID) without session; initiating handshake")
if !noiseService.hasSession(with: Peer(str: peerID)) { if !noiseService.hasSession(with: peerID) {
initiateNoiseHandshake(with: peerID) initiateNoiseHandshake(with: peerID)
} }
} catch { } catch {
@@ -1976,9 +2067,9 @@ final class BLEService: NSObject {
var payload = Data([NoisePayloadType.delivered.rawValue]) var payload = Data([NoisePayloadType.delivered.rawValue])
payload.append(contentsOf: messageID.utf8) payload.append(contentsOf: messageID.utf8)
if noiseService.hasEstablishedSession(with: Peer(str: peerID)) { if noiseService.hasEstablishedSession(with: peerID) {
do { do {
let encrypted = try noiseService.encrypt(payload, for: Peer(str: peerID)) let encrypted = try noiseService.encrypt(payload, for: peerID)
let packet = BitchatPacket( let packet = BitchatPacket(
type: MessageType.noiseEncrypted.rawValue, type: MessageType.noiseEncrypted.rawValue,
senderID: myPeerIDData, senderID: myPeerIDData,
@@ -1998,7 +2089,7 @@ final class BLEService: NSObject {
guard let self = self else { return } guard let self = self else { return }
self.pendingNoisePayloadsAfterHandshake[peerID, default: []].append(payload) self.pendingNoisePayloadsAfterHandshake[peerID, default: []].append(payload)
} }
if !noiseService.hasSession(with: Peer(str: peerID)) { initiateNoiseHandshake(with: peerID) } if !noiseService.hasSession(with: peerID) { initiateNoiseHandshake(with: peerID) }
SecureLogger.debug("🕒 Queued DELIVERED ack for \(peerID) until handshake completes", category: .session) SecureLogger.debug("🕒 Queued DELIVERED ack for \(peerID) until handshake completes", category: .session)
} }
} }
@@ -2013,7 +2104,7 @@ final class BLEService: NSObject {
SecureLogger.debug("📤 Sending \(payloads.count) pending noise payloads to \(peerID) after handshake", category: .session) SecureLogger.debug("📤 Sending \(payloads.count) pending noise payloads to \(peerID) after handshake", category: .session)
for payload in payloads { for payload in payloads {
do { do {
let encrypted = try noiseService.encrypt(payload, for: Peer(str: peerID)) let encrypted = try noiseService.encrypt(payload, for: peerID)
let packet = BitchatPacket( let packet = BitchatPacket(
type: MessageType.noiseEncrypted.rawValue, type: MessageType.noiseEncrypted.rawValue,
senderID: myPeerIDData, senderID: myPeerIDData,
@@ -2506,7 +2597,8 @@ extension BLEService: CBCentralManagerDelegate {
peerID: nil, peerID: nil,
isConnecting: true, isConnecting: true,
isConnected: false, isConnected: false,
lastConnectionAttempt: Date() lastConnectionAttempt: Date(),
assembler: NotificationStreamAssembler()
) )
peripheral.delegate = self peripheral.delegate = self
@@ -2555,7 +2647,9 @@ func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeriph
characteristic: nil, characteristic: nil,
peerID: nil, peerID: nil,
isConnecting: false, isConnecting: false,
isConnected: true isConnected: true,
lastConnectionAttempt: nil,
assembler: NotificationStreamAssembler()
) )
} }
@@ -2693,7 +2787,8 @@ extension BLEService {
peerID: nil, peerID: nil,
isConnecting: true, isConnecting: true,
isConnected: false, isConnected: false,
lastConnectionAttempt: Date() lastConnectionAttempt: Date(),
assembler: NotificationStreamAssembler()
) )
peripheral.delegate = self peripheral.delegate = self
let options: [String: Any] = [ let options: [String: Any] = [
@@ -2830,53 +2925,72 @@ extension BLEService: CBPeripheralDelegate {
return return
} }
guard let data = characteristic.value else { guard let data = characteristic.value, !data.isEmpty else {
SecureLogger.warning("⚠️ No data in notification", category: .session) SecureLogger.warning("⚠️ No data in notification", category: .session)
return return
} }
// Received BLE notification bufferNotificationChunk(data, from: peripheral)
// Process directly on main thread to avoid deadlocks (matches original implementation)
guard let packet = BinaryProtocol.decode(data) else {
// Avoid dumping entire payload; log size and short prefix for diagnostics
let prefix = data.prefix(16).map { String(format: "%02x", $0) }.joined(separator: " ")
SecureLogger.error("❌ Failed to decode notification packet (len=\(data.count), prefix=\(prefix))", category: .session)
return
}
// Use the packet's senderID as the peer identifier
let senderID = packet.senderID.hexEncodedString()
// Only log non-announce packets
if packet.type != MessageType.announce.rawValue {
SecureLogger.debug("📦 Decoded notification packet type: \(packet.type) from sender: \(senderID)", category: .session)
} }
private func bufferNotificationChunk(_ chunk: Data, from peripheral: CBPeripheral) {
let peripheralUUID = peripheral.identifier.uuidString let peripheralUUID = peripheral.identifier.uuidString
// Update mapping ONLY for announce packets that come directly from the peer (not relayed) var state = peripherals[peripheralUUID] ?? PeripheralState(
peripheral: peripheral,
characteristic: nil,
peerID: nil,
isConnecting: false,
isConnected: peripheral.state == .connected,
lastConnectionAttempt: nil,
assembler: NotificationStreamAssembler()
)
var assembler = state.assembler
let result = assembler.append(chunk)
state.assembler = assembler
peripherals[peripheralUUID] = state
for byte in result.droppedPrefixes {
SecureLogger.warning("⚠️ Dropping byte from BLE stream (unexpected prefix \(String(format: "%02x", byte)))", category: .session)
}
if result.reset {
SecureLogger.error("❌ Invalid BLE frame length; reset notification stream", category: .session)
}
for frame in result.frames {
guard let packet = BinaryProtocol.decode(frame) else {
let prefix = frame.prefix(16).map { String(format: "%02x", $0) }.joined(separator: " ")
SecureLogger.error("❌ Failed to decode assembled notification frame (len=\(frame.count), prefix=\(prefix))", category: .session)
continue
}
processNotificationPacket(packet, from: peripheral, peripheralUUID: peripheralUUID)
}
}
private func processNotificationPacket(_ packet: BitchatPacket, from peripheral: CBPeripheral, peripheralUUID: String) {
let senderID = packet.senderID.hexEncodedString()
if packet.type != MessageType.announce.rawValue {
SecureLogger.debug("📦 Decoded notification packet type: \(packet.type) from sender: \(senderID)", category: .session)
}
if packet.type == MessageType.announce.rawValue { if packet.type == MessageType.announce.rawValue {
// Only update mapping if this is a direct announce (TTL == messageTTL means not relayed)
if packet.ttl == messageTTL { if packet.ttl == messageTTL {
if var state = peripherals[peripheralUUID] { if var state = peripherals[peripheralUUID] {
state.peerID = senderID state.peerID = senderID
peripherals[peripheralUUID] = state peripherals[peripheralUUID] = state
} }
peerToPeripheralUUID[senderID] = peripheralUUID peerToPeripheralUUID[senderID] = peripheralUUID
// Mapping update - direct announce from peer
} }
// Record ingress link for last-hop suppression and process
let msgID = makeMessageID(for: packet) let msgID = makeMessageID(for: packet)
collectionsQueue.async(flags: .barrier) { [weak self] in collectionsQueue.async(flags: .barrier) { [weak self] in
self?.ingressByMessageID[msgID] = (.peripheral(peripheralUUID), Date()) self?.ingressByMessageID[msgID] = (.peripheral(peripheralUUID), Date())
} }
// Process the announce packet regardless of whether we updated the mapping
handleReceivedPacket(packet, from: senderID) handleReceivedPacket(packet, from: senderID)
} else { } else {
// For non-announce packets, DO NOT update mappings
// These could be relayed packets from other peers
// Always use the packet's original senderID
// Record ingress link for last-hop suppression and process
let msgID = makeMessageID(for: packet) let msgID = makeMessageID(for: packet)
collectionsQueue.async(flags: .barrier) { [weak self] in collectionsQueue.async(flags: .barrier) { [weak self] in
self?.ingressByMessageID[msgID] = (.peripheral(peripheralUUID), Date()) self?.ingressByMessageID[msgID] = (.peripheral(peripheralUUID), Date())
@@ -179,11 +179,12 @@ final class FavoritesPersistenceService: ObservableObject {
/// Resolve favorite status by short peer ID (16-hex derived from Noise pubkey) /// Resolve favorite status by short peer ID (16-hex derived from Noise pubkey)
/// Falls back to scanning favorites and matching on derived peer ID. /// Falls back to scanning favorites and matching on derived peer ID.
func getFavoriteStatus(for peer: Peer) -> FavoriteRelationship? { func getFavoriteStatus(forPeerID peerID: String) -> FavoriteRelationship? {
// Quick sanity: peer.id should be 16 hex chars (8 bytes) // Quick sanity: peerID should be 16 hex chars (8 bytes)
guard peer.isShort else { return nil } guard peerID.count == 16 else { return nil }
for (pubkey, rel) in favorites where Peer(publicKey: pubkey) == peer { for (pubkey, rel) in favorites {
return rel let derived = PeerIDUtils.derivePeerID(fromPublicKey: pubkey)
if derived == peerID { return rel }
} }
return nil return nil
} }
+53 -7
View File
@@ -1,5 +1,34 @@
import BitLogger
import Foundation import Foundation
struct LocationNotesCounterDependencies {
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
var relayLookup: RelayLookup
var subscribe: Subscribe
var unsubscribe: Unsubscribe
static let live = LocationNotesCounterDependencies(
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)
}
)
}
/// Lightweight background counter for location notes (kind 1) at building-level geohash (8 chars). /// Lightweight background counter for location notes (kind 1) at building-level geohash (8 chars).
@MainActor @MainActor
final class LocationNotesCounter: ObservableObject { final class LocationNotesCounter: ObservableObject {
@@ -8,29 +37,45 @@ final class LocationNotesCounter: ObservableObject {
@Published private(set) var geohash: String? = nil @Published private(set) var geohash: String? = nil
@Published private(set) var count: Int? = 0 @Published private(set) var count: Int? = 0
@Published private(set) var initialLoadComplete: Bool = false @Published private(set) var initialLoadComplete: Bool = false
@Published private(set) var relayAvailable: Bool = true
private var subscriptionID: String? = nil private var subscriptionID: String? = nil
private var noteIDs = Set<String>() private var noteIDs = Set<String>()
private let dependencies: LocationNotesCounterDependencies
private init() {} private init(dependencies: LocationNotesCounterDependencies = .live) {
self.dependencies = dependencies
}
init(testDependencies: LocationNotesCounterDependencies) {
self.dependencies = testDependencies
}
func subscribe(geohash gh: String) { func subscribe(geohash gh: String) {
let norm = gh.lowercased() let norm = gh.lowercased()
if geohash == norm, subscriptionID != nil { return } if geohash == norm, subscriptionID != nil { return }
// Unsubscribe previous without clearing count to avoid flicker // Unsubscribe previous without clearing count to avoid flicker
if let sub = subscriptionID { NostrRelayManager.shared.unsubscribe(id: sub) } if let sub = subscriptionID { dependencies.unsubscribe(sub) }
subscriptionID = nil subscriptionID = nil
geohash = norm geohash = norm
noteIDs.removeAll() noteIDs.removeAll()
initialLoadComplete = false initialLoadComplete = false
relayAvailable = true
// Subscribe only to the building geohash (precision 8) // Subscribe only to the building geohash (precision 8)
let subID = "locnotes-count-\(norm)-\(UUID().uuidString.prefix(6))" let subID = "locnotes-count-\(norm)-\(UUID().uuidString.prefix(6))"
let relays = dependencies.relayLookup(norm, TransportConfig.nostrGeoRelayCount)
guard !relays.isEmpty else {
relayAvailable = false
initialLoadComplete = true
count = 0
SecureLogger.warning("LocationNotesCounter: no geo relays for geohash=\(norm)", category: .session)
return
}
subscriptionID = subID subscriptionID = subID
let filter = NostrFilter.geohashNotes(norm, since: nil, limit: 500) let filter = NostrFilter.geohashNotes(norm, since: nil, limit: 500)
let relays = GeoRelayDirectory.shared.closestRelays(toGeohash: norm, count: TransportConfig.nostrGeoRelayCount) dependencies.subscribe(filter, subID, relays, { [weak self] event in
let relayUrls: [String]? = relays.isEmpty ? nil : relays
NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: relayUrls, handler: { [weak self] event in
guard let self = self else { return } guard let self = self else { return }
guard event.kind == NostrProtocol.EventKind.textNote.rawValue else { return } guard event.kind == NostrProtocol.EventKind.textNote.rawValue else { return }
guard event.tags.contains(where: { $0.count >= 2 && $0[0].lowercased() == "g" && $0[1].lowercased() == norm }) else { return } guard event.tags.contains(where: { $0.count >= 2 && $0[0].lowercased() == "g" && $0[1].lowercased() == norm }) else { return }
@@ -38,16 +83,17 @@ final class LocationNotesCounter: ObservableObject {
self.noteIDs.insert(event.id) self.noteIDs.insert(event.id)
self.count = self.noteIDs.count self.count = self.noteIDs.count
} }
}, onEOSE: { [weak self] in }, { [weak self] in
self?.initialLoadComplete = true self?.initialLoadComplete = true
}) })
} }
func cancel() { func cancel() {
if let sub = subscriptionID { NostrRelayManager.shared.unsubscribe(id: sub) } if let sub = subscriptionID { dependencies.unsubscribe(sub) }
subscriptionID = nil subscriptionID = nil
geohash = nil geohash = nil
count = 0 count = 0
noteIDs.removeAll() noteIDs.removeAll()
relayAvailable = true
} }
} }
+130 -14
View File
@@ -1,10 +1,57 @@
import BitLogger import BitLogger
import Foundation import Foundation
/// Persistent location notes (Nostr kind 1) scoped to a street-level geohash (precision 7). /// 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
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 NostrIdentityBridge.deriveIdentity(forGeohash: geohash)
},
now: { Date() }
)
}
/// 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. /// Subscribes to and publishes notes for a given geohash and provides a send API.
@MainActor @MainActor
final class LocationNotesManager: ObservableObject { final class LocationNotesManager: ObservableObject {
enum State: Equatable {
case idle
case loading
case ready
case noRelays
}
struct Note: Identifiable, Equatable { struct Note: Identifiable, Equatable {
let id: String let id: String
let pubkey: String let pubkey: String
@@ -24,10 +71,29 @@ final class LocationNotesManager: ObservableObject {
@Published private(set) var notes: [Note] = [] // reverse-chron sorted @Published private(set) var notes: [Note] = [] // reverse-chron sorted
@Published private(set) var geohash: String @Published private(set) var geohash: String
@Published private(set) var initialLoadComplete: Bool = false @Published private(set) var initialLoadComplete: Bool = false
@Published private(set) var state: State = .loading
@Published private(set) var errorMessage: String?
private var subscriptionID: String? private var subscriptionID: String?
private let dependencies: LocationNotesDependencies
init(geohash: String) { private enum Strings {
static let noRelays = NSLocalizedString(
"location_notes.error.no_relays",
comment: "Shown when no geo relays are available near the selected location"
)
static func failedToSend(_ detail: String) -> String {
let format = NSLocalizedString(
"location_notes.error.failed_to_send",
comment: "Shown when a location note fails to send"
)
return String(format: format, detail)
}
}
init(geohash: String, dependencies: LocationNotesDependencies = .live) {
self.geohash = geohash.lowercased() self.geohash = geohash.lowercased()
self.dependencies = dependencies
subscribe() subscribe()
} }
@@ -35,7 +101,7 @@ final class LocationNotesManager: ObservableObject {
let norm = newGeohash.lowercased() let norm = newGeohash.lowercased()
guard norm != geohash else { return } guard norm != geohash else { return }
if let sub = subscriptionID { if let sub = subscriptionID {
NostrRelayManager.shared.unsubscribe(id: sub) dependencies.unsubscribe(sub)
subscriptionID = nil subscriptionID = nil
} }
geohash = norm geohash = norm
@@ -43,15 +109,43 @@ final class LocationNotesManager: ObservableObject {
subscribe() subscribe()
} }
func refresh() {
if let sub = subscriptionID {
dependencies.unsubscribe(sub)
subscriptionID = nil
}
notes.removeAll()
subscribe()
}
func clearError() {
errorMessage = nil
}
private func subscribe() { 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 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 subscriptionID = subID
initialLoadComplete = false
// For persistent notes, allow relays to return recent history without an aggressive time cutoff // For persistent notes, allow relays to return recent history without an aggressive time cutoff
let filter = NostrFilter.geohashNotes(geohash, since: nil, limit: 200) let filter = NostrFilter.geohashNotes(geohash, since: nil, limit: 200)
let relays = GeoRelayDirectory.shared.closestRelays(toGeohash: geohash, count: TransportConfig.nostrGeoRelayCount)
let relayUrls: [String]? = relays.isEmpty ? nil : relays dependencies.subscribe(filter, subID, relays, { [weak self] event in
initialLoadComplete = false
NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: relayUrls, handler: { [weak self] event in
guard let self = self else { return } guard let self = self else { return }
guard event.kind == NostrProtocol.EventKind.textNote.rawValue else { return } guard event.kind == NostrProtocol.EventKind.textNote.rawValue else { return }
// Ensure matching tag // Ensure matching tag
@@ -62,8 +156,13 @@ final class LocationNotesManager: ObservableObject {
let note = Note(id: event.id, pubkey: event.pubkey, content: event.content, createdAt: ts, nickname: nick) let note = Note(id: event.id, pubkey: event.pubkey, content: event.content, createdAt: ts, nickname: nick)
self.notes.append(note) self.notes.append(note)
self.notes.sort { $0.createdAt > $1.createdAt } self.notes.sort { $0.createdAt > $1.createdAt }
}, onEOSE: { [weak self] in self.state = .ready
self?.initialLoadComplete = true }, { [weak self] in
guard let self = self else { return }
self.initialLoadComplete = true
if self.state != .noRelays {
self.state = .ready
}
}) })
} }
@@ -71,29 +170,46 @@ final class LocationNotesManager: ObservableObject {
func send(content: String, nickname: String) { func send(content: String, nickname: String) {
let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines) let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines)
guard !trimmed.isEmpty else { return } guard !trimmed.isEmpty 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 { do {
let id = try NostrIdentityBridge.deriveIdentity(forGeohash: geohash) let id = try dependencies.deriveIdentity(geohash)
let event = try NostrProtocol.createGeohashTextNote( let event = try NostrProtocol.createGeohashTextNote(
content: trimmed, content: trimmed,
geohash: geohash, geohash: geohash,
senderIdentity: id, senderIdentity: id,
nickname: nickname nickname: nickname
) )
let relays = GeoRelayDirectory.shared.closestRelays(toGeohash: geohash, count: TransportConfig.nostrGeoRelayCount) dependencies.sendEvent(event, relays)
NostrRelayManager.shared.sendEvent(event, to: relays)
// Optimistic local-echo // Optimistic local-echo
let echo = Note(id: event.id, pubkey: id.publicKeyHex, content: trimmed, createdAt: Date(), nickname: nickname) let echo = Note(
id: event.id,
pubkey: id.publicKeyHex,
content: trimmed,
createdAt: dependencies.now(),
nickname: nickname
)
self.notes.insert(echo, at: 0) self.notes.insert(echo, at: 0)
self.state = .ready
self.errorMessage = nil
} catch { } catch {
SecureLogger.error("LocationNotesManager: failed to send note: \(error)", category: .session) SecureLogger.error("LocationNotesManager: failed to send note: \(error)", category: .session)
errorMessage = Strings.failedToSend(error.localizedDescription)
} }
} }
/// Explicitly cancel subscription and release resources. /// Explicitly cancel subscription and release resources.
func cancel() { func cancel() {
if let sub = subscriptionID { if let sub = subscriptionID {
NostrRelayManager.shared.unsubscribe(id: sub) dependencies.unsubscribe(sub)
subscriptionID = nil subscriptionID = nil
} }
state = .idle
errorMessage = nil
} }
} }
+45 -45
View File
@@ -6,7 +6,7 @@ import Foundation
final class MessageRouter { final class MessageRouter {
private let mesh: Transport private let mesh: Transport
private let nostr: NostrTransport private let nostr: NostrTransport
private var outbox: [Peer: [(content: String, nickname: String, messageID: String)]] = [:] // Peer -> queued messages private var outbox: [String: [(content: String, nickname: String, messageID: String)]] = [:] // peerID -> queued messages
init(mesh: Transport, nostr: NostrTransport) { init(mesh: Transport, nostr: NostrTransport) {
self.mesh = mesh self.mesh = mesh
@@ -21,80 +21,80 @@ final class MessageRouter {
) { [weak self] note in ) { [weak self] note in
guard let self = self else { return } guard let self = self else { return }
if let data = note.userInfo?["peerPublicKey"] as? Data { if let data = note.userInfo?["peerPublicKey"] as? Data {
let peer = Peer(publicKey: data) let peerID = PeerIDUtils.derivePeerID(fromPublicKey: data)
Task { @MainActor in Task { @MainActor in
self.flushOutbox(for: peer) self.flushOutbox(for: peerID)
} }
} }
// Handle key updates // Handle key updates
if let newKey = note.userInfo?["peerPublicKey"] as? Data, if let newKey = note.userInfo?["peerPublicKey"] as? Data,
let _ = note.userInfo?["isKeyUpdate"] as? Bool { let _ = note.userInfo?["isKeyUpdate"] as? Bool {
let peer = Peer(publicKey: newKey) let peerID = PeerIDUtils.derivePeerID(fromPublicKey: newKey)
Task { @MainActor in Task { @MainActor in
self.flushOutbox(for: peer) self.flushOutbox(for: peerID)
} }
} }
} }
} }
func sendPrivate(_ content: String, to peer: Peer, recipientNickname: String, messageID: String) { func sendPrivate(_ content: String, to peerID: String, recipientNickname: String, messageID: String) {
let reachableMesh = mesh.isPeerReachable(peer.id) let reachableMesh = mesh.isPeerReachable(peerID)
if reachableMesh { if reachableMesh {
SecureLogger.debug("Routing PM via mesh (reachable) to \(peer.id.prefix(8))… id=\(messageID.prefix(8))", category: .session) SecureLogger.debug("Routing PM via mesh (reachable) to \(peerID.prefix(8))… id=\(messageID.prefix(8))", category: .session)
// BLEService will initiate a handshake if needed and queue the message // BLEService will initiate a handshake if needed and queue the message
mesh.sendPrivateMessage(content, to: peer.id, recipientNickname: recipientNickname, messageID: messageID) mesh.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
} else if canSendViaNostr(peer: peer) { } else if canSendViaNostr(peerID: peerID) {
SecureLogger.debug("Routing PM via Nostr to \(peer.id.prefix(8))… id=\(messageID.prefix(8))", category: .session) SecureLogger.debug("Routing PM via Nostr to \(peerID.prefix(8))… id=\(messageID.prefix(8))", category: .session)
nostr.sendPrivateMessage(content, to: peer.id, recipientNickname: recipientNickname, messageID: messageID) nostr.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
} else { } else {
// Queue for later (when mesh connects or Nostr mapping appears) // Queue for later (when mesh connects or Nostr mapping appears)
if outbox[peer] == nil { outbox[peer] = [] } if outbox[peerID] == nil { outbox[peerID] = [] }
outbox[peer]?.append((content, recipientNickname, messageID)) outbox[peerID]?.append((content, recipientNickname, messageID))
SecureLogger.debug("Queued PM for \(peer.id.prefix(8))… (no mesh, no Nostr mapping) id=\(messageID.prefix(8))", category: .session) SecureLogger.debug("Queued PM for \(peerID.prefix(8))… (no mesh, no Nostr mapping) id=\(messageID.prefix(8))", category: .session)
} }
} }
func sendReadReceipt(_ receipt: ReadReceipt, to peer: Peer) { func sendReadReceipt(_ receipt: ReadReceipt, to peerID: String) {
// Prefer mesh for reachable peers; BLE will queue if handshake is needed // Prefer mesh for reachable peers; BLE will queue if handshake is needed
if mesh.isPeerReachable(peer.id) { if mesh.isPeerReachable(peerID) {
SecureLogger.debug("Routing READ ack via mesh (reachable) to \(peer.id.prefix(8))… id=\(receipt.originalMessageID.prefix(8))", category: .session) SecureLogger.debug("Routing READ ack via mesh (reachable) to \(peerID.prefix(8))… id=\(receipt.originalMessageID.prefix(8))", category: .session)
mesh.sendReadReceipt(receipt, to: peer.id) mesh.sendReadReceipt(receipt, to: peerID)
} else { } else {
SecureLogger.debug("Routing READ ack via Nostr to \(peer.id.prefix(8))… id=\(receipt.originalMessageID.prefix(8))", category: .session) SecureLogger.debug("Routing READ ack via Nostr to \(peerID.prefix(8))… id=\(receipt.originalMessageID.prefix(8))", category: .session)
nostr.sendReadReceipt(receipt, to: peer.id) nostr.sendReadReceipt(receipt, to: peerID)
} }
} }
func sendDeliveryAck(_ messageID: String, to peer: Peer) { func sendDeliveryAck(_ messageID: String, to peerID: String) {
if mesh.isPeerReachable(peer.id) { if mesh.isPeerReachable(peerID) {
SecureLogger.debug("Routing DELIVERED ack via mesh (reachable) to \(peer.id.prefix(8))… id=\(messageID.prefix(8))", category: .session) SecureLogger.debug("Routing DELIVERED ack via mesh (reachable) to \(peerID.prefix(8))… id=\(messageID.prefix(8))", category: .session)
mesh.sendDeliveryAck(for: messageID, to: peer.id) mesh.sendDeliveryAck(for: messageID, to: peerID)
} else { } else {
nostr.sendDeliveryAck(for: messageID, to: peer.id) nostr.sendDeliveryAck(for: messageID, to: peerID)
} }
} }
func sendFavoriteNotification(to peer: Peer, isFavorite: Bool) { func sendFavoriteNotification(to peerID: String, isFavorite: Bool) {
// Route via mesh when connected; else use Nostr // Route via mesh when connected; else use Nostr
if mesh.isPeerConnected(peer.id) { if mesh.isPeerConnected(peerID) {
mesh.sendFavoriteNotification(to: peer.id, isFavorite: isFavorite) mesh.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
} else { } else {
nostr.sendFavoriteNotification(to: peer.id, isFavorite: isFavorite) nostr.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
} }
} }
// MARK: - Outbox Management // MARK: - Outbox Management
private func canSendViaNostr(peer: Peer) -> Bool { private func canSendViaNostr(peerID: String) -> Bool {
// Two forms are supported: // Two forms are supported:
// - 64-hex Noise public key (32 bytes) // - 64-hex Noise public key (32 bytes)
// - 16-hex short peer ID (derived from Noise pubkey) // - 16-hex short peer ID (derived from Noise pubkey)
if let noiseKey = peer.noiseKey { if peerID.count == 64, let noiseKey = Data(hexString: peerID) {
if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey), if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
fav.peerNostrPublicKey != nil { fav.peerNostrPublicKey != nil {
return true return true
} }
} else if peer.isShort { } else if peerID.count == 16 {
if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: peer), if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID),
fav.peerNostrPublicKey != nil { fav.peerNostrPublicKey != nil {
return true return true
} }
@@ -102,18 +102,18 @@ final class MessageRouter {
return false return false
} }
func flushOutbox(for peer: Peer) { func flushOutbox(for peerID: String) {
guard let queued = outbox[peer], !queued.isEmpty else { return } guard let queued = outbox[peerID], !queued.isEmpty else { return }
SecureLogger.debug("Flushing outbox for \(peer.id.prefix(8))… count=\(queued.count)", category: .session) SecureLogger.debug("Flushing outbox for \(peerID.prefix(8))… count=\(queued.count)", category: .session)
var remaining: [(content: String, nickname: String, messageID: String)] = [] var remaining: [(content: String, nickname: String, messageID: String)] = []
// Prefer mesh if connected; else try Nostr if mapping exists // Prefer mesh if connected; else try Nostr if mapping exists
for (content, nickname, messageID) in queued { for (content, nickname, messageID) in queued {
if mesh.isPeerReachable(peer.id) { if mesh.isPeerReachable(peerID) {
SecureLogger.debug("Outbox -> mesh for \(peer.id.prefix(8))… id=\(messageID.prefix(8))", category: .session) SecureLogger.debug("Outbox -> mesh for \(peerID.prefix(8))… id=\(messageID.prefix(8))", category: .session)
mesh.sendPrivateMessage(content, to: peer.id, recipientNickname: nickname, messageID: messageID) mesh.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
} else if canSendViaNostr(peer: peer) { } else if canSendViaNostr(peerID: peerID) {
SecureLogger.debug("Outbox -> Nostr for \(peer.id.prefix(8))… id=\(messageID.prefix(8))", category: .session) SecureLogger.debug("Outbox -> Nostr for \(peerID.prefix(8))… id=\(messageID.prefix(8))", category: .session)
nostr.sendPrivateMessage(content, to: peer.id, recipientNickname: nickname, messageID: messageID) nostr.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
} else { } else {
// Keep unsent items queued // Keep unsent items queued
remaining.append((content, nickname, messageID)) remaining.append((content, nickname, messageID))
@@ -121,9 +121,9 @@ final class MessageRouter {
} }
// Persist only items we could not send // Persist only items we could not send
if remaining.isEmpty { if remaining.isEmpty {
outbox.removeValue(forKey: peer) outbox.removeValue(forKey: peerID)
} else { } else {
outbox[peer] = remaining outbox[peerID] = remaining
} }
} }
+98 -54
View File
@@ -62,7 +62,6 @@
/// ## Integration Points /// ## Integration Points
/// - **BLEService**: Calls this service for all private messages /// - **BLEService**: Calls this service for all private messages
/// - **ChatViewModel**: Monitors encryption status for UI indicators /// - **ChatViewModel**: Monitors encryption status for UI indicators
/// - **NoiseHandshakeCoordinator**: Prevents handshake race conditions
/// - **KeychainManager**: Secure storage for identity keys /// - **KeychainManager**: Secure storage for identity keys
/// ///
/// ## Thread Safety /// ## Thread Safety
@@ -116,15 +115,60 @@ enum EncryptionStatus: Equatable {
var description: String { var description: String {
switch self { switch self {
case .none: case .none:
return "Encryption failed" return L10n.string(
"encryption.status.failed",
comment: "Status text when encryption failed"
)
case .noHandshake: case .noHandshake:
return "Not encrypted" return L10n.string(
"encryption.status.not_encrypted",
comment: "Status text when no encryption handshake happened"
)
case .noiseHandshaking: case .noiseHandshaking:
return "Establishing encryption..." return L10n.string(
"encryption.status.establishing",
comment: "Status text when encryption is being established"
)
case .noiseSecured: case .noiseSecured:
return "Encrypted" return L10n.string(
"encryption.status.secured",
comment: "Status text when encryption is secured but not verified"
)
case .noiseVerified: case .noiseVerified:
return "Encrypted & Verified" return L10n.string(
"encryption.status.verified",
comment: "Status text when encryption is verified"
)
}
}
var accessibilityDescription: String {
switch self {
case .none:
return L10n.string(
"encryption.accessibility.failed",
comment: "Accessibility text when encryption failed"
)
case .noHandshake:
return L10n.string(
"encryption.accessibility.not_encrypted",
comment: "Accessibility text when encryption is not established"
)
case .noiseHandshaking:
return L10n.string(
"encryption.accessibility.establishing",
comment: "Accessibility text when encryption is being established"
)
case .noiseSecured:
return L10n.string(
"encryption.accessibility.secured",
comment: "Accessibility text when encryption is secured"
)
case .noiseVerified:
return L10n.string(
"encryption.accessibility.verified",
comment: "Accessibility text when encryption is verified"
)
} }
} }
} }
@@ -148,8 +192,8 @@ final class NoiseEncryptionService {
private let sessionManager: NoiseSessionManager private let sessionManager: NoiseSessionManager
// Peer fingerprints (SHA256 hash of static public key) // Peer fingerprints (SHA256 hash of static public key)
private var peerFingerprints: [Peer: String] = [:] // Peer -> fingerprint private var peerFingerprints: [String: String] = [:] // peerID -> fingerprint
private var fingerprintToPeer: [String: Peer] = [:] // fingerprint -> Peer private var fingerprintToPeerID: [String: String] = [:] // fingerprint -> peerID
// Thread safety // Thread safety
private let serviceQueue = DispatchQueue(label: "chat.bitchat.noise.service", attributes: .concurrent) private let serviceQueue = DispatchQueue(label: "chat.bitchat.noise.service", attributes: .concurrent)
@@ -237,7 +281,7 @@ final class NoiseEncryptionService {
// Set up session callbacks // Set up session callbacks
sessionManager.onSessionEstablished = { [weak self] peerID, remoteStaticKey in sessionManager.onSessionEstablished = { [weak self] peerID, remoteStaticKey in
self?.handleSessionEstablished(peer: Peer(str: peerID), remoteStaticKey: remoteStaticKey) self?.handleSessionEstablished(peerID: peerID, remoteStaticKey: remoteStaticKey)
} }
// Start session maintenance timer // Start session maintenance timer
@@ -263,8 +307,8 @@ final class NoiseEncryptionService {
} }
/// Get peer's public key data /// Get peer's public key data
func getPeerPublicKeyData(_ peer: Peer) -> Data? { func getPeerPublicKeyData(_ peerID: String) -> Data? {
return sessionManager.getRemoteStaticKey(for: peer.id)?.rawRepresentation return sessionManager.getRemoteStaticKey(for: peerID)?.rawRepresentation
} }
/// Clear persistent identity (for panic mode) /// Clear persistent identity (for panic mode)
@@ -391,52 +435,52 @@ final class NoiseEncryptionService {
// MARK: - Handshake Management // MARK: - Handshake Management
/// Initiate a Noise handshake with a peer /// Initiate a Noise handshake with a peer
func initiateHandshake(with peer: Peer) throws -> Data { func initiateHandshake(with peerID: String) throws -> Data {
// Validate peer ID // Validate peer ID
guard peer.isValid else { guard NoiseSecurityValidator.validatePeerID(peerID) else {
SecureLogger.warning(.authenticationFailed(peerID: peer.id)) SecureLogger.warning(.authenticationFailed(peerID: peerID))
throw NoiseSecurityError.invalidPeerID throw NoiseSecurityError.invalidPeerID
} }
// Check rate limit // Check rate limit
guard rateLimiter.allowHandshake(from: peer) else { guard rateLimiter.allowHandshake(from: peerID) else {
SecureLogger.warning(.authenticationFailed(peerID: "Rate limited: \(peer.id)")) SecureLogger.warning(.authenticationFailed(peerID: "Rate limited: \(peerID)"))
throw NoiseSecurityError.rateLimitExceeded throw NoiseSecurityError.rateLimitExceeded
} }
SecureLogger.info(.handshakeStarted(peerID: peer.id)) SecureLogger.info(.handshakeStarted(peerID: peerID))
// Return raw handshake data without wrapper // Return raw handshake data without wrapper
// The Noise protocol handles its own message format // The Noise protocol handles its own message format
let handshakeData = try sessionManager.initiateHandshake(with: peer.id) let handshakeData = try sessionManager.initiateHandshake(with: peerID)
return handshakeData return handshakeData
} }
/// Process an incoming handshake message /// Process an incoming handshake message
func processHandshakeMessage(from peer: Peer, message: Data) throws -> Data? { func processHandshakeMessage(from peerID: String, message: Data) throws -> Data? {
// Validate peer ID // Validate peer ID
guard peer.isValid else { guard NoiseSecurityValidator.validatePeerID(peerID) else {
SecureLogger.warning(.authenticationFailed(peerID: peer.id)) SecureLogger.warning(.authenticationFailed(peerID: peerID))
throw NoiseSecurityError.invalidPeerID throw NoiseSecurityError.invalidPeerID
} }
// Validate message size // Validate message size
guard NoiseSecurityValidator.validateHandshakeMessageSize(message) else { guard NoiseSecurityValidator.validateHandshakeMessageSize(message) else {
SecureLogger.warning(.handshakeFailed(peerID: peer.id, error: "Message too large")) SecureLogger.warning(.handshakeFailed(peerID: peerID, error: "Message too large"))
throw NoiseSecurityError.messageTooLarge throw NoiseSecurityError.messageTooLarge
} }
// Check rate limit // Check rate limit
guard rateLimiter.allowHandshake(from: peer) else { guard rateLimiter.allowHandshake(from: peerID) else {
SecureLogger.warning(.authenticationFailed(peerID: "Rate limited: \(peer.id)")) SecureLogger.warning(.authenticationFailed(peerID: "Rate limited: \(peerID)"))
throw NoiseSecurityError.rateLimitExceeded throw NoiseSecurityError.rateLimitExceeded
} }
// For handshakes, we process the raw data directly without NoiseMessage wrapper // For handshakes, we process the raw data directly without NoiseMessage wrapper
// The Noise protocol handles its own message format // The Noise protocol handles its own message format
let responsePayload = try sessionManager.handleIncomingHandshake(from: peer.id, message: message) let responsePayload = try sessionManager.handleIncomingHandshake(from: peerID, message: message)
// Return raw response without wrapper // Return raw response without wrapper
@@ -444,117 +488,117 @@ final class NoiseEncryptionService {
} }
/// Check if we have an established session with a peer /// Check if we have an established session with a peer
func hasEstablishedSession(with peer: Peer) -> Bool { func hasEstablishedSession(with peerID: String) -> Bool {
return sessionManager.getSession(for: peer.id)?.isEstablished() ?? false return sessionManager.getSession(for: peerID)?.isEstablished() ?? false
} }
/// Check if we have a session (established or handshaking) with a peer /// Check if we have a session (established or handshaking) with a peer
func hasSession(with peer: Peer) -> Bool { func hasSession(with peerID: String) -> Bool {
return sessionManager.getSession(for: peer.id) != nil return sessionManager.getSession(for: peerID) != nil
} }
// MARK: - Encryption/Decryption // MARK: - Encryption/Decryption
/// Encrypt data for a specific peer /// Encrypt data for a specific peer
func encrypt(_ data: Data, for peer: Peer) throws -> Data { func encrypt(_ data: Data, for peerID: String) throws -> Data {
// Validate message size // Validate message size
guard NoiseSecurityValidator.validateMessageSize(data) else { guard NoiseSecurityValidator.validateMessageSize(data) else {
throw NoiseSecurityError.messageTooLarge throw NoiseSecurityError.messageTooLarge
} }
// Check rate limit // Check rate limit
guard rateLimiter.allowMessage(from: peer) else { guard rateLimiter.allowMessage(from: peerID) else {
throw NoiseSecurityError.rateLimitExceeded throw NoiseSecurityError.rateLimitExceeded
} }
// Check if we have an established session // Check if we have an established session
guard hasEstablishedSession(with: peer) else { guard hasEstablishedSession(with: peerID) else {
// Signal that handshake is needed // Signal that handshake is needed
onHandshakeRequired?(peer.id) onHandshakeRequired?(peerID)
throw NoiseEncryptionError.handshakeRequired throw NoiseEncryptionError.handshakeRequired
} }
return try sessionManager.encrypt(data, for: peer.id) return try sessionManager.encrypt(data, for: peerID)
} }
/// Decrypt data from a specific peer /// Decrypt data from a specific peer
func decrypt(_ data: Data, from peer: Peer) throws -> Data { func decrypt(_ data: Data, from peerID: String) throws -> Data {
// Validate message size // Validate message size
guard NoiseSecurityValidator.validateMessageSize(data) else { guard NoiseSecurityValidator.validateMessageSize(data) else {
throw NoiseSecurityError.messageTooLarge throw NoiseSecurityError.messageTooLarge
} }
// Check rate limit // Check rate limit
guard rateLimiter.allowMessage(from: peer) else { guard rateLimiter.allowMessage(from: peerID) else {
throw NoiseSecurityError.rateLimitExceeded throw NoiseSecurityError.rateLimitExceeded
} }
// Check if we have an established session // Check if we have an established session
guard hasEstablishedSession(with: peer) else { guard hasEstablishedSession(with: peerID) else {
throw NoiseEncryptionError.sessionNotEstablished throw NoiseEncryptionError.sessionNotEstablished
} }
return try sessionManager.decrypt(data, from: peer.id) return try sessionManager.decrypt(data, from: peerID)
} }
// MARK: - Peer Management // MARK: - Peer Management
/// Get fingerprint for a peer /// Get fingerprint for a peer
func getPeerFingerprint(_ peer: Peer) -> String? { func getPeerFingerprint(_ peerID: String) -> String? {
return serviceQueue.sync { return serviceQueue.sync {
return peerFingerprints[peer] return peerFingerprints[peerID]
} }
} }
/// Get peer ID for a fingerprint /// Get peer ID for a fingerprint
func getPeer(for fingerprint: String) -> Peer? { func getPeerID(for fingerprint: String) -> String? {
return serviceQueue.sync { return serviceQueue.sync {
return fingerprintToPeer[fingerprint] return fingerprintToPeerID[fingerprint]
} }
} }
/// Remove a peer session /// Remove a peer session
func removePeer(_ peer: Peer) { func removePeer(_ peerID: String) {
sessionManager.removeSession(for: peer.id) sessionManager.removeSession(for: peerID)
serviceQueue.sync(flags: .barrier) { serviceQueue.sync(flags: .barrier) {
if let fingerprint = peerFingerprints[peer] { if let fingerprint = peerFingerprints[peerID] {
fingerprintToPeer.removeValue(forKey: fingerprint) fingerprintToPeerID.removeValue(forKey: fingerprint)
} }
peerFingerprints.removeValue(forKey: peer) peerFingerprints.removeValue(forKey: peerID)
} }
SecureLogger.info(.sessionExpired(peerID: peer.id)) SecureLogger.info(.sessionExpired(peerID: peerID))
} }
func clearEphemeralStateForPanic() { func clearEphemeralStateForPanic() {
sessionManager.removeAllSessions() sessionManager.removeAllSessions()
serviceQueue.sync(flags: .barrier) { serviceQueue.sync(flags: .barrier) {
peerFingerprints.removeAll() peerFingerprints.removeAll()
fingerprintToPeer.removeAll() fingerprintToPeerID.removeAll()
} }
rateLimiter.resetAll() rateLimiter.resetAll()
} }
// MARK: - Private Helpers // MARK: - Private Helpers
private func handleSessionEstablished(peer: Peer, remoteStaticKey: Curve25519.KeyAgreement.PublicKey) { private func handleSessionEstablished(peerID: String, remoteStaticKey: Curve25519.KeyAgreement.PublicKey) {
// Calculate fingerprint // Calculate fingerprint
let fingerprint = calculateFingerprint(for: remoteStaticKey) let fingerprint = calculateFingerprint(for: remoteStaticKey)
// Store fingerprint mapping // Store fingerprint mapping
serviceQueue.sync(flags: .barrier) { serviceQueue.sync(flags: .barrier) {
peerFingerprints[peer] = fingerprint peerFingerprints[peerID] = fingerprint
fingerprintToPeer[fingerprint] = peer fingerprintToPeerID[fingerprint] = peerID
} }
// Log security event // Log security event
SecureLogger.info(.handshakeCompleted(peerID: peer.id)) SecureLogger.info(.handshakeCompleted(peerID: peerID))
// Notify all handlers about authentication // Notify all handlers about authentication
serviceQueue.async { [weak self] in serviceQueue.async { [weak self] in
self?.onPeerAuthenticatedHandlers.forEach { handler in self?.onPeerAuthenticatedHandlers.forEach { handler in
handler(peer.id, fingerprint) handler(peerID, fingerprint)
} }
} }
} }
+1 -1
View File
@@ -174,7 +174,7 @@ final class NostrTransport: Transport {
return npub return npub
} }
if peerID.count == 16, if peerID.count == 16,
let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: Peer(str: peerID)), let fav = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID),
let npub = fav.peerNostrPublicKey { let npub = fav.peerNostrPublicKey {
return npub return npub
} }
+2 -2
View File
@@ -61,11 +61,11 @@ final class NotificationService {
sendLocalNotification(title: title, body: body, identifier: identifier) sendLocalNotification(title: title, body: body, identifier: identifier)
} }
func sendPrivateMessageNotification(from sender: String, message: String, peer: Peer) { func sendPrivateMessageNotification(from sender: String, message: String, peerID: String) {
let title = "🔒 DM from \(sender)" let title = "🔒 DM from \(sender)"
let body = message let body = message
let identifier = "private-\(UUID().uuidString)" let identifier = "private-\(UUID().uuidString)"
let userInfo = ["peerID": peer.id, "senderName": sender] let userInfo = ["peerID": peerID, "senderName": sender]
sendLocalNotification(title: title, body: body, identifier: identifier, userInfo: userInfo) sendLocalNotification(title: title, body: body, identifier: identifier, userInfo: userInfo)
} }
+6 -6
View File
@@ -73,7 +73,7 @@ final class PrivateChatManager: ObservableObject {
originalSender: nil, originalSender: nil,
isPrivate: true, isPrivate: true,
recipientNickname: peerNickname, recipientNickname: peerNickname,
senderPeer: Peer(str: meshService.myPeerID), senderPeerID: meshService.myPeerID,
mentions: nil, mentions: nil,
deliveryStatus: .sending deliveryStatus: .sending
) )
@@ -94,7 +94,7 @@ final class PrivateChatManager: ObservableObject {
/// Handle incoming private message /// Handle incoming private message
func handleIncomingMessage(_ message: BitchatMessage) { func handleIncomingMessage(_ message: BitchatMessage) {
guard let senderPeerID = message.senderPeer?.id else { return } guard let senderPeerID = message.senderPeerID else { return }
// Initialize chat if needed // Initialize chat if needed
if privateChats[senderPeerID] == nil { if privateChats[senderPeerID] == nil {
@@ -126,7 +126,7 @@ final class PrivateChatManager: ObservableObject {
NotificationService.shared.sendPrivateMessageNotification( NotificationService.shared.sendPrivateMessageNotification(
from: message.sender, from: message.sender,
message: message.content, message: message.content,
peer: Peer(str: senderPeerID) peerID: senderPeerID
) )
} }
} else { } else {
@@ -161,7 +161,7 @@ final class PrivateChatManager: ObservableObject {
// Send read receipts for unread messages that haven't been sent yet // Send read receipts for unread messages that haven't been sent yet
if let messages = privateChats[peerID] { if let messages = privateChats[peerID] {
for message in messages { for message in messages {
if message.senderPeer?.id == peerID && !message.isRelay && !sentReadReceipts.contains(message.id) { if message.senderPeerID == peerID && !message.isRelay && !sentReadReceipts.contains(message.id) {
sendReadReceipt(for: message) sendReadReceipt(for: message)
} }
} }
@@ -214,7 +214,7 @@ final class PrivateChatManager: ObservableObject {
private func sendReadReceipt(for message: BitchatMessage) { private func sendReadReceipt(for message: BitchatMessage) {
guard !sentReadReceipts.contains(message.id), guard !sentReadReceipts.contains(message.id),
let senderPeerID = message.senderPeer?.id else { let senderPeerID = message.senderPeerID else {
return return
} }
@@ -231,7 +231,7 @@ final class PrivateChatManager: ObservableObject {
if let router = messageRouter { if let router = messageRouter {
SecureLogger.debug("PrivateChatManager: sending READ ack for \(message.id.prefix(8))… to \(senderPeerID.prefix(8))… via router", category: .session) SecureLogger.debug("PrivateChatManager: sending READ ack for \(message.id.prefix(8))… to \(senderPeerID.prefix(8))… via router", category: .session)
Task { @MainActor in Task { @MainActor in
router.sendReadReceipt(receipt, to: Peer(str: senderPeerID)) router.sendReadReceipt(receipt, to: senderPeerID)
} }
} else { } else {
// Fallback: preserve previous behavior // Fallback: preserve previous behavior
+16 -23
View File
@@ -18,13 +18,17 @@ struct RelayController {
isAnnounce: Bool, isAnnounce: Bool,
degree: Int, degree: Int,
highDegreeThreshold: Int) -> RelayDecision { highDegreeThreshold: Int) -> RelayDecision {
let ttlCap = min(ttl, TransportConfig.messageTTLDefault)
// Suppress obvious non-relays // Suppress obvious non-relays
if ttl <= 1 || senderIsSelf { return RelayDecision(shouldRelay: false, newTTL: ttl, delayMs: 0) } if ttlCap <= 1 || senderIsSelf {
return RelayDecision(shouldRelay: false, newTTL: ttlCap, delayMs: 0)
}
// For session-critical or directed traffic, be deterministic and reliable // For session-critical or directed traffic, be deterministic and reliable
if isHandshake || isDirectedFragment || isDirectedEncrypted { if isHandshake || isDirectedFragment || isDirectedEncrypted {
// Always relay with no TTL cap for these types // Always relay with no TTL cap for these types
let newTTL = (ttl &- 1) let newTTL = ttlCap &- 1
// Slight jitter to desynchronize without adding too much latency // Slight jitter to desynchronize without adding too much latency
// Tighter for faster multi-hop handshakes and directed DMs // Tighter for faster multi-hop handshakes and directed DMs
let delayRange: ClosedRange<Int> = isHandshake ? 10...35 : 20...60 let delayRange: ClosedRange<Int> = isHandshake ? 10...35 : 20...60
@@ -32,28 +36,17 @@ struct RelayController {
return RelayDecision(shouldRelay: true, newTTL: newTTL, delayMs: delayMs) return RelayDecision(shouldRelay: true, newTTL: newTTL, delayMs: delayMs)
} }
// Degree-aware probability to reduce floods in dense graphs (broadcast/public)
let baseProb: Double
switch degree {
case 0...2: baseProb = 1.0
case 3...4: baseProb = 0.9
case 5...6: baseProb = 0.7
case 7...9: baseProb = 0.55
default: baseProb = 0.45
}
let prob = baseProb
let shouldRelay = Double.random(in: 0...1) <= prob
// TTL clamping for broadcast // TTL clamping for broadcast
// - Dense graphs: keep very low to avoid floods // - Dense graphs: keep lower but still allow multi-hop bridging
// - Sparse graphs: allow slightly longer reach for multi-hop discovery // - Announces get a bit more headroom
// - Announces in sparse graphs get a bit more headroom let ttlLimit: UInt8 = {
let ttlCap: UInt8 = { if degree >= highDegreeThreshold {
if degree >= highDegreeThreshold { return 3 } return max(UInt8(2), min(ttlCap, UInt8(5)))
return isAnnounce ? 7 : 6 }
let preferred = UInt8(isAnnounce ? 7 : 6)
return max(UInt8(2), min(ttlCap, preferred))
}() }()
let clamped = max(1, min(ttl, ttlCap)) let newTTL = ttlLimit &- 1
let newTTL = clamped &- 1
// Wider jitter window to allow duplicate suppression to win more often // Wider jitter window to allow duplicate suppression to win more often
// For sparse graphs (<=2), relay quickly to avoid cancellation races // For sparse graphs (<=2), relay quickly to avoid cancellation races
@@ -64,6 +57,6 @@ struct RelayController {
case 6...9: delayMs = Int.random(in: 80...180) case 6...9: delayMs = Int.random(in: 80...180)
default: delayMs = Int.random(in: 100...220) default: delayMs = Int.random(in: 100...220)
} }
return RelayDecision(shouldRelay: shouldRelay, newTTL: newTTL, delayMs: delayMs) return RelayDecision(shouldRelay: true, newTTL: newTTL, delayMs: delayMs)
} }
} }
+1 -1
View File
@@ -307,7 +307,7 @@ final class UnifiedPeerService: ObservableObject, TransportPeerEventsDelegate {
// Send favorite notification to the peer via router (mesh or Nostr) // Send favorite notification to the peer via router (mesh or Nostr)
if let router = messageRouter { if let router = messageRouter {
router.sendFavoriteNotification(to: Peer(str: peerID), isFavorite: !wasFavorite) router.sendFavoriteNotification(to: peerID, isFavorite: !wasFavorite)
} else { } else {
// Fallback to mesh-only if router not yet wired // Fallback to mesh-only if router not yet wired
meshService.sendFavoriteNotification(to: peerID, isFavorite: !wasFavorite) meshService.sendFavoriteNotification(to: peerID, isFavorite: !wasFavorite)
+70 -16
View File
@@ -4,7 +4,7 @@ import CryptoKit
// Golomb-Coded Set (GCS) filter utilities for sync. // Golomb-Coded Set (GCS) filter utilities for sync.
// Hashing: // Hashing:
// - Packet ID is 16 bytes (see PacketIdUtil). For GCS mapping, use h64 = first 8 bytes of SHA-256 over the 16-byte ID. // - Packet ID is 16 bytes (see PacketIdUtil). For GCS mapping, use h64 = first 8 bytes of SHA-256 over the 16-byte ID.
// - Map to [0, M) via (h64 % M). // - Map to [1, M) by computing (h64 % M) and remapping 0 -> 1 to avoid zero-length deltas.
// Encoding (v1): // Encoding (v1):
// - Sort mapped values ascending; encode deltas (first is v0, then vi - v{i-1}) as positive integers x >= 1. // - Sort mapped values ascending; encode deltas (first is v0, then vi - v{i-1}) as positive integers x >= 1.
// - Golomb-Rice with parameter P: q = (x - 1) >> P encoded as unary (q ones then a zero), then write P-bit remainder r = (x - 1) & ((1<<P)-1). // - Golomb-Rice with parameter P: q = (x - 1) >> P encoded as unary (q ones then a zero), then write P-bit remainder r = (x - 1) & ((1<<P)-1).
@@ -29,25 +29,40 @@ enum GCSFilter {
static func buildFilter(ids: [Data], maxBytes: Int, targetFpr: Double) -> Params { static func buildFilter(ids: [Data], maxBytes: Int, targetFpr: Double) -> Params {
let p = deriveP(targetFpr: targetFpr) let p = deriveP(targetFpr: targetFpr)
guard !ids.isEmpty else {
return Params(p: p, m: 1, data: Data())
}
let cap = estimateMaxElements(sizeBytes: maxBytes, p: p) let cap = estimateMaxElements(sizeBytes: maxBytes, p: p)
let n = min(ids.count, cap) let selected = Array(ids.prefix(cap))
let selected = Array(ids.prefix(n)) let range = max(1, hashRange(count: selected.count, p: p))
// Map to [0, M) let modulo = UInt64(range)
let mInit = UInt32(n << p)
var mapped = selected.map { id16 -> UInt64 in var mapped = selected
let h = h64(id16) .map { h64($0) }
return UInt64(h % UInt64(max(1, mInit))) .map { mapHash($0, modulo: modulo) }
}.sorted() .sorted()
mapped = normalizeMappedValues(mapped, modulo: modulo)
if mapped.isEmpty {
return Params(p: p, m: range, data: Data())
}
var encoded = encode(sorted: mapped, p: p) var encoded = encode(sorted: mapped, p: p)
var trimmedN = n var trimmedCount = mapped.count
// Trim if over budget
while encoded.count > maxBytes && trimmedN > 0 { while encoded.count > maxBytes && trimmedCount > 0 {
trimmedN = (trimmedN * 9) / 10 // drop ~10% if trimmedCount == 1 {
mapped = Array(mapped.prefix(trimmedN)) mapped.removeAll()
encoded = Data()
break
}
trimmedCount = max(1, (trimmedCount * 9) / 10)
mapped = Array(mapped.prefix(trimmedCount))
encoded = encode(sorted: mapped, p: p) encoded = encode(sorted: mapped, p: p)
} }
let finalM = UInt32(max(1, trimmedN << p))
return Params(p: p, m: finalM, data: encoded) return Params(p: p, m: range, data: encoded)
} }
static func decodeToSortedSet(p: Int, m: UInt32, data: Data) -> [UInt64] { static func decodeToSortedSet(p: Int, m: UInt32, data: Data) -> [UInt64] {
@@ -77,6 +92,12 @@ enum GCSFilter {
return false return false
} }
static func bucket(for id: Data, modulus m: UInt32) -> UInt64 {
let modulo = UInt64(max(1, m))
guard modulo > 1 else { return 0 }
return mapHash(h64(id), modulo: modulo)
}
private static func h64(_ id16: Data) -> UInt64 { private static func h64(_ id16: Data) -> UInt64 {
var hasher = SHA256() var hasher = SHA256()
hasher.update(data: id16) hasher.update(data: id16)
@@ -88,6 +109,39 @@ enum GCSFilter {
return x & 0x7fff_ffff_ffff_ffff return x & 0x7fff_ffff_ffff_ffff
} }
private static func hashRange(count: Int, p: Int) -> UInt32 {
guard count > 0 else { return 1 }
if p >= 64 { return UInt32.max }
let multiplier = UInt64(1) << UInt64(p)
let (product, overflow) = UInt64(count).multipliedReportingOverflow(by: multiplier)
if overflow { return UInt32.max }
if product == 0 { return 1 }
return product > UInt64(UInt32.max) ? UInt32.max : UInt32(product)
}
private static func mapHash(_ hash: UInt64, modulo: UInt64) -> UInt64 {
guard modulo > 1 else { return 0 }
let value = hash % modulo
if value == 0 { return 1 }
return value
}
private static func normalizeMappedValues(_ values: [UInt64], modulo: UInt64) -> [UInt64] {
guard modulo > 1 else { return [] }
guard !values.isEmpty else { return [] }
var result: [UInt64] = []
result.reserveCapacity(values.count)
var last: UInt64 = 0
for value in values {
let normalized = min(value, modulo - 1)
if normalized > last {
result.append(normalized)
last = normalized
}
}
return result
}
private static func encode(sorted: [UInt64], p: Int) -> Data { private static func encode(sorted: [UInt64], p: Int) -> Data {
let writer = BitWriter() let writer = BitWriter()
var prev: UInt64 = 0 var prev: UInt64 = 0
+21 -11
View File
@@ -1,5 +1,4 @@
import Foundation import Foundation
import CryptoKit
// Gossip-based sync manager using on-demand GCS filters // Gossip-based sync manager using on-demand GCS filters
final class GossipSyncManager { final class GossipSyncManager {
@@ -53,6 +52,12 @@ final class GossipSyncManager {
} }
func onPublicPacketSeen(_ packet: BitchatPacket) { func onPublicPacketSeen(_ packet: BitchatPacket) {
queue.async { [weak self] in
self?._onPublicPacketSeen(packet)
}
}
private func _onPublicPacketSeen(_ packet: BitchatPacket) {
let mt = MessageType(rawValue: packet.type) let mt = MessageType(rawValue: packet.type)
let isBroadcastRecipient: Bool = { let isBroadcastRecipient: Bool = {
guard let r = packet.recipientID else { return true } guard let r = packet.recipientID else { return true }
@@ -119,18 +124,17 @@ final class GossipSyncManager {
} }
func handleRequestSync(fromPeerID: String, request: RequestSyncPacket) { func handleRequestSync(fromPeerID: String, request: RequestSyncPacket) {
queue.async { [weak self] in
self?._handleRequestSync(fromPeerID: fromPeerID, request: request)
}
}
private func _handleRequestSync(fromPeerID: String, request: RequestSyncPacket) {
// Decode GCS into sorted set and prepare membership checker // Decode GCS into sorted set and prepare membership checker
let sorted = GCSFilter.decodeToSortedSet(p: request.p, m: request.m, data: request.data) let sorted = GCSFilter.decodeToSortedSet(p: request.p, m: request.m, data: request.data)
func mightContain(_ id: Data) -> Bool { func mightContain(_ id: Data) -> Bool {
var hasher = SHA256() let bucket = GCSFilter.bucket(for: id, modulus: request.m)
hasher.update(data: id) // 16-byte PacketId return GCSFilter.contains(sortedValues: sorted, candidate: bucket)
let digest = hasher.finalize()
let db = Data(digest)
var x: UInt64 = 0
let take = min(8, db.count)
for i in 0..<take { x = (x << 8) | UInt64(db[i]) }
let v = (x & 0x7fff_ffff_ffff_ffff) % UInt64(request.m)
return GCSFilter.contains(sortedValues: sorted, candidate: v)
} }
// 1) Announcements: send latest per peer if requester lacks them // 1) Announcements: send latest per peer if requester lacks them
@@ -182,9 +186,15 @@ final class GossipSyncManager {
// Explicit removal hook for LEAVE/stale peer // Explicit removal hook for LEAVE/stale peer
func removeAnnouncementForPeer(_ peerID: String) { func removeAnnouncementForPeer(_ peerID: String) {
queue.async { [weak self] in
self?._removeAnnouncementForPeer(peerID)
}
}
private func _removeAnnouncementForPeer(_ peerID: String) {
let normalizedPeerID = peerID.lowercased() let normalizedPeerID = peerID.lowercased()
_ = latestAnnouncementByPeer.removeValue(forKey: normalizedPeerID) _ = latestAnnouncementByPeer.removeValue(forKey: normalizedPeerID)
// Remove messages from this peer // Remove messages from this peer
// Collect IDs to remove first to avoid concurrent modification // Collect IDs to remove first to avoid concurrent modification
let messageIdsToRemove = messages.compactMap { (id, message) -> String? in let messageIdsToRemove = messages.compactMap { (id, message) -> String? in
+41
View File
@@ -0,0 +1,41 @@
import SwiftUI
/// Provides Dynamic Type aware font helpers that map existing fixed sizes onto
/// preferred text styles so the UI scales with user accessibility settings.
extension Font {
static func bitchatSystem(size: CGFloat, weight: Font.Weight = .regular, design: Font.Design = .default) -> Font {
let style = Font.TextStyle.bitchatPreferredStyle(for: size)
var font = Font.system(style, design: design)
if weight != .regular {
font = font.weight(weight)
}
return font
}
}
private extension Font.TextStyle {
static func bitchatPreferredStyle(for size: CGFloat) -> Font.TextStyle {
switch size {
case ..<11.5:
return .caption2
case ..<13.0:
return .caption
case ..<13.75:
return .footnote
case ..<15.5:
return .subheadline
case ..<17.5:
return .callout
case ..<19.5:
return .body
case ..<22.5:
return .title3
case ..<27.5:
return .title2
case ..<34.0:
return .title
default:
return .largeTitle
}
}
}
+24 -1
View File
@@ -8,8 +8,31 @@ struct InputValidator {
struct Limits { struct Limits {
static let maxNicknameLength = 50 static let maxNicknameLength = 50
static let maxMessageLength = 10_000 // BinaryProtocol caps payload length at UInt16.max (65_535). Leave headroom
// for headers/padding by limiting user content to 60_000 bytes.
static let maxMessageLength = 60_000
static let maxReasonLength = 200 static let maxReasonLength = 200
static let maxPeerIDLength = 64
static let hexPeerIDLength = 16 // 8 bytes = 16 hex chars
}
// MARK: - Peer ID Validation
/// Validates a peer ID from any source (short 16-hex, full 64-hex, or internal alnum/-/_ up to 64)
static func validatePeerID(_ peerID: String) -> Bool {
// Accept short routing IDs (exact 16-hex)
if PeerIDResolver.isShortID(peerID) { return true }
// If length equals short-hex length but isn't valid hex, reject
if peerID.count == Limits.hexPeerIDLength { return false }
// Accept full Noise key hex (exact 64-hex)
if PeerIDResolver.isNoiseKeyHex(peerID) { return true }
// If length equals full key length but isn't valid hex, reject
if peerID.count == Limits.maxPeerIDLength { return false }
// Internal format: alphanumeric + dash/underscore up to 63 (not 16 or 64)
let validCharset = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-_"))
return !peerID.isEmpty &&
peerID.count < Limits.maxPeerIDLength &&
peerID.rangeOfCharacter(from: validCharset.inverted) == nil
} }
// MARK: - String Content Validation // MARK: - String Content Validation
+12
View File
@@ -0,0 +1,12 @@
import Foundation
enum L10n {
static func string(_ key: String, comment: String) -> String {
NSLocalizedString(key, comment: comment)
}
static func format(_ key: String, comment: String, _ args: CVarArg...) -> String {
let format = NSLocalizedString(key, comment: comment)
return String(format: format, locale: Locale.current, arguments: args)
}
}
+20
View File
@@ -0,0 +1,20 @@
import Foundation
struct PeerIDResolver {
/// Returns a 16-hex short peer ID derived from a 64-hex Noise public key if needed
static func toShortID(_ id: String) -> String {
if id.count == 64, let data = Data(hexString: id) {
return PeerIDUtils.derivePeerID(fromPublicKey: data)
}
return id
}
static func isShortID(_ id: String) -> Bool {
return id.count == 16 && Data(hexString: id) != nil
}
static func isNoiseKeyHex(_ id: String) -> Bool {
return id.count == 64 && Data(hexString: id) != nil
}
}
+234 -114
View File
@@ -153,7 +153,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
@MainActor @MainActor
private func normalizedSenderKey(for message: BitchatMessage) -> String { private func normalizedSenderKey(for message: BitchatMessage) -> String {
if let spid = message.senderPeer?.id { if let spid = message.senderPeerID {
if spid.hasPrefix("nostr:") || spid.hasPrefix("nostr_") { if spid.hasPrefix("nostr:") || spid.hasPrefix("nostr_") {
let bare: String = { let bare: String = {
if spid.hasPrefix("nostr:") { return String(spid.dropFirst(6)) } if spid.hasPrefix("nostr:") { return String(spid.dropFirst(6)) }
@@ -310,7 +310,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if let mapped = shortIDToNoiseKey[shortPeerID] { return mapped } if let mapped = shortIDToNoiseKey[shortPeerID] { return mapped }
// Fallback: derive from active Noise session if available // Fallback: derive from active Noise session if available
if shortPeerID.count == 16, if shortPeerID.count == 16,
let key = meshService.getNoiseService().getPeerPublicKeyData(Peer(str: shortPeerID)) { let key = meshService.getNoiseService().getPeerPublicKeyData(shortPeerID) {
let stable = key.hexEncodedString() let stable = key.hexEncodedString()
shortIDToNoiseKey[shortPeerID] = stable shortIDToNoiseKey[shortPeerID] = stable
return stable return stable
@@ -553,12 +553,22 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Announce Tor status (geohash-only; do not show in mesh chat). Only when auto-start is allowed. // Announce Tor status (geohash-only; do not show in mesh chat). Only when auto-start is allowed.
if TorManager.shared.torEnforced && !torStatusAnnounced && TorManager.shared.isAutoStartAllowed() { if TorManager.shared.torEnforced && !torStatusAnnounced && TorManager.shared.isAutoStartAllowed() {
torStatusAnnounced = true torStatusAnnounced = true
addGeohashOnlySystemMessage("starting tor...") addGeohashOnlySystemMessage(
L10n.string(
"system.tor.starting",
comment: "System message when Tor is starting"
)
)
// Suppress incremental Tor progress messages // Suppress incremental Tor progress messages
torProgressCancellable = nil torProgressCancellable = nil
} else if !TorManager.shared.torEnforced && !torStatusAnnounced { } else if !TorManager.shared.torEnforced && !torStatusAnnounced {
torStatusAnnounced = true torStatusAnnounced = true
addGeohashOnlySystemMessage("development build: tor bypass enabled.") addGeohashOnlySystemMessage(
L10n.string(
"system.tor.dev_bypass",
comment: "System message when Tor bypass is enabled in development"
)
)
} }
// Initialize Nostr relay manager regardless of Tor readiness; connection is controlled elsewhere // Initialize Nostr relay manager regardless of Tor readiness; connection is controlled elsewhere
@@ -855,7 +865,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if !self.torStatusAnnounced && TorManager.shared.torEnforced { if !self.torStatusAnnounced && TorManager.shared.torEnforced {
self.torStatusAnnounced = true self.torStatusAnnounced = true
// Post only in geohash channels (queue if not active) // Post only in geohash channels (queue if not active)
self.addGeohashOnlySystemMessage("starting tor...") self.addGeohashOnlySystemMessage(
L10n.string(
"system.tor.starting",
comment: "System message when Tor is starting"
)
)
} }
} }
} }
@@ -863,7 +878,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
Task { @MainActor in Task { @MainActor in
self.torRestartPending = true self.torRestartPending = true
// Post only in geohash channels (queue if not active) // Post only in geohash channels (queue if not active)
self.addGeohashOnlySystemMessage("tor restarting to recover connectivity...") self.addGeohashOnlySystemMessage(
L10n.string(
"system.tor.restarting",
comment: "System message when Tor is restarting"
)
)
} }
} }
@@ -872,11 +892,21 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Only announce "restarted" if we actually restarted this session // Only announce "restarted" if we actually restarted this session
if self.torRestartPending { if self.torRestartPending {
// Post only in geohash channels (queue if not active) // Post only in geohash channels (queue if not active)
self.addGeohashOnlySystemMessage("tor restarted. network routing restored.") self.addGeohashOnlySystemMessage(
L10n.string(
"system.tor.restarted",
comment: "System message when Tor has restarted"
)
)
self.torRestartPending = false self.torRestartPending = false
} else if TorManager.shared.torEnforced && !self.torInitialReadyAnnounced { } else if TorManager.shared.torEnforced && !self.torInitialReadyAnnounced {
// Initial start completed // Initial start completed
self.addGeohashOnlySystemMessage("tor started. routing all chats via tor for privacy.") self.addGeohashOnlySystemMessage(
L10n.string(
"system.tor.started",
comment: "System message when Tor has started"
)
)
self.torInitialReadyAnnounced = true self.torInitialReadyAnnounced = true
} }
} }
@@ -997,7 +1027,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
content: content, content: content,
timestamp: timestamp, timestamp: timestamp,
isRelay: false, isRelay: false,
senderPeer: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))", senderPeerID: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))",
mentions: mentions.isEmpty ? nil : mentions mentions: mentions.isEmpty ? nil : mentions
) )
Task { @MainActor in Task { @MainActor in
@@ -1068,7 +1098,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
isRelay: false, isRelay: false,
isPrivate: true, isPrivate: true,
recipientNickname: nickname, recipientNickname: nickname,
senderPeer: Peer(str: convKey), senderPeerID: convKey,
deliveryStatus: .delivered(to: nickname, at: Date()) deliveryStatus: .delivered(to: nickname, at: Date())
) )
@@ -1096,7 +1126,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
NotificationService.shared.sendPrivateMessageNotification( NotificationService.shared.sendPrivateMessageNotification(
from: senderName, from: senderName,
message: pm.content, message: pm.content,
peer: Peer(str: convKey) peerID: convKey
) )
} }
} }
@@ -1231,7 +1261,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// If no nickname in status, try to get from private chat messages // If no nickname in status, try to get from private chat messages
if nickname == nil, let messages = privateChats[peerID], !messages.isEmpty { if nickname == nil, let messages = privateChats[peerID], !messages.isEmpty {
// Get the nickname from the first message where this peer was the sender // Get the nickname from the first message where this peer was the sender
nickname = messages.first { $0.senderPeer?.id == peerID }?.sender nickname = messages.first { $0.senderPeerID == peerID }?.sender
} }
let finalNickname = nickname ?? "Unknown" let finalNickname = nickname ?? "Unknown"
@@ -1298,7 +1328,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
} }
// Update identity state manager with handshake completion // Update identity state manager with handshake completion
identityManager.updateHandshakeState(peer: Peer(str: peerID), state: .completed(fingerprint: fingerprintStr)) identityManager.updateHandshakeState(peerID: peerID, state: .completed(fingerprint: fingerprintStr))
// Update encryption status now that we have the fingerprint // Update encryption status now that we have the fingerprint
updateEncryptionStatus(for: peerID) updateEncryptionStatus(for: peerID)
@@ -1468,7 +1498,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
content: trimmed, content: trimmed,
timestamp: Date(), timestamp: Date(),
isRelay: false, isRelay: false,
senderPeer: Peer(str: localSenderPeerID), senderPeerID: localSenderPeerID,
mentions: mentions.isEmpty ? nil : mentions mentions: mentions.isEmpty ? nil : mentions
) )
@@ -1557,7 +1587,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
} }
} catch { } catch {
SecureLogger.error("❌ Failed to send geohash message: \(error)", category: .session) SecureLogger.error("❌ Failed to send geohash message: \(error)", category: .session)
addSystemMessage("failed to send to location channel") addSystemMessage(
L10n.string(
"system.location.send_failed",
comment: "System message when a location channel send fails"
)
)
} }
} }
@@ -1719,7 +1754,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
content: content, content: content,
timestamp: min(rawTs, Date()), timestamp: min(rawTs, Date()),
isRelay: false, isRelay: false,
senderPeer: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))", senderPeerID: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))",
mentions: mentions.isEmpty ? nil : mentions mentions: mentions.isEmpty ? nil : mentions
) )
@@ -1819,7 +1854,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
isRelay: false, isRelay: false,
isPrivate: true, isPrivate: true,
recipientNickname: nickname, recipientNickname: nickname,
senderPeer: Peer(str: convKey), senderPeerID: convKey,
deliveryStatus: .delivered(to: nickname, at: Date()) deliveryStatus: .delivered(to: nickname, at: Date())
) )
@@ -1850,7 +1885,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
NotificationService.shared.sendPrivateMessageNotification( NotificationService.shared.sendPrivateMessageNotification(
from: senderName, from: senderName,
message: pm.content, message: pm.content,
peer: Peer(str: convKey) peerID: convKey
) )
} }
@@ -2010,7 +2045,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if let gh = currentGeohash { if let gh = currentGeohash {
if var arr = geoTimelines[gh] { if var arr = geoTimelines[gh] {
arr.removeAll { msg in arr.removeAll { msg in
if let spid = msg.senderPeer?.id, msg.senderPeer?.isNostr == true { if let spid = msg.senderPeerID, spid.hasPrefix("nostr") {
if let full = nostrKeyMapping[spid]?.lowercased() { return full == hex } if let full = nostrKeyMapping[spid]?.lowercased() { return full == hex }
} }
return false return false
@@ -2021,7 +2056,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
switch activeChannel { switch activeChannel {
case .location: case .location:
messages.removeAll { msg in messages.removeAll { msg in
if let spid = msg.senderPeer?.id, msg.senderPeer?.isNostr == true { if let spid = msg.senderPeerID, spid.hasPrefix("nostr") {
if let full = nostrKeyMapping[spid]?.lowercased() { return full == hex } if let full = nostrKeyMapping[spid]?.lowercased() { return full == hex }
} }
return false return false
@@ -2041,12 +2076,24 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Remove mapping keys pointing to this pubkey to avoid accidental resolution // Remove mapping keys pointing to this pubkey to avoid accidental resolution
for (k, v) in nostrKeyMapping where v.lowercased() == hex { nostrKeyMapping.removeValue(forKey: k) } for (k, v) in nostrKeyMapping where v.lowercased() == hex { nostrKeyMapping.removeValue(forKey: k) }
addSystemMessage("blocked \(displayName) in geohash chats") addSystemMessage(
L10n.format(
"system.geohash.blocked",
comment: "System message shown when a user is blocked in geohash chats",
displayName
)
)
} }
@MainActor @MainActor
func unblockGeohashUser(pubkeyHexLowercased: String, displayName: String) { func unblockGeohashUser(pubkeyHexLowercased: String, displayName: String) {
identityManager.setNostrBlocked(pubkeyHexLowercased, isBlocked: false) identityManager.setNostrBlocked(pubkeyHexLowercased, isBlocked: false)
addSystemMessage("unblocked \(displayName) in geohash chats") addSystemMessage(
L10n.format(
"system.geohash.unblocked",
comment: "System message shown when a user is unblocked in geohash chats",
displayName
)
)
} }
/// Begin sampling multiple geohashes (used by channel sheet) without changing active channel. /// Begin sampling multiple geohashes (used by channel sheet) without changing active channel.
@@ -2158,7 +2205,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
content: content, content: content,
timestamp: ts, timestamp: ts,
isRelay: false, isRelay: false,
senderPeer: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))", senderPeerID: "nostr:\(event.pubkey.prefix(TransportConfig.nostrShortKeyDisplayLength))",
mentions: mentions.isEmpty ? nil : mentions mentions: mentions.isEmpty ? nil : mentions
) )
if !arr.contains(where: { $0.id == msg.id }) { if !arr.contains(where: { $0.id == msg.id }) {
@@ -2230,7 +2277,13 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Check if blocked // Check if blocked
if unifiedPeerService.isBlocked(peerID) { if unifiedPeerService.isBlocked(peerID) {
let nickname = meshService.peerNickname(peerID: peerID) ?? "user" let nickname = meshService.peerNickname(peerID: peerID) ?? "user"
addSystemMessage("cannot send message to \(nickname): user is blocked.") addSystemMessage(
L10n.format(
"system.dm.blocked_recipient",
comment: "System message when attempting to message a blocked user",
nickname
)
)
return return
} }
@@ -2267,7 +2320,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: nil, originalSender: nil,
isPrivate: true, isPrivate: true,
recipientNickname: recipientNickname, recipientNickname: recipientNickname,
senderPeer: Peer(str: meshService.myPeerID), senderPeerID: meshService.myPeerID,
mentions: nil, mentions: nil,
deliveryStatus: .sending deliveryStatus: .sending
) )
@@ -2284,7 +2337,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Send via appropriate transport (BLE if connected/reachable, else Nostr when possible) // Send via appropriate transport (BLE if connected/reachable, else Nostr when possible)
if isConnected || isReachable || (isMutualFavorite && hasNostrKey) { if isConnected || isReachable || (isMutualFavorite && hasNostrKey) {
messageRouter.sendPrivate(content, to: Peer(str: peerID), recipientNickname: recipientNickname ?? "user", messageID: messageID) messageRouter.sendPrivate(content, to: peerID, recipientNickname: recipientNickname ?? "user", messageID: messageID)
// Optimistically mark as sent for both transports; delivery/read will update subsequently // Optimistically mark as sent for both transports; delivery/read will update subsequently
if let idx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) { if let idx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) {
privateChats[peerID]?[idx].deliveryStatus = .sent privateChats[peerID]?[idx].deliveryStatus = .sent
@@ -2292,15 +2345,31 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
} else { } else {
// Update delivery status to failed // Update delivery status to failed
if let index = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) { if let index = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) {
privateChats[peerID]?[index].deliveryStatus = .failed(reason: "Peer not reachable") privateChats[peerID]?[index].deliveryStatus = .failed(
reason: L10n.string(
"content.delivery.reason.unreachable",
comment: "Failure reason when a peer is unreachable"
)
)
} }
addSystemMessage("Cannot send message to \(recipientNickname ?? "user") - peer is not reachable via mesh or Nostr.") addSystemMessage(
L10n.format(
"system.dm.unreachable",
comment: "System message when a recipient is unreachable",
recipientNickname ?? L10n.string("system.common.user", comment: "Fallback recipient name")
)
)
} }
} }
private func sendGeohashDM(_ content: String, to peerID: String) { private func sendGeohashDM(_ content: String, to peerID: String) {
guard case .location(let ch) = activeChannel else { guard case .location(let ch) = activeChannel else {
addSystemMessage("cannot send: not in a location channel") addSystemMessage(
L10n.string(
"system.location.not_in_channel",
comment: "System message when attempting to send without being in a location channel"
)
)
return return
} }
let messageID = UUID().uuidString let messageID = UUID().uuidString
@@ -2314,7 +2383,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
isRelay: false, isRelay: false,
isPrivate: true, isPrivate: true,
recipientNickname: nickname, recipientNickname: nickname,
senderPeer: Peer(str: meshService.myPeerID), senderPeerID: meshService.myPeerID,
deliveryStatus: .sending deliveryStatus: .sending
) )
@@ -2329,7 +2398,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Resolve recipient hex from mapping // Resolve recipient hex from mapping
guard let recipientHex = nostrKeyMapping[peerID] else { guard let recipientHex = nostrKeyMapping[peerID] else {
if let msgIdx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) { if let msgIdx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) {
privateChats[peerID]?[msgIdx].deliveryStatus = .failed(reason: "unknown recipient") privateChats[peerID]?[msgIdx].deliveryStatus = .failed(
reason: L10n.string(
"content.delivery.reason.unknown_recipient",
comment: "Failure reason when the recipient is unknown"
)
)
} }
return return
} }
@@ -2337,9 +2411,19 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Respect geohash blocks // Respect geohash blocks
if identityManager.isNostrBlocked(pubkeyHexLowercased: recipientHex) { if identityManager.isNostrBlocked(pubkeyHexLowercased: recipientHex) {
if let msgIdx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) { if let msgIdx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) {
privateChats[peerID]?[msgIdx].deliveryStatus = .failed(reason: "user is blocked") privateChats[peerID]?[msgIdx].deliveryStatus = .failed(
reason: L10n.string(
"content.delivery.reason.blocked",
comment: "Failure reason when the user is blocked"
)
)
} }
addSystemMessage("cannot send message: user is blocked.") addSystemMessage(
L10n.string(
"system.dm.blocked_generic",
comment: "System message when sending fails because user is blocked"
)
)
return return
} }
@@ -2349,8 +2433,13 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Prevent messaging ourselves // Prevent messaging ourselves
if recipientHex.lowercased() == id.publicKeyHex.lowercased() { if recipientHex.lowercased() == id.publicKeyHex.lowercased() {
if let idx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) { if let idx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) {
privateChats[peerID]?[idx].deliveryStatus = .failed(reason: "cannot message yourself") privateChats[peerID]?[idx].deliveryStatus = .failed(
} reason: L10n.string(
"content.delivery.reason.self",
comment: "Failure reason when attempting to message yourself"
)
)
}
return return
} }
SecureLogger.debug("GeoDM: local send mid=\(messageID.prefix(8))… to=\(recipientHex.prefix(8))… conv=\(peerID)", category: .session) SecureLogger.debug("GeoDM: local send mid=\(messageID.prefix(8))… to=\(recipientHex.prefix(8))… conv=\(peerID)", category: .session)
@@ -2362,7 +2451,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
} }
} catch { } catch {
if let idx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) { if let idx = privateChats[peerID]?.firstIndex(where: { $0.id == messageID }) {
privateChats[peerID]?[idx].deliveryStatus = .failed(reason: "send error") privateChats[peerID]?[idx].deliveryStatus = .failed(
reason: L10n.string(
"content.delivery.reason.send_error",
comment: "Failure reason for a generic send error"
)
)
} }
} }
} }
@@ -2403,7 +2497,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: nil, originalSender: nil,
isPrivate: true, isPrivate: true,
recipientNickname: meshService.peerNickname(peerID: peerID), recipientNickname: meshService.peerNickname(peerID: peerID),
senderPeer: Peer(str: meshService.myPeerID) senderPeerID: meshService.myPeerID
) )
if privateChats[peerID] == nil { privateChats[peerID] = [] } if privateChats[peerID] == nil { privateChats[peerID] = [] }
privateChats[peerID]?.append(systemMessage) privateChats[peerID]?.append(systemMessage)
@@ -2421,13 +2515,22 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
switch state { switch state {
case .poweredOff: case .poweredOff:
bluetoothAlertMessage = "Bluetooth is turned off. Please turn on Bluetooth in Settings to use BitChat." bluetoothAlertMessage = L10n.string(
"content.alert.bluetooth_required.off",
comment: "Message shown when Bluetooth is turned off"
)
showBluetoothAlert = true showBluetoothAlert = true
case .unauthorized: case .unauthorized:
bluetoothAlertMessage = "BitChat needs Bluetooth permission to connect with nearby devices. Please enable Bluetooth access in Settings." bluetoothAlertMessage = L10n.string(
"content.alert.bluetooth_required.permission",
comment: "Message shown when Bluetooth permission is missing"
)
showBluetoothAlert = true showBluetoothAlert = true
case .unsupported: case .unsupported:
bluetoothAlertMessage = "This device does not support Bluetooth. BitChat requires Bluetooth to function." bluetoothAlertMessage = L10n.string(
"content.alert.bluetooth_required.unsupported",
comment: "Message shown when the device lacks Bluetooth support"
)
showBluetoothAlert = true showBluetoothAlert = true
case .poweredOn: case .poweredOn:
// Hide alert when Bluetooth is powered on // Hide alert when Bluetooth is powered on
@@ -2457,14 +2560,26 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Check if the peer is blocked // Check if the peer is blocked
if unifiedPeerService.isBlocked(peerID) { if unifiedPeerService.isBlocked(peerID) {
addSystemMessage("cannot start chat with \(peerNickname): user is blocked.") addSystemMessage(
L10n.format(
"system.chat.blocked",
comment: "System message when starting chat fails because peer is blocked",
peerNickname
)
)
return return
} }
// Check mutual favorites for offline messaging // Check mutual favorites for offline messaging
if let peer = unifiedPeerService.getPeer(by: peerID), if let peer = unifiedPeerService.getPeer(by: peerID),
peer.isFavorite && !peer.theyFavoritedUs && !peer.isConnected { peer.isFavorite && !peer.theyFavoritedUs && !peer.isConnected {
addSystemMessage("cannot start chat with \(peerNickname): mutual favorite required for offline messaging.") addSystemMessage(
L10n.format(
"system.chat.requires_favorite",
comment: "System message when mutual favorite requirement blocks chat",
peerNickname
)
)
return return
} }
@@ -2501,7 +2616,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: message.originalSender, originalSender: message.originalSender,
isPrivate: message.isPrivate, isPrivate: message.isPrivate,
recipientNickname: message.recipientNickname, recipientNickname: message.recipientNickname,
senderPeer: message.senderPeer?.id == meshService.myPeerID ? Peer(str: meshService.myPeerID) : Peer(str: peerID), // Update peer ID if it's from them senderPeerID: message.senderPeerID == meshService.myPeerID ? meshService.myPeerID : peerID, // Update peer ID if it's from them
mentions: message.mentions, mentions: message.mentions,
deliveryStatus: message.deliveryStatus deliveryStatus: message.deliveryStatus
) )
@@ -2512,7 +2627,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// 1. Not a message we sent // 1. Not a message we sent
// 2. Message is recent (< 60s old) // 2. Message is recent (< 60s old)
// Never mark old messages as unread during consolidation // Never mark old messages as unread during consolidation
if message.senderPeer?.id != meshService.myPeerID { if message.senderPeerID != meshService.myPeerID {
let messageAge = Date().timeIntervalSince(message.timestamp) let messageAge = Date().timeIntervalSince(message.timestamp)
if messageAge < 60 && !sentReadReceipts.contains(message.id) { if messageAge < 60 && !sentReadReceipts.contains(message.id) {
hasActualUnreadMessages = true hasActualUnreadMessages = true
@@ -2589,7 +2704,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: message.originalSender, originalSender: message.originalSender,
isPrivate: message.isPrivate, isPrivate: message.isPrivate,
recipientNickname: message.recipientNickname, recipientNickname: message.recipientNickname,
senderPeer: Peer(str: peerID), // Update to match current peer senderPeerID: peerID, // Update to match current peer
mentions: message.mentions, mentions: message.mentions,
deliveryStatus: message.deliveryStatus deliveryStatus: message.deliveryStatus
) )
@@ -2671,7 +2786,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Store the Nostr pubkey if provided (for messages from unknown senders) // Store the Nostr pubkey if provided (for messages from unknown senders)
if let nostrPubkey = notification.userInfo?["nostrPubkey"] as? String, if let nostrPubkey = notification.userInfo?["nostrPubkey"] as? String,
let senderPeerID = message.senderPeer?.id { let senderPeerID = message.senderPeerID {
// Store mapping for read receipts // Store mapping for read receipts
nostrKeyMapping[senderPeerID] = nostrPubkey nostrKeyMapping[senderPeerID] = nostrPubkey
} }
@@ -2812,7 +2927,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: nil, originalSender: nil,
isPrivate: false, isPrivate: false,
recipientNickname: nil, recipientNickname: nil,
senderPeer: nil, senderPeerID: nil,
mentions: nil mentions: nil
) )
@@ -2866,7 +2981,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
switch sessionState { switch sessionState {
case .established: case .established:
// Send the message directly without going through sendPrivateMessage to avoid local echo // Send the message directly without going through sendPrivateMessage to avoid local echo
messageRouter.sendPrivate(screenshotMessage, to: Peer(str: peerID), recipientNickname: peerNickname, messageID: UUID().uuidString) messageRouter.sendPrivate(screenshotMessage, to: peerID, recipientNickname: peerNickname, messageID: UUID().uuidString)
default: default:
// Don't send screenshot notification if no session exists // Don't send screenshot notification if no session exists
SecureLogger.debug("Skipping screenshot notification to \(peerID) - no established session", category: .security) SecureLogger.debug("Skipping screenshot notification to \(peerID) - no established session", category: .security)
@@ -2882,7 +2997,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: nil, originalSender: nil,
isPrivate: true, isPrivate: true,
recipientNickname: meshService.peerNickname(peerID: peerID), recipientNickname: meshService.peerNickname(peerID: peerID),
senderPeer: Peer(str: meshService.myPeerID) senderPeerID: meshService.myPeerID
) )
var chats = privateChats var chats = privateChats
if chats[peerID] == nil { if chats[peerID] == nil {
@@ -2918,7 +3033,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
self.recordGeoParticipant(pubkeyHex: identity.publicKeyHex) self.recordGeoParticipant(pubkeyHex: identity.publicKeyHex)
} catch { } catch {
SecureLogger.error("❌ Failed to send geohash screenshot message: \(error)", category: .session) SecureLogger.error("❌ Failed to send geohash screenshot message: \(error)", category: .session)
self.addSystemMessage("failed to send to location channel") self.addSystemMessage(
L10n.string(
"system.location.send_failed",
comment: "System message when a location channel send fails"
)
)
} }
} }
} }
@@ -2988,7 +3108,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
return return
} }
// Use router to decide (mesh if reachable, else Nostr if available) // Use router to decide (mesh if reachable, else Nostr if available)
messageRouter.sendReadReceipt(receipt, to: Peer(str: actualPeerID)) messageRouter.sendReadReceipt(receipt, to: actualPeerID)
} }
@MainActor @MainActor
@@ -3001,7 +3121,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
case .location(let ch) = LocationChannelManager.shared.selectedChannel, case .location(let ch) = LocationChannelManager.shared.selectedChannel,
let id = try? NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash) { let id = try? NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash) {
let messages = privateChats[peerID] ?? [] let messages = privateChats[peerID] ?? []
for message in messages where message.senderPeer?.id == peerID && !message.isRelay { for message in messages where message.senderPeerID == peerID && !message.isRelay {
if !sentReadReceipts.contains(message.id) { if !sentReadReceipts.contains(message.id) {
SecureLogger.debug("GeoDM: sending READ for mid=\(message.id.prefix(8))… to=\(recipientHex.prefix(8))", category: .session) SecureLogger.debug("GeoDM: sending READ for mid=\(message.id.prefix(8))… to=\(recipientHex.prefix(8))", category: .session)
let nostrTransport = NostrTransport(keychain: keychain) let nostrTransport = NostrTransport(keychain: keychain)
@@ -3043,13 +3163,13 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
for message in messagesToAck { for message in messagesToAck {
// Only send read ACKs for messages from the peer (not our own) // Only send read ACKs for messages from the peer (not our own)
// Check both the ephemeral peer ID and stable Noise key as sender // Check both the ephemeral peer ID and stable Noise key as sender
if (message.senderPeer?.id == peerID || message.senderPeer?.id == noiseKeyHex) && !message.isRelay { if (message.senderPeerID == peerID || message.senderPeerID == noiseKeyHex) && !message.isRelay {
// Skip if we already sent an ACK for this message // Skip if we already sent an ACK for this message
if !sentReadReceipts.contains(message.id) { if !sentReadReceipts.contains(message.id) {
// Use stable Noise key hex if available; else fall back to peerID // Use stable Noise key hex if available; else fall back to peerID
let recipPeer = (Data(hexString: peerID) != nil) ? peerID : (unifiedPeerService.getPeer(by: peerID)?.noisePublicKey.hexEncodedString() ?? peerID) let recipPeer = (Data(hexString: peerID) != nil) ? peerID : (unifiedPeerService.getPeer(by: peerID)?.noisePublicKey.hexEncodedString() ?? peerID)
let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID, readerNickname: nickname) let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID, readerNickname: nickname)
messageRouter.sendReadReceipt(receipt, to: Peer(str: recipPeer)) messageRouter.sendReadReceipt(receipt, to: recipPeer)
sentReadReceipts.insert(message.id) sentReadReceipts.insert(message.id)
} }
} }
@@ -3290,7 +3410,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
func formatMessageAsText(_ message: BitchatMessage, colorScheme: ColorScheme) -> AttributedString { func formatMessageAsText(_ message: BitchatMessage, colorScheme: ColorScheme) -> AttributedString {
// Determine if this message was sent by self (mesh, geo, or DM) // Determine if this message was sent by self (mesh, geo, or DM)
let isSelf: Bool = { let isSelf: Bool = {
if let spid = message.senderPeer?.id { if let spid = message.senderPeerID {
// In geohash channels, compare against our per-geohash nostr short ID // In geohash channels, compare against our per-geohash nostr short ID
if case .location(let ch) = activeChannel, spid.hasPrefix("nostr:") { if case .location(let ch) = activeChannel, spid.hasPrefix("nostr:") {
if let myGeo = try? NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash) { if let myGeo = try? NostrIdentityBridge.deriveIdentity(forGeohash: ch.geohash) {
@@ -3323,9 +3443,9 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
senderStyle.foregroundColor = baseColor senderStyle.foregroundColor = baseColor
// Bold the user's own nickname // Bold the user's own nickname
let fontWeight: Font.Weight = isSelf ? .bold : .medium let fontWeight: Font.Weight = isSelf ? .bold : .medium
senderStyle.font = .system(size: 14, weight: fontWeight, design: .monospaced) senderStyle.font = .bitchatSystem(size: 14, weight: fontWeight, design: .monospaced)
// Make sender clickable: encode senderPeerID into a custom URL // Make sender clickable: encode senderPeerID into a custom URL
if let spid = message.senderPeer?.id, let url = URL(string: "bitchat://user/\(spid.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? spid)") { if let spid = message.senderPeerID, let url = URL(string: "bitchat://user/\(spid.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? spid)") {
senderStyle.link = url senderStyle.link = url
} }
@@ -3358,8 +3478,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
var plainStyle = AttributeContainer() var plainStyle = AttributeContainer()
plainStyle.foregroundColor = baseColor plainStyle.foregroundColor = baseColor
plainStyle.font = isSelf plainStyle.font = isSelf
? .system(size: 14, weight: .bold, design: .monospaced) ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
: .system(size: 14, design: .monospaced) : .bitchatSystem(size: 14, design: .monospaced)
result.append(AttributedString(content).mergingAttributes(plainStyle)) result.append(AttributedString(content).mergingAttributes(plainStyle))
} else { } else {
// Reuse compiled regexes and detector // Reuse compiled regexes and detector
@@ -3455,8 +3575,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
var beforeStyle = AttributeContainer() var beforeStyle = AttributeContainer()
beforeStyle.foregroundColor = baseColor beforeStyle.foregroundColor = baseColor
beforeStyle.font = isSelf beforeStyle.font = isSelf
? .system(size: 14, weight: .bold, design: .monospaced) ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
: .system(size: 14, design: .monospaced) : .bitchatSystem(size: 14, design: .monospaced)
if isMentioned { if isMentioned {
beforeStyle.font = beforeStyle.font?.bold() beforeStyle.font = beforeStyle.font?.bold()
} }
@@ -3486,7 +3606,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
return false return false
}() }()
var mentionStyle = AttributeContainer() var mentionStyle = AttributeContainer()
mentionStyle.font = .system(size: 14, weight: isSelf ? .bold : .semibold, design: .monospaced) mentionStyle.font = .bitchatSystem(size: 14, weight: isSelf ? .bold : .semibold, design: .monospaced)
let mentionColor: Color = isMentionToMe ? .orange : baseColor let mentionColor: Color = isMentionToMe ? .orange : baseColor
mentionStyle.foregroundColor = mentionColor mentionStyle.foregroundColor = mentionColor
// Emit '@' // Emit '@'
@@ -3530,8 +3650,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
}() }()
var tagStyle = AttributeContainer() var tagStyle = AttributeContainer()
tagStyle.font = isSelf tagStyle.font = isSelf
? .system(size: 14, weight: .bold, design: .monospaced) ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
: .system(size: 14, design: .monospaced) : .bitchatSystem(size: 14, design: .monospaced)
tagStyle.foregroundColor = baseColor tagStyle.foregroundColor = baseColor
if isGeohash && !attachedToMention && standalone, let url = URL(string: "bitchat://geohash/\(token)") { if isGeohash && !attachedToMention && standalone, let url = URL(string: "bitchat://geohash/\(token)") {
tagStyle.link = url tagStyle.link = url
@@ -3544,21 +3664,21 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
var spacer = AttributeContainer() var spacer = AttributeContainer()
spacer.foregroundColor = baseColor spacer.foregroundColor = baseColor
spacer.font = isSelf spacer.font = isSelf
? .system(size: 14, weight: .bold, design: .monospaced) ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
: .system(size: 14, design: .monospaced) : .bitchatSystem(size: 14, design: .monospaced)
result.append(AttributedString(" ").mergingAttributes(spacer)) result.append(AttributedString(" ").mergingAttributes(spacer))
} else if type == "lightning" || type == "bolt11" || type == "lnurl" { } else if type == "lightning" || type == "bolt11" || type == "lnurl" {
// Skip inline invoice/link; a styled chip is rendered below the message // Skip inline invoice/link; a styled chip is rendered below the message
var spacer = AttributeContainer() var spacer = AttributeContainer()
spacer.foregroundColor = baseColor spacer.foregroundColor = baseColor
spacer.font = isSelf spacer.font = isSelf
? .system(size: 14, weight: .bold, design: .monospaced) ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
: .system(size: 14, design: .monospaced) : .bitchatSystem(size: 14, design: .monospaced)
result.append(AttributedString(" ").mergingAttributes(spacer)) result.append(AttributedString(" ").mergingAttributes(spacer))
} else { } else {
// Keep URL styling and make it tappable via .link attribute // Keep URL styling and make it tappable via .link attribute
var matchStyle = AttributeContainer() var matchStyle = AttributeContainer()
matchStyle.font = .system(size: 14, weight: isSelf ? .bold : .semibold, design: .monospaced) matchStyle.font = .bitchatSystem(size: 14, weight: isSelf ? .bold : .semibold, design: .monospaced)
if type == "url" { if type == "url" {
matchStyle.foregroundColor = isSelf ? .orange : .blue matchStyle.foregroundColor = isSelf ? .orange : .blue
matchStyle.underlineStyle = .single matchStyle.underlineStyle = .single
@@ -3582,8 +3702,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
var remainingStyle = AttributeContainer() var remainingStyle = AttributeContainer()
remainingStyle.foregroundColor = baseColor remainingStyle.foregroundColor = baseColor
remainingStyle.font = isSelf remainingStyle.font = isSelf
? .system(size: 14, weight: .bold, design: .monospaced) ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
: .system(size: 14, design: .monospaced) : .bitchatSystem(size: 14, design: .monospaced)
if isMentioned { if isMentioned {
remainingStyle.font = remainingStyle.font?.bold() remainingStyle.font = remainingStyle.font?.bold()
} }
@@ -3595,21 +3715,21 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
let timestamp = AttributedString(" [\(message.formattedTimestamp)]") let timestamp = AttributedString(" [\(message.formattedTimestamp)]")
var timestampStyle = AttributeContainer() var timestampStyle = AttributeContainer()
timestampStyle.foregroundColor = Color.gray.opacity(0.7) timestampStyle.foregroundColor = Color.gray.opacity(0.7)
timestampStyle.font = .system(size: 10, design: .monospaced) timestampStyle.font = .bitchatSystem(size: 10, design: .monospaced)
result.append(timestamp.mergingAttributes(timestampStyle)) result.append(timestamp.mergingAttributes(timestampStyle))
} else { } else {
// System message // System message
var contentStyle = AttributeContainer() var contentStyle = AttributeContainer()
contentStyle.foregroundColor = Color.gray contentStyle.foregroundColor = Color.gray
let content = AttributedString("* \(message.content) *") let content = AttributedString("* \(message.content) *")
contentStyle.font = .system(size: 12, design: .monospaced).italic() contentStyle.font = .bitchatSystem(size: 12, design: .monospaced).italic()
result.append(content.mergingAttributes(contentStyle)) result.append(content.mergingAttributes(contentStyle))
// Add timestamp at the end for system messages too // Add timestamp at the end for system messages too
let timestamp = AttributedString(" [\(message.formattedTimestamp)]") let timestamp = AttributedString(" [\(message.formattedTimestamp)]")
var timestampStyle = AttributeContainer() var timestampStyle = AttributeContainer()
timestampStyle.foregroundColor = Color.gray.opacity(0.5) timestampStyle.foregroundColor = Color.gray.opacity(0.5)
timestampStyle.font = .system(size: 10, design: .monospaced) timestampStyle.font = .bitchatSystem(size: 10, design: .monospaced)
result.append(timestamp.mergingAttributes(timestampStyle)) result.append(timestamp.mergingAttributes(timestampStyle))
} }
@@ -3629,14 +3749,14 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
let content = AttributedString("* \(message.content) *") let content = AttributedString("* \(message.content) *")
var contentStyle = AttributeContainer() var contentStyle = AttributeContainer()
contentStyle.foregroundColor = Color.gray contentStyle.foregroundColor = Color.gray
contentStyle.font = .system(size: 12, design: .monospaced).italic() contentStyle.font = .bitchatSystem(size: 12, design: .monospaced).italic()
result.append(content.mergingAttributes(contentStyle)) result.append(content.mergingAttributes(contentStyle))
// Add timestamp at the end for system messages // Add timestamp at the end for system messages
let timestamp = AttributedString(" [\(message.formattedTimestamp)]") let timestamp = AttributedString(" [\(message.formattedTimestamp)]")
var timestampStyle = AttributeContainer() var timestampStyle = AttributeContainer()
timestampStyle.foregroundColor = Color.gray.opacity(0.5) timestampStyle.foregroundColor = Color.gray.opacity(0.5)
timestampStyle.font = .system(size: 10, design: .monospaced) timestampStyle.font = .bitchatSystem(size: 10, design: .monospaced)
result.append(timestamp.mergingAttributes(timestampStyle)) result.append(timestamp.mergingAttributes(timestampStyle))
} else { } else {
let sender = AttributedString("<@\(message.sender)> ") let sender = AttributedString("<@\(message.sender)> ")
@@ -3646,7 +3766,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
senderStyle.foregroundColor = primaryColor senderStyle.foregroundColor = primaryColor
// Bold the user's own nickname // Bold the user's own nickname
let fontWeight: Font.Weight = message.sender == nickname ? .bold : .medium let fontWeight: Font.Weight = message.sender == nickname ? .bold : .medium
senderStyle.font = .system(size: 12, weight: fontWeight, design: .monospaced) senderStyle.font = .bitchatSystem(size: 12, weight: fontWeight, design: .monospaced)
result.append(sender.mergingAttributes(senderStyle)) result.append(sender.mergingAttributes(senderStyle))
@@ -3670,7 +3790,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
let beforeText = String(contentText[lastEndIndex..<range.lowerBound]) let beforeText = String(contentText[lastEndIndex..<range.lowerBound])
if !beforeText.isEmpty { if !beforeText.isEmpty {
var normalStyle = AttributeContainer() var normalStyle = AttributeContainer()
normalStyle.font = .system(size: 14, design: .monospaced) normalStyle.font = .bitchatSystem(size: 14, design: .monospaced)
normalStyle.foregroundColor = isDark ? Color.white : Color.black normalStyle.foregroundColor = isDark ? Color.white : Color.black
processedContent.append(AttributedString(beforeText).mergingAttributes(normalStyle)) processedContent.append(AttributedString(beforeText).mergingAttributes(normalStyle))
} }
@@ -3679,7 +3799,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Add the mention with highlight // Add the mention with highlight
let mentionText = String(contentText[range]) let mentionText = String(contentText[range])
var mentionStyle = AttributeContainer() var mentionStyle = AttributeContainer()
mentionStyle.font = .system(size: 14, weight: .semibold, design: .monospaced) mentionStyle.font = .bitchatSystem(size: 14, weight: .semibold, design: .monospaced)
mentionStyle.foregroundColor = Color.orange mentionStyle.foregroundColor = Color.orange
processedContent.append(AttributedString(mentionText).mergingAttributes(mentionStyle)) processedContent.append(AttributedString(mentionText).mergingAttributes(mentionStyle))
@@ -3691,7 +3811,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if lastEndIndex < contentText.endIndex { if lastEndIndex < contentText.endIndex {
let remainingText = String(contentText[lastEndIndex...]) let remainingText = String(contentText[lastEndIndex...])
var normalStyle = AttributeContainer() var normalStyle = AttributeContainer()
normalStyle.font = .system(size: 14, design: .monospaced) normalStyle.font = .bitchatSystem(size: 14, design: .monospaced)
normalStyle.foregroundColor = isDark ? Color.white : Color.black normalStyle.foregroundColor = isDark ? Color.white : Color.black
processedContent.append(AttributedString(remainingText).mergingAttributes(normalStyle)) processedContent.append(AttributedString(remainingText).mergingAttributes(normalStyle))
} }
@@ -3702,7 +3822,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
let relay = AttributedString(" (via \(originalSender))") let relay = AttributedString(" (via \(originalSender))")
var relayStyle = AttributeContainer() var relayStyle = AttributeContainer()
relayStyle.foregroundColor = primaryColor.opacity(0.7) relayStyle.foregroundColor = primaryColor.opacity(0.7)
relayStyle.font = .system(size: 11, design: .monospaced) relayStyle.font = .bitchatSystem(size: 11, design: .monospaced)
result.append(relay.mergingAttributes(relayStyle)) result.append(relay.mergingAttributes(relayStyle))
} }
@@ -3710,7 +3830,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
let timestamp = AttributedString(" [\(message.formattedTimestamp)]") let timestamp = AttributedString(" [\(message.formattedTimestamp)]")
var timestampStyle = AttributeContainer() var timestampStyle = AttributeContainer()
timestampStyle.foregroundColor = Color.gray.opacity(0.7) timestampStyle.foregroundColor = Color.gray.opacity(0.7)
timestampStyle.font = .system(size: 10, design: .monospaced) timestampStyle.font = .bitchatSystem(size: 10, design: .monospaced)
result.append(timestamp.mergingAttributes(timestampStyle)) result.append(timestamp.mergingAttributes(timestampStyle))
} }
@@ -3730,7 +3850,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
func updateEncryptionStatusForPeer(_ peerID: String) { func updateEncryptionStatusForPeer(_ peerID: String) {
let noiseService = meshService.getNoiseService() let noiseService = meshService.getNoiseService()
if noiseService.hasEstablishedSession(with: Peer(str: peerID)) { if noiseService.hasEstablishedSession(with: peerID) {
// Check if fingerprint is verified using our persisted data // Check if fingerprint is verified using our persisted data
if let fingerprint = getFingerprint(for: peerID), if let fingerprint = getFingerprint(for: peerID),
verifiedFingerprints.contains(fingerprint) { verifiedFingerprints.contains(fingerprint) {
@@ -3738,7 +3858,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
} else { } else {
peerEncryptionStatus[peerID] = .noiseSecured peerEncryptionStatus[peerID] = .noiseSecured
} }
} else if noiseService.hasSession(with: Peer(str: peerID)) { } else if noiseService.hasSession(with: peerID) {
// Session exists but not established - handshaking // Session exists but not established - handshaking
peerEncryptionStatus[peerID] = .noiseHandshaking peerEncryptionStatus[peerID] = .noiseHandshaking
} else { } else {
@@ -3855,7 +3975,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
@MainActor @MainActor
private func peerColor(for message: BitchatMessage, isDark: Bool) -> Color { private func peerColor(for message: BitchatMessage, isDark: Bool) -> Color {
if let spid = message.senderPeer?.id { if let spid = message.senderPeerID {
if spid.hasPrefix("nostr:") || spid.hasPrefix("nostr_") { if spid.hasPrefix("nostr:") || spid.hasPrefix("nostr_") {
let bare: String = { let bare: String = {
if spid.hasPrefix("nostr:") { return String(spid.dropFirst(6)) } if spid.hasPrefix("nostr:") { return String(spid.dropFirst(6)) }
@@ -4196,7 +4316,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
private func updateEncryptionStatus(for peerID: String) { private func updateEncryptionStatus(for peerID: String) {
let noiseService = meshService.getNoiseService() let noiseService = meshService.getNoiseService()
if noiseService.hasEstablishedSession(with: Peer(str: peerID)) { if noiseService.hasEstablishedSession(with: peerID) {
if let fingerprint = getFingerprint(for: peerID) { if let fingerprint = getFingerprint(for: peerID) {
if verifiedFingerprints.contains(fingerprint) { if verifiedFingerprints.contains(fingerprint) {
peerEncryptionStatus[peerID] = .noiseVerified peerEncryptionStatus[peerID] = .noiseVerified
@@ -4207,7 +4327,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Session established but no fingerprint yet // Session established but no fingerprint yet
peerEncryptionStatus[peerID] = .noiseSecured peerEncryptionStatus[peerID] = .noiseSecured
} }
} else if noiseService.hasSession(with: Peer(str: peerID)) { } else if noiseService.hasSession(with: peerID) {
peerEncryptionStatus[peerID] = .noiseHandshaking peerEncryptionStatus[peerID] = .noiseHandshaking
} else { } else {
peerEncryptionStatus[peerID] = Optional.none peerEncryptionStatus[peerID] = Optional.none
@@ -4358,7 +4478,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Cache shortID -> full Noise key mapping as soon as session authenticates // Cache shortID -> full Noise key mapping as soon as session authenticates
if self.shortIDToNoiseKey[peerID] == nil, if self.shortIDToNoiseKey[peerID] == nil,
let keyData = self.meshService.getNoiseService().getPeerPublicKeyData(Peer(str: peerID)) { let keyData = self.meshService.getNoiseService().getPeerPublicKeyData(peerID) {
let stable = keyData.hexEncodedString() let stable = keyData.hexEncodedString()
self.shortIDToNoiseKey[peerID] = stable self.shortIDToNoiseKey[peerID] = stable
SecureLogger.debug("🗺️ Mapped short peerID to Noise key for header continuity: \(peerID) -> \(stable.prefix(8))", category: .session) SecureLogger.debug("🗺️ Mapped short peerID to Noise key for header continuity: \(peerID) -> \(stable.prefix(8))", category: .session)
@@ -4451,7 +4571,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: nil, originalSender: nil,
isPrivate: true, isPrivate: true,
recipientNickname: nickname, recipientNickname: nickname,
senderPeer: Peer(str: peerID), senderPeerID: peerID,
mentions: pmMentions.isEmpty ? nil : pmMentions mentions: pmMentions.isEmpty ? nil : pmMentions
) )
handlePrivateMessage(msg) handlePrivateMessage(msg)
@@ -4558,7 +4678,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: nil, originalSender: nil,
isPrivate: false, isPrivate: false,
recipientNickname: nil, recipientNickname: nil,
senderPeer: Peer(str: peerID), senderPeerID: peerID,
mentions: publicMentions.isEmpty ? nil : publicMentions mentions: publicMentions.isEmpty ? nil : publicMentions
) )
handlePublicMessage(msg) handlePublicMessage(msg)
@@ -4587,7 +4707,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
pendingQRVerifications[peerID] = pending pendingQRVerifications[peerID] = pending
// If Noise session is established, send immediately; otherwise trigger handshake and send on auth // If Noise session is established, send immediately; otherwise trigger handshake and send on auth
let noise = meshService.getNoiseService() let noise = meshService.getNoiseService()
if noise.hasEstablishedSession(with: Peer(str: peerID)) { if noise.hasEstablishedSession(with: peerID) {
meshService.sendVerifyChallenge(to: peerID, noiseKeyHex: qr.noiseKeyHex, nonceA: nonce) meshService.sendVerifyChallenge(to: peerID, noiseKeyHex: qr.noiseKeyHex, nonceA: nonce)
pending.sent = true pending.sent = true
pendingQRVerifications[peerID] = pending pendingQRVerifications[peerID] = pending
@@ -4608,7 +4728,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
isConnected = true isConnected = true
// Register ephemeral session with identity manager // Register ephemeral session with identity manager
identityManager.registerEphemeralSession(peer: Peer(str: peerID), handshakeState: .none) identityManager.registerEphemeralSession(peerID: peerID, handshakeState: .none)
// Intentionally do not resend favorites on reconnect. // Intentionally do not resend favorites on reconnect.
// We only send our npub when a favorite is toggled on, or if our npub changes. // We only send our npub when a favorite is toggled on, or if our npub changes.
@@ -4623,7 +4743,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
} }
// Flush any queued messages for this peer via router // Flush any queued messages for this peer via router
messageRouter.flushOutbox(for: Peer(str: peerID)) messageRouter.flushOutbox(for: peerID)
} }
// //
@@ -4633,12 +4753,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
SecureLogger.debug("👋 Peer disconnected: \(peerID)", category: .session) SecureLogger.debug("👋 Peer disconnected: \(peerID)", category: .session)
// Remove ephemeral session from identity manager // Remove ephemeral session from identity manager
identityManager.removeEphemeralSession(peer: Peer(str: peerID)) identityManager.removeEphemeralSession(peerID: peerID)
// If the open PM is tied to this short peer ID, switch UI context to the full Noise key (offline favorite) // If the open PM is tied to this short peer ID, switch UI context to the full Noise key (offline favorite)
var derivedStableKeyHex: String? = shortIDToNoiseKey[peerID] var derivedStableKeyHex: String? = shortIDToNoiseKey[peerID]
if derivedStableKeyHex == nil, if derivedStableKeyHex == nil,
let key = meshService.getNoiseService().getPeerPublicKeyData(Peer(str: peerID)) { let key = meshService.getNoiseService().getPeerPublicKeyData(peerID) {
derivedStableKeyHex = key.hexEncodedString() derivedStableKeyHex = key.hexEncodedString()
shortIDToNoiseKey[peerID] = derivedStableKeyHex shortIDToNoiseKey[peerID] = derivedStableKeyHex
} }
@@ -4659,7 +4779,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: msg.originalSender, originalSender: msg.originalSender,
isPrivate: msg.isPrivate, isPrivate: msg.isPrivate,
recipientNickname: msg.recipientNickname, recipientNickname: msg.recipientNickname,
senderPeer: (msg.senderPeer?.id == meshService.myPeerID) ? Peer(str: meshService.myPeerID) : Peer(str: stableKeyHex), senderPeerID: (msg.senderPeerID == meshService.myPeerID) ? meshService.myPeerID : stableKeyHex,
mentions: msg.mentions, mentions: msg.mentions,
deliveryStatus: msg.deliveryStatus deliveryStatus: msg.deliveryStatus
) )
@@ -4687,7 +4807,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if let messages = privateChats[peerID] { if let messages = privateChats[peerID] {
for message in messages { for message in messages {
// Remove read receipts for messages FROM this peer (not TO this peer) // Remove read receipts for messages FROM this peer (not TO this peer)
if message.senderPeer?.id == peerID { if message.senderPeerID == peerID {
sentReadReceipts.remove(message.id) sentReadReceipts.remove(message.id)
} }
} }
@@ -4740,7 +4860,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Register ephemeral sessions for all connected peers // Register ephemeral sessions for all connected peers
for peerID in peers { for peerID in peers {
self.identityManager.registerEphemeralSession(peer: Peer(str: peerID), handshakeState: .none) self.identityManager.registerEphemeralSession(peerID: peerID, handshakeState: .none)
} }
// Schedule UI refresh to ensure offline favorites are shown // Schedule UI refresh to ensure offline favorites are shown
@@ -5224,7 +5344,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
isRelay: false, isRelay: false,
isPrivate: true, isPrivate: true,
recipientNickname: nickname, recipientNickname: nickname,
senderPeer: Peer(str: targetPeerID), senderPeerID: targetPeerID,
deliveryStatus: .delivered(to: nickname, at: Date()) deliveryStatus: .delivered(to: nickname, at: Date())
) )
@@ -5312,7 +5432,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if let key { if let key {
SecureLogger.debug("Sending DELIVERED ack for \(message.id.prefix(8))… via router", category: .session) SecureLogger.debug("Sending DELIVERED ack for \(message.id.prefix(8))… via router", category: .session)
messageRouter.sendDeliveryAck(message.id, to: Peer(str: key.hexEncodedString())) messageRouter.sendDeliveryAck(message.id, to: key.hexEncodedString())
} else if let id = try? NostrIdentityBridge.getCurrentNostrIdentity() { } else if let id = try? NostrIdentityBridge.getCurrentNostrIdentity() {
// Fallback: no Noise mapping yet send directly to sender's Nostr pubkey // Fallback: no Noise mapping yet send directly to sender's Nostr pubkey
let nt = NostrTransport(keychain: keychain) let nt = NostrTransport(keychain: keychain)
@@ -5333,7 +5453,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if let key { if let key {
let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID, readerNickname: nickname) let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID, readerNickname: nickname)
SecureLogger.debug("Viewing chat; sending READ ack for \(message.id.prefix(8))… via router", category: .session) SecureLogger.debug("Viewing chat; sending READ ack for \(message.id.prefix(8))… via router", category: .session)
messageRouter.sendReadReceipt(receipt, to: Peer(str: key.hexEncodedString())) messageRouter.sendReadReceipt(receipt, to: key.hexEncodedString())
sentReadReceipts.insert(message.id) sentReadReceipts.insert(message.id)
} else if let id = try? NostrIdentityBridge.getCurrentNostrIdentity() { } else if let id = try? NostrIdentityBridge.getCurrentNostrIdentity() {
let nt = NostrTransport(keychain: keychain) let nt = NostrTransport(keychain: keychain)
@@ -5366,7 +5486,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
NotificationService.shared.sendPrivateMessageNotification( NotificationService.shared.sendPrivateMessageNotification(
from: senderNickname, from: senderNickname,
message: messageContent, message: messageContent,
peer: Peer(str: targetPeerID) peerID: targetPeerID
) )
} }
} }
@@ -5548,7 +5668,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if senderNickname == nil { if senderNickname == nil {
for (_, messages) in privateChats { for (_, messages) in privateChats {
if let previousMessage = messages.first(where: { if let previousMessage = messages.first(where: {
$0.senderPeer?.id == tempPeerID $0.senderPeerID == tempPeerID
}) { }) {
finalSenderNickname = previousMessage.sender finalSenderNickname = previousMessage.sender
break break
@@ -5566,7 +5686,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: nil, originalSender: nil,
isPrivate: true, isPrivate: true,
recipientNickname: nickname, recipientNickname: nickname,
senderPeer: Peer(str: tempPeerID), senderPeerID: tempPeerID,
mentions: nil, mentions: nil,
deliveryStatus: .delivered(to: nickname, at: Date()) deliveryStatus: .delivered(to: nickname, at: Date())
) )
@@ -5598,7 +5718,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
NotificationService.shared.sendPrivateMessageNotification( NotificationService.shared.sendPrivateMessageNotification(
from: finalSenderNickname, from: finalSenderNickname,
message: content, message: content,
peer: Peer(str: tempPeerID) peerID: tempPeerID
) )
} else { } else {
// Not notifying for old message // Not notifying for old message
@@ -5655,7 +5775,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
@MainActor @MainActor
private func sendFavoriteNotificationViaNostr(noisePublicKey: Data, isFavorite: Bool) { private func sendFavoriteNotificationViaNostr(noisePublicKey: Data, isFavorite: Bool) {
let peerIDHex = noisePublicKey.hexEncodedString() let peerIDHex = noisePublicKey.hexEncodedString()
messageRouter.sendFavoriteNotification(to: Peer(str: peerIDHex), isFavorite: isFavorite) messageRouter.sendFavoriteNotification(to: peerIDHex, isFavorite: isFavorite)
} }
@MainActor @MainActor
@@ -5675,12 +5795,12 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
// Try mesh first for connected peers // Try mesh first for connected peers
if meshService.isPeerConnected(peerID) { if meshService.isPeerConnected(peerID) {
messageRouter.sendFavoriteNotification(to: Peer(str: peerID), isFavorite: isFavorite) messageRouter.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
SecureLogger.debug("📤 Sent favorite notification via BLE to \(peerID)", category: .session) SecureLogger.debug("📤 Sent favorite notification via BLE to \(peerID)", category: .session)
} else if let key = noiseKey { } else if let key = noiseKey {
// Send via Nostr for offline peers (using router) // Send via Nostr for offline peers (using router)
let recipientPeerID = key.hexEncodedString() let recipientPeerID = key.hexEncodedString()
messageRouter.sendFavoriteNotification(to: Peer(str: recipientPeerID), isFavorite: isFavorite) messageRouter.sendFavoriteNotification(to: recipientPeerID, isFavorite: isFavorite)
} else { } else {
SecureLogger.warning("⚠️ Cannot send favorite notification - peer not connected and no Nostr pubkey", category: .session) SecureLogger.warning("⚠️ Cannot send favorite notification - peer not connected and no Nostr pubkey", category: .session)
} }
@@ -5691,7 +5811,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
/// Check if a message should be blocked based on sender /// Check if a message should be blocked based on sender
@MainActor @MainActor
private func isMessageBlocked(_ message: BitchatMessage) -> Bool { private func isMessageBlocked(_ message: BitchatMessage) -> Bool {
if let peerID = message.senderPeer?.id ?? getPeerIDForNickname(message.sender) { if let peerID = message.senderPeerID ?? getPeerIDForNickname(message.sender) {
// Check mesh/known peers first // Check mesh/known peers first
if isPeerBlocked(peerID) { return true } if isPeerBlocked(peerID) { return true }
// Check geohash (Nostr) blocks using mapping to full pubkey // Check geohash (Nostr) blocks using mapping to full pubkey
@@ -5731,7 +5851,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
originalSender: message.originalSender, originalSender: message.originalSender,
isPrivate: message.isPrivate, isPrivate: message.isPrivate,
recipientNickname: message.recipientNickname, recipientNickname: message.recipientNickname,
senderPeer: message.senderPeer, senderPeerID: message.senderPeerID,
mentions: message.mentions, mentions: message.mentions,
deliveryStatus: message.deliveryStatus deliveryStatus: message.deliveryStatus
) )
@@ -5840,7 +5960,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
@MainActor @MainActor
private func handlePrivateMessage(_ message: BitchatMessage) { private func handlePrivateMessage(_ message: BitchatMessage) {
SecureLogger.debug("📥 handlePrivateMessage called for message from \(message.sender)", category: .session) SecureLogger.debug("📥 handlePrivateMessage called for message from \(message.sender)", category: .session)
let senderPeerID = message.senderPeer?.id ?? getPeerIDForNickname(message.sender) let senderPeerID = message.senderPeerID ?? getPeerIDForNickname(message.sender)
guard let peerID = senderPeerID else { guard let peerID = senderPeerID else {
SecureLogger.warning("⚠️ Could not get peer ID for sender \(message.sender)", category: .session) SecureLogger.warning("⚠️ Could not get peer ID for sender \(message.sender)", category: .session)
@@ -5932,7 +6052,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
NotificationService.shared.sendPrivateMessageNotification( NotificationService.shared.sendPrivateMessageNotification(
from: message.sender, from: message.sender,
message: message.content, message: message.content,
peer: Peer(str: peerID) peerID: peerID
) )
} }
} else { } else {
@@ -5951,7 +6071,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
readerNickname: nickname readerNickname: nickname
) )
let recipientID = message.senderPeer?.id ?? peerID let recipientID = message.senderPeerID ?? peerID
Task { @MainActor in Task { @MainActor in
var originalTransport: String? = nil var originalTransport: String? = nil
@@ -5983,7 +6103,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if isMessageBlocked(finalMessage) { return } if isMessageBlocked(finalMessage) { return }
// Classify origin: geochat if senderPeerID starts with 'nostr:', else mesh (or system) // Classify origin: geochat if senderPeerID starts with 'nostr:', else mesh (or system)
let isGeo = finalMessage.senderPeer?.isNostrColon == true let isGeo = finalMessage.senderPeerID?.hasPrefix("nostr:") == true
// Apply per-sender and per-content rate limits (drop if exceeded) // Apply per-sender and per-content rate limits (drop if exceeded)
if finalMessage.sender != "system" { if finalMessage.sender != "system" {
+128 -96
View File
@@ -18,41 +18,77 @@ struct AppInfoView: View {
// MARK: - Constants // MARK: - Constants
private enum Strings { private enum Strings {
static let appName = "bitchat" static let appName: LocalizedStringKey = "app_info.app_name"
static let tagline = "sidegroupchat" static let tagline: LocalizedStringKey = "app_info.tagline"
enum Features { enum Features {
static let title = "FEATURES" static let title: LocalizedStringKey = "app_info.features.title"
static let offlineComm = ("wifi.slash", "offline communication", "works without internet using Bluetooth low energy") static let offlineComm = AppInfoFeatureInfo(
static let encryption = ("lock.shield", "end-to-end encryption", "private messages encrypted with noise protocol") icon: "wifi.slash",
static let extendedRange = ("antenna.radiowaves.left.and.right", "extended range", "messages relay through peers, going the distance") title: "app_info.features.offline.title",
static let mentions = ("at", "mentions", "use @nickname to notify specific people") description: "app_info.features.offline.description"
static let favorites = ("star.fill", "favorites", "get notified when your favorite people join") )
static let geohash = ("number", "local channels", "geohash channels to chat with people in nearby regions over decentralized anonymous relays") static let encryption = AppInfoFeatureInfo(
icon: "lock.shield",
title: "app_info.features.encryption.title",
description: "app_info.features.encryption.description"
)
static let extendedRange = AppInfoFeatureInfo(
icon: "antenna.radiowaves.left.and.right",
title: "app_info.features.extended_range.title",
description: "app_info.features.extended_range.description"
)
static let mentions = AppInfoFeatureInfo(
icon: "at",
title: "app_info.features.mentions.title",
description: "app_info.features.mentions.description"
)
static let favorites = AppInfoFeatureInfo(
icon: "star.fill",
title: "app_info.features.favorites.title",
description: "app_info.features.favorites.description"
)
static let geohash = AppInfoFeatureInfo(
icon: "number",
title: "app_info.features.geohash.title",
description: "app_info.features.geohash.description"
)
} }
enum Privacy { enum Privacy {
static let title = "PRIVACY" static let title: LocalizedStringKey = "app_info.privacy.title"
static let noTracking = ("eye.slash", "no tracking", "no servers, accounts, or data collection") static let noTracking = AppInfoFeatureInfo(
static let ephemeral = ("shuffle", "ephemeral identity", "new peer ID generated regularly") icon: "eye.slash",
static let panic = ("hand.raised.fill", "panic mode", "triple-tap logo to instantly clear all data") title: "app_info.privacy.no_tracking.title",
description: "app_info.privacy.no_tracking.description"
)
static let ephemeral = AppInfoFeatureInfo(
icon: "shuffle",
title: "app_info.privacy.ephemeral.title",
description: "app_info.privacy.ephemeral.description"
)
static let panic = AppInfoFeatureInfo(
icon: "hand.raised.fill",
title: "app_info.privacy.panic.title",
description: "app_info.privacy.panic.description"
)
} }
enum HowToUse { enum HowToUse {
static let title = "HOW TO USE" static let title: LocalizedStringKey = "app_info.how_to_use.title"
static let instructions = [ static let instructions: [LocalizedStringKey] = [
"• set your nickname by tapping it", "app_info.how_to_use.set_nickname",
"• tap #mesh to change channels", "app_info.how_to_use.change_channels",
"• tap people icon for sidebar", "app_info.how_to_use.open_sidebar",
"• tap a peer's name to start a DM", "app_info.how_to_use.start_dm",
"• triple-tap chat to clear", "app_info.how_to_use.clear_chat",
"• type / for commands" "app_info.how_to_use.commands"
] ]
} }
enum Warning { enum Warning {
static let title = "WARNING" static let title: LocalizedStringKey = "app_info.warning.title"
static let message = "private message security has not yet been fully audited. do not use for critical situations until this warning disappears." static let message: LocalizedStringKey = "app_info.warning.message"
} }
} }
@@ -62,7 +98,7 @@ struct AppInfoView: View {
// Custom header for macOS // Custom header for macOS
HStack { HStack {
Spacer() Spacer()
Button("DONE") { Button("app_info.done") {
dismiss() dismiss()
} }
.buttonStyle(.plain) .buttonStyle(.plain)
@@ -88,12 +124,12 @@ struct AppInfoView: View {
ToolbarItem(placement: .navigationBarTrailing) { ToolbarItem(placement: .navigationBarTrailing) {
Button(action: { dismiss() }) { Button(action: { dismiss() }) {
Image(systemName: "xmark") Image(systemName: "xmark")
.font(.system(size: 13, weight: .semibold, design: .monospaced)) .font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.frame(width: 32, height: 32) .frame(width: 32, height: 32)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.accessibilityLabel("Close") .accessibilityLabel("app_info.close")
} }
} }
} }
@@ -106,82 +142,64 @@ struct AppInfoView: View {
// Header // Header
VStack(alignment: .center, spacing: 8) { VStack(alignment: .center, spacing: 8) {
Text(Strings.appName) Text(Strings.appName)
.font(.system(size: 32, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 32, weight: .bold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
Text(Strings.tagline) Text(Strings.tagline)
.font(.system(size: 16, design: .monospaced)) .font(.bitchatSystem(size: 16, design: .monospaced))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
} }
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.padding(.vertical) .padding(.vertical)
// Features
VStack(alignment: .leading, spacing: 16) {
SectionHeader(Strings.Features.title)
FeatureRow(icon: Strings.Features.offlineComm.0,
title: Strings.Features.offlineComm.1,
description: Strings.Features.offlineComm.2)
FeatureRow(icon: Strings.Features.encryption.0,
title: Strings.Features.encryption.1,
description: Strings.Features.encryption.2)
FeatureRow(icon: Strings.Features.extendedRange.0,
title: Strings.Features.extendedRange.1,
description: Strings.Features.extendedRange.2)
FeatureRow(icon: Strings.Features.favorites.0,
title: Strings.Features.favorites.1,
description: Strings.Features.favorites.2)
FeatureRow(icon: Strings.Features.geohash.0,
title: Strings.Features.geohash.1,
description: Strings.Features.geohash.2)
FeatureRow(icon: Strings.Features.mentions.0,
title: Strings.Features.mentions.1,
description: Strings.Features.mentions.2)
}
// Privacy
VStack(alignment: .leading, spacing: 16) {
SectionHeader(Strings.Privacy.title)
FeatureRow(icon: Strings.Privacy.noTracking.0,
title: Strings.Privacy.noTracking.1,
description: Strings.Privacy.noTracking.2)
FeatureRow(icon: Strings.Privacy.ephemeral.0,
title: Strings.Privacy.ephemeral.1,
description: Strings.Privacy.ephemeral.2)
FeatureRow(icon: Strings.Privacy.panic.0,
title: Strings.Privacy.panic.1,
description: Strings.Privacy.panic.2)
}
// How to Use // How to Use
VStack(alignment: .leading, spacing: 16) { VStack(alignment: .leading, spacing: 16) {
SectionHeader(Strings.HowToUse.title) SectionHeader(Strings.HowToUse.title)
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
ForEach(Strings.HowToUse.instructions, id: \.self) { instruction in ForEach(Array(Strings.HowToUse.instructions.enumerated()), id: \.offset) { _, instruction in
Text(instruction) Text(instruction)
} }
} }
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
} }
// Features
VStack(alignment: .leading, spacing: 16) {
SectionHeader(Strings.Features.title)
FeatureRow(info: Strings.Features.offlineComm)
FeatureRow(info: Strings.Features.encryption)
FeatureRow(info: Strings.Features.extendedRange)
FeatureRow(info: Strings.Features.favorites)
FeatureRow(info: Strings.Features.geohash)
FeatureRow(info: Strings.Features.mentions)
}
// Privacy
VStack(alignment: .leading, spacing: 16) {
SectionHeader(Strings.Privacy.title)
FeatureRow(info: Strings.Privacy.noTracking)
FeatureRow(info: Strings.Privacy.ephemeral)
FeatureRow(info: Strings.Privacy.panic)
}
// Warning // Warning
VStack(alignment: .leading, spacing: 6) { VStack(alignment: .leading, spacing: 6) {
SectionHeader(Strings.Warning.title) SectionHeader(Strings.Warning.title)
.foregroundColor(Color.red) .foregroundColor(Color.red)
Text(Strings.Warning.message) Text(Strings.Warning.message)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(Color.red) .foregroundColor(Color.red)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
} }
@@ -197,30 +215,34 @@ struct AppInfoView: View {
} }
} }
struct AppInfoFeatureInfo {
let icon: String
let title: LocalizedStringKey
let description: LocalizedStringKey
}
struct SectionHeader: View { struct SectionHeader: View {
let title: String let title: LocalizedStringKey
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
private var textColor: Color { private var textColor: Color {
colorScheme == .dark ? Color.green : Color(red: 0, green: 0.5, blue: 0) colorScheme == .dark ? Color.green : Color(red: 0, green: 0.5, blue: 0)
} }
init(_ title: String) { init(_ title: LocalizedStringKey) {
self.title = title self.title = title
} }
var body: some View { var body: some View {
Text(title) Text(title)
.font(.system(size: 16, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.padding(.top, 8) .padding(.top, 8)
} }
} }
struct FeatureRow: View { struct FeatureRow: View {
let icon: String let info: AppInfoFeatureInfo
let title: String
let description: String
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
private var textColor: Color { private var textColor: Color {
@@ -233,18 +255,18 @@ struct FeatureRow: View {
var body: some View { var body: some View {
HStack(alignment: .top, spacing: 12) { HStack(alignment: .top, spacing: 12) {
Image(systemName: icon) Image(systemName: info.icon)
.font(.system(size: 20)) .font(.bitchatSystem(size: 20))
.foregroundColor(textColor) .foregroundColor(textColor)
.frame(width: 30) .frame(width: 30)
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
Text(title) Text(info.title)
.font(.system(size: 14, weight: .semibold, design: .monospaced)) .font(.bitchatSystem(size: 14, weight: .semibold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
Text(description) Text(info.description)
.font(.system(size: 12, design: .monospaced)) .font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
} }
@@ -254,6 +276,16 @@ struct FeatureRow: View {
} }
} }
#Preview { #Preview("Default") {
AppInfoView() AppInfoView()
} }
#Preview("Dynamic Type XXL") {
AppInfoView()
.environment(\.sizeCategory, .accessibilityExtraExtraExtraLarge)
}
#Preview("Dynamic Type XS") {
AppInfoView()
.environment(\.sizeCategory, .extraSmall)
}
+288 -113
View File
@@ -30,6 +30,7 @@ struct ContentView: View {
@State private var textFieldSelection: NSRange? = nil @State private var textFieldSelection: NSRange? = nil
@FocusState private var isTextFieldFocused: Bool @FocusState private var isTextFieldFocused: Bool
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
@Environment(\.dynamicTypeSize) private var dynamicTypeSize
@State private var showPeerList = false @State private var showPeerList = false
@State private var showSidebar = false @State private var showSidebar = false
@State private var sidebarDragOffset: CGFloat = 0 @State private var sidebarDragOffset: CGFloat = 0
@@ -53,6 +54,9 @@ struct ContentView: View {
@State private var showLocationNotes = false @State private var showLocationNotes = false
@State private var notesGeohash: String? = nil @State private var notesGeohash: String? = nil
@State private var sheetNotesCount: Int = 0 @State private var sheetNotesCount: Int = 0
@ScaledMetric(relativeTo: .body) private var headerHeight: CGFloat = 44
@ScaledMetric(relativeTo: .subheadline) private var headerPeerIconSize: CGFloat = 11
@ScaledMetric(relativeTo: .subheadline) private var headerPeerCountFontSize: CGFloat = 12
// Timer-based refresh removed; use LocationChannelManager live updates instead // Timer-based refresh removed; use LocationChannelManager live updates instead
// Window sizes for rendering (infinite scroll up) // Window sizes for rendering (infinite scroll up)
@State private var windowCountPublic: Int = 300 @State private var windowCountPublic: Int = 300
@@ -63,14 +67,18 @@ struct ContentView: View {
private var backgroundColor: Color { private var backgroundColor: Color {
colorScheme == .dark ? Color.black : Color.white colorScheme == .dark ? Color.black : Color.white
} }
private var textColor: Color { private var textColor: Color {
colorScheme == .dark ? Color.green : Color(red: 0, green: 0.5, blue: 0) colorScheme == .dark ? Color.green : Color(red: 0, green: 0.5, blue: 0)
} }
private var secondaryTextColor: Color { private var secondaryTextColor: Color {
colorScheme == .dark ? Color.green.opacity(0.8) : Color(red: 0, green: 0.5, blue: 0).opacity(0.8) colorScheme == .dark ? Color.green.opacity(0.8) : Color(red: 0, green: 0.5, blue: 0).opacity(0.8)
} }
private var headerLineLimit: Int? {
dynamicTypeSize.isAccessibilitySize ? 2 : 1
}
// MARK: - Body // MARK: - Body
@@ -182,11 +190,14 @@ struct ContentView: View {
} }
} }
.confirmationDialog( .confirmationDialog(
selectedMessageSender.map { "@\($0)" } ?? "Actions", selectedMessageSender.map { "@\($0)" } ?? L10n.string(
"content.actions.title",
comment: "Fallback title for the message action sheet"
),
isPresented: $showMessageActions, isPresented: $showMessageActions,
titleVisibility: .visible titleVisibility: .visible
) { ) {
Button("mention") { Button("content.actions.mention") {
if let sender = selectedMessageSender { if let sender = selectedMessageSender {
// Pre-fill the input with an @mention and focus the field // Pre-fill the input with an @mention and focus the field
messageText = "@\(sender) " messageText = "@\(sender) "
@@ -194,7 +205,7 @@ struct ContentView: View {
} }
} }
Button("direct message") { Button("content.actions.direct_message") {
if let peerID = selectedMessageSenderID { if let peerID = selectedMessageSenderID {
if peerID.hasPrefix("nostr:") { if peerID.hasPrefix("nostr:") {
if let full = viewModel.fullNostrHex(forSenderPeerID: peerID) { if let full = viewModel.fullNostrHex(forSenderPeerID: peerID) {
@@ -209,20 +220,20 @@ struct ContentView: View {
} }
} }
} }
Button("hug") { Button("content.actions.hug") {
if let sender = selectedMessageSender { if let sender = selectedMessageSender {
viewModel.sendMessage("/hug @\(sender)") viewModel.sendMessage("/hug @\(sender)")
} }
} }
Button("slap") { Button("content.actions.slap") {
if let sender = selectedMessageSender { if let sender = selectedMessageSender {
viewModel.sendMessage("/slap @\(sender)") viewModel.sendMessage("/slap @\(sender)")
} }
} }
Button("BLOCK", role: .destructive) { Button("content.actions.block", role: .destructive) {
// Prefer direct geohash block when we have a Nostr sender ID // Prefer direct geohash block when we have a Nostr sender ID
if let peerID = selectedMessageSenderID, peerID.hasPrefix("nostr:"), if let peerID = selectedMessageSenderID, peerID.hasPrefix("nostr:"),
let full = viewModel.fullNostrHex(forSenderPeerID: peerID), let full = viewModel.fullNostrHex(forSenderPeerID: peerID),
@@ -232,18 +243,18 @@ struct ContentView: View {
viewModel.sendMessage("/block \(sender)") viewModel.sendMessage("/block \(sender)")
} }
} }
Button("cancel", role: .cancel) {} Button("common.cancel", role: .cancel) {}
} }
.alert("Bluetooth Required", isPresented: $viewModel.showBluetoothAlert) { .alert("content.alert.bluetooth_required.title", isPresented: $viewModel.showBluetoothAlert) {
Button("Settings") { Button("content.alert.bluetooth_required.settings") {
#if os(iOS) #if os(iOS)
if let url = URL(string: UIApplication.openSettingsURLString) { if let url = URL(string: UIApplication.openSettingsURLString) {
UIApplication.shared.open(url) UIApplication.shared.open(url)
} }
#endif #endif
} }
Button("OK", role: .cancel) {} Button("common.ok", role: .cancel) {}
} message: { } message: {
Text(viewModel.bluetoothAlertMessage) Text(viewModel.bluetoothAlertMessage)
} }
@@ -324,11 +335,12 @@ struct ContentView: View {
// Expand/Collapse for very long messages // Expand/Collapse for very long messages
if (message.content.count > TransportConfig.uiLongMessageLengthThreshold || message.content.hasVeryLongToken(threshold: TransportConfig.uiVeryLongTokenThreshold)) && cashuTokens.isEmpty { if (message.content.count > TransportConfig.uiLongMessageLengthThreshold || message.content.hasVeryLongToken(threshold: TransportConfig.uiVeryLongTokenThreshold)) && cashuTokens.isEmpty {
let isExpanded = expandedMessageIDs.contains(message.id) let isExpanded = expandedMessageIDs.contains(message.id)
Button(isExpanded ? "show less" : "show more") { let labelKey = isExpanded ? LocalizedStringKey("content.message.show_less") : LocalizedStringKey("content.message.show_more")
Button(labelKey) {
if isExpanded { expandedMessageIDs.remove(message.id) } if isExpanded { expandedMessageIDs.remove(message.id) }
else { expandedMessageIDs.insert(message.id) } else { expandedMessageIDs.insert(message.id) }
} }
.font(.system(size: 11, weight: .medium, design: .monospaced)) .font(.bitchatSystem(size: 11, weight: .medium, design: .monospaced))
.foregroundColor(Color.blue) .foregroundColor(Color.blue)
.padding(.top, 4) .padding(.top, 4)
} }
@@ -340,7 +352,10 @@ struct ContentView: View {
let link = lightningLinks[i] let link = lightningLinks[i]
PaymentChipView( PaymentChipView(
emoji: "", emoji: "",
label: "pay via lightning", label: L10n.string(
"content.payment.lightning",
comment: "Label for Lightning payment chip"
),
colorScheme: colorScheme colorScheme: colorScheme
) { ) {
#if os(iOS) #if os(iOS)
@@ -356,7 +371,10 @@ struct ContentView: View {
let urlStr = "cashu:\(enc)" let urlStr = "cashu:\(enc)"
PaymentChipView( PaymentChipView(
emoji: "🥜", emoji: "🥜",
label: "pay via cashu", label: L10n.string(
"content.payment.cashu",
comment: "Label for Cashu payment chip"
),
colorScheme: colorScheme colorScheme: colorScheme
) { ) {
#if os(iOS) #if os(iOS)
@@ -426,7 +444,7 @@ struct ContentView: View {
} }
} }
.contextMenu { .contextMenu {
Button("Copy message") { Button("content.message.copy") {
#if os(iOS) #if os(iOS)
UIPasteboard.general.string = message.content UIPasteboard.general.string = message.content
#else #else
@@ -459,7 +477,7 @@ struct ContentView: View {
if let name = viewModel.meshService.peerNickname(peerID: peerID) { if let name = viewModel.meshService.peerNickname(peerID: peerID) {
selectedMessageSender = name selectedMessageSender = name
} else { } else {
selectedMessageSender = viewModel.messages.last(where: { $0.senderPeer?.id == peerID && $0.sender != "system" })?.sender selectedMessageSender = viewModel.messages.last(where: { $0.senderPeerID == peerID && $0.sender != "system" })?.sender
} }
} }
if viewModel.isSelfSender(peerID: selectedMessageSenderID, displayName: selectedMessageSender) { if viewModel.isSelfSender(peerID: selectedMessageSenderID, displayName: selectedMessageSender) {
@@ -706,7 +724,7 @@ struct ContentView: View {
}) { }) {
HStack { HStack {
Text(suggestion) Text(suggestion)
.font(.system(size: 11, design: .monospaced)) .font(.bitchatSystem(size: 11, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.fontWeight(.medium) .fontWeight(.medium)
Spacer() Spacer()
@@ -764,14 +782,14 @@ struct ContentView: View {
HStack { HStack {
// Show all aliases together // Show all aliases together
Text(info.commands.joined(separator: ", ")) Text(info.commands.joined(separator: ", "))
.font(.system(size: 11, design: .monospaced)) .font(.bitchatSystem(size: 11, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.fontWeight(.medium) .fontWeight(.medium)
// Show syntax if any // Show syntax if any
if let syntax = info.syntax { if let syntax = info.syntax {
Text(syntax) Text(syntax)
.font(.system(size: 10, design: .monospaced)) .font(.bitchatSystem(size: 10, design: .monospaced))
.foregroundColor(secondaryTextColor.opacity(0.8)) .foregroundColor(secondaryTextColor.opacity(0.8))
} }
@@ -779,7 +797,7 @@ struct ContentView: View {
// Show description // Show description
Text(info.description) Text(info.description)
.font(.system(size: 10, design: .monospaced)) .font(.bitchatSystem(size: 10, design: .monospaced))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
} }
.padding(.horizontal, 12) .padding(.horizontal, 12)
@@ -800,9 +818,9 @@ struct ContentView: View {
} }
HStack(alignment: .center, spacing: 4) { HStack(alignment: .center, spacing: 4) {
TextField("type a message...", text: $messageText) TextField("content.input.message_placeholder", text: $messageText)
.textFieldStyle(.plain) .textFieldStyle(.plain)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.focused($isTextFieldFocused) .focused($isTextFieldFocused)
.padding(.leading, 12) .padding(.leading, 12)
@@ -827,18 +845,18 @@ struct ContentView: View {
}() }()
let isGeoDM: Bool = (viewModel.selectedPrivateChatPeer?.hasPrefix("nostr_") == true) let isGeoDM: Bool = (viewModel.selectedPrivateChatPeer?.hasPrefix("nostr_") == true)
var commandDescriptions = [ var commandDescriptions = [
("/block", "block or list blocked peers"), ("/block", L10n.string("content.commands.block", comment: "Description for /block command")),
("/clear", "clear chat messages"), ("/clear", L10n.string("content.commands.clear", comment: "Description for /clear command")),
("/hug", "send someone a warm hug"), ("/hug", L10n.string("content.commands.hug", comment: "Description for /hug command")),
("/m", "send private message"), ("/m", L10n.string("content.commands.message", comment: "Description for /m command")),
("/slap", "slap someone with a trout"), ("/slap", L10n.string("content.commands.slap", comment: "Description for /slap command")),
("/unblock", "unblock a peer"), ("/unblock", L10n.string("content.commands.unblock", comment: "Description for /unblock command")),
("/w", "see who's online") ("/w", L10n.string("content.commands.who", comment: "Description for /w command"))
] ]
// Only show favorites commands when not in geohash context // Only show favorites commands when not in geohash context
if !(isGeoPublic || isGeoDM) { if !(isGeoPublic || isGeoDM) {
commandDescriptions.append(("/fav", "add to favorites")) commandDescriptions.append(("/fav", L10n.string("content.commands.favorite", comment: "Description for /fav command")))
commandDescriptions.append(("/unfav", "remove from favorites")) commandDescriptions.append(("/unfav", L10n.string("content.commands.unfavorite", comment: "Description for /unfav command")))
} }
let input = newValue.lowercased() let input = newValue.lowercased()
@@ -877,15 +895,30 @@ struct ContentView: View {
Button(action: sendMessage) { Button(action: sendMessage) {
Image(systemName: "arrow.up.circle.fill") Image(systemName: "arrow.up.circle.fill")
.font(.system(size: 20)) .font(.bitchatSystem(size: 20))
.foregroundColor(messageText.isEmpty ? Color.gray : .foregroundColor(messageText.isEmpty ? Color.gray :
viewModel.selectedPrivateChatPeer != nil viewModel.selectedPrivateChatPeer != nil
? Color.orange : textColor) ? Color.orange : textColor)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.padding(.trailing, 12) .padding(.trailing, 12)
.accessibilityLabel("Send message") .accessibilityLabel(
.accessibilityHint(messageText.isEmpty ? "Enter a message to send" : "Double tap to send") L10n.string(
"content.accessibility.send_message",
comment: "Accessibility label for the send message button"
)
)
.accessibilityHint(
messageText.isEmpty
? L10n.string(
"content.accessibility.send_hint_empty",
comment: "Hint prompting the user to enter a message"
)
: L10n.string(
"content.accessibility.send_hint_ready",
comment: "Hint prompting the user to send the message"
)
)
} }
.padding(.vertical, 8) .padding(.vertical, 8)
.background(backgroundColor.opacity(0.95)) .background(backgroundColor.opacity(0.95))
@@ -917,21 +950,26 @@ struct ContentView: View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
// Header - match main toolbar height // Header - match main toolbar height
HStack { HStack {
Text("PEOPLE") Text("content.header.people")
.font(.system(size: 16, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
Spacer() Spacer()
// Show QR in mesh on all platforms // Show QR in mesh on all platforms
if case .mesh = locationManager.selectedChannel { if case .mesh = locationManager.selectedChannel {
Button(action: { showVerifySheet = true }) { Button(action: { showVerifySheet = true }) {
Image(systemName: "qrcode") Image(systemName: "qrcode")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.help("Verification: show my QR or scan a friend") .help(
L10n.string(
"content.help.verification",
comment: "Help text for verification button"
)
)
} }
} }
.frame(height: 44) // Match header height .frame(height: headerHeight) // Match header height
.padding(.horizontal, 12) .padding(.horizontal, 12)
.background(backgroundColor.opacity(0.95)) .background(backgroundColor.opacity(0.95))
@@ -1082,7 +1120,7 @@ struct ContentView: View {
private var mainHeaderView: some View { private var mainHeaderView: some View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("bitchat/") Text("bitchat/")
.font(.system(size: 18, weight: .medium, design: .monospaced)) .font(.bitchatSystem(size: 18, weight: .medium, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.onTapGesture(count: 3) { .onTapGesture(count: 3) {
// PANIC: Triple-tap to clear all data // PANIC: Triple-tap to clear all data
@@ -1095,12 +1133,12 @@ struct ContentView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("@") Text("@")
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
TextField("nickname", text: $viewModel.nickname) TextField("content.input.nickname_placeholder", text: $viewModel.nickname)
.textFieldStyle(.plain) .textFieldStyle(.plain)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.frame(maxWidth: 80) .frame(maxWidth: 80)
.foregroundColor(textColor) .foregroundColor(textColor)
.focused($isNicknameFieldFocused) .focused($isNicknameFieldFocused)
@@ -1139,11 +1177,16 @@ struct ContentView: View {
if viewModel.hasAnyUnreadMessages { if viewModel.hasAnyUnreadMessages {
Button(action: { viewModel.openMostRelevantPrivateChat() }) { Button(action: { viewModel.openMostRelevantPrivateChat() }) {
Image(systemName: "envelope.fill") Image(systemName: "envelope.fill")
.font(.system(size: 12)) .font(.bitchatSystem(size: 12))
.foregroundColor(Color.orange) .foregroundColor(Color.orange)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.accessibilityLabel("Open unread private chat") .accessibilityLabel(
L10n.string(
"content.accessibility.open_unread_private_chat",
comment: "Accessibility label for the unread private chat button"
)
)
} }
// Notes icon (mesh only and when location is authorized), to the left of #mesh // Notes icon (mesh only and when location is authorized), to the left of #mesh
if case .mesh = locationManager.selectedChannel, locationManager.permissionState == .authorized { if case .mesh = locationManager.selectedChannel, locationManager.permissionState == .authorized {
@@ -1159,24 +1202,35 @@ struct ContentView: View {
let currentCount = (notesCounter.count ?? 0) let currentCount = (notesCounter.count ?? 0)
let hasNotes = (!notesCounter.initialLoadComplete ? max(currentCount, sheetNotesCount) : currentCount) > 0 let hasNotes = (!notesCounter.initialLoadComplete ? max(currentCount, sheetNotesCount) : currentCount) > 0
Image(systemName: "long.text.page.and.pencil") Image(systemName: "long.text.page.and.pencil")
.font(.system(size: 12)) .font(.bitchatSystem(size: 12))
.foregroundColor(hasNotes ? textColor : Color.gray) .foregroundColor(hasNotes ? textColor : Color.gray)
.padding(.top, 1) .padding(.top, 1)
} }
.fixedSize(horizontal: true, vertical: false) .fixedSize(horizontal: true, vertical: false)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.accessibilityLabel("Location notes for this place") .accessibilityLabel(
L10n.string(
"content.accessibility.location_notes",
comment: "Accessibility label for location notes button"
)
)
} }
// Bookmark toggle (geochats): to the left of #geohash // Bookmark toggle (geochats): to the left of #geohash
if case .location(let ch) = locationManager.selectedChannel { if case .location(let ch) = locationManager.selectedChannel {
Button(action: { GeohashBookmarksStore.shared.toggle(ch.geohash) }) { Button(action: { GeohashBookmarksStore.shared.toggle(ch.geohash) }) {
Image(systemName: GeohashBookmarksStore.shared.isBookmarked(ch.geohash) ? "bookmark.fill" : "bookmark") Image(systemName: GeohashBookmarksStore.shared.isBookmarked(ch.geohash) ? "bookmark.fill" : "bookmark")
.font(.system(size: 12)) .font(.bitchatSystem(size: 12))
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.accessibilityLabel("Toggle bookmark for #\(ch.geohash)") .accessibilityLabel(
L10n.format(
"content.accessibility.toggle_bookmark",
comment: "Accessibility label for toggling a geohash bookmark",
ch.geohash
)
)
} }
// Location channels button '#' // Location channels button '#'
@@ -1196,12 +1250,17 @@ struct ContentView: View {
} }
}() }()
Text(badgeText) Text(badgeText)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(badgeColor) .foregroundColor(badgeColor)
.lineLimit(1) .lineLimit(headerLineLimit)
.fixedSize(horizontal: true, vertical: false) .fixedSize(horizontal: true, vertical: false)
.layoutPriority(2) .layoutPriority(2)
.accessibilityLabel("location channels") .accessibilityLabel(
L10n.string(
"content.accessibility.location_channels",
comment: "Accessibility label for the location channels button"
)
)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.padding(.leading, 4) .padding(.leading, 4)
@@ -1210,15 +1269,23 @@ struct ContentView: View {
HStack(spacing: 4) { HStack(spacing: 4) {
// People icon with count // People icon with count
Image(systemName: "person.2.fill") Image(systemName: "person.2.fill")
.font(.system(size: 11)) .font(.system(size: headerPeerIconSize, weight: .regular))
.accessibilityLabel("\(headerOtherPeersCount) people") .accessibilityLabel(
NSString.localizedStringWithFormat(
NSLocalizedString(
"content.accessibility.people_count",
comment: "Accessibility label announcing number of people in header"
) as NSString,
headerOtherPeersCount
) as String
)
Text("\(headerOtherPeersCount)") Text("\(headerOtherPeersCount)")
.font(.system(size: 12, design: .monospaced)) .font(.system(size: headerPeerCountFontSize, weight: .regular, design: .monospaced))
.accessibilityHidden(true) .accessibilityHidden(true)
} }
.foregroundColor(headerCountColor) .foregroundColor(headerCountColor)
.padding(.leading, 2) .padding(.leading, 2)
.lineLimit(1) .lineLimit(headerLineLimit)
.fixedSize(horizontal: true, vertical: false) .fixedSize(horizontal: true, vertical: false)
// QR moved to the PEOPLE header in the sidebar when on mesh channel // QR moved to the PEOPLE header in the sidebar when on mesh channel
@@ -1235,7 +1302,7 @@ struct ContentView: View {
.environmentObject(viewModel) .environmentObject(viewModel)
} }
} }
.frame(height: 44) .frame(height: headerHeight)
.padding(.horizontal, 12) .padding(.horizontal, 12)
.sheet(isPresented: $showLocationChannelsSheet) { .sheet(isPresented: $showLocationChannelsSheet) {
LocationChannelsSheet(isPresented: $showLocationChannelsSheet) LocationChannelsSheet(isPresented: $showLocationChannelsSheet)
@@ -1250,25 +1317,28 @@ struct ContentView: View {
} else { } else {
VStack(spacing: 12) { VStack(spacing: 12) {
HStack { HStack {
Text("notes") Text("content.notes.title")
.font(.system(size: 16, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
Spacer() Spacer()
Button(action: { showLocationNotes = false }) { Button(action: { showLocationNotes = false }) {
Image(systemName: "xmark") Image(systemName: "xmark")
.font(.system(size: 13, weight: .semibold, design: .monospaced)) .font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.frame(width: 32, height: 32) .frame(width: 32, height: 32)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.accessibilityLabel("Close") .accessibilityLabel(L10n.string(
"common.close",
comment: "Accessibility label for close buttons"
))
} }
.frame(height: 44) .frame(height: headerHeight)
.padding(.horizontal, 12) .padding(.horizontal, 12)
.background(backgroundColor.opacity(0.95)) .background(backgroundColor.opacity(0.95))
Text("location unavailable") Text("content.notes.location_unavailable")
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
Button("enable location") { Button("content.location.enable") {
LocationChannelManager.shared.enableLocationChannels() LocationChannelManager.shared.enableLocationChannels()
LocationChannelManager.shared.refreshChannels() LocationChannelManager.shared.refreshChannels()
} }
@@ -1326,10 +1396,10 @@ struct ContentView: View {
LocationChannelManager.shared.refreshChannels() LocationChannelManager.shared.refreshChannels()
} }
} }
.alert("heads up", isPresented: $viewModel.showScreenshotPrivacyWarning) { .alert("content.alert.screenshot.title", isPresented: $viewModel.showScreenshotPrivacyWarning) {
Button("ok", role: .cancel) {} Button("common.ok", role: .cancel) {}
} message: { } message: {
Text("screenshots of location channels will reveal your location. think before sharing publicly.") Text("content.alert.screenshot.message")
} }
.background(backgroundColor.opacity(0.95)) .background(backgroundColor.opacity(0.95))
} }
@@ -1372,7 +1442,7 @@ struct ContentView: View {
!fav.peerNickname.isEmpty { return fav.peerNickname } !fav.peerNickname.isEmpty { return fav.peerNickname }
// Fallback: resolve from persisted social identity via fingerprint mapping // Fallback: resolve from persisted social identity via fingerprint mapping
if headerPeerID.count == 16 { if headerPeerID.count == 16 {
let candidates = viewModel.identityManager.getCryptoIdentitiesByPeerIDPrefix(Peer(str: headerPeerID)) let candidates = viewModel.identityManager.getCryptoIdentitiesByPeerIDPrefix(headerPeerID)
if let id = candidates.first, if let id = candidates.first,
let social = viewModel.identityManager.getSocialIdentity(for: id.fingerprint) { let social = viewModel.identityManager.getSocialIdentity(for: id.fingerprint) {
if let pet = social.localPetname, !pet.isEmpty { return pet } if let pet = social.localPetname, !pet.isEmpty { return pet }
@@ -1385,7 +1455,10 @@ struct ContentView: View {
if !social.claimedNickname.isEmpty { return social.claimedNickname } if !social.claimedNickname.isEmpty { return social.claimedNickname }
} }
} }
return "Unknown" return L10n.string(
"common.unknown",
comment: "Fallback label for unknown peer"
)
}() }()
let isNostrAvailable: Bool = { let isNostrAvailable: Bool = {
guard let connectionState = peer?.connectionState else { guard let connectionState = peer?.connectionState else {
@@ -1417,21 +1490,36 @@ struct ContentView: View {
case .bluetoothConnected: case .bluetoothConnected:
// Radio icon for mesh connection // Radio icon for mesh connection
Image(systemName: "dot.radiowaves.left.and.right") Image(systemName: "dot.radiowaves.left.and.right")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
.foregroundColor(textColor) .foregroundColor(textColor)
.accessibilityLabel("Connected via mesh") .accessibilityLabel(
L10n.string(
"content.accessibility.connected_mesh",
comment: "Accessibility label for mesh-connected peer indicator"
)
)
case .meshReachable: case .meshReachable:
// point.3 filled icon for reachable via mesh (not directly connected) // point.3 filled icon for reachable via mesh (not directly connected)
Image(systemName: "point.3.filled.connected.trianglepath.dotted") Image(systemName: "point.3.filled.connected.trianglepath.dotted")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
.foregroundColor(textColor) .foregroundColor(textColor)
.accessibilityLabel("Reachable via mesh") .accessibilityLabel(
L10n.string(
"content.accessibility.reachable_mesh",
comment: "Accessibility label for mesh-reachable peer indicator"
)
)
case .nostrAvailable: case .nostrAvailable:
// Purple globe for Nostr // Purple globe for Nostr
Image(systemName: "globe") Image(systemName: "globe")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
.foregroundColor(.purple) .foregroundColor(.purple)
.accessibilityLabel("Available via Nostr") .accessibilityLabel(
L10n.string(
"content.accessibility.available_nostr",
comment: "Accessibility label for Nostr-available peer indicator"
)
)
case .offline: case .offline:
// Should not happen for PM header, but handle gracefully // Should not happen for PM header, but handle gracefully
EmptyView() EmptyView()
@@ -1439,25 +1527,40 @@ struct ContentView: View {
} else if viewModel.meshService.isPeerReachable(headerPeerID) { } else if viewModel.meshService.isPeerReachable(headerPeerID) {
// Fallback: reachable via mesh but not in current peer list // Fallback: reachable via mesh but not in current peer list
Image(systemName: "point.3.filled.connected.trianglepath.dotted") Image(systemName: "point.3.filled.connected.trianglepath.dotted")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
.foregroundColor(textColor) .foregroundColor(textColor)
.accessibilityLabel("Reachable via mesh") .accessibilityLabel(
L10n.string(
"content.accessibility.reachable_mesh",
comment: "Accessibility label for mesh-reachable peer indicator"
)
)
} else if isNostrAvailable { } else if isNostrAvailable {
// Fallback to Nostr if peer not in list but is mutual favorite // Fallback to Nostr if peer not in list but is mutual favorite
Image(systemName: "globe") Image(systemName: "globe")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
.foregroundColor(.purple) .foregroundColor(.purple)
.accessibilityLabel("Available via Nostr") .accessibilityLabel(
L10n.string(
"content.accessibility.available_nostr",
comment: "Accessibility label for Nostr-available peer indicator"
)
)
} else if viewModel.meshService.isPeerConnected(headerPeerID) || viewModel.connectedPeers.contains(headerPeerID) { } else if viewModel.meshService.isPeerConnected(headerPeerID) || viewModel.connectedPeers.contains(headerPeerID) {
// Fallback: if peer lookup is missing but mesh reports connected, show radio // Fallback: if peer lookup is missing but mesh reports connected, show radio
Image(systemName: "dot.radiowaves.left.and.right") Image(systemName: "dot.radiowaves.left.and.right")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
.foregroundColor(textColor) .foregroundColor(textColor)
.accessibilityLabel("Connected via mesh") .accessibilityLabel(
L10n.string(
"content.accessibility.connected_mesh",
comment: "Accessibility label for mesh-connected peer indicator"
)
)
} }
Text("\(privatePeerNick)") Text("\(privatePeerNick)")
.font(.system(size: 16, weight: .medium, design: .monospaced)) .font(.bitchatSystem(size: 16, weight: .medium, design: .monospaced))
.foregroundColor(textColor) // Dynamic encryption status icon (hide for geohash DMs) .foregroundColor(textColor) // Dynamic encryption status icon (hide for geohash DMs)
if !privatePeerID.hasPrefix("nostr_") { if !privatePeerID.hasPrefix("nostr_") {
// Use short peer ID if available for encryption status (sessions keyed by short ID) // Use short peer ID if available for encryption status (sessions keyed by short ID)
@@ -1470,16 +1573,33 @@ struct ContentView: View {
let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID) let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID)
if let icon = encryptionStatus.icon { if let icon = encryptionStatus.icon {
Image(systemName: icon) Image(systemName: icon)
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
.foregroundColor(encryptionStatus == .noiseVerified ? textColor : .foregroundColor(encryptionStatus == .noiseVerified ? textColor :
encryptionStatus == .noiseSecured ? textColor : encryptionStatus == .noiseSecured ? textColor :
Color.red) Color.red)
.accessibilityLabel("Encryption status: \(encryptionStatus == .noiseVerified ? "verified" : encryptionStatus == .noiseSecured ? "secured" : "not encrypted")") .accessibilityLabel(
L10n.format(
"content.accessibility.encryption_status",
comment: "Accessibility label announcing encryption status",
encryptionStatus.accessibilityDescription
)
)
} }
} }
} }
.accessibilityLabel("Private chat with \(privatePeerNick)") .accessibilityLabel(
.accessibilityHint("Tap to view encryption fingerprint") L10n.format(
"content.accessibility.private_chat_header",
comment: "Accessibility label describing the private chat header",
privatePeerNick
)
)
.accessibilityHint(
L10n.string(
"content.accessibility.view_fingerprint_hint",
comment: "Accessibility hint for viewing encryption fingerprint"
)
)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
@@ -1492,13 +1612,18 @@ struct ContentView: View {
} }
}) { }) {
Image(systemName: "chevron.left") Image(systemName: "chevron.left")
.font(.system(size: 12)) .font(.bitchatSystem(size: 12))
.foregroundColor(textColor) .foregroundColor(textColor)
.frame(width: 44, height: 44, alignment: .leading) .frame(width: 44, height: 44, alignment: .leading)
.contentShape(Rectangle()) .contentShape(Rectangle())
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.accessibilityLabel("Back to main chat") .accessibilityLabel(
L10n.string(
"content.accessibility.back_to_main_chat",
comment: "Accessibility label for returning to main chat"
)
)
Spacer() Spacer()
@@ -1508,16 +1633,31 @@ struct ContentView: View {
viewModel.toggleFavorite(peerID: headerPeerID) viewModel.toggleFavorite(peerID: headerPeerID)
}) { }) {
Image(systemName: viewModel.isFavorite(peerID: headerPeerID) ? "star.fill" : "star") Image(systemName: viewModel.isFavorite(peerID: headerPeerID) ? "star.fill" : "star")
.font(.system(size: 16)) .font(.bitchatSystem(size: 16))
.foregroundColor(viewModel.isFavorite(peerID: headerPeerID) ? Color.yellow : textColor) .foregroundColor(viewModel.isFavorite(peerID: headerPeerID) ? Color.yellow : textColor)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.accessibilityLabel(viewModel.isFavorite(peerID: privatePeerID) ? "Remove from favorites" : "Add to favorites") .accessibilityLabel(
.accessibilityHint("Double tap to toggle favorite status") viewModel.isFavorite(peerID: privatePeerID)
? L10n.string(
"content.accessibility.remove_favorite",
comment: "Accessibility label to remove a favorite"
)
: L10n.string(
"content.accessibility.add_favorite",
comment: "Accessibility label to add a favorite"
)
)
.accessibilityHint(
L10n.string(
"content.accessibility.toggle_favorite_hint",
comment: "Accessibility hint for toggling favorite status"
)
)
} }
} }
} }
.frame(height: 44) .frame(height: headerHeight)
.padding(.horizontal, 12) .padding(.horizontal, 12)
.background(backgroundColor.opacity(0.95)) .background(backgroundColor.opacity(0.95))
} }
@@ -1574,7 +1714,7 @@ private struct PaymentChipView: View {
HStack(spacing: 6) { HStack(spacing: 6) {
Text(emoji) Text(emoji)
Text(label) Text(label)
.font(.system(size: 12, weight: .semibold, design: .monospaced)) .font(.bitchatSystem(size: 12, weight: .semibold, design: .monospaced))
} }
.padding(.vertical, 6) .padding(.vertical, 6)
.padding(.horizontal, 12) .padding(.horizontal, 12)
@@ -1608,6 +1748,41 @@ struct DeliveryStatusView: View {
private var secondaryTextColor: Color { private var secondaryTextColor: Color {
colorScheme == .dark ? Color.green.opacity(0.8) : Color(red: 0, green: 0.5, blue: 0).opacity(0.8) colorScheme == .dark ? Color.green.opacity(0.8) : Color(red: 0, green: 0.5, blue: 0).opacity(0.8)
} }
private enum Strings {
static func delivered(to nickname: String) -> String {
L10n.format(
"content.delivery.delivered_to",
comment: "Tooltip for delivered private messages",
nickname
)
}
static func read(by nickname: String) -> String {
L10n.format(
"content.delivery.read_by",
comment: "Tooltip for read private messages",
nickname
)
}
static func failed(_ reason: String) -> String {
L10n.format(
"content.delivery.failed",
comment: "Tooltip for failed message delivery",
reason
)
}
static func deliveredToMembers(_ reached: Int, _ total: Int) -> String {
L10n.format(
"content.delivery.delivered_members",
comment: "Tooltip for partially delivered messages",
reached,
total
)
}
}
// MARK: - Body // MARK: - Body
@@ -1615,49 +1790,49 @@ struct DeliveryStatusView: View {
switch status { switch status {
case .sending: case .sending:
Image(systemName: "circle") Image(systemName: "circle")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(secondaryTextColor.opacity(0.6)) .foregroundColor(secondaryTextColor.opacity(0.6))
case .sent: case .sent:
Image(systemName: "checkmark") Image(systemName: "checkmark")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(secondaryTextColor.opacity(0.6)) .foregroundColor(secondaryTextColor.opacity(0.6))
case .delivered(let nickname, _): case .delivered(let nickname, _):
HStack(spacing: -2) { HStack(spacing: -2) {
Image(systemName: "checkmark") Image(systemName: "checkmark")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
Image(systemName: "checkmark") Image(systemName: "checkmark")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
} }
.foregroundColor(textColor.opacity(0.8)) .foregroundColor(textColor.opacity(0.8))
.help("Delivered to \(nickname)") .help(Strings.delivered(to: nickname))
case .read(let nickname, _): case .read(let nickname, _):
HStack(spacing: -2) { HStack(spacing: -2) {
Image(systemName: "checkmark") Image(systemName: "checkmark")
.font(.system(size: 10, weight: .bold)) .font(.bitchatSystem(size: 10, weight: .bold))
Image(systemName: "checkmark") Image(systemName: "checkmark")
.font(.system(size: 10, weight: .bold)) .font(.bitchatSystem(size: 10, weight: .bold))
} }
.foregroundColor(Color(red: 0.0, green: 0.478, blue: 1.0)) // Bright blue .foregroundColor(Color(red: 0.0, green: 0.478, blue: 1.0)) // Bright blue
.help("Read by \(nickname)") .help(Strings.read(by: nickname))
case .failed(let reason): case .failed(let reason):
Image(systemName: "exclamationmark.triangle") Image(systemName: "exclamationmark.triangle")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(Color.red.opacity(0.8)) .foregroundColor(Color.red.opacity(0.8))
.help("Failed: \(reason)") .help(Strings.failed(reason))
case .partiallyDelivered(let reached, let total): case .partiallyDelivered(let reached, let total):
HStack(spacing: 1) { HStack(spacing: 1) {
Image(systemName: "checkmark") Image(systemName: "checkmark")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
Text("\(reached)/\(total)") Text("\(reached)/\(total)")
.font(.system(size: 10, design: .monospaced)) .font(.bitchatSystem(size: 10, design: .monospaced))
} }
.foregroundColor(secondaryTextColor.opacity(0.6)) .foregroundColor(secondaryTextColor.opacity(0.6))
.help("Delivered to \(reached) of \(total) members") .help(Strings.deliveredToMembers(reached, total))
} }
} }
} }
+58 -28
View File
@@ -21,20 +21,46 @@ struct FingerprintView: View {
private var backgroundColor: Color { private var backgroundColor: Color {
colorScheme == .dark ? Color.black : Color.white colorScheme == .dark ? Color.black : Color.white
} }
private enum Strings {
static let title: LocalizedStringKey = "fingerprint.title"
static let theirFingerprint: LocalizedStringKey = "fingerprint.their_label"
static let handshakePending: LocalizedStringKey = "fingerprint.handshake_pending"
static let yourFingerprint: LocalizedStringKey = "fingerprint.your_label"
static let copy: LocalizedStringKey = "common.copy"
static let verifiedBadge: LocalizedStringKey = "fingerprint.badge.verified"
static let notVerifiedBadge: LocalizedStringKey = "fingerprint.badge.not_verified"
static let verifiedMessage: LocalizedStringKey = "fingerprint.message.verified"
static func verifyHint(_ nickname: String) -> String {
L10n.format(
"fingerprint.message.verify_hint",
comment: "Instruction to compare fingerprints with a named peer",
nickname
)
}
static let markVerified: LocalizedStringKey = "fingerprint.action.mark_verified"
static let removeVerification: LocalizedStringKey = "fingerprint.action.remove_verification"
static func unknownPeer() -> String {
L10n.string(
"common.unknown",
comment: "Label for an unknown peer"
)
}
}
var body: some View { var body: some View {
VStack(spacing: 20) { VStack(spacing: 20) {
// Header // Header
HStack { HStack {
Text("SECURITY VERIFICATION") Text(Strings.title)
.font(.system(size: 16, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
Spacer() Spacer()
Button(action: { dismiss() }) { Button(action: { dismiss() }) {
Image(systemName: "xmark") Image(systemName: "xmark")
.font(.system(size: 14, weight: .semibold)) .font(.bitchatSystem(size: 14, weight: .semibold))
} }
.foregroundColor(textColor) .foregroundColor(textColor)
} }
@@ -58,7 +84,7 @@ struct FingerprintView: View {
if !social.claimedNickname.isEmpty { return social.claimedNickname } if !social.claimedNickname.isEmpty { return social.claimedNickname }
} }
} }
return "Unknown" return Strings.unknownPeer()
}() }()
// Accurate encryption state based on short ID session // Accurate encryption state based on short ID session
let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID) let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID)
@@ -66,17 +92,17 @@ struct FingerprintView: View {
HStack { HStack {
if let icon = encryptionStatus.icon { if let icon = encryptionStatus.icon {
Image(systemName: icon) Image(systemName: icon)
.font(.system(size: 20)) .font(.bitchatSystem(size: 20))
.foregroundColor(encryptionStatus == .noiseVerified ? Color.green : textColor) .foregroundColor(encryptionStatus == .noiseVerified ? Color.green : textColor)
} }
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
Text(peerNickname) Text(peerNickname)
.font(.system(size: 18, weight: .semibold, design: .monospaced)) .font(.bitchatSystem(size: 18, weight: .semibold, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
Text(encryptionStatus.description) Text(encryptionStatus.description)
.font(.system(size: 12, design: .monospaced)) .font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(textColor.opacity(0.7)) .foregroundColor(textColor.opacity(0.7))
} }
@@ -88,13 +114,13 @@ struct FingerprintView: View {
// Their fingerprint // Their fingerprint
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
Text("THEIR FINGERPRINT:") Text(Strings.theirFingerprint)
.font(.system(size: 12, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 12, weight: .bold, design: .monospaced))
.foregroundColor(textColor.opacity(0.7)) .foregroundColor(textColor.opacity(0.7))
if let fingerprint = viewModel.getFingerprint(for: statusPeerID) { if let fingerprint = viewModel.getFingerprint(for: statusPeerID) {
Text(formatFingerprint(fingerprint)) Text(formatFingerprint(fingerprint))
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.lineLimit(nil) .lineLimit(nil)
@@ -104,7 +130,7 @@ struct FingerprintView: View {
.background(Color.gray.opacity(0.1)) .background(Color.gray.opacity(0.1))
.cornerRadius(8) .cornerRadius(8)
.contextMenu { .contextMenu {
Button("Copy") { Button(Strings.copy) {
#if os(iOS) #if os(iOS)
UIPasteboard.general.string = fingerprint UIPasteboard.general.string = fingerprint
#else #else
@@ -114,22 +140,22 @@ struct FingerprintView: View {
} }
} }
} else { } else {
Text("not available - handshake in progress") Text(Strings.handshakePending)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(Color.orange) .foregroundColor(Color.orange)
.padding() .padding()
} }
} }
// My fingerprint // My fingerprint
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
Text("YOUR FINGERPRINT:") Text(Strings.yourFingerprint)
.font(.system(size: 12, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 12, weight: .bold, design: .monospaced))
.foregroundColor(textColor.opacity(0.7)) .foregroundColor(textColor.opacity(0.7))
let myFingerprint = viewModel.getMyFingerprint() let myFingerprint = viewModel.getMyFingerprint()
Text(formatFingerprint(myFingerprint)) Text(formatFingerprint(myFingerprint))
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(textColor) .foregroundColor(textColor)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.lineLimit(nil) .lineLimit(nil)
@@ -139,7 +165,7 @@ struct FingerprintView: View {
.background(Color.gray.opacity(0.1)) .background(Color.gray.opacity(0.1))
.cornerRadius(8) .cornerRadius(8)
.contextMenu { .contextMenu {
Button("Copy") { Button(Strings.copy) {
#if os(iOS) #if os(iOS)
UIPasteboard.general.string = myFingerprint UIPasteboard.general.string = myFingerprint
#else #else
@@ -155,15 +181,19 @@ struct FingerprintView: View {
let isVerified = encryptionStatus == .noiseVerified let isVerified = encryptionStatus == .noiseVerified
VStack(spacing: 12) { VStack(spacing: 12) {
Text(isVerified ? "✓ VERIFIED" : "⚠️ NOT VERIFIED") Text(isVerified ? Strings.verifiedBadge : Strings.notVerifiedBadge)
.font(.system(size: 14, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 14, weight: .bold, design: .monospaced))
.foregroundColor(isVerified ? Color.green : Color.orange) .foregroundColor(isVerified ? Color.green : Color.orange)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
Text(isVerified ? Group {
"you have verified this person's identity." : if isVerified {
"compare these fingerprints with \(peerNickname) using a secure channel.") Text(Strings.verifiedMessage)
.font(.system(size: 12, design: .monospaced)) } else {
Text(Strings.verifyHint(peerNickname))
}
}
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(textColor.opacity(0.7)) .foregroundColor(textColor.opacity(0.7))
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.lineLimit(nil) .lineLimit(nil)
@@ -175,8 +205,8 @@ struct FingerprintView: View {
viewModel.verifyFingerprint(for: peerID) viewModel.verifyFingerprint(for: peerID)
dismiss() dismiss()
}) { }) {
Text("MARK AS VERIFIED") Text(Strings.markVerified)
.font(.system(size: 14, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 14, weight: .bold, design: .monospaced))
.foregroundColor(.white) .foregroundColor(.white)
.padding(.horizontal, 20) .padding(.horizontal, 20)
.padding(.vertical, 10) .padding(.vertical, 10)
@@ -189,8 +219,8 @@ struct FingerprintView: View {
viewModel.unverifyFingerprint(for: peerID) viewModel.unverifyFingerprint(for: peerID)
dismiss() dismiss()
}) { }) {
Text("REMOVE VERIFICATION") Text(Strings.removeVerification)
.font(.system(size: 14, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 14, weight: .bold, design: .monospaced))
.foregroundColor(.white) .foregroundColor(.white)
.padding(.horizontal, 20) .padding(.horizontal, 20)
.padding(.vertical, 10) .padding(.vertical, 10)
+22 -11
View File
@@ -8,11 +8,22 @@ struct GeohashPeopleList: View {
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
@State private var orderedIDs: [String] = [] @State private var orderedIDs: [String] = []
private enum Strings {
static let noneNearby: LocalizedStringKey = "geohash_people.none_nearby"
static let youSuffix: LocalizedStringKey = "geohash_people.you_suffix"
static let blockedTooltip = L10n.string(
"geohash_people.tooltip.blocked",
comment: "Tooltip shown next to users blocked in geohash channels"
)
static let unblock: LocalizedStringKey = "geohash_people.action.unblock"
static let block: LocalizedStringKey = "geohash_people.action.block"
}
var body: some View { var body: some View {
if viewModel.visibleGeohashPeople().isEmpty { if viewModel.visibleGeohashPeople().isEmpty {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
Text("nobody around...") Text(Strings.noneNearby)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
.padding(.horizontal) .padding(.horizontal)
.padding(.top, 12) .padding(.top, 12)
@@ -51,32 +62,32 @@ struct GeohashPeopleList: View {
let icon = teleported ? "face.dashed" : "mappin.and.ellipse" let icon = teleported ? "face.dashed" : "mappin.and.ellipse"
let assignedColor = viewModel.colorForNostrPubkey(person.id, isDark: colorScheme == .dark) let assignedColor = viewModel.colorForNostrPubkey(person.id, isDark: colorScheme == .dark)
let rowColor: Color = isMe ? .orange : assignedColor let rowColor: Color = isMe ? .orange : assignedColor
Image(systemName: icon).font(.system(size: 12)).foregroundColor(rowColor) Image(systemName: icon).font(.bitchatSystem(size: 12)).foregroundColor(rowColor)
let (base, suffix) = splitSuffix(from: person.displayName) let (base, suffix) = splitSuffix(from: person.displayName)
HStack(spacing: 0) { HStack(spacing: 0) {
Text(base) Text(base)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.fontWeight(isMe ? .bold : .regular) .fontWeight(isMe ? .bold : .regular)
.foregroundColor(rowColor) .foregroundColor(rowColor)
if !suffix.isEmpty { if !suffix.isEmpty {
let suffixColor = isMe ? Color.orange.opacity(0.6) : rowColor.opacity(0.6) let suffixColor = isMe ? Color.orange.opacity(0.6) : rowColor.opacity(0.6)
Text(suffix) Text(suffix)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(suffixColor) .foregroundColor(suffixColor)
} }
if isMe { if isMe {
Text(" (you)") Text(Strings.youSuffix)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(rowColor) .foregroundColor(rowColor)
} }
} }
if let me = myHex, person.id != me { if let me = myHex, person.id != me {
if viewModel.isGeohashUserBlocked(pubkeyHexLowercased: person.id) { if viewModel.isGeohashUserBlocked(pubkeyHexLowercased: person.id) {
Image(systemName: "nosign") Image(systemName: "nosign")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(.red) .foregroundColor(.red)
.help("Blocked in geochash") .help(Strings.blockedTooltip)
} }
} }
Spacer() Spacer()
@@ -97,9 +108,9 @@ struct GeohashPeopleList: View {
} else { } else {
let blocked = viewModel.isGeohashUserBlocked(pubkeyHexLowercased: person.id) let blocked = viewModel.isGeohashUserBlocked(pubkeyHexLowercased: person.id)
if blocked { if blocked {
Button("Unblock") { viewModel.unblockGeohashUser(pubkeyHexLowercased: person.id, displayName: person.displayName) } Button(Strings.unblock) { viewModel.unblockGeohashUser(pubkeyHexLowercased: person.id, displayName: person.displayName) }
} else { } else {
Button("Block") { viewModel.blockGeohashUser(pubkeyHexLowercased: person.id, displayName: person.displayName) } Button(Strings.block) { viewModel.blockGeohashUser(pubkeyHexLowercased: person.id, displayName: person.displayName) }
} }
} }
} }
+292 -228
View File
@@ -17,21 +17,89 @@ struct LocationChannelsSheet: View {
private var backgroundColor: Color { colorScheme == .dark ? .black : .white } private var backgroundColor: Color { colorScheme == .dark ? .black : .white }
private enum Strings {
static let title: LocalizedStringKey = "location_channels.title"
static let description: LocalizedStringKey = "location_channels.description"
static let requestPermissions: LocalizedStringKey = "location_channels.action.request_permissions"
static let permissionDenied: LocalizedStringKey = "location_channels.permission_denied"
static let openSettings: LocalizedStringKey = "location_channels.action.open_settings"
static let loadingNearby: LocalizedStringKey = "location_channels.loading_nearby"
static let teleport: LocalizedStringKey = "location_channels.action.teleport"
static let bookmarked: LocalizedStringKey = "location_channels.bookmarked_section_title"
static let removeAccess: LocalizedStringKey = "location_channels.action.remove_access"
static let torTitle: LocalizedStringKey = "location_channels.tor.title"
static let torSubtitle: LocalizedStringKey = "location_channels.tor.subtitle"
static let toggleOn: LocalizedStringKey = "common.toggle.on"
static let toggleOff: LocalizedStringKey = "common.toggle.off"
static let invalidGeohash = L10n.string(
"location_channels.error.invalid_geohash",
comment: "Error shown when a custom geohash is invalid"
)
static func meshTitle(_ count: Int) -> String {
let label = L10n.string(
"location_channels.mesh_label",
comment: "Label for the mesh channel row"
)
return rowTitle(label: label, count: count)
}
static func levelTitle(for level: GeohashChannelLevel, count: Int) -> String {
return rowTitle(label: level.displayName, count: count)
}
static func bookmarkTitle(geohash: String, count: Int) -> String {
return rowTitle(label: "#\(geohash)", count: count)
}
static func subtitlePrefix(geohash: String, coverage: String) -> String {
L10n.format(
"location_channels.subtitle_prefix",
comment: "Subtitle prefix showing geohash and coverage",
geohash,
coverage
)
}
static func subtitle(prefix: String, name: String?) -> String {
guard let name, !name.isEmpty else { return prefix }
return L10n.format(
"location_channels.subtitle_with_name",
comment: "Subtitle combining prefix and resolved location name",
prefix,
name
)
}
private static func rowTitle(label: String, count: Int) -> String {
let format = NSLocalizedString(
"location_channels.row_title",
comment: "List row title with participant count"
)
return NSString.localizedStringWithFormat(format as NSString, label, count) as String
}
}
var body: some View { var body: some View {
NavigationView { NavigationView {
VStack(alignment: .leading, spacing: 12) { VStack(alignment: .leading, spacing: 12) {
Text("#location channels") HStack(spacing: 12) {
.font(.system(size: 18, design: .monospaced)) Text(Strings.title)
Text("chat with people near you using geohash channels. only a coarse geohash is shared, never exact gps. your IP address is hidden by routing all traffic over tor.") .font(.bitchatSystem(size: 18, design: .monospaced))
.font(.system(size: 12, design: .monospaced)) Spacer()
closeButton
}
Text(Strings.description)
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.secondary) .foregroundColor(.secondary)
Group { Group {
switch manager.permissionState { switch manager.permissionState {
case LocationChannelManager.PermissionState.notDetermined: case LocationChannelManager.PermissionState.notDetermined:
Button(action: { manager.enableLocationChannels() }) { Button(action: { manager.enableLocationChannels() }) {
Text("get location and my geohashes") Text(Strings.requestPermissions)
.font(.system(size: 12, design: .monospaced)) .font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(standardGreen) .foregroundColor(standardGreen)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.padding(.vertical, 6) .padding(.vertical, 6)
@@ -41,10 +109,10 @@ struct LocationChannelsSheet: View {
.buttonStyle(.plain) .buttonStyle(.plain)
case LocationChannelManager.PermissionState.denied, LocationChannelManager.PermissionState.restricted: case LocationChannelManager.PermissionState.denied, LocationChannelManager.PermissionState.restricted:
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
Text("location permission denied. enable in settings to use location channels.") Text(Strings.permissionDenied)
.font(.system(size: 12, design: .monospaced)) .font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.secondary) .foregroundColor(.secondary)
Button("open settings") { openSystemLocationSettings() } Button(Strings.openSettings) { openSystemLocationSettings() }
.buttonStyle(.plain) .buttonStyle(.plain)
} }
case LocationChannelManager.PermissionState.authorized: case LocationChannelManager.PermissionState.authorized:
@@ -60,29 +128,9 @@ struct LocationChannelsSheet: View {
.background(backgroundColor) .background(backgroundColor)
#if os(iOS) #if os(iOS)
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
.toolbar { .navigationBarHidden(true)
ToolbarItem(placement: .navigationBarTrailing) {
Button(action: { isPresented = false }) {
Image(systemName: "xmark")
.font(.system(size: 13, weight: .semibold, design: .monospaced))
.frame(width: 32, height: 32)
}
.buttonStyle(.plain)
.accessibilityLabel("Close")
}
}
#else #else
.toolbar { .navigationTitle("")
ToolbarItem(placement: .automatic) {
Button(action: { isPresented = false }) {
Image(systemName: "xmark")
.font(.system(size: 13, weight: .semibold, design: .monospaced))
.frame(width: 20, height: 20)
}
.buttonStyle(.plain)
.accessibilityLabel("Close")
}
}
#endif #endif
} }
#if os(iOS) #if os(iOS)
@@ -112,183 +160,225 @@ struct LocationChannelsSheet: View {
.onChange(of: manager.availableChannels) { _ in } .onChange(of: manager.availableChannels) { _ in }
} }
private var channelList: some View { private var closeButton: some View {
List { Button(action: { isPresented = false }) {
// Mesh option first (no bookmark) Image(systemName: "xmark")
channelRow(title: meshTitleWithCount(), subtitlePrefix: "#bluetooth • \(bluetoothRangeString())", isSelected: isMeshSelected, titleColor: standardBlue, titleBold: meshCount() > 0) { .font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
manager.select(ChannelID.mesh) .frame(width: 32, height: 32)
isPresented = false }
} .buttonStyle(.plain)
.accessibilityLabel("Close")
}
// Nearby options private var channelList: some View {
if !manager.availableChannels.isEmpty { ScrollView {
ForEach(manager.availableChannels.filter { $0.level != .building }) { channel in LazyVStack(spacing: 0) {
let coverage = coverageString(forPrecision: channel.geohash.count) channelRow(title: Strings.meshTitle(meshCount()), subtitlePrefix: Strings.subtitlePrefix(geohash: "bluetooth", coverage: bluetoothRangeString()), isSelected: isMeshSelected, titleColor: standardBlue, titleBold: meshCount() > 0) {
let nameBase = locationName(for: channel.level) manager.select(ChannelID.mesh)
let namePart = nameBase.map { formattedNamePrefix(for: channel.level) + $0 } isPresented = false
let subtitlePrefix = "#\(channel.geohash)\(coverage)" }
let highlight = viewModel.geohashParticipantCount(for: channel.geohash) > 0 .padding(.vertical, 6)
let nearby = manager.availableChannels.filter { $0.level != .building }
if !nearby.isEmpty {
ForEach(nearby) { channel in
sectionDivider
let coverage = coverageString(forPrecision: channel.geohash.count)
let nameBase = locationName(for: channel.level)
let namePart = nameBase.map { formattedNamePrefix(for: channel.level) + $0 }
let participantCount = viewModel.geohashParticipantCount(for: channel.geohash)
let subtitlePrefix = Strings.subtitlePrefix(geohash: channel.geohash, coverage: coverage)
let highlight = participantCount > 0
channelRow(
title: Strings.levelTitle(for: channel.level, count: participantCount),
subtitlePrefix: subtitlePrefix,
subtitleName: namePart,
isSelected: isSelected(channel),
titleBold: highlight,
trailingAccessory: {
Button(action: { bookmarks.toggle(channel.geohash) }) {
Image(systemName: bookmarks.isBookmarked(channel.geohash) ? "bookmark.fill" : "bookmark")
.font(.bitchatSystem(size: 14))
}
.buttonStyle(.plain)
.padding(.leading, 8)
}
) {
manager.markTeleported(for: channel.geohash, false)
manager.select(ChannelID.location(channel))
isPresented = false
}
.padding(.vertical, 6)
}
} else {
sectionDivider
HStack(spacing: 8) {
ProgressView()
Text(Strings.loadingNearby)
.font(.bitchatSystem(size: 12, design: .monospaced))
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 10)
}
sectionDivider
customTeleportSection
.padding(.vertical, 8)
let bookmarkedList = bookmarks.bookmarks
if !bookmarkedList.isEmpty {
sectionDivider
bookmarkedSection(bookmarkedList)
.padding(.vertical, 8)
}
if manager.permissionState == LocationChannelManager.PermissionState.authorized {
sectionDivider
torToggleSection
.padding(.top, 12)
Button(action: {
openSystemLocationSettings()
}) {
Text(Strings.removeAccess)
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(Color(red: 0.75, green: 0.1, blue: 0.1))
.frame(maxWidth: .infinity)
.padding(.vertical, 6)
.background(Color.red.opacity(0.08))
.cornerRadius(6)
}
.buttonStyle(.plain)
.padding(.vertical, 8)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.vertical, 6)
.background(backgroundColor)
}
.background(backgroundColor)
}
private var sectionDivider: some View {
Rectangle()
.fill(dividerColor)
.frame(height: 1)
}
private var dividerColor: Color {
colorScheme == .dark ? Color.white.opacity(0.12) : Color.black.opacity(0.08)
}
private var customTeleportSection: some View {
VStack(alignment: .leading, spacing: 6) {
HStack(spacing: 2) {
Text("#")
.font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(.secondary)
TextField("geohash", text: $customGeohash)
#if os(iOS)
.textInputAutocapitalization(.never)
.autocorrectionDisabled(true)
.keyboardType(.asciiCapable)
#endif
.font(.bitchatSystem(size: 14, design: .monospaced))
.onChange(of: customGeohash) { newValue in
let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz")
let filtered = newValue
.lowercased()
.replacingOccurrences(of: "#", with: "")
.filter { allowed.contains($0) }
if filtered.count > 12 {
customGeohash = String(filtered.prefix(12))
} else if filtered != newValue {
customGeohash = filtered
}
}
let normalized = customGeohash
.trimmingCharacters(in: .whitespacesAndNewlines)
.lowercased()
.replacingOccurrences(of: "#", with: "")
let isValid = validateGeohash(normalized)
Button(action: {
let gh = normalized
guard isValid else { customError = Strings.invalidGeohash; return }
let level = levelForLength(gh.count)
let ch = GeohashChannel(level: level, geohash: gh)
manager.markTeleported(for: ch.geohash, true)
manager.select(ChannelID.location(ch))
isPresented = false
}) {
HStack(spacing: 6) {
Text(Strings.teleport)
.font(.bitchatSystem(size: 14, design: .monospaced))
Image(systemName: "face.dashed")
.font(.bitchatSystem(size: 14))
}
}
.buttonStyle(.plain)
.font(.bitchatSystem(size: 14, design: .monospaced))
.padding(.vertical, 6)
.padding(.horizontal, 10)
.background(Color.secondary.opacity(0.12))
.cornerRadius(6)
.opacity(isValid ? 1.0 : 0.4)
.disabled(!isValid)
}
if let err = customError {
Text(err)
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.red)
}
}
}
private func bookmarkedSection(_ entries: [String]) -> some View {
VStack(alignment: .leading, spacing: 8) {
Text(Strings.bookmarked)
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.secondary)
LazyVStack(spacing: 0) {
ForEach(Array(entries.enumerated()), id: \.offset) { index, gh in
let level = levelForLength(gh.count)
let channel = GeohashChannel(level: level, geohash: gh)
let coverage = coverageString(forPrecision: gh.count)
let subtitle = Strings.subtitlePrefix(geohash: gh, coverage: coverage)
let name = bookmarks.bookmarkNames[gh]
let participantCount = viewModel.geohashParticipantCount(for: gh)
channelRow( channelRow(
title: geohashTitleWithCount(for: channel), title: Strings.bookmarkTitle(geohash: gh, count: participantCount),
subtitlePrefix: subtitlePrefix, subtitlePrefix: subtitle,
subtitleName: namePart, subtitleName: name.map { formattedNamePrefix(for: level) + $0 },
isSelected: isSelected(channel), isSelected: isSelected(channel),
titleBold: highlight,
trailingAccessory: { trailingAccessory: {
Button(action: { bookmarks.toggle(channel.geohash) }) { Button(action: { bookmarks.toggle(gh) }) {
Image(systemName: bookmarks.isBookmarked(channel.geohash) ? "bookmark.fill" : "bookmark") Image(systemName: bookmarks.isBookmarked(gh) ? "bookmark.fill" : "bookmark")
.font(.system(size: 14)) .font(.bitchatSystem(size: 14))
} }
.buttonStyle(.plain) .buttonStyle(.plain)
.padding(.leading, 8) .padding(.leading, 8)
} }
) { ) {
// Selecting a suggested nearby channel is not a teleport. Persist this. let inRegional = manager.availableChannels.contains { $0.geohash == gh }
manager.markTeleported(for: channel.geohash, false) if !inRegional && !manager.availableChannels.isEmpty {
manager.markTeleported(for: gh, true)
} else {
manager.markTeleported(for: gh, false)
}
manager.select(ChannelID.location(channel)) manager.select(ChannelID.location(channel))
isPresented = false isPresented = false
} }
}
} else {
HStack {
ProgressView()
Text("finding nearby channels…")
.font(.system(size: 12, design: .monospaced))
}
}
// Custom geohash teleport
VStack(alignment: .leading, spacing: 6) {
HStack(spacing: 2) {
Text("#")
.font(.system(size: 14, design: .monospaced))
.foregroundColor(.secondary)
TextField("geohash", text: $customGeohash)
#if os(iOS)
.textInputAutocapitalization(.never)
.autocorrectionDisabled(true)
.keyboardType(.asciiCapable)
#endif
.font(.system(size: 14, design: .monospaced))
.onChange(of: customGeohash) { newValue in
// Allow only geohash base32 characters, strip '#', limit length
let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz")
let filtered = newValue
.lowercased()
.replacingOccurrences(of: "#", with: "")
.filter { allowed.contains($0) }
if filtered.count > 12 {
customGeohash = String(filtered.prefix(12))
} else if filtered != newValue {
customGeohash = filtered
}
}
let normalized = customGeohash.trimmingCharacters(in: .whitespacesAndNewlines).lowercased().replacingOccurrences(of: "#", with: "")
let isValid = validateGeohash(normalized)
Button(action: {
let gh = normalized
guard isValid else { customError = "invalid geohash"; return }
let level = levelForLength(gh.count)
let ch = GeohashChannel(level: level, geohash: gh)
// Mark this selection as a manual teleport
manager.markTeleported(for: ch.geohash, true)
manager.select(ChannelID.location(ch))
isPresented = false
}) {
HStack(spacing: 6) {
Text("teleport")
.font(.system(size: 14, design: .monospaced))
Image(systemName: "face.dashed")
.font(.system(size: 14))
}
}
.buttonStyle(.plain)
.font(.system(size: 14, design: .monospaced))
.padding(.horizontal, 10)
.padding(.vertical, 6) .padding(.vertical, 6)
.background(Color.secondary.opacity(0.12)) .onAppear { bookmarks.resolveNameIfNeeded(for: gh) }
.cornerRadius(6)
.opacity(isValid ? 1.0 : 0.4)
.disabled(!isValid)
}
if let err = customError {
Text(err)
.font(.system(size: 12, design: .monospaced))
.foregroundColor(.red)
}
}
// Bookmarked geohashes if index < entries.count - 1 {
if !bookmarks.bookmarks.isEmpty { sectionDivider
VStack(alignment: .leading, spacing: 8) {
Text("bookmarked")
.font(.system(size: 12, design: .monospaced))
.foregroundColor(.secondary)
VStack(spacing: 6) {
ForEach(bookmarks.bookmarks, id: \.self) { gh in
let level = levelForLength(gh.count)
let channel = GeohashChannel(level: level, geohash: gh)
let coverage = coverageString(forPrecision: gh.count)
let subtitle = "#\(gh)\(coverage)"
let name = bookmarks.bookmarkNames[gh]
channelRow(
title: geohashHashTitleWithCount(gh),
subtitlePrefix: subtitle,
subtitleName: name.map { formattedNamePrefix(for: level) + $0 },
isSelected: isSelected(channel),
trailingAccessory: {
Button(action: { bookmarks.toggle(gh) }) {
Image(systemName: bookmarks.isBookmarked(gh) ? "bookmark.fill" : "bookmark")
.font(.system(size: 14))
}
.buttonStyle(.plain)
.padding(.leading, 8)
}
) {
// For bookmarked selection, mark teleported based on regional membership
let inRegional = manager.availableChannels.contains { $0.geohash == gh }
if !inRegional && !manager.availableChannels.isEmpty {
manager.markTeleported(for: gh, true)
} else {
manager.markTeleported(for: gh, false)
}
manager.select(ChannelID.location(channel))
isPresented = false
}
.onAppear { bookmarks.resolveNameIfNeeded(for: gh) }
}
} }
.padding(12)
.background(Color.secondary.opacity(0.12))
.cornerRadius(8)
} }
.listRowSeparator(.hidden)
}
// Footer action inside the list
if manager.permissionState == LocationChannelManager.PermissionState.authorized {
torToggleSection
Button(action: {
openSystemLocationSettings()
}) {
Text("remove location access")
.font(.system(size: 12, design: .monospaced))
.foregroundColor(Color(red: 0.75, green: 0.1, blue: 0.1))
.frame(maxWidth: .infinity)
.padding(.vertical, 6)
.background(Color.red.opacity(0.08))
.cornerRadius(6)
}
.buttonStyle(.plain)
.listRowSeparator(.hidden)
.listRowBackground(Color.clear)
} }
} }
.listStyle(.plain)
.scrollContentBackground(.hidden)
.background(backgroundColor)
} }
private func isSelected(_ channel: GeohashChannel) -> Bool { private func isSelected(_ channel: GeohashChannel) -> Bool {
if case .location(let ch) = manager.selectedChannel { if case .location(let ch) = manager.selectedChannel {
return ch == channel return ch == channel
@@ -319,23 +409,18 @@ struct LocationChannelsSheet: View {
let parts = splitTitleAndCount(title) let parts = splitTitleAndCount(title)
HStack(spacing: 4) { HStack(spacing: 4) {
Text(parts.base) Text(parts.base)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.fontWeight(titleBold ? .bold : .regular) .fontWeight(titleBold ? .bold : .regular)
.foregroundColor(titleColor ?? Color.primary) .foregroundColor(titleColor ?? Color.primary)
if let count = parts.countSuffix, !count.isEmpty { if let count = parts.countSuffix, !count.isEmpty {
Text(count) Text(count)
.font(.system(size: 11, design: .monospaced)) .font(.bitchatSystem(size: 11, design: .monospaced))
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
} }
let subtitleFull: String = { let subtitleFull = Strings.subtitle(prefix: subtitlePrefix, name: subtitleName)
if let name = subtitleName, !name.isEmpty {
return subtitlePrefix + "" + name
}
return subtitlePrefix
}()
Text(subtitleFull) Text(subtitleFull)
.font(.system(size: 12, design: .monospaced)) .font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.secondary) .foregroundColor(.secondary)
.lineLimit(1) .lineLimit(1)
.truncationMode(.tail) .truncationMode(.tail)
@@ -343,7 +428,7 @@ struct LocationChannelsSheet: View {
Spacer() Spacer()
if isSelected { if isSelected {
Text("✔︎") Text("✔︎")
.font(.system(size: 16, design: .monospaced)) .font(.bitchatSystem(size: 16, design: .monospaced))
.foregroundColor(standardGreen) .foregroundColor(standardGreen)
} }
trailingAccessory() trailingAccessory()
@@ -362,13 +447,6 @@ struct LocationChannelsSheet: View {
} }
// MARK: - Helpers for counts // MARK: - Helpers for counts
private func meshTitleWithCount() -> String {
// Count currently connected mesh peers (excluding self)
let meshCount = meshCount()
let noun = meshCount == 1 ? "person" : "people"
return "mesh [\(meshCount) \(noun)]"
}
private func meshCount() -> Int { private func meshCount() -> Int {
// Count mesh-connected OR mesh-reachable peers (exclude self) // Count mesh-connected OR mesh-reachable peers (exclude self)
let myID = viewModel.meshService.myPeerID let myID = viewModel.meshService.myPeerID
@@ -378,20 +456,6 @@ struct LocationChannelsSheet: View {
} }
} }
private func geohashTitleWithCount(for channel: GeohashChannel) -> String {
// Main list: keep level labels (block/neighborhood/city/province/region)
let count = viewModel.geohashParticipantCount(for: channel.geohash)
let noun = count == 1 ? "person" : "people"
return "\(channel.level.displayName.lowercased()) [\(count) \(noun)]"
}
private func geohashHashTitleWithCount(_ geohash: String) -> String {
// Bookmarked list: show the #geohash as the main label
let count = viewModel.geohashParticipantCount(for: geohash)
let noun = count == 1 ? "person" : "people"
return "#\(geohash) [\(count) \(noun)]"
}
private func validateGeohash(_ s: String) -> Bool { private func validateGeohash(_ s: String) -> Bool {
let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz") let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz")
guard !s.isEmpty, s.count <= 12 else { return false } guard !s.isEmpty, s.count <= 12 else { return false }
@@ -424,21 +488,19 @@ extension LocationChannelsSheet {
VStack(alignment: .leading, spacing: 8) { VStack(alignment: .leading, spacing: 8) {
Toggle(isOn: torToggleBinding) { Toggle(isOn: torToggleBinding) {
VStack(alignment: .leading, spacing: 2) { VStack(alignment: .leading, spacing: 2) {
Text("tor routing") Text(Strings.torTitle)
.font(.system(size: 12, weight: .semibold, design: .monospaced)) .font(.bitchatSystem(size: 12, weight: .semibold, design: .monospaced))
.foregroundColor(.primary) .foregroundColor(.primary)
Text("hides your ip for location channels. recommended: on.") Text(Strings.torSubtitle)
.font(.system(size: 11, design: .monospaced)) .font(.bitchatSystem(size: 11, design: .monospaced))
.foregroundColor(.secondary) .foregroundColor(.secondary)
} }
} }
.toggleStyle(IRCToggleStyle(accent: standardGreen)) .toggleStyle(IRCToggleStyle(accent: standardGreen, onLabel: Strings.toggleOn, offLabel: Strings.toggleOff))
} }
.padding(12) .padding(12)
.background(Color.secondary.opacity(0.12)) .background(Color.secondary.opacity(0.12))
.cornerRadius(8) .cornerRadius(8)
.listRowSeparator(.hidden)
.listRowBackground(Color.clear)
} }
private var standardGreen: Color { private var standardGreen: Color {
@@ -451,15 +513,17 @@ extension LocationChannelsSheet {
private struct IRCToggleStyle: ToggleStyle { private struct IRCToggleStyle: ToggleStyle {
let accent: Color let accent: Color
let onLabel: LocalizedStringKey
let offLabel: LocalizedStringKey
func makeBody(configuration: Configuration) -> some View { func makeBody(configuration: Configuration) -> some View {
Button(action: { configuration.isOn.toggle() }) { Button(action: { configuration.isOn.toggle() }) {
HStack(spacing: 12) { HStack(spacing: 12) {
configuration.label configuration.label
Spacer() Spacer()
Text(configuration.isOn ? "on" : "off") Text(configuration.isOn ? onLabel : offLabel)
.textCase(.uppercase) .textCase(.uppercase)
.font(.system(size: 12, weight: .semibold, design: .monospaced)) .font(.bitchatSystem(size: 12, weight: .semibold, design: .monospaced))
.foregroundColor(configuration.isOn ? accent : .secondary) .foregroundColor(configuration.isOn ? accent : .secondary)
.padding(.vertical, 4) .padding(.vertical, 4)
.padding(.horizontal, 10) .padding(.horizontal, 10)
+223 -111
View File
@@ -7,6 +7,7 @@ struct LocationNotesView: View {
let onNotesCountChanged: ((Int) -> Void)? let onNotesCountChanged: ((Int) -> Void)?
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
@Environment(\.dynamicTypeSize) private var dynamicTypeSize
@ObservedObject private var locationManager = LocationChannelManager.shared @ObservedObject private var locationManager = LocationChannelManager.shared
@Environment(\.dismiss) private var dismiss @Environment(\.dismiss) private var dismiss
@State private var draft: String = "" @State private var draft: String = ""
@@ -18,30 +19,42 @@ struct LocationNotesView: View {
_manager = StateObject(wrappedValue: LocationNotesManager(geohash: gh)) _manager = StateObject(wrappedValue: LocationNotesManager(geohash: gh))
} }
private var backgroundColor: Color { private var backgroundColor: Color { colorScheme == .dark ? .black : .white }
colorScheme == .dark ? Color.black : Color.white private var accentGreen: Color { colorScheme == .dark ? .green : Color(red: 0, green: 0.5, blue: 0) }
} private var maxDraftLines: Int { dynamicTypeSize.isAccessibilitySize ? 5 : 3 }
private var textColor: Color {
colorScheme == .dark ? Color.green : Color(red: 0, green: 0.5, blue: 0) private enum Strings {
} static let closeAccessibility = L10n.string(
private var secondaryTextColor: Color { "common.close",
colorScheme == .dark ? Color.green.opacity(0.8) : Color(red: 0, green: 0.5, blue: 0).opacity(0.8) comment: "Accessibility label for close buttons"
} )
// Slightly darker green for hash suffix emphasis static let description: LocalizedStringKey = "location_notes.description"
private var darkerTextColor: Color { static let loadingRecent: LocalizedStringKey = "location_notes.loading_recent"
colorScheme == .dark ? Color.green : Color(red: 0, green: 0.4, blue: 0) static let relaysPaused: LocalizedStringKey = "location_notes.relays_paused"
static let noRelaysNearby: LocalizedStringKey = "location_notes.no_relays_nearby"
static let retry: LocalizedStringKey = "location_notes.action.retry"
static let relaysRetryHint: LocalizedStringKey = "location_notes.relays_retry_hint"
static let loadingNotes: LocalizedStringKey = "location_notes.loading_notes"
static let emptyTitle: LocalizedStringKey = "location_notes.empty_title"
static let emptySubtitle: LocalizedStringKey = "location_notes.empty_subtitle"
static let dismissError: LocalizedStringKey = "location_notes.action.dismiss"
static let addPlaceholder: LocalizedStringKey = "location_notes.placeholder"
} }
var body: some View { var body: some View {
#if os(macOS)
VStack(spacing: 0) { VStack(spacing: 0) {
header ScrollView {
Divider() VStack(spacing: 0) {
list headerSection
Divider() notesContent
input }
}
.background(backgroundColor)
inputSection
} }
.frame(minWidth: 420, idealWidth: 440, minHeight: 620, idealHeight: 680)
.background(backgroundColor) .background(backgroundColor)
.foregroundColor(textColor)
.onDisappear { manager.cancel() } .onDisappear { manager.cancel() }
.onChange(of: geohash) { newValue in .onChange(of: geohash) { newValue in
manager.setGeohash(newValue) manager.setGeohash(newValue)
@@ -50,100 +63,210 @@ struct LocationNotesView: View {
.onChange(of: manager.notes.count) { newValue in .onChange(of: manager.notes.count) { newValue in
onNotesCountChanged?(newValue) onNotesCountChanged?(newValue)
} }
#else
NavigationView {
VStack(spacing: 0) {
headerSection
ScrollView {
notesContent
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
inputSection
}
.background(backgroundColor)
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
.navigationBarHidden(true)
#else
.navigationTitle("")
#endif
}
#if os(iOS)
.presentationDetents([.large])
#endif
.background(backgroundColor)
.onDisappear { manager.cancel() }
.onChange(of: geohash) { newValue in
manager.setGeohash(newValue)
}
.onAppear { onNotesCountChanged?(manager.notes.count) }
.onChange(of: manager.notes.count) { newValue in
onNotesCountChanged?(newValue)
}
#endif
} }
private var header: some View { private var closeButton: some View {
HStack { Button(action: { dismiss() }) {
VStack(alignment: .leading, spacing: 2) { Image(systemName: "xmark")
HStack(spacing: 4) { .font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
let c = manager.notes.count .frame(width: 32, height: 32)
Text("\(c) \(c == 1 ? "note" : "notes") ")
.font(.system(size: 16, weight: .bold, design: .monospaced))
Text("@ ")
.font(.system(size: 16, weight: .bold, design: .monospaced))
Text("#\(geohash)")
.font(.system(size: 16, weight: .bold, design: .monospaced))
.foregroundColor(textColor)
}
if let buildingName = locationManager.locationNames[.building], !buildingName.isEmpty {
Text(buildingName)
.font(.system(size: 12, design: .monospaced))
.foregroundColor(secondaryTextColor)
} else if let blockName = locationManager.locationNames[.block], !blockName.isEmpty {
Text(blockName)
.font(.system(size: 12, design: .monospaced))
.foregroundColor(secondaryTextColor)
}
}
Spacer()
Button(action: { dismiss() }) {
Image(systemName: "xmark")
.font(.system(size: 13, weight: .semibold, design: .monospaced))
.foregroundColor(textColor)
.frame(width: 32, height: 32)
.contentShape(Rectangle())
}
.buttonStyle(.plain)
.accessibilityLabel("Close")
} }
.frame(height: 44) .buttonStyle(.plain)
.padding(.horizontal, 12) .accessibilityLabel(Strings.closeAccessibility)
.background(backgroundColor.opacity(0.95))
} }
private var list: some View { private var headerSection: some View {
ScrollView { let count = manager.notes.count
LazyVStack(alignment: .leading, spacing: 8) { return VStack(alignment: .leading, spacing: 8) {
ForEach(manager.notes) { note in HStack(spacing: 12) {
VStack(alignment: .leading, spacing: 2) { Text(headerTitle(for: count))
HStack(spacing: 6) { .font(.bitchatSystem(size: 18, design: .monospaced))
// Show @name without the #abcd suffix; timestamp in brackets Spacer()
HStack(spacing: 0) { closeButton
Text("@") }
.font(.system(size: 12, weight: .semibold, design: .monospaced)) if let building = locationManager.locationNames[.building], !building.isEmpty {
.foregroundColor(textColor) Text(building)
let parts = splitSuffix(from: note.displayName) .font(.bitchatSystem(size: 12, design: .monospaced))
Text(parts.0) .foregroundColor(accentGreen)
.font(.system(size: 12, weight: .semibold, design: .monospaced)) } else if let block = locationManager.locationNames[.block], !block.isEmpty {
.foregroundColor(textColor) Text(block)
} .font(.bitchatSystem(size: 12, design: .monospaced))
let ts = timestampText(for: note.createdAt) .foregroundColor(accentGreen)
Text(ts.isEmpty ? "" : "[\(ts)]") }
.font(.system(size: 11, design: .monospaced)) Text(Strings.description)
.foregroundColor(secondaryTextColor.opacity(0.8)) .font(.bitchatSystem(size: 12, design: .monospaced))
} .foregroundColor(.secondary)
Text(note.content) .fixedSize(horizontal: false, vertical: true)
.font(.system(size: 14, design: .monospaced)) if manager.state == .loading && !manager.initialLoadComplete {
.fixedSize(horizontal: false, vertical: true) Text(Strings.loadingRecent)
} .font(.bitchatSystem(size: 11, design: .monospaced))
.padding(.horizontal, 12) .foregroundColor(.secondary)
} } else if manager.state == .noRelays {
Text(Strings.relaysPaused)
.font(.bitchatSystem(size: 11, design: .monospaced))
.foregroundColor(.secondary)
} }
.padding(.vertical, 8)
} }
.padding(.horizontal, 16)
.padding(.top, 16)
.padding(.bottom, 12)
.background(backgroundColor) .background(backgroundColor)
} }
private var input: some View { private func headerTitle(for count: Int) -> String {
HStack(alignment: .center, spacing: 8) { let format = NSLocalizedString(
TextField("add a note for this place", text: $draft, axis: .vertical) "location_notes.header",
.textFieldStyle(.plain) comment: "Header displaying the geohash and localized note count"
.font(.system(size: 14, design: .monospaced)) )
.lineLimit(3, reservesSpace: true) return NSString.localizedStringWithFormat(format as NSString, geohash, count) as String
.padding(.horizontal, 12) }
private var notesContent: some View {
LazyVStack(alignment: .leading, spacing: 12) {
if manager.state == .noRelays {
noRelaysRow
} else if manager.state == .loading && !manager.initialLoadComplete {
loadingRow
} else if manager.notes.isEmpty {
emptyRow
} else {
ForEach(manager.notes) { note in
noteRow(note)
}
}
if let error = manager.errorMessage, manager.state != .noRelays {
errorRow(message: error)
}
}
.padding(.horizontal, 16)
.padding(.vertical, 8)
}
private func noteRow(_ note: LocationNotesManager.Note) -> some View {
let baseName = note.displayName.split(separator: "#", maxSplits: 1, omittingEmptySubsequences: false).first.map(String.init) ?? note.displayName
let ts = timestampText(for: note.createdAt)
return VStack(alignment: .leading, spacing: 2) {
HStack(spacing: 6) {
Text("@\(baseName)")
.font(.bitchatSystem(size: 12, weight: .semibold, design: .monospaced))
if !ts.isEmpty {
Text(ts)
.font(.bitchatSystem(size: 11, design: .monospaced))
.foregroundColor(.secondary)
}
Spacer()
}
Text(note.content)
.font(.bitchatSystem(size: 14, design: .monospaced))
.fixedSize(horizontal: false, vertical: true)
}
.padding(.vertical, 4)
}
private var noRelaysRow: some View {
VStack(alignment: .leading, spacing: 4) {
Text(Strings.noRelaysNearby)
.font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
Text(Strings.relaysRetryHint)
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.secondary)
Button(Strings.retry) { manager.refresh() }
.font(.bitchatSystem(size: 12, design: .monospaced))
.buttonStyle(.plain)
}
.padding(.vertical, 6)
}
private var loadingRow: some View {
HStack(spacing: 10) {
ProgressView()
Text(Strings.loadingNotes)
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.secondary)
Spacer()
}
.padding(.vertical, 8)
}
private var emptyRow: some View {
VStack(alignment: .leading, spacing: 4) {
Text(Strings.emptyTitle)
.font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
Text(Strings.emptySubtitle)
.font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.secondary)
}
.padding(.vertical, 6)
}
private func errorRow(message: String) -> some View {
VStack(alignment: .leading, spacing: 4) {
HStack(spacing: 6) {
Image(systemName: "exclamationmark.triangle.fill")
.font(.bitchatSystem(size: 12, design: .monospaced))
Text(message)
.font(.bitchatSystem(size: 12, design: .monospaced))
Spacer()
}
Button(Strings.dismissError) { manager.clearError() }
.font(.bitchatSystem(size: 12, design: .monospaced))
.buttonStyle(.plain)
}
.padding(.vertical, 6)
}
private var inputSection: some View {
HStack(alignment: .top, spacing: 10) {
TextField(Strings.addPlaceholder, text: $draft, axis: .vertical)
.textFieldStyle(.plain)
.font(.bitchatSystem(size: 14, design: .monospaced))
.lineLimit(maxDraftLines, reservesSpace: true)
.padding(.vertical, 6)
Button(action: send) { Button(action: send) {
Image(systemName: "arrow.up.circle.fill") Image(systemName: "arrow.up.circle.fill")
.font(.system(size: 20)) .font(.bitchatSystem(size: 20))
.foregroundColor(draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ? Color.gray : textColor) .foregroundColor(sendButtonEnabled ? accentGreen : .secondary)
} }
.padding(.top, 2)
.buttonStyle(.plain) .buttonStyle(.plain)
.disabled(draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty) .disabled(!sendButtonEnabled)
.padding(.trailing, 12)
} }
.frame(minHeight: 44) .padding(.horizontal, 16)
.padding(.vertical, 8) .padding(.vertical, 14)
.background(backgroundColor.opacity(0.95)) .background(backgroundColor)
.overlay(Divider(), alignment: .top)
} }
private func send() { private func send() {
@@ -153,15 +276,17 @@ struct LocationNotesView: View {
draft = "" draft = ""
} }
private var sendButtonEnabled: Bool {
!draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && manager.state != .noRelays
}
// MARK: - Timestamp Formatting // MARK: - Timestamp Formatting
private func timestampText(for date: Date) -> String { private func timestampText(for date: Date) -> String {
let now = Date() let now = Date()
if let days = Calendar.current.dateComponents([.day], from: date, to: now).day, days < 7 { if let days = Calendar.current.dateComponents([.day], from: date, to: now).day, days < 7 {
// Relative (minute/hour/day), no seconds
let rel = Self.relativeFormatter.string(from: date, to: now) ?? "" let rel = Self.relativeFormatter.string(from: date, to: now) ?? ""
return rel.isEmpty ? "" : "\(rel) ago" return rel.isEmpty ? "" : "\(rel) ago"
} else { } else {
// Absolute date (MMM d or MMM d, yyyy if different year)
let sameYear = Calendar.current.isDate(date, equalTo: now, toGranularity: .year) let sameYear = Calendar.current.isDate(date, equalTo: now, toGranularity: .year)
let fmt = sameYear ? Self.absDateFormatter : Self.absDateYearFormatter let fmt = sameYear ? Self.absDateFormatter : Self.absDateYearFormatter
return fmt.string(from: date) return fmt.string(from: date)
@@ -189,16 +314,3 @@ struct LocationNotesView: View {
return f return f
}() }()
} }
// Helper to split a trailing #abcd suffix
private func splitSuffix(from name: String) -> (String, String) {
guard name.count >= 5 else { return (name, "") }
let suffix = String(name.suffix(5))
if suffix.first == "#", suffix.dropFirst().allSatisfy({ c in
("0"..."9").contains(String(c)) || ("a"..."f").contains(String(c)) || ("A"..."F").contains(String(c))
}) {
let base = String(name.dropLast(5))
return (base, suffix)
}
return (name, "")
}
+29 -17
View File
@@ -11,11 +11,23 @@ struct MeshPeerList: View {
@State private var orderedIDs: [String] = [] @State private var orderedIDs: [String] = []
private enum Strings {
static let noneNearby: LocalizedStringKey = "geohash_people.none_nearby"
static let blockedTooltip = L10n.string(
"geohash_people.tooltip.blocked",
comment: "Tooltip shown next to a blocked peer indicator"
)
static let newMessagesTooltip = L10n.string(
"mesh_peers.tooltip.new_messages",
comment: "Tooltip for the unread messages indicator"
)
}
var body: some View { var body: some View {
if viewModel.allPeers.isEmpty { if viewModel.allPeers.isEmpty {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
Text("nobody around...") Text(Strings.noneNearby)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
.padding(.horizontal) .padding(.horizontal)
.padding(.top, 12) .padding(.top, 12)
@@ -45,27 +57,27 @@ struct MeshPeerList: View {
let baseColor = isMe ? Color.orange : assigned let baseColor = isMe ? Color.orange : assigned
if isMe { if isMe {
Image(systemName: "person.fill") Image(systemName: "person.fill")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(baseColor) .foregroundColor(baseColor)
} else if peer.isConnected { } else if peer.isConnected {
// Mesh-connected peer: radio icon // Mesh-connected peer: radio icon
Image(systemName: "antenna.radiowaves.left.and.right") Image(systemName: "antenna.radiowaves.left.and.right")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(baseColor) .foregroundColor(baseColor)
} else if peer.isReachable { } else if peer.isReachable {
// Mesh-reachable (relayed): point.3 icon // Mesh-reachable (relayed): point.3 icon
Image(systemName: "point.3.filled.connected.trianglepath.dotted") Image(systemName: "point.3.filled.connected.trianglepath.dotted")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(baseColor) .foregroundColor(baseColor)
} else if peer.isMutualFavorite { } else if peer.isMutualFavorite {
// Mutual favorite reachable via Nostr: globe icon (purple) // Mutual favorite reachable via Nostr: globe icon (purple)
Image(systemName: "globe") Image(systemName: "globe")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(.purple) .foregroundColor(.purple)
} else { } else {
// Fallback icon for others (dimmed) // Fallback icon for others (dimmed)
Image(systemName: "person") Image(systemName: "person")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(secondaryTextColor) .foregroundColor(secondaryTextColor)
} }
@@ -73,28 +85,28 @@ struct MeshPeerList: View {
let (base, suffix) = splitSuffix(from: displayName) let (base, suffix) = splitSuffix(from: displayName)
HStack(spacing: 0) { HStack(spacing: 0) {
Text(base) Text(base)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(baseColor) .foregroundColor(baseColor)
if !suffix.isEmpty { if !suffix.isEmpty {
let suffixColor = isMe ? Color.orange.opacity(0.6) : baseColor.opacity(0.6) let suffixColor = isMe ? Color.orange.opacity(0.6) : baseColor.opacity(0.6)
Text(suffix) Text(suffix)
.font(.system(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
.foregroundColor(suffixColor) .foregroundColor(suffixColor)
} }
} }
if !isMe, viewModel.isPeerBlocked(peer.id) { if !isMe, viewModel.isPeerBlocked(peer.id) {
Image(systemName: "nosign") Image(systemName: "nosign")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(.red) .foregroundColor(.red)
.help("Blocked") .help(Strings.blockedTooltip)
} }
if !isMe { if !isMe {
if peer.isConnected { if peer.isConnected {
if let icon = item.enc.icon { if let icon = item.enc.icon {
Image(systemName: icon) Image(systemName: icon)
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(baseColor) .foregroundColor(baseColor)
} }
} else { } else {
@@ -102,12 +114,12 @@ struct MeshPeerList: View {
if let fp = viewModel.getFingerprint(for: peer.id), if let fp = viewModel.getFingerprint(for: peer.id),
viewModel.verifiedFingerprints.contains(fp) { viewModel.verifiedFingerprints.contains(fp) {
Image(systemName: "checkmark.seal.fill") Image(systemName: "checkmark.seal.fill")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(baseColor) .foregroundColor(baseColor)
} else if let icon = item.enc.icon { } else if let icon = item.enc.icon {
// Fallback to whatever status says (likely lock if we had a past session) // Fallback to whatever status says (likely lock if we had a past session)
Image(systemName: icon) Image(systemName: icon)
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(baseColor) .foregroundColor(baseColor)
} }
} }
@@ -118,15 +130,15 @@ struct MeshPeerList: View {
// Unread message indicator for this peer // Unread message indicator for this peer
if !isMe, item.hasUnread { if !isMe, item.hasUnread {
Image(systemName: "envelope.fill") Image(systemName: "envelope.fill")
.font(.system(size: 10)) .font(.bitchatSystem(size: 10))
.foregroundColor(.orange) .foregroundColor(.orange)
.help("New messages") .help(Strings.newMessagesTooltip)
} }
if !isMe { if !isMe {
Button(action: { onToggleFavorite(peer.id) }) { Button(action: { onToggleFavorite(peer.id) }) {
Image(systemName: (peer.favoriteStatus?.isFavorite ?? false) ? "star.fill" : "star") Image(systemName: (peer.favoriteStatus?.isFavorite ?? false) ? "star.fill" : "star")
.font(.system(size: 12)) .font(.bitchatSystem(size: 12))
.foregroundColor((peer.favoriteStatus?.isFavorite ?? false) ? .yellow : secondaryTextColor) .foregroundColor((peer.favoriteStatus?.isFavorite ?? false) ? .yellow : secondaryTextColor)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
+52 -19
View File
@@ -13,18 +13,26 @@ struct MyQRView: View {
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
private var boxColor: Color { Color.gray.opacity(0.1) } private var boxColor: Color { Color.gray.opacity(0.1) }
private enum Strings {
static let title: LocalizedStringKey = "verification.my_qr.title"
static let accessibilityLabel = L10n.string(
"verification.my_qr.accessibility_label",
comment: "Accessibility label describing the verification QR code"
)
}
var body: some View { var body: some View {
VStack(spacing: 12) { VStack(spacing: 12) {
Text("scan to verify me") Text(Strings.title)
.font(.system(size: 16, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
VStack(spacing: 10) { VStack(spacing: 10) {
QRCodeImage(data: qrString, size: 240) QRCodeImage(data: qrString, size: 240)
.accessibilityLabel("verification qr code") .accessibilityLabel(Strings.accessibilityLabel)
// Non-scrolling, fully visible URL (wraps across lines) // Non-scrolling, fully visible URL (wraps across lines)
Text(qrString) Text(qrString)
.font(.system(size: 11, design: .monospaced)) .font(.bitchatSystem(size: 11, design: .monospaced))
.textSelection(.enabled) .textSelection(.enabled)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
@@ -49,6 +57,10 @@ struct QRCodeImage: View {
private let context = CIContext() private let context = CIContext()
private let filter = CIFilter.qrCodeGenerator() private let filter = CIFilter.qrCodeGenerator()
private enum Strings {
static let unavailable: LocalizedStringKey = "verification.my_qr.unavailable"
}
var body: some View { var body: some View {
Group { Group {
if let image = generateImage() { if let image = generateImage() {
@@ -59,8 +71,8 @@ struct QRCodeImage: View {
.stroke(Color.gray.opacity(0.5), lineWidth: 1) .stroke(Color.gray.opacity(0.5), lineWidth: 1)
.frame(width: size, height: size) .frame(width: size, height: size)
.overlay( .overlay(
Text("qr unavailable") Text(Strings.unavailable)
.font(.system(size: 12, design: .monospaced)) .font(.bitchatSystem(size: 12, design: .monospaced))
.foregroundColor(.gray) .foregroundColor(.gray)
) )
} }
@@ -103,6 +115,27 @@ struct QRScanView: View {
@State private var input = "" @State private var input = ""
@State private var result: String = "" // not shown for iOS scanner @State private var result: String = "" // not shown for iOS scanner
@State private var lastValid: String = "" @State private var lastValid: String = ""
private enum Strings {
static let pastePrompt: LocalizedStringKey = "verification.scan.paste_prompt"
static let validate: LocalizedStringKey = "verification.scan.validate"
static func requested(_ nickname: String) -> String {
L10n.format(
"verification.scan.status.requested",
comment: "Status text when verification is requested for a nickname",
nickname
)
}
static let notFound = L10n.string(
"verification.scan.status.no_peer",
comment: "Status when no matching peer is found for a verification request"
)
static let invalid = L10n.string(
"verification.scan.status.invalid",
comment: "Status when a scanned QR payload is invalid"
)
}
var body: some View { var body: some View {
VStack(alignment: .leading, spacing: 12) { VStack(alignment: .leading, spacing: 12) {
#if os(iOS) #if os(iOS)
@@ -118,17 +151,17 @@ struct QRScanView: View {
.frame(height: 260) .frame(height: 260)
.clipShape(RoundedRectangle(cornerRadius: 8)) .clipShape(RoundedRectangle(cornerRadius: 8))
#else #else
Text("paste qr content to validate:") Text(Strings.pastePrompt)
.font(.system(size: 14, weight: .medium, design: .monospaced)) .font(.bitchatSystem(size: 14, weight: .medium, design: .monospaced))
TextEditor(text: $input) TextEditor(text: $input)
.frame(height: 100) .frame(height: 100)
.border(Color.gray.opacity(0.4)) .border(Color.gray.opacity(0.4))
Button("validate") { Button(Strings.validate) {
if let qr = VerificationService.shared.verifyScannedQR(input) { if let qr = VerificationService.shared.verifyScannedQR(input) {
let ok = viewModel.beginQRVerification(with: qr) let ok = viewModel.beginQRVerification(with: qr)
result = ok ? "verification requested for \(qr.nickname)" : "could not find matching peer" result = ok ? Strings.requested(qr.nickname) : Strings.notFound
} else { } else {
result = "invalid or expired qr payload" result = Strings.invalid
} }
} }
.buttonStyle(.bordered) .buttonStyle(.bordered)
@@ -254,8 +287,8 @@ struct VerificationSheetView: View {
VStack(spacing: 0) { VStack(spacing: 0) {
// Top header (always at top) // Top header (always at top)
HStack { HStack {
Text("VERIFY") Text("verification.sheet.title")
.font(.system(size: 14, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 14, weight: .bold, design: .monospaced))
.foregroundColor(accentColor) .foregroundColor(accentColor)
Spacer() Spacer()
Button(action: { Button(action: {
@@ -263,7 +296,7 @@ struct VerificationSheetView: View {
isPresented = false isPresented = false
}) { }) {
Image(systemName: "xmark") Image(systemName: "xmark")
.font(.system(size: 14, weight: .semibold)) .font(.bitchatSystem(size: 14, weight: .semibold))
.foregroundColor(accentColor) .foregroundColor(accentColor)
} }
.buttonStyle(.plain) .buttonStyle(.plain)
@@ -278,8 +311,8 @@ struct VerificationSheetView: View {
Group { Group {
if showingScanner { if showingScanner {
VStack(alignment: .leading, spacing: 12) { VStack(alignment: .leading, spacing: 12) {
Text("scan a friend's qr") Text("verification.scan.prompt_friend")
.font(.system(size: 16, weight: .bold, design: .monospaced)) .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.foregroundColor(accentColor) .foregroundColor(accentColor)
@@ -310,13 +343,13 @@ struct VerificationSheetView: View {
if showingScanner { if showingScanner {
Button(action: { showingScanner = false }) { Button(action: { showingScanner = false }) {
Label("show my qr", systemImage: "qrcode") Label("show my qr", systemImage: "qrcode")
.font(.system(size: 13, design: .monospaced)) .font(.bitchatSystem(size: 13, design: .monospaced))
} }
.buttonStyle(.bordered) .buttonStyle(.bordered)
} else { } else {
Button(action: { showingScanner = true }) { Button(action: { showingScanner = true }) {
Label("scan someone else's qr", systemImage: "camera.viewfinder") Label("scan someone else's qr", systemImage: "camera.viewfinder")
.font(.system(size: 13, weight: .medium, design: .monospaced)) .font(.bitchatSystem(size: 13, weight: .medium, design: .monospaced))
} }
.buttonStyle(.bordered) .buttonStyle(.bordered)
.tint(.gray) .tint(.gray)
@@ -328,7 +361,7 @@ struct VerificationSheetView: View {
viewModel.verifiedFingerprints.contains(fp) { viewModel.verifiedFingerprints.contains(fp) {
Button(action: { viewModel.unverifyFingerprint(for: pid) }) { Button(action: { viewModel.unverifyFingerprint(for: pid) }) {
Label("remove verification", systemImage: "minus.circle") Label("remove verification", systemImage: "minus.circle")
.font(.system(size: 12, design: .monospaced)) .font(.bitchatSystem(size: 12, design: .monospaced))
} }
.buttonStyle(.bordered) .buttonStyle(.bordered)
.tint(.gray) .tint(.gray)
@@ -0,0 +1,14 @@
/*
Localizable.strings
bitchatShareExtension
Base English strings for the share extension.
*/
"share.status.nothing_to_share" = "nothing to share";
"share.status.no_shareable_content" = "no shareable content";
"share.fallback.shared_link_title" = "shared Link";
"share.status.shared_link" = "✓ shared link to bitchat";
"share.status.shared_text" = "✓ shared text to bitchat";
"share.status.failed_to_encode" = "failed to encode link";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Arabic)
*/
"share.status.nothing_to_share" = "لا شيء لمشاركته";
"share.status.no_shareable_content" = "لا محتوى قابلاً للمشاركة";
"share.fallback.shared_link_title" = "رابط مشترك";
"share.status.shared_link" = "✓ تم إرسال الرابط إلى bitchat";
"share.status.shared_text" = "✓ تم إرسال النص إلى bitchat";
"share.status.failed_to_encode" = "تعذر ترميز الرابط";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (German)
*/
"share.status.nothing_to_share" = "nichts zum teilen";
"share.status.no_shareable_content" = "kein teilbarer inhalt";
"share.fallback.shared_link_title" = "geteilter link";
"share.status.shared_link" = "✓ link zu bitchat geteilt";
"share.status.shared_text" = "✓ text zu bitchat geteilt";
"share.status.failed_to_encode" = "link konnte nicht codiert werden";
@@ -0,0 +1,12 @@
/*
Localizable.strings
bitchatShareExtension (Spanish)
*/
"share.status.nothing_to_share" = "nada que compartir";
"share.status.no_shareable_content" = "sin contenido que se pueda compartir";
"share.fallback.shared_link_title" = "enlace compartido";
"share.status.shared_link" = "✓ enlace compartido con bitchat";
"share.status.shared_text" = "✓ texto compartido con bitchat";
"share.status.failed_to_encode" = "no se pudo codificar el enlace";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (French)
*/
"share.status.nothing_to_share" = "rien à partager";
"share.status.no_shareable_content" = "aucun contenu partageable";
"share.fallback.shared_link_title" = "lien partagé";
"share.status.shared_link" = "✓ lien partagé vers bitchat";
"share.status.shared_text" = "✓ texte partagé vers bitchat";
"share.status.failed_to_encode" = "échec de l'encodage du lien";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Hebrew)
*/
"share.status.nothing_to_share" = "אין מה לשתף";
"share.status.no_shareable_content" = "אין תוכן שניתן לשתף";
"share.fallback.shared_link_title" = "קישור משותף";
"share.status.shared_link" = "✓ הקישור נשלח אל bitchat";
"share.status.shared_text" = "✓ הטקסט נשלח אל bitchat";
"share.status.failed_to_encode" = "לא ניתן לקודד את הקישור";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Indonesian)
*/
"share.status.nothing_to_share" = "tidak ada yang bisa dibagikan";
"share.status.no_shareable_content" = "tidak ada konten yang bisa dibagikan";
"share.fallback.shared_link_title" = "tautan dibagikan";
"share.status.shared_link" = "✓ tautan dikirim ke bitchat";
"share.status.shared_text" = "✓ teks dikirim ke bitchat";
"share.status.failed_to_encode" = "gagal mengodekan tautan";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Italian)
*/
"share.status.nothing_to_share" = "niente da condividere";
"share.status.no_shareable_content" = "nessun contenuto condivisibile";
"share.fallback.shared_link_title" = "link condiviso";
"share.status.shared_link" = "✓ link inviato a bitchat";
"share.status.shared_text" = "✓ testo inviato a bitchat";
"share.status.failed_to_encode" = "impossibile codificare il link";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Japanese)
*/
"share.status.nothing_to_share" = "共有できるものがありません";
"share.status.no_shareable_content" = "共有可能なコンテンツがありません";
"share.fallback.shared_link_title" = "共有リンク";
"share.status.shared_link" = "✓ bitchatにリンクを共有";
"share.status.shared_text" = "✓ bitchatにテキストを共有";
"share.status.failed_to_encode" = "リンクのエンコードに失敗しました";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Nepali)
*/
"share.status.nothing_to_share" = "बाँड्ने केही छैन";
"share.status.no_shareable_content" = "बाँड्न मिल्ने सामग्री छैन";
"share.fallback.shared_link_title" = "साझा गरिएको लिङ्क";
"share.status.shared_link" = "✓ bitchat मा लिङ्क पठाइयो";
"share.status.shared_text" = "✓ bitchat मा पाठ पठाइयो";
"share.status.failed_to_encode" = "लिङ्क सङ्केत गर्न सकेन";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Portuguese - Brazil)
*/
"share.status.nothing_to_share" = "nada para compartilhar";
"share.status.no_shareable_content" = "nenhum conteúdo compartilhável";
"share.fallback.shared_link_title" = "link compartilhado";
"share.status.shared_link" = "✓ link enviado para bitchat";
"share.status.shared_text" = "✓ texto enviado para bitchat";
"share.status.failed_to_encode" = "falha ao codificar link";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Russian)
*/
"share.status.nothing_to_share" = "нечем поделиться";
"share.status.no_shareable_content" = "нет подходящего контента";
"share.fallback.shared_link_title" = "поделился ссылкой";
"share.status.shared_link" = "✓ ссылка отправлена в bitchat";
"share.status.shared_text" = "✓ текст отправлен в bitchat";
"share.status.failed_to_encode" = "не удалось закодировать ссылку";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Ukrainian)
*/
"share.status.nothing_to_share" = "нема чим ділитися";
"share.status.no_shareable_content" = "нема відповідного контенту";
"share.fallback.shared_link_title" = "спільне посилання";
"share.status.shared_link" = "✓ посилання надіслано в bitchat";
"share.status.shared_text" = "✓ текст надіслано в bitchat";
"share.status.failed_to_encode" = "не вдалося закодувати посилання";
@@ -0,0 +1,11 @@
/*
Localizable.strings
bitchatShareExtension (Simplified Chinese)
*/
"share.status.nothing_to_share" = "没有可分享的内容";
"share.status.no_shareable_content" = "没有可分享的素材";
"share.fallback.shared_link_title" = "分享的链接";
"share.status.shared_link" = "✓ 已将链接分享至 bitchat";
"share.status.shared_text" = "✓ 已将文本分享至 bitchat";
"share.status.failed_to_encode" = "无法编码链接";
@@ -14,6 +14,15 @@ import UniformTypeIdentifiers
final class ShareViewController: UIViewController { final class ShareViewController: UIViewController {
// Bundle.main.bundleIdentifier would get the extension's bundleID // Bundle.main.bundleIdentifier would get the extension's bundleID
private static let groupID = "group.chat.bitchat" private static let groupID = "group.chat.bitchat"
private enum Strings {
static let nothingToShare = NSLocalizedString("share.status.nothing_to_share", comment: "Shown when the share extension receives no content")
static let noShareableContent = NSLocalizedString("share.status.no_shareable_content", comment: "Shown when provided content cannot be shared")
static let sharedLinkTitleFallback = NSLocalizedString("share.fallback.shared_link_title", comment: "Fallback title when saving a shared link")
static let sharedLinkConfirmation = NSLocalizedString("share.status.shared_link", comment: "Confirmation after successfully sharing a link")
static let sharedTextConfirmation = NSLocalizedString("share.status.shared_text", comment: "Confirmation after successfully sharing text")
static let failedToEncode = NSLocalizedString("share.status.failed_to_encode", comment: "Shown when the share payload cannot be encoded")
}
private let statusLabel: UILabel = { private let statusLabel: UILabel = {
let l = UILabel() let l = UILabel()
@@ -44,7 +53,7 @@ final class ShareViewController: UIViewController {
private func processShare() { private func processShare() {
guard let ctx = self.extensionContext, guard let ctx = self.extensionContext,
let item = ctx.inputItems.first as? NSExtensionItem else { let item = ctx.inputItems.first as? NSExtensionItem else {
finishWithMessage("Nothing to share") finishWithMessage(Strings.nothingToShare)
return return
} }
@@ -61,7 +70,7 @@ final class ShareViewController: UIViewController {
if let title = item.attributedTitle?.string, !title.isEmpty { if let title = item.attributedTitle?.string, !title.isEmpty {
saveAndFinish(text: title) saveAndFinish(text: title)
} else { } else {
finishWithMessage("No shareable content") finishWithMessage(Strings.noShareableContent)
} }
return return
} }
@@ -81,7 +90,7 @@ final class ShareViewController: UIViewController {
self.saveAndFinish(text: t) self.saveAndFinish(text: t)
} }
} else { } else {
self.finishWithMessage("No shareable content") self.finishWithMessage(Strings.noShareableContent)
} }
} }
} }
@@ -136,20 +145,20 @@ final class ShareViewController: UIViewController {
private func saveAndFinish(url: URL, title: String?) { private func saveAndFinish(url: URL, title: String?) {
let payload: [String: String] = [ let payload: [String: String] = [
"url": url.absoluteString, "url": url.absoluteString,
"title": title ?? url.host ?? "Shared Link" "title": title ?? url.host ?? Strings.sharedLinkTitleFallback
] ]
if let json = try? JSONSerialization.data(withJSONObject: payload), if let json = try? JSONSerialization.data(withJSONObject: payload),
let s = String(data: json, encoding: .utf8) { let s = String(data: json, encoding: .utf8) {
saveToSharedDefaults(content: s, type: "url") saveToSharedDefaults(content: s, type: "url")
finishWithMessage("✓ Shared link to bitchat") finishWithMessage(Strings.sharedLinkConfirmation)
} else { } else {
finishWithMessage("Failed to encode link") finishWithMessage(Strings.failedToEncode)
} }
} }
private func saveAndFinish(text: String) { private func saveAndFinish(text: String) {
saveToSharedDefaults(content: text, type: "text") saveToSharedDefaults(content: text, type: "text")
finishWithMessage("✓ Shared text to bitchat") finishWithMessage(Strings.sharedTextConfirmation)
} }
private func saveToSharedDefaults(content: String, type: String) { private func saveToSharedDefaults(content: String, type: String) {
+3 -3
View File
@@ -134,7 +134,7 @@ final class BLEServiceTests: XCTestCase {
originalSender: nil, originalSender: nil,
isPrivate: false, isPrivate: false,
recipientNickname: nil, recipientNickname: nil,
senderPeer: "REMOTE123", senderPeerID: "REMOTE123",
mentions: nil mentions: nil
) )
@@ -161,7 +161,7 @@ final class BLEServiceTests: XCTestCase {
originalSender: nil, originalSender: nil,
isPrivate: false, isPrivate: false,
recipientNickname: nil, recipientNickname: nil,
senderPeer: "PACKET123", senderPeerID: "PACKET123",
mentions: nil mentions: nil
) )
@@ -243,7 +243,7 @@ final class BLEServiceTests: XCTestCase {
originalSender: nil, originalSender: nil,
isPrivate: false, isPrivate: false,
recipientNickname: nil, recipientNickname: nil,
senderPeer: "TEST123", senderPeerID: "TEST123",
mentions: nil mentions: nil
) )
@@ -111,7 +111,7 @@ final class PublicChatE2ETests: XCTestCase {
originalSender: message.sender, originalSender: message.sender,
isPrivate: message.isPrivate, isPrivate: message.isPrivate,
recipientNickname: message.recipientNickname, recipientNickname: message.recipientNickname,
senderPeerID: message.senderPeer?.id, senderPeerID: message.senderPeerID,
mentions: message.mentions mentions: message.mentions
) )
@@ -439,7 +439,7 @@ final class PublicChatE2ETests: XCTestCase {
if let message = BitchatMessage(packet.payload) { if let message = BitchatMessage(packet.payload) {
// Don't relay own messages // Don't relay own messages
guard message.senderPeer?.id != node.peerID else { return } guard message.senderPeerID != node.peerID else { return }
// Create relay message // Create relay message
let relayMessage = BitchatMessage( let relayMessage = BitchatMessage(
@@ -451,7 +451,7 @@ final class PublicChatE2ETests: XCTestCase {
originalSender: message.isRelay ? message.originalSender : message.sender, originalSender: message.isRelay ? message.originalSender : message.sender,
isPrivate: message.isPrivate, isPrivate: message.isPrivate,
recipientNickname: message.recipientNickname, recipientNickname: message.recipientNickname,
senderPeerID: message.senderPeer?.id, senderPeerID: message.senderPeerID,
mentions: message.mentions mentions: message.mentions
) )
+16
View File
@@ -0,0 +1,16 @@
import SwiftUI
import XCTest
@testable import bitchat
final class FontBitchatTests: XCTestCase {
func testMonospacedMapping() {
XCTAssertEqual(Font.bitchatSystem(size: 10, design: .monospaced), Font.system(.caption2, design: .monospaced))
XCTAssertEqual(Font.bitchatSystem(size: 14, design: .monospaced), Font.system(.body, design: .monospaced))
XCTAssertEqual(Font.bitchatSystem(size: 20, design: .monospaced), Font.system(.title2, design: .monospaced))
}
func testWeightIsPreserved() {
let bold = Font.bitchatSystem(size: 14, weight: .bold, design: .monospaced)
XCTAssertEqual(bold, Font.system(.body, design: .monospaced).weight(.bold))
}
}
+22
View File
@@ -0,0 +1,22 @@
import XCTest
@testable import bitchat
final class GCSFilterTests: XCTestCase {
func testBuildFilterWithDuplicateIdsProducesStableEncoding() {
let id = Data(repeating: 0xAB, count: 16)
let ids = Array(repeating: id, count: 64)
let params = GCSFilter.buildFilter(ids: ids, maxBytes: 128, targetFpr: 0.01)
XCTAssertGreaterThanOrEqual(params.m, 1)
let decoded = GCSFilter.decodeToSortedSet(p: params.p, m: params.m, data: params.data)
XCTAssertLessThanOrEqual(decoded.count, 1)
}
func testBucketAvoidsZeroCandidate() {
let id = Data(repeating: 0x01, count: 16)
let bucket = GCSFilter.bucket(for: id, modulus: 2)
XCTAssertNotEqual(bucket, 0)
XCTAssertLessThan(bucket, 2)
}
}
+70
View File
@@ -0,0 +1,70 @@
import Foundation
import XCTest
@testable import bitchat
final class GossipSyncManagerTests: XCTestCase {
func testConcurrentPacketIntakeAndSyncRequest() {
let manager = GossipSyncManager(myPeerID: "0102030405060708")
let delegate = RecordingDelegate()
let sendExpectation = expectation(description: "sync request sent")
delegate.onSend = { sendExpectation.fulfill() }
manager.delegate = delegate
let iterations = 200
let group = DispatchGroup()
for i in 0..<iterations {
group.enter()
DispatchQueue.global(qos: .userInitiated).async {
let packet = BitchatPacket(
type: MessageType.message.rawValue,
senderID: Data(hexString: "1122334455667788") ?? Data(),
recipientID: nil,
timestamp: 1_000_000 + UInt64(i),
payload: Data([UInt8(truncatingIfNeeded: i)]),
signature: nil,
ttl: 1
)
manager.onPublicPacketSeen(packet)
Thread.sleep(forTimeInterval: 0.001)
group.leave()
}
}
DispatchQueue.global(qos: .userInitiated).asyncAfter(deadline: .now() + 0.002) {
manager.scheduleInitialSyncToPeer("FFFFFFFFFFFFFFFF", delaySeconds: 0.0)
}
group.wait()
wait(for: [sendExpectation], timeout: 2.0)
guard let lastPacket = delegate.lastPacket else {
XCTFail("Expected sync packet to be sent")
return
}
XCTAssertEqual(lastPacket.type, MessageType.requestSync.rawValue)
XCTAssertNotNil(RequestSyncPacket.decode(from: lastPacket.payload))
}
}
private final class RecordingDelegate: GossipSyncManager.Delegate {
var onSend: (() -> Void)?
private(set) var lastPacket: BitchatPacket?
private let lock = NSLock()
func sendPacket(_ packet: BitchatPacket) {
lock.lock()
lastPacket = packet
lock.unlock()
onSend?()
}
func sendPacket(to peerID: String, packet: BitchatPacket) {
sendPacket(packet)
}
func signPacketForBroadcast(_ packet: BitchatPacket) -> BitchatPacket {
packet
}
}
@@ -627,7 +627,7 @@ final class IntegrationTests: XCTestCase {
guard packet.ttl > 1 else { return } guard packet.ttl > 1 else { return }
if let message = BitchatMessage(packet.payload) { if let message = BitchatMessage(packet.payload) {
guard message.senderPeer?.id != node.peerID else { return } guard message.senderPeerID != node.peerID else { return }
let relayMessage = BitchatMessage( let relayMessage = BitchatMessage(
id: message.id, id: message.id,
@@ -638,7 +638,7 @@ final class IntegrationTests: XCTestCase {
originalSender: message.isRelay ? message.originalSender : message.sender, originalSender: message.isRelay ? message.originalSender : message.sender,
isPrivate: message.isPrivate, isPrivate: message.isPrivate,
recipientNickname: message.recipientNickname, recipientNickname: message.recipientNickname,
senderPeerID: message.senderPeer?.id, senderPeerID: message.senderPeerID,
mentions: message.mentions mentions: message.mentions
) )
@@ -0,0 +1,146 @@
import XCTest
@testable import bitchat
@MainActor
final class LocationNotesManagerTests: XCTestCase {
func testSubscribeWithoutRelaysSetsNoRelaysState() {
var subscribeCalled = false
let deps = LocationNotesDependencies(
relayLookup: { _, _ in [] },
subscribe: { _, _, _, _, _ in
subscribeCalled = true
},
unsubscribe: { _ in },
sendEvent: { _, _ in },
deriveIdentity: { _ in fatalError("should not derive identity") },
now: { Date() }
)
let manager = LocationNotesManager(geohash: "abcd1234", dependencies: deps)
XCTAssertFalse(subscribeCalled)
XCTAssertEqual(manager.state, .noRelays)
XCTAssertTrue(manager.initialLoadComplete)
XCTAssertEqual(manager.errorMessage, "No geo relays available near this location. Try again soon.")
}
func testSendWhenNoRelaysSurfacesError() {
var sendCalled = false
let deps = LocationNotesDependencies(
relayLookup: { _, _ in [] },
subscribe: { _, _, _, _, _ in },
unsubscribe: { _ in },
sendEvent: { _, _ in sendCalled = true },
deriveIdentity: { _ in throw TestError.shouldNotDerive },
now: { Date() }
)
let manager = LocationNotesManager(geohash: "zzzzzzzz", dependencies: deps)
manager.send(content: "hello", nickname: "tester")
XCTAssertFalse(sendCalled)
XCTAssertEqual(manager.state, .noRelays)
XCTAssertEqual(manager.errorMessage, "No geo relays available near this location. Try again soon.")
}
func testSubscribeUsesGeoRelaysAndAppendsNotes() {
var relaysCaptured: [String] = []
var storedHandler: ((NostrEvent) -> Void)?
var storedEOSE: (() -> Void)?
let deps = LocationNotesDependencies(
relayLookup: { _, _ in ["wss://relay.one"] },
subscribe: { filter, id, relays, handler, eose in
XCTAssertEqual(filter.kinds, [1])
XCTAssertFalse(id.isEmpty)
relaysCaptured = relays
storedHandler = handler
storedEOSE = eose
},
unsubscribe: { _ in },
sendEvent: { _, _ in },
deriveIdentity: { _ in throw TestError.shouldNotDerive },
now: { Date() }
)
let manager = LocationNotesManager(geohash: "abcd1234", dependencies: deps)
XCTAssertEqual(relaysCaptured, ["wss://relay.one"])
XCTAssertEqual(manager.state, .loading)
var event = NostrEvent(
pubkey: "pub",
createdAt: Date(),
kind: .textNote,
tags: [["g", "abcd1234"]],
content: "hi"
)
event.id = "event1"
storedHandler?(event)
storedEOSE?()
XCTAssertEqual(manager.state, .ready)
XCTAssertEqual(manager.notes.count, 1)
XCTAssertEqual(manager.notes.first?.content, "hi")
}
private enum TestError: Error {
case shouldNotDerive
}
}
@MainActor
final class LocationNotesCounterTests: XCTestCase {
func testSubscribeWithoutRelaysMarksUnavailable() {
var subscribeCalled = false
let deps = LocationNotesCounterDependencies(
relayLookup: { _, _ in [] },
subscribe: { _, _, _, _, _ in subscribeCalled = true },
unsubscribe: { _ in }
)
let counter = LocationNotesCounter(testDependencies: deps)
counter.subscribe(geohash: "abcdefgh")
XCTAssertFalse(subscribeCalled)
XCTAssertFalse(counter.relayAvailable)
XCTAssertTrue(counter.initialLoadComplete)
XCTAssertEqual(counter.count, 0)
}
func testSubscribeCountsUniqueNotes() {
var storedHandler: ((NostrEvent) -> Void)?
var storedEOSE: (() -> Void)?
let deps = LocationNotesCounterDependencies(
relayLookup: { _, _ in ["wss://relay.geo"] },
subscribe: { filter, id, relays, handler, eose in
XCTAssertEqual(relays, ["wss://relay.geo"])
XCTAssertEqual(filter.kinds, [1])
XCTAssertFalse(id.isEmpty)
storedHandler = handler
storedEOSE = eose
},
unsubscribe: { _ in }
)
let counter = LocationNotesCounter(testDependencies: deps)
counter.subscribe(geohash: "abcdefgh")
var first = NostrEvent(
pubkey: "pub",
createdAt: Date(),
kind: .textNote,
tags: [["g", "abcdefgh"]],
content: "a"
)
first.id = "eventA"
storedHandler?(first)
let duplicate = first
storedHandler?(duplicate)
storedEOSE?()
XCTAssertTrue(counter.relayAvailable)
XCTAssertEqual(counter.count, 1)
XCTAssertTrue(counter.initialLoadComplete)
}
}
+1 -1
View File
@@ -331,7 +331,7 @@ final class MockBLEService: NSObject {
let nextTTL = packet.ttl > 0 ? packet.ttl - 1 : 0 let nextTTL = packet.ttl > 0 ? packet.ttl - 1 : 0
for neighbor in neighbors() { for neighbor in neighbors() {
// Avoid immediate echo loopback to sender if known // Avoid immediate echo loopback to sender if known
if let sender = message.senderPeer?.id, sender == neighbor.peerID { continue } if let sender = message.senderPeerID, sender == neighbor.peerID { continue }
var relay = packet var relay = packet
relay.ttl = nextTTL relay.ttl = nextTTL
neighbor.simulateIncomingPacket(relay) neighbor.simulateIncomingPacket(relay)
@@ -0,0 +1,111 @@
import XCTest
@testable import bitchat
final class NotificationStreamAssemblerTests: XCTestCase {
private func makePacket(timestamp: UInt64 = 0x0102030405) -> BitchatPacket {
let sender = Data([0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77])
return BitchatPacket(
type: MessageType.message.rawValue,
senderID: sender,
recipientID: nil,
timestamp: timestamp,
payload: Data([0xDE, 0xAD, 0xBE, 0xEF]),
signature: nil,
ttl: 3
)
}
func testAssemblesSingleFrameAcrossChunks() {
var assembler = NotificationStreamAssembler()
let packet = makePacket()
guard let frame = packet.toBinaryData(padding: false) else {
return XCTFail("Failed to encode packet")
}
XCTAssertNotNil(BinaryProtocol.decode(frame))
let payloadLen = (Int(frame[12]) << 8) | Int(frame[13])
XCTAssertEqual(payloadLen, packet.payload.count)
let splitIndex = min(20, max(1, frame.count / 2))
let first = frame.prefix(splitIndex)
let second = frame.suffix(from: splitIndex)
XCTAssertEqual(first.count + second.count, frame.count)
var result = assembler.append(first)
XCTAssertTrue(result.frames.isEmpty)
XCTAssertTrue(result.droppedPrefixes.isEmpty)
XCTAssertFalse(result.reset)
result = assembler.append(second)
XCTAssertEqual(result.frames.count, 1)
XCTAssertTrue(result.droppedPrefixes.isEmpty)
XCTAssertFalse(result.reset)
guard let frameData = result.frames.first else {
return XCTFail("Missing frame data")
}
if frameData.count != frame.count {
XCTFail("Frame size mismatch: expected \(frame.count) got \(frameData.count)\nframe=\(Array(frame))\nassembled=\(Array(frameData))")
return
}
guard let decoded = BinaryProtocol.decode(frameData) else {
return XCTFail("Failed to decode frame")
}
XCTAssertEqual(decoded.type, packet.type)
XCTAssertEqual(decoded.payload, packet.payload)
XCTAssertEqual(decoded.senderID, packet.senderID)
XCTAssertEqual(decoded.timestamp, packet.timestamp)
var directAssembler = NotificationStreamAssembler()
let directResult = directAssembler.append(frame)
XCTAssertEqual(directResult.frames.first?.count, frame.count)
}
func testAssemblesMultipleFramesSequentially() {
var assembler = NotificationStreamAssembler()
let packet1 = makePacket(timestamp: 0xABC)
let packet2 = makePacket(timestamp: 0xDEF)
guard let frame1 = packet1.toBinaryData(padding: false),
let frame2 = packet2.toBinaryData(padding: false) else {
return XCTFail("Failed to encode packets")
}
var combined = Data()
combined.append(frame1)
combined.append(frame2)
let firstChunk = combined.prefix(20)
let secondChunk = combined.suffix(from: 20)
var result = assembler.append(firstChunk)
XCTAssertTrue(result.frames.isEmpty)
result = assembler.append(secondChunk)
XCTAssertEqual(result.frames.count, 2)
guard let decoded1 = BinaryProtocol.decode(result.frames[0]),
let decoded2 = BinaryProtocol.decode(result.frames[1]) else {
return XCTFail("Failed to decode frames")
}
XCTAssertEqual(decoded1.timestamp, packet1.timestamp)
XCTAssertEqual(decoded2.timestamp, packet2.timestamp)
}
func testDropsInvalidPrefixByte() {
var assembler = NotificationStreamAssembler()
let packet = makePacket(timestamp: 0xF00)
guard let frame = packet.toBinaryData(padding: false) else {
return XCTFail("Failed to encode packet")
}
var noisyFrame = Data([0x00])
noisyFrame.append(frame)
let result = assembler.append(noisyFrame)
XCTAssertEqual(result.droppedPrefixes, [0x00])
XCTAssertEqual(result.frames.count, 1)
XCTAssertFalse(result.reset)
guard let decoded = BinaryProtocol.decode(result.frames[0]) else {
return XCTFail("Failed to decode frame after drop")
}
XCTAssertEqual(decoded.timestamp, packet.timestamp)
}
}
@@ -204,7 +204,7 @@ final class BinaryProtocolTests: XCTestCase {
XCTAssertEqual(decodedMessage.content, message.content) XCTAssertEqual(decodedMessage.content, message.content)
XCTAssertEqual(decodedMessage.sender, message.sender) XCTAssertEqual(decodedMessage.sender, message.sender)
XCTAssertEqual(decodedMessage.senderPeerID, message.senderPeer?.id) XCTAssertEqual(decodedMessage.senderPeerID, message.senderPeerID)
XCTAssertEqual(decodedMessage.isPrivate, message.isPrivate) XCTAssertEqual(decodedMessage.isPrivate, message.isPrivate)
// Timestamp should be close (within 1 second due to conversion) // Timestamp should be close (within 1 second due to conversion)
+1 -1
View File
@@ -44,7 +44,7 @@ final class TestHelpers {
originalSender: nil, originalSender: nil,
isPrivate: isPrivate, isPrivate: isPrivate,
recipientNickname: recipientNickname, recipientNickname: recipientNickname,
senderPeer: senderPeerID, senderPeerID: senderPeerID,
mentions: mentions mentions: mentions
) )
} }
+264 -253
View File
@@ -1,264 +1,275 @@
Relay URL,Latitude,Longitude Relay URL,Latitude,Longitude
relay.laantungir.net,-19.4692,-42.5315 nostr.tac.lol,47.4748,-122.273
relay.endfiat.money,43.6532,-79.3832 relay.javi.space,43.4633,11.8796
relay.zone667.com,60.1699,24.9384
shu04.shugur.net,25.2604,55.2989
relay.bitcoinartclock.com,50.4754,12.3683
relay.nostromo.social,49.4543,11.0746
nostr.liberty.fans,36.9104,-89.5875
roles-az-achieving-somebody.trycloudflare.com,43.6532,-79.3832
nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874
relay.nostr.wirednet.jp,34.706,135.493
nostr.einundzwanzig.space,50.1109,8.68213 nostr.einundzwanzig.space,50.1109,8.68213
relay.21e6.cz,50.1682,14.0546 nostr.kalf.org,52.3676,4.90414
relay04.lnfi.network,39.0997,-94.5786 wot.dtonon.com,43.6532,-79.3832
relay.chorus.community,50.1109,8.68213 nostr-01.yakihonne.com,1.32123,103.695
relay.nostr.place,32.7767,-96.797 wot.basspistol.org,49.4521,11.0767
relay.vrtmrz.net,43.6532,-79.3832 relay.puresignal.news,43.6532,-79.3832
noxir.kpherox.dev,34.8587,135.509 nostrelites.org,41.8781,-87.6298
wot.nostr.net,43.6532,-79.3832 nostr-relay.nextblockvending.com,47.674,-122.122
relay.cypherflow.ai,48.8566,2.35222 relay03.lnfi.network,39.0997,-94.5786
wot.sudocarlos.com,51.5072,-0.127586 nproxy.kristapsk.lv,60.1699,24.9384
nostr.jerrynya.fun,31.2304,121.474 relay.toastr.net,40.8054,-74.0241
nostr2.girino.org,43.6532,-79.3832
nostrings-relay-dev.fly.dev,41.8781,-87.6298
fanfares.nostr1.com,40.7128,-74.006
nostr.red5d.dev,43.6532,-79.3832
nostr.hifish.org,47.4043,8.57398
nostr.now,36.55,139.733
relay.nostr.band,60.1699,24.9384
relay.wavlake.com,41.2619,-95.8608
nostr.bilthon.dev,25.8128,-80.2377
khatru.nostrver.se,51.8933,4.42083
relay.bitcoindistrict.org,43.6532,-79.3832
nostr.makibisskey.work,43.6532,-79.3832
relay.nostraddress.com,43.6532,-79.3832
relay.jmoose.rocks,60.1699,24.9384
relay.davidebtc.me,51.5072,-0.127586 relay.davidebtc.me,51.5072,-0.127586
a.nos.lol,50.4754,12.3683 wot.nostr.net,43.6532,-79.3832
nostr.tadryanom.me,43.6532,-79.3832
relay.nostrdice.com,-33.8688,151.209
relay.lumina.rocks,49.0291,8.35695
relay.goodmorningbitcoin.com,43.6532,-79.3832
nostr.rtvslawenia.com,49.4543,11.0746
relay.mattybs.lol,43.6532,-79.3832 relay.mattybs.lol,43.6532,-79.3832
relay.zone667.com,60.1699,24.9384
nostr.kungfu-g.rip,33.7946,-84.4488
relay.mccormick.cx,52.3563,4.95714
relay.dwadziesciajeden.pl,52.2297,21.0122
nostr.data.haus,50.4754,12.3683
vitor.nostr1.com,40.7128,-74.006
purpura.cloud,43.6532,-79.3832
relay2.angor.io,48.1046,11.6002
nos.lol,50.4754,12.3683
nostr.rohoss.com,50.1109,8.68213
strfry.bonsai.com,37.8715,-122.273
relay.fountain.fm,39.0997,-94.5786
relay.npubhaus.com,43.6532,-79.3832
relay.nostr.wirednet.jp,34.706,135.493
soloco.nl,43.6532,-79.3832
shu01.shugur.net,21.4902,39.2246
nostr.davidebtc.me,51.5072,-0.127586
pyramid.fiatjaf.com,50.1109,8.68213
relay.ditto.pub,43.6532,-79.3832
relay.nostr.vet,52.6467,4.7395
relay.wavlake.com,41.2619,-95.8608
ribo.eu.nostria.app,52.3676,4.90414
relay.ngengine.org,43.6532,-79.3832
relay.bitcoinveneto.org,64.1466,-21.9426
no.str.cr,9.92857,-84.0528
relay.primal.net,43.6532,-79.3832
ynostr.yael.at,60.1699,24.9384
nostr.camalolo.com,24.1469,120.684
purplerelay.com,50.1109,8.68213
nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832
relay.internationalright-wing.org,-22.5022,-48.7114
wheat.happytavern.co,43.6532,-79.3832
nostr.lostr.space,43.6532,-79.3832
relay.tagayasu.xyz,43.6715,-79.38
relay.varke.eu,52.6921,6.19372
free.relayted.de,50.1109,8.68213
nostr.thebiglake.org,32.71,-96.6745
nostr.lojong.info,43.6532,-79.3832
nostr.now,36.55,139.733
relay.jmoose.rocks,60.1699,24.9384
relay.holzeis.me,43.6532,-79.3832
nostr.roundrockbitcoiners.com,40.8054,-74.0241
nostr-rs-relay.dev.fedibtc.com,39.0438,-77.4874
relay2.ngengine.org,43.6532,-79.3832
nostr.snowbla.de,60.1699,24.9384
4u2ni0zjbjvni.clorecloud.net,43.6532,-79.3832
shu04.shugur.net,25.2604,55.2989
relay.fr13nd5.com,52.5233,13.3426
nostr.vulpem.com,49.4543,11.0746
temp.iris.to,43.6532,-79.3832
x.kojira.io,43.6532,-79.3832
adre.su,59.9311,30.3609
nostr-dev.wellorder.net,45.5201,-122.99
nostr.mom,50.4754,12.3683
relay.nostr.place,32.7767,-96.797
wot.nostr.place,30.2672,-97.7431
nostr.carroarmato0.be,50.9928,3.26317
nostrelay.circum.space,51.2217,6.77616
relay.chorus.community,50.1109,8.68213
relay.nostr.net,50.4754,12.3683
relay.nostr-check.me,43.6532,-79.3832
relay.nostrhub.fr,48.1046,11.6002
relay.nostraddress.com,43.6532,-79.3832
nostr.rblb.it,43.4633,11.8796
nostr.red5d.dev,43.6532,-79.3832
santo.iguanatech.net,40.8302,-74.1299
relay02.lnfi.network,39.0997,-94.5786
relay.21e6.cz,50.1682,14.0546
a.nos.lol,50.4754,12.3683
shu02.shugur.net,21.4902,39.2246
schnorr.me,43.6532,-79.3832
nostr.n7ekb.net,47.4941,-122.294
wot.shaving.kiwi,43.6532,-79.3832
dev-nostr.bityacht.io,25.0797,121.234
relay.credenso.cafe,43.1149,-80.7228
relay-testnet.k8s.layer3.news,37.3387,-121.885
relay.mess.ch,47.3591,8.55292
inbox.azzamo.net,52.2633,21.0283
prl.plus,55.7623,37.6381
yabu.me,35.6092,139.73
relayrs.notoshi.win,43.6532,-79.3832
premium.primal.net,43.6532,-79.3832
nostr.coincrowd.fund,39.0438,-77.4874
nostr.2b9t.xyz,34.0549,-118.243
nostr.thaliyal.com,40.8218,-74.45
relay.exit.pub,50.4754,12.3683
nostr.jfischer.org,49.0291,8.35696
relay.origin.land,35.6673,139.751
nostr.myshosholoza.co.za,52.3676,4.90414
relay.nostriot.com,41.5695,-83.9786
relay.btcforplebs.com,43.6532,-79.3832
relay.chakany.systems,43.6532,-79.3832
nostr.openhoofd.nl,51.9229,4.40833
nostrcheck.me,43.6532,-79.3832
nostr.plantroon.com,50.1013,8.62643
satsage.xyz,37.3986,-121.964
nostr.faultables.net,43.6532,-79.3832
nostr.calitabby.net,39.9268,-75.0246
relay.freeplace.nl,52.3676,4.90414
relay.nostrhub.tech,49.4543,11.0746
roles-az-achieving-somebody.trycloudflare.com,43.6532,-79.3832
relay.arx-ccn.com,50.4754,12.3683
cyberspace.nostr1.com,40.7128,-74.006
nostr.smut.cloud,43.6532,-79.3832
nostr-02.czas.top,53.471,9.88208
relay.tapestry.ninja,40.8054,-74.0241
relay.mostro.network,40.8302,-74.1299
wot.brightbolt.net,47.6735,-116.781
nostr.spaceshell.xyz,43.6532,-79.3832
nostr.rikmeijer.nl,50.4754,12.3683
relay.artx.market,43.652,-79.3633
strfry.felixzieger.de,50.1013,8.62643
relay.seq1.net,43.6532,-79.3832
relay.cosmicbolt.net,37.3986,-121.964
relay.electriclifestyle.com,26.2897,-80.1293
r.bitcoinhold.net,43.6532,-79.3832
nostr-relay.amethyst.name,39.0067,-77.4291
relay.stream.labs.h3.se,59.4016,17.9455
relay.unknown.cloud,43.6532,-79.3832
nostr-02.yakihonne.com,1.32123,103.695
relay.coinos.io,43.6532,-79.3832
relay5.bitransfer.org,43.6532,-79.3832
relay-dev.satlantis.io,40.8302,-74.1299 relay-dev.satlantis.io,40.8302,-74.1299
nostream.breadslice.com,43.6532,-79.3832 nostream.breadslice.com,43.6532,-79.3832
nostr.vulpem.com,49.4543,11.0746 relay.fundstr.me,42.3601,-71.0589
nostr.rohoss.com,50.1109,8.68213 nostr.oxtr.dev,50.4754,12.3683
articles.layer3.news,37.3387,-121.885
nos.lol,50.4754,12.3683
relay.artx.market,43.652,-79.3633
wot.sebastix.social,51.8933,4.42083
alien.macneilmediagroup.com,43.6532,-79.3832
relay.unknown.cloud,43.6532,-79.3832
nostr.lojong.info,43.6532,-79.3832
nostr.zenon.network,43.5009,-70.4428
orangesync.tech,50.1109,8.68213
nostr.davidebtc.me,51.5072,-0.127586
internationalright-wing.org,-22.5022,-48.7114
nostr.rikmeijer.nl,50.4754,12.3683
ynostr.yael.at,60.1699,24.9384
ithurtswhenip.ee,51.223,6.78245
relay.wellorder.net,45.5201,-122.99
nostr.sathoarder.com,48.5734,7.75211
purplerelay.com,50.1109,8.68213
yabu.me,35.6092,139.73
nostr.88mph.life,43.6532,-79.3832
nostr.overmind.lol,43.6532,-79.3832
rnostr.breadslice.com,43.6532,-79.3832
zap.watch,45.5029,-73.5723
wot.basspistol.org,49.4521,11.0767
shu01.shugur.net,21.4902,39.2246
relay.electriclifestyle.com,26.2897,-80.1293
relay.mccormick.cx,52.3563,4.95714
nostr.middling.mydns.jp,35.8099,140.12
nostr.smut.cloud,43.6532,-79.3832
satsage.xyz,37.3986,-121.964
srtrelay.c-stellar.net,43.6532,-79.3832
nostr.0x7e.xyz,47.4988,8.72369
shu02.shugur.net,21.4902,39.2246
nostrelites.org,41.8781,-87.6298
relay-admin.thaliyal.com,40.8218,-74.45
wot.soundhsa.com,34.0479,-118.256
nostrcheck.me,43.6532,-79.3832
relay.nostrhub.tech,49.4543,11.0746
relay.stream.labs.h3.se,59.4016,17.9455
nostrelay.memory-art.xyz,43.6532,-79.3832
nostr.n7ekb.net,47.4941,-122.294
relay.nosto.re,51.8933,4.42083
nostr.girino.org,43.6532,-79.3832
relay.siamdev.cc,13.9178,100.424
nostr.mehdibekhtaoui.com,49.4939,-1.54813
orangepiller.org,60.1699,24.9384
nostr.plantroon.com,50.1013,8.62643
nostr-verified.wellorder.net,45.5201,-122.99
relay.primal.net,43.6532,-79.3832
relay.bitcoinveneto.org,64.1466,-21.9426
relay.hasenpfeffr.com,39.0438,-77.4874
strfry.openhoofd.nl,51.9229,4.40833
relay.aloftus.io,34.0881,-118.379
nostr.spaceshell.xyz,43.6532,-79.3832
nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832
ribo.af.nostria.app,-26.2041,28.0473
nostr.tac.lol,47.4748,-122.273
relay.satlantis.io,32.8769,-80.0114
nostr.azzamo.net,52.2633,21.0283
strfry.bonsai.com,37.8715,-122.273
relay.agora.social,50.7383,15.0648
nostr-relay.amethyst.name,39.0067,-77.4291
relay.toastr.net,40.8054,-74.0241
nostr.thebiglake.org,32.71,-96.6745
nostr-relay.nextblockvending.com,47.674,-122.122
vitor.nostr1.com,40.7057,-74.0136
relay.btcforplebs.com,43.6532,-79.3832
relay.g1sms.fr,43.9432,2.07537
nostr.jfischer.org,49.0291,8.35696
nostr.mikoshi.de,52.52,13.405
relay.notoshi.win,13.7829,100.546
pyramid.fiatjaf.com,50.1109,8.68213
relay.coinos.io,43.6532,-79.3832
relay.freeplace.nl,52.3676,4.90414
nostr-relay.psfoundation.info,39.0438,-77.4874
relay.copylaradio.com,51.223,6.78245
relay.exit.pub,50.4754,12.3683
freelay.sovbit.host,64.1476,-21.9392
nostr.satstralia.com,64.1476,-21.9392
nostr.l484.com,30.2944,-97.6223
nostr.rblb.it,43.4633,11.8796
nostr.2b9t.xyz,34.0549,-118.243
nostr.dlsouza.lol,50.1109,8.68213
strfry.shock.network,41.8959,-88.2169
offchain.pub,36.1809,-115.241
nostr-01.yakihonne.com,1.32123,103.695
nostr.kungfu-g.rip,33.7946,-84.4488
relay.letsfo.com,51.098,17.0321
relay.lifpay.me,1.35208,103.82
relay.damus.io,43.6532,-79.3832
relay2.angor.io,48.1046,11.6002
relayrs.notoshi.win,43.6532,-79.3832
relay2.ngengine.org,43.6532,-79.3832
portal-relay.pareto.space,49.4543,11.0746
inbox.azzamo.net,52.2633,21.0283
nostr-dev.wellorder.net,45.5201,-122.99
nostr.stakey.net,52.3676,4.90414
relay.13room.space,43.6532,-79.3832
relay.fountain.fm,39.0997,-94.5786
black.nostrcity.club,41.8781,-87.6298
nostr-2.21crypto.ch,47.4988,8.72369
dev-nostr.bityacht.io,25.0797,121.234
santo.iguanatech.net,40.8302,-74.1299
relay.angor.io,48.1046,11.6002
relay.tagayasu.xyz,43.6715,-79.38
relay.npubhaus.com,43.6532,-79.3832
relay01.lnfi.network,39.0997,-94.5786
nostr.myshosholoza.co.za,52.3676,4.90414
relay02.lnfi.network,39.0997,-94.5786
gnostr.com,40.9017,29.1616
nostr.sagaciousd.com,49.2827,-123.121
nostr.night7.space,50.4754,12.3683
schnorr.me,43.6532,-79.3832
nostr.blankfors.se,60.1699,24.9384
relay.mostro.network,40.8302,-74.1299
purpura.cloud,43.6532,-79.3832
ribo.eu.nostria.app,52.3676,4.90414
vidono.apps.slidestr.net,48.8566,2.35222
wheat.happytavern.co,43.6532,-79.3832
nostr.faultables.net,43.6532,-79.3832
relay5.bitransfer.org,43.6532,-79.3832
relay.nostrhub.fr,48.1046,11.6002
nostr.thaliyal.com,40.8218,-74.45
relay.holzeis.me,43.6532,-79.3832
relay.nostriot.com,41.5695,-83.9786
nostr.openhoofd.nl,51.9229,4.40833
relay.nostr.vet,52.6467,4.7395
nostr.camalolo.com,24.1469,120.684
relay.origin.land,35.6673,139.751
relay.chakany.systems,43.6532,-79.3832
relay.0xchat.com,1.35208,103.82
nostr.mom,50.4754,12.3683
4u2ni0zjbjvni.clorecloud.net,43.6532,-79.3832
prl.plus,55.7623,37.6381
relay.moinsen.com,50.4754,12.3683
nostr-02.czas.top,53.471,9.88208
relay.sigit.io,50.4754,12.3683
relay.nostrcheck.me,43.6532,-79.3832
relay03.lnfi.network,39.0997,-94.5786
relay.sincensura.org,43.6532,-79.3832
nostr.coincards.com,53.5501,-113.469
nostr-03.dorafactory.org,1.35208,103.82
relay.credenso.cafe,43.1149,-80.7228
nostr.fbxl.net,48.3809,-89.2477
relay.bullishbounty.com,43.6532,-79.3832
nos.xmark.cc,50.6924,3.20113 nos.xmark.cc,50.6924,3.20113
x.kojira.io,43.6532,-79.3832 nostr.mikoshi.de,50.1109,8.68213
wot.sovbit.host,64.1466,-21.9426
shu05.shugur.net,48.8566,2.35222
nostr.carroarmato0.be,50.9928,3.26317
relay.cosmicbolt.net,37.3986,-121.964
r.bitcoinhold.net,43.6532,-79.3832
nostr.diakod.com,43.6532,-79.3832
nostr-relay.cbrx.io,43.6532,-79.3832
nostr.coincrowd.fund,39.0438,-77.4874
cyberspace.nostr1.com,40.7128,-74.006
relay.barine.co,43.6532,-79.3832
relay.orangepill.ovh,49.1689,-0.358841
no.str.cr,9.92857,-84.0528
nostr.casa21.space,43.6532,-79.3832
relay.mwaters.net,50.9871,2.12554
relay.magiccity.live,25.8128,-80.2377 relay.magiccity.live,25.8128,-80.2377
relayone.soundhsa.com,34.0479,-118.256 nostr-verified.wellorder.net,45.5201,-122.99
slick.mjex.me,39.048,-77.4817 nostr.makibisskey.work,43.6532,-79.3832
relay.utxo.farm,35.6916,139.768 wot.nostr.party,36.1627,-86.7816
theoutpost.life,64.1476,-21.9392 relay.copylaradio.com,51.223,6.78245
nostr.hekster.org,37.3986,-121.964 nostr.sathoarder.com,48.5734,7.75211
strfry.felixzieger.de,50.1013,8.62643
relay.mess.ch,47.3591,8.55292
wot.codingarena.top,50.4754,12.3683
nostrelay.circum.space,51.2217,6.77616
nostr-relay.online,43.6532,-79.3832
temp.iris.to,43.6532,-79.3832
wot.dergigi.com,64.1476,-21.9392
wot.brightbolt.net,47.6735,-116.781
nostr-rs-relay-ishosta.phamthanh.me,43.6532,-79.3832
wot.nostr.place,30.2672,-97.7431
ribo.us.nostria.app,41.5868,-93.625
relay.nostr.net,50.4754,12.3683
nostr-02.dorafactory.org,1.35208,103.82
relay.tapestry.ninja,40.8054,-74.0241
adre.su,59.9311,30.3609
librerelay.aaroniumii.com,43.6532,-79.3832
nostr-pub.wellorder.net,45.5201,-122.99
kitchen.zap.cooking,43.6532,-79.3832
nostr.21crypto.ch,47.4988,8.72369
nostr-02.yakihonne.com,1.32123,103.695
relay.javi.space,43.4633,11.8796
nostr.ser1.net,12.9716,77.5946
relay-rpi.edufeed.org,49.4543,11.0746
premium.primal.net,43.6532,-79.3832
relay.degmods.com,50.4754,12.3683
relay.arx-ccn.com,50.4754,12.3683
nostr.chaima.info,51.223,6.78245
relay.illuminodes.com,47.6061,-122.333
relay.nostx.io,43.6532,-79.3832
relay.puresignal.news,43.6532,-79.3832
fenrir-s.notoshi.win,43.6532,-79.3832
relay.getsafebox.app,43.6532,-79.3832
relay.conduit.market,43.6532,-79.3832
relay.jeffg.fyi,43.6532,-79.3832 relay.jeffg.fyi,43.6532,-79.3832
nproxy.kristapsk.lv,60.1699,24.9384 relay.wellorder.net,45.5201,-122.99
relay.olas.app,50.4754,12.3683 nostr.ovia.to,43.6532,-79.3832
relay.dwadziesciajeden.pl,52.2297,21.0122 black.nostrcity.club,41.8781,-87.6298
relay-testnet.k8s.layer3.news,37.3387,-121.885 relay.nostrcheck.me,43.6532,-79.3832
nostr.pleb.one,38.6327,-90.1961 nostr-relay.cbrx.io,43.6532,-79.3832
relay.digitalezukunft.cyou,45.5019,-73.5674 nostr-03.dorafactory.org,1.35208,103.82
relay.evanverma.com,40.8302,-74.1299
wot.dtonon.com,43.6532,-79.3832
relay.seq1.net,43.6532,-79.3832
nostr.kalf.org,52.3676,4.90414
nostr.snowbla.de,60.1699,24.9384
nostr.spicyz.io,43.6532,-79.3832
nostr-relay.zimage.com,34.282,-118.439 nostr-relay.zimage.com,34.282,-118.439
nostr.spacecitynode.com,29.7057,-95.2706 relay.sigit.io,50.4754,12.3683
dev-relay.lnfi.network,39.0997,-94.5786 relay.laantungir.net,-19.4692,-42.5315
relay-admin.thaliyal.com,40.8218,-74.45
relay.mwaters.net,50.9871,2.12554
relay.lumina.rocks,49.0291,8.35695
nostr.satstralia.com,64.1476,-21.9392
nostr.sagaciousd.com,49.2827,-123.121
relay.bullishbounty.com,43.6532,-79.3832
wot.dergigi.com,64.1476,-21.9392
relay.vrtmrz.net,43.6532,-79.3832
nostr.0x7e.xyz,47.4988,8.72369
articles.layer3.news,37.3387,-121.885
relay.digitalezukunft.cyou,45.5019,-73.5674
nostr.notribe.net,40.8302,-74.1299
nostr.21crypto.ch,47.4988,8.72369
relay.lifpay.me,1.35208,103.82
relay.g1sms.fr,43.9432,2.07537
relay.snort.social,43.6532,-79.3832
relay.getsafebox.app,43.6532,-79.3832
relay.moinsen.com,50.4754,12.3683
nostr.blankfors.se,60.1699,24.9384
nostr-relay-1.trustlessenterprise.com,43.6532,-79.3832
orangesync.tech,50.1109,8.68213
relay.ru.ac.th,13.7584,100.622
orangepiller.org,60.1699,24.9384
relay.nostr.band,60.1699,24.9384
wot.soundhsa.com,34.0479,-118.256
khatru.nostrver.se,51.8933,4.42083
nostr.hifish.org,47.4043,8.57398
freelay.sovbit.host,64.1476,-21.9392
nostr.bilthon.dev,25.8128,-80.2377
nostr.night7.space,50.4754,12.3683
relay.illuminodes.com,47.6061,-122.333
relayone.soundhsa.com,34.0479,-118.256
nostr.azzamo.net,52.2633,21.0283
fenrir-s.notoshi.win,43.6532,-79.3832
nostr.spicyz.io,43.6532,-79.3832
nostrelay.memory-art.xyz,43.6532,-79.3832
nostr.coincards.com,53.5501,-113.469
alien.macneilmediagroup.com,43.6532,-79.3832
nostrings-relay-dev.fly.dev,41.8781,-87.6298
relay.satlantis.io,32.8769,-80.0114
srtrelay.c-stellar.net,43.6532,-79.3832
relay.agora.social,50.7383,15.0648
relay.bitcoindistrict.org,43.6532,-79.3832
relay.0xchat.com,1.35208,103.82
wot.utxo.one,43.6532,-79.3832
relay.bitcoinartclock.com,50.4754,12.3683
nostr.zenon.network,43.5009,-70.4428
wot.codingarena.top,50.4754,12.3683
nostr-02.dorafactory.org,1.35208,103.82
relay.nostromo.social,49.4543,11.0746
theoutpost.life,64.1476,-21.9392
strfry.shock.network,41.8959,-88.2169
strfry.openhoofd.nl,51.9229,4.40833
itanostr.space,52.2931,4.79099 itanostr.space,52.2931,4.79099
relay.barine.co,43.6532,-79.3832
nostr.middling.mydns.jp,35.8099,140.12
relay.olas.app,50.4754,12.3683
nostr.girino.org,43.6532,-79.3832
nostr-relay.online,43.6532,-79.3832
relay.evanverma.com,40.8302,-74.1299
relay.angor.io,48.1046,11.6002
relay.nostrdice.com,-33.8688,151.209
ribo.us.nostria.app,41.5868,-93.625
relay01.lnfi.network,39.0997,-94.5786
nostr.namek.link,43.6532,-79.3832
relay.aloftus.io,34.0881,-118.379
ithurtswhenip.ee,51.223,6.78245
ribo.af.nostria.app,-26.2041,28.0473
shu05.shugur.net,48.8566,2.35222
noxir.kpherox.dev,34.8587,135.509
relay.degmods.com,50.4754,12.3683
relay.goodmorningbitcoin.com,43.6532,-79.3832
nostr.4rs.nl,49.0291,8.35696
nostr-relay.psfoundation.info,39.0438,-77.4874
relay.hasenpfeffr.com,39.0438,-77.4874
fanfares.nostr1.com,40.7128,-74.006
relay.nosto.re,51.8933,4.42083
nostr.liberty.fans,36.9104,-89.5875
nostr-2.21crypto.ch,47.4988,8.72369
relay-rpi.edufeed.org,49.4543,11.0746
offchain.pub,36.1809,-115.241
nostr.88mph.life,43.6532,-79.3832
nostr.luisschwab.net,43.6532,-79.3832
nostr.casa21.space,43.6532,-79.3832
nostr.hekster.org,37.3986,-121.964
relay.utxo.farm,35.6916,139.768
zap.watch,45.5029,-73.5723
nostr-pub.wellorder.net,45.5201,-122.99
wot.sovbit.host,64.1466,-21.9426
relay.endfiat.money,43.6532,-79.3832
nostr2.girino.org,43.6532,-79.3832
nostr.jerrynya.fun,31.2304,121.474
nostr.spacecitynode.com,29.7057,-95.2706
relay.siamdev.cc,13.9178,100.424
relay.notoshi.win,13.7829,100.546
relay.nostx.io,43.6532,-79.3832
relay.cypherflow.ai,48.8566,2.35222
relay.letsfo.com,51.098,17.0321
librerelay.aaroniumii.com,43.6532,-79.3832
gnostr.com,40.9017,29.1616
nostr.pleb.one,38.6327,-90.1961
nostr.mehdibekhtaoui.com,49.4939,-1.54813
nostr.tadryanom.me,43.6532,-79.3832
relay.orangepill.ovh,49.1689,-0.358841
nostr.stakey.net,52.3676,4.90414
nostr.rtvslawenia.com,49.4543,11.0746
relay.damus.io,43.6532,-79.3832
dev-relay.lnfi.network,39.0997,-94.5786
slick.mjex.me,39.048,-77.4817
wot.sudocarlos.com,51.5072,-0.127586
relay04.lnfi.network,39.0997,-94.5786
relay.13room.space,43.6532,-79.3832
relay.conduit.market,43.6532,-79.3832
nostr.chaima.info,51.223,6.78245
1 Relay URL Latitude Longitude
2 relay.laantungir.net nostr.tac.lol -19.4692 47.4748 -42.5315 -122.273
3 relay.endfiat.money relay.javi.space 43.6532 43.4633 -79.3832 11.8796
relay.zone667.com 60.1699 24.9384
shu04.shugur.net 25.2604 55.2989
relay.bitcoinartclock.com 50.4754 12.3683
relay.nostromo.social 49.4543 11.0746
nostr.liberty.fans 36.9104 -89.5875
roles-az-achieving-somebody.trycloudflare.com 43.6532 -79.3832
nostr-rs-relay.dev.fedibtc.com 39.0438 -77.4874
relay.nostr.wirednet.jp 34.706 135.493
4 nostr.einundzwanzig.space 50.1109 8.68213
5 relay.21e6.cz nostr.kalf.org 50.1682 52.3676 14.0546 4.90414
6 relay04.lnfi.network wot.dtonon.com 39.0997 43.6532 -94.5786 -79.3832
7 relay.chorus.community nostr-01.yakihonne.com 50.1109 1.32123 8.68213 103.695
8 relay.nostr.place wot.basspistol.org 32.7767 49.4521 -96.797 11.0767
9 relay.vrtmrz.net relay.puresignal.news 43.6532 -79.3832
10 noxir.kpherox.dev nostrelites.org 34.8587 41.8781 135.509 -87.6298
11 wot.nostr.net nostr-relay.nextblockvending.com 43.6532 47.674 -79.3832 -122.122
12 relay.cypherflow.ai relay03.lnfi.network 48.8566 39.0997 2.35222 -94.5786
13 wot.sudocarlos.com nproxy.kristapsk.lv 51.5072 60.1699 -0.127586 24.9384
14 nostr.jerrynya.fun relay.toastr.net 31.2304 40.8054 121.474 -74.0241
nostr2.girino.org 43.6532 -79.3832
nostrings-relay-dev.fly.dev 41.8781 -87.6298
fanfares.nostr1.com 40.7128 -74.006
nostr.red5d.dev 43.6532 -79.3832
nostr.hifish.org 47.4043 8.57398
nostr.now 36.55 139.733
relay.nostr.band 60.1699 24.9384
relay.wavlake.com 41.2619 -95.8608
nostr.bilthon.dev 25.8128 -80.2377
khatru.nostrver.se 51.8933 4.42083
relay.bitcoindistrict.org 43.6532 -79.3832
nostr.makibisskey.work 43.6532 -79.3832
relay.nostraddress.com 43.6532 -79.3832
relay.jmoose.rocks 60.1699 24.9384
15 relay.davidebtc.me 51.5072 -0.127586
16 a.nos.lol wot.nostr.net 50.4754 43.6532 12.3683 -79.3832
nostr.tadryanom.me 43.6532 -79.3832
relay.nostrdice.com -33.8688 151.209
relay.lumina.rocks 49.0291 8.35695
relay.goodmorningbitcoin.com 43.6532 -79.3832
nostr.rtvslawenia.com 49.4543 11.0746
17 relay.mattybs.lol 43.6532 -79.3832
18 relay.zone667.com 60.1699 24.9384
19 nostr.kungfu-g.rip 33.7946 -84.4488
20 relay.mccormick.cx 52.3563 4.95714
21 relay.dwadziesciajeden.pl 52.2297 21.0122
22 nostr.data.haus 50.4754 12.3683
23 vitor.nostr1.com 40.7128 -74.006
24 purpura.cloud 43.6532 -79.3832
25 relay2.angor.io 48.1046 11.6002
26 nos.lol 50.4754 12.3683
27 nostr.rohoss.com 50.1109 8.68213
28 strfry.bonsai.com 37.8715 -122.273
29 relay.fountain.fm 39.0997 -94.5786
30 relay.npubhaus.com 43.6532 -79.3832
31 relay.nostr.wirednet.jp 34.706 135.493
32 soloco.nl 43.6532 -79.3832
33 shu01.shugur.net 21.4902 39.2246
34 nostr.davidebtc.me 51.5072 -0.127586
35 pyramid.fiatjaf.com 50.1109 8.68213
36 relay.ditto.pub 43.6532 -79.3832
37 relay.nostr.vet 52.6467 4.7395
38 relay.wavlake.com 41.2619 -95.8608
39 ribo.eu.nostria.app 52.3676 4.90414
40 relay.ngengine.org 43.6532 -79.3832
41 relay.bitcoinveneto.org 64.1466 -21.9426
42 no.str.cr 9.92857 -84.0528
43 relay.primal.net 43.6532 -79.3832
44 ynostr.yael.at 60.1699 24.9384
45 nostr.camalolo.com 24.1469 120.684
46 purplerelay.com 50.1109 8.68213
47 nostr-rs-relay-ishosta.phamthanh.me 43.6532 -79.3832
48 relay.internationalright-wing.org -22.5022 -48.7114
49 wheat.happytavern.co 43.6532 -79.3832
50 nostr.lostr.space 43.6532 -79.3832
51 relay.tagayasu.xyz 43.6715 -79.38
52 relay.varke.eu 52.6921 6.19372
53 free.relayted.de 50.1109 8.68213
54 nostr.thebiglake.org 32.71 -96.6745
55 nostr.lojong.info 43.6532 -79.3832
56 nostr.now 36.55 139.733
57 relay.jmoose.rocks 60.1699 24.9384
58 relay.holzeis.me 43.6532 -79.3832
59 nostr.roundrockbitcoiners.com 40.8054 -74.0241
60 nostr-rs-relay.dev.fedibtc.com 39.0438 -77.4874
61 relay2.ngengine.org 43.6532 -79.3832
62 nostr.snowbla.de 60.1699 24.9384
63 4u2ni0zjbjvni.clorecloud.net 43.6532 -79.3832
64 shu04.shugur.net 25.2604 55.2989
65 relay.fr13nd5.com 52.5233 13.3426
66 nostr.vulpem.com 49.4543 11.0746
67 temp.iris.to 43.6532 -79.3832
68 x.kojira.io 43.6532 -79.3832
69 adre.su 59.9311 30.3609
70 nostr-dev.wellorder.net 45.5201 -122.99
71 nostr.mom 50.4754 12.3683
72 relay.nostr.place 32.7767 -96.797
73 wot.nostr.place 30.2672 -97.7431
74 nostr.carroarmato0.be 50.9928 3.26317
75 nostrelay.circum.space 51.2217 6.77616
76 relay.chorus.community 50.1109 8.68213
77 relay.nostr.net 50.4754 12.3683
78 relay.nostr-check.me 43.6532 -79.3832
79 relay.nostrhub.fr 48.1046 11.6002
80 relay.nostraddress.com 43.6532 -79.3832
81 nostr.rblb.it 43.4633 11.8796
82 nostr.red5d.dev 43.6532 -79.3832
83 santo.iguanatech.net 40.8302 -74.1299
84 relay02.lnfi.network 39.0997 -94.5786
85 relay.21e6.cz 50.1682 14.0546
86 a.nos.lol 50.4754 12.3683
87 shu02.shugur.net 21.4902 39.2246
88 schnorr.me 43.6532 -79.3832
89 nostr.n7ekb.net 47.4941 -122.294
90 wot.shaving.kiwi 43.6532 -79.3832
91 dev-nostr.bityacht.io 25.0797 121.234
92 relay.credenso.cafe 43.1149 -80.7228
93 relay-testnet.k8s.layer3.news 37.3387 -121.885
94 relay.mess.ch 47.3591 8.55292
95 inbox.azzamo.net 52.2633 21.0283
96 prl.plus 55.7623 37.6381
97 yabu.me 35.6092 139.73
98 relayrs.notoshi.win 43.6532 -79.3832
99 premium.primal.net 43.6532 -79.3832
100 nostr.coincrowd.fund 39.0438 -77.4874
101 nostr.2b9t.xyz 34.0549 -118.243
102 nostr.thaliyal.com 40.8218 -74.45
103 relay.exit.pub 50.4754 12.3683
104 nostr.jfischer.org 49.0291 8.35696
105 relay.origin.land 35.6673 139.751
106 nostr.myshosholoza.co.za 52.3676 4.90414
107 relay.nostriot.com 41.5695 -83.9786
108 relay.btcforplebs.com 43.6532 -79.3832
109 relay.chakany.systems 43.6532 -79.3832
110 nostr.openhoofd.nl 51.9229 4.40833
111 nostrcheck.me 43.6532 -79.3832
112 nostr.plantroon.com 50.1013 8.62643
113 satsage.xyz 37.3986 -121.964
114 nostr.faultables.net 43.6532 -79.3832
115 nostr.calitabby.net 39.9268 -75.0246
116 relay.freeplace.nl 52.3676 4.90414
117 relay.nostrhub.tech 49.4543 11.0746
118 roles-az-achieving-somebody.trycloudflare.com 43.6532 -79.3832
119 relay.arx-ccn.com 50.4754 12.3683
120 cyberspace.nostr1.com 40.7128 -74.006
121 nostr.smut.cloud 43.6532 -79.3832
122 nostr-02.czas.top 53.471 9.88208
123 relay.tapestry.ninja 40.8054 -74.0241
124 relay.mostro.network 40.8302 -74.1299
125 wot.brightbolt.net 47.6735 -116.781
126 nostr.spaceshell.xyz 43.6532 -79.3832
127 nostr.rikmeijer.nl 50.4754 12.3683
128 relay.artx.market 43.652 -79.3633
129 strfry.felixzieger.de 50.1013 8.62643
130 relay.seq1.net 43.6532 -79.3832
131 relay.cosmicbolt.net 37.3986 -121.964
132 relay.electriclifestyle.com 26.2897 -80.1293
133 r.bitcoinhold.net 43.6532 -79.3832
134 nostr-relay.amethyst.name 39.0067 -77.4291
135 relay.stream.labs.h3.se 59.4016 17.9455
136 relay.unknown.cloud 43.6532 -79.3832
137 nostr-02.yakihonne.com 1.32123 103.695
138 relay.coinos.io 43.6532 -79.3832
139 relay5.bitransfer.org 43.6532 -79.3832
140 relay-dev.satlantis.io 40.8302 -74.1299
141 nostream.breadslice.com 43.6532 -79.3832
142 nostr.vulpem.com relay.fundstr.me 49.4543 42.3601 11.0746 -71.0589
143 nostr.rohoss.com nostr.oxtr.dev 50.1109 50.4754 8.68213 12.3683
articles.layer3.news 37.3387 -121.885
nos.lol 50.4754 12.3683
relay.artx.market 43.652 -79.3633
wot.sebastix.social 51.8933 4.42083
alien.macneilmediagroup.com 43.6532 -79.3832
relay.unknown.cloud 43.6532 -79.3832
nostr.lojong.info 43.6532 -79.3832
nostr.zenon.network 43.5009 -70.4428
orangesync.tech 50.1109 8.68213
nostr.davidebtc.me 51.5072 -0.127586
internationalright-wing.org -22.5022 -48.7114
nostr.rikmeijer.nl 50.4754 12.3683
ynostr.yael.at 60.1699 24.9384
ithurtswhenip.ee 51.223 6.78245
relay.wellorder.net 45.5201 -122.99
nostr.sathoarder.com 48.5734 7.75211
purplerelay.com 50.1109 8.68213
yabu.me 35.6092 139.73
nostr.88mph.life 43.6532 -79.3832
nostr.overmind.lol 43.6532 -79.3832
rnostr.breadslice.com 43.6532 -79.3832
zap.watch 45.5029 -73.5723
wot.basspistol.org 49.4521 11.0767
shu01.shugur.net 21.4902 39.2246
relay.electriclifestyle.com 26.2897 -80.1293
relay.mccormick.cx 52.3563 4.95714
nostr.middling.mydns.jp 35.8099 140.12
nostr.smut.cloud 43.6532 -79.3832
satsage.xyz 37.3986 -121.964
srtrelay.c-stellar.net 43.6532 -79.3832
nostr.0x7e.xyz 47.4988 8.72369
shu02.shugur.net 21.4902 39.2246
nostrelites.org 41.8781 -87.6298
relay-admin.thaliyal.com 40.8218 -74.45
wot.soundhsa.com 34.0479 -118.256
nostrcheck.me 43.6532 -79.3832
relay.nostrhub.tech 49.4543 11.0746
relay.stream.labs.h3.se 59.4016 17.9455
nostrelay.memory-art.xyz 43.6532 -79.3832
nostr.n7ekb.net 47.4941 -122.294
relay.nosto.re 51.8933 4.42083
nostr.girino.org 43.6532 -79.3832
relay.siamdev.cc 13.9178 100.424
nostr.mehdibekhtaoui.com 49.4939 -1.54813
orangepiller.org 60.1699 24.9384
nostr.plantroon.com 50.1013 8.62643
nostr-verified.wellorder.net 45.5201 -122.99
relay.primal.net 43.6532 -79.3832
relay.bitcoinveneto.org 64.1466 -21.9426
relay.hasenpfeffr.com 39.0438 -77.4874
strfry.openhoofd.nl 51.9229 4.40833
relay.aloftus.io 34.0881 -118.379
nostr.spaceshell.xyz 43.6532 -79.3832
nostr-relay-1.trustlessenterprise.com 43.6532 -79.3832
ribo.af.nostria.app -26.2041 28.0473
nostr.tac.lol 47.4748 -122.273
relay.satlantis.io 32.8769 -80.0114
nostr.azzamo.net 52.2633 21.0283
strfry.bonsai.com 37.8715 -122.273
relay.agora.social 50.7383 15.0648
nostr-relay.amethyst.name 39.0067 -77.4291
relay.toastr.net 40.8054 -74.0241
nostr.thebiglake.org 32.71 -96.6745
nostr-relay.nextblockvending.com 47.674 -122.122
vitor.nostr1.com 40.7057 -74.0136
relay.btcforplebs.com 43.6532 -79.3832
relay.g1sms.fr 43.9432 2.07537
nostr.jfischer.org 49.0291 8.35696
nostr.mikoshi.de 52.52 13.405
relay.notoshi.win 13.7829 100.546
pyramid.fiatjaf.com 50.1109 8.68213
relay.coinos.io 43.6532 -79.3832
relay.freeplace.nl 52.3676 4.90414
nostr-relay.psfoundation.info 39.0438 -77.4874
relay.copylaradio.com 51.223 6.78245
relay.exit.pub 50.4754 12.3683
freelay.sovbit.host 64.1476 -21.9392
nostr.satstralia.com 64.1476 -21.9392
nostr.l484.com 30.2944 -97.6223
nostr.rblb.it 43.4633 11.8796
nostr.2b9t.xyz 34.0549 -118.243
nostr.dlsouza.lol 50.1109 8.68213
strfry.shock.network 41.8959 -88.2169
offchain.pub 36.1809 -115.241
nostr-01.yakihonne.com 1.32123 103.695
nostr.kungfu-g.rip 33.7946 -84.4488
relay.letsfo.com 51.098 17.0321
relay.lifpay.me 1.35208 103.82
relay.damus.io 43.6532 -79.3832
relay2.angor.io 48.1046 11.6002
relayrs.notoshi.win 43.6532 -79.3832
relay2.ngengine.org 43.6532 -79.3832
portal-relay.pareto.space 49.4543 11.0746
inbox.azzamo.net 52.2633 21.0283
nostr-dev.wellorder.net 45.5201 -122.99
nostr.stakey.net 52.3676 4.90414
relay.13room.space 43.6532 -79.3832
relay.fountain.fm 39.0997 -94.5786
black.nostrcity.club 41.8781 -87.6298
nostr-2.21crypto.ch 47.4988 8.72369
dev-nostr.bityacht.io 25.0797 121.234
santo.iguanatech.net 40.8302 -74.1299
relay.angor.io 48.1046 11.6002
relay.tagayasu.xyz 43.6715 -79.38
relay.npubhaus.com 43.6532 -79.3832
relay01.lnfi.network 39.0997 -94.5786
nostr.myshosholoza.co.za 52.3676 4.90414
relay02.lnfi.network 39.0997 -94.5786
gnostr.com 40.9017 29.1616
nostr.sagaciousd.com 49.2827 -123.121
nostr.night7.space 50.4754 12.3683
schnorr.me 43.6532 -79.3832
nostr.blankfors.se 60.1699 24.9384
relay.mostro.network 40.8302 -74.1299
purpura.cloud 43.6532 -79.3832
ribo.eu.nostria.app 52.3676 4.90414
vidono.apps.slidestr.net 48.8566 2.35222
wheat.happytavern.co 43.6532 -79.3832
nostr.faultables.net 43.6532 -79.3832
relay5.bitransfer.org 43.6532 -79.3832
relay.nostrhub.fr 48.1046 11.6002
nostr.thaliyal.com 40.8218 -74.45
relay.holzeis.me 43.6532 -79.3832
relay.nostriot.com 41.5695 -83.9786
nostr.openhoofd.nl 51.9229 4.40833
relay.nostr.vet 52.6467 4.7395
nostr.camalolo.com 24.1469 120.684
relay.origin.land 35.6673 139.751
relay.chakany.systems 43.6532 -79.3832
relay.0xchat.com 1.35208 103.82
nostr.mom 50.4754 12.3683
4u2ni0zjbjvni.clorecloud.net 43.6532 -79.3832
prl.plus 55.7623 37.6381
relay.moinsen.com 50.4754 12.3683
nostr-02.czas.top 53.471 9.88208
relay.sigit.io 50.4754 12.3683
relay.nostrcheck.me 43.6532 -79.3832
relay03.lnfi.network 39.0997 -94.5786
relay.sincensura.org 43.6532 -79.3832
nostr.coincards.com 53.5501 -113.469
nostr-03.dorafactory.org 1.35208 103.82
relay.credenso.cafe 43.1149 -80.7228
nostr.fbxl.net 48.3809 -89.2477
relay.bullishbounty.com 43.6532 -79.3832
144 nos.xmark.cc 50.6924 3.20113
145 x.kojira.io nostr.mikoshi.de 43.6532 50.1109 -79.3832 8.68213
wot.sovbit.host 64.1466 -21.9426
shu05.shugur.net 48.8566 2.35222
nostr.carroarmato0.be 50.9928 3.26317
relay.cosmicbolt.net 37.3986 -121.964
r.bitcoinhold.net 43.6532 -79.3832
nostr.diakod.com 43.6532 -79.3832
nostr-relay.cbrx.io 43.6532 -79.3832
nostr.coincrowd.fund 39.0438 -77.4874
cyberspace.nostr1.com 40.7128 -74.006
relay.barine.co 43.6532 -79.3832
relay.orangepill.ovh 49.1689 -0.358841
no.str.cr 9.92857 -84.0528
nostr.casa21.space 43.6532 -79.3832
relay.mwaters.net 50.9871 2.12554
146 relay.magiccity.live 25.8128 -80.2377
147 relayone.soundhsa.com nostr-verified.wellorder.net 34.0479 45.5201 -118.256 -122.99
148 slick.mjex.me nostr.makibisskey.work 39.048 43.6532 -77.4817 -79.3832
149 relay.utxo.farm wot.nostr.party 35.6916 36.1627 139.768 -86.7816
150 theoutpost.life relay.copylaradio.com 64.1476 51.223 -21.9392 6.78245
151 nostr.hekster.org nostr.sathoarder.com 37.3986 48.5734 -121.964 7.75211
strfry.felixzieger.de 50.1013 8.62643
relay.mess.ch 47.3591 8.55292
wot.codingarena.top 50.4754 12.3683
nostrelay.circum.space 51.2217 6.77616
nostr-relay.online 43.6532 -79.3832
temp.iris.to 43.6532 -79.3832
wot.dergigi.com 64.1476 -21.9392
wot.brightbolt.net 47.6735 -116.781
nostr-rs-relay-ishosta.phamthanh.me 43.6532 -79.3832
wot.nostr.place 30.2672 -97.7431
ribo.us.nostria.app 41.5868 -93.625
relay.nostr.net 50.4754 12.3683
nostr-02.dorafactory.org 1.35208 103.82
relay.tapestry.ninja 40.8054 -74.0241
adre.su 59.9311 30.3609
librerelay.aaroniumii.com 43.6532 -79.3832
nostr-pub.wellorder.net 45.5201 -122.99
kitchen.zap.cooking 43.6532 -79.3832
nostr.21crypto.ch 47.4988 8.72369
nostr-02.yakihonne.com 1.32123 103.695
relay.javi.space 43.4633 11.8796
nostr.ser1.net 12.9716 77.5946
relay-rpi.edufeed.org 49.4543 11.0746
premium.primal.net 43.6532 -79.3832
relay.degmods.com 50.4754 12.3683
relay.arx-ccn.com 50.4754 12.3683
nostr.chaima.info 51.223 6.78245
relay.illuminodes.com 47.6061 -122.333
relay.nostx.io 43.6532 -79.3832
relay.puresignal.news 43.6532 -79.3832
fenrir-s.notoshi.win 43.6532 -79.3832
relay.getsafebox.app 43.6532 -79.3832
relay.conduit.market 43.6532 -79.3832
152 relay.jeffg.fyi 43.6532 -79.3832
153 nproxy.kristapsk.lv relay.wellorder.net 60.1699 45.5201 24.9384 -122.99
154 relay.olas.app nostr.ovia.to 50.4754 43.6532 12.3683 -79.3832
155 relay.dwadziesciajeden.pl black.nostrcity.club 52.2297 41.8781 21.0122 -87.6298
156 relay-testnet.k8s.layer3.news relay.nostrcheck.me 37.3387 43.6532 -121.885 -79.3832
157 nostr.pleb.one nostr-relay.cbrx.io 38.6327 43.6532 -90.1961 -79.3832
158 relay.digitalezukunft.cyou nostr-03.dorafactory.org 45.5019 1.35208 -73.5674 103.82
relay.evanverma.com 40.8302 -74.1299
wot.dtonon.com 43.6532 -79.3832
relay.seq1.net 43.6532 -79.3832
nostr.kalf.org 52.3676 4.90414
nostr.snowbla.de 60.1699 24.9384
nostr.spicyz.io 43.6532 -79.3832
159 nostr-relay.zimage.com 34.282 -118.439
160 nostr.spacecitynode.com relay.sigit.io 29.7057 50.4754 -95.2706 12.3683
161 dev-relay.lnfi.network relay.laantungir.net 39.0997 -19.4692 -94.5786 -42.5315
162 relay-admin.thaliyal.com 40.8218 -74.45
163 relay.mwaters.net 50.9871 2.12554
164 relay.lumina.rocks 49.0291 8.35695
165 nostr.satstralia.com 64.1476 -21.9392
166 nostr.sagaciousd.com 49.2827 -123.121
167 relay.bullishbounty.com 43.6532 -79.3832
168 wot.dergigi.com 64.1476 -21.9392
169 relay.vrtmrz.net 43.6532 -79.3832
170 nostr.0x7e.xyz 47.4988 8.72369
171 articles.layer3.news 37.3387 -121.885
172 relay.digitalezukunft.cyou 45.5019 -73.5674
173 nostr.notribe.net 40.8302 -74.1299
174 nostr.21crypto.ch 47.4988 8.72369
175 relay.lifpay.me 1.35208 103.82
176 relay.g1sms.fr 43.9432 2.07537
177 relay.snort.social 43.6532 -79.3832
178 relay.getsafebox.app 43.6532 -79.3832
179 relay.moinsen.com 50.4754 12.3683
180 nostr.blankfors.se 60.1699 24.9384
181 nostr-relay-1.trustlessenterprise.com 43.6532 -79.3832
182 orangesync.tech 50.1109 8.68213
183 relay.ru.ac.th 13.7584 100.622
184 orangepiller.org 60.1699 24.9384
185 relay.nostr.band 60.1699 24.9384
186 wot.soundhsa.com 34.0479 -118.256
187 khatru.nostrver.se 51.8933 4.42083
188 nostr.hifish.org 47.4043 8.57398
189 freelay.sovbit.host 64.1476 -21.9392
190 nostr.bilthon.dev 25.8128 -80.2377
191 nostr.night7.space 50.4754 12.3683
192 relay.illuminodes.com 47.6061 -122.333
193 relayone.soundhsa.com 34.0479 -118.256
194 nostr.azzamo.net 52.2633 21.0283
195 fenrir-s.notoshi.win 43.6532 -79.3832
196 nostr.spicyz.io 43.6532 -79.3832
197 nostrelay.memory-art.xyz 43.6532 -79.3832
198 nostr.coincards.com 53.5501 -113.469
199 alien.macneilmediagroup.com 43.6532 -79.3832
200 nostrings-relay-dev.fly.dev 41.8781 -87.6298
201 relay.satlantis.io 32.8769 -80.0114
202 srtrelay.c-stellar.net 43.6532 -79.3832
203 relay.agora.social 50.7383 15.0648
204 relay.bitcoindistrict.org 43.6532 -79.3832
205 relay.0xchat.com 1.35208 103.82
206 wot.utxo.one 43.6532 -79.3832
207 relay.bitcoinartclock.com 50.4754 12.3683
208 nostr.zenon.network 43.5009 -70.4428
209 wot.codingarena.top 50.4754 12.3683
210 nostr-02.dorafactory.org 1.35208 103.82
211 relay.nostromo.social 49.4543 11.0746
212 theoutpost.life 64.1476 -21.9392
213 strfry.shock.network 41.8959 -88.2169
214 strfry.openhoofd.nl 51.9229 4.40833
215 itanostr.space 52.2931 4.79099
216 relay.barine.co 43.6532 -79.3832
217 nostr.middling.mydns.jp 35.8099 140.12
218 relay.olas.app 50.4754 12.3683
219 nostr.girino.org 43.6532 -79.3832
220 nostr-relay.online 43.6532 -79.3832
221 relay.evanverma.com 40.8302 -74.1299
222 relay.angor.io 48.1046 11.6002
223 relay.nostrdice.com -33.8688 151.209
224 ribo.us.nostria.app 41.5868 -93.625
225 relay01.lnfi.network 39.0997 -94.5786
226 nostr.namek.link 43.6532 -79.3832
227 relay.aloftus.io 34.0881 -118.379
228 ithurtswhenip.ee 51.223 6.78245
229 ribo.af.nostria.app -26.2041 28.0473
230 shu05.shugur.net 48.8566 2.35222
231 noxir.kpherox.dev 34.8587 135.509
232 relay.degmods.com 50.4754 12.3683
233 relay.goodmorningbitcoin.com 43.6532 -79.3832
234 nostr.4rs.nl 49.0291 8.35696
235 nostr-relay.psfoundation.info 39.0438 -77.4874
236 relay.hasenpfeffr.com 39.0438 -77.4874
237 fanfares.nostr1.com 40.7128 -74.006
238 relay.nosto.re 51.8933 4.42083
239 nostr.liberty.fans 36.9104 -89.5875
240 nostr-2.21crypto.ch 47.4988 8.72369
241 relay-rpi.edufeed.org 49.4543 11.0746
242 offchain.pub 36.1809 -115.241
243 nostr.88mph.life 43.6532 -79.3832
244 nostr.luisschwab.net 43.6532 -79.3832
245 nostr.casa21.space 43.6532 -79.3832
246 nostr.hekster.org 37.3986 -121.964
247 relay.utxo.farm 35.6916 139.768
248 zap.watch 45.5029 -73.5723
249 nostr-pub.wellorder.net 45.5201 -122.99
250 wot.sovbit.host 64.1466 -21.9426
251 relay.endfiat.money 43.6532 -79.3832
252 nostr2.girino.org 43.6532 -79.3832
253 nostr.jerrynya.fun 31.2304 121.474
254 nostr.spacecitynode.com 29.7057 -95.2706
255 relay.siamdev.cc 13.9178 100.424
256 relay.notoshi.win 13.7829 100.546
257 relay.nostx.io 43.6532 -79.3832
258 relay.cypherflow.ai 48.8566 2.35222
259 relay.letsfo.com 51.098 17.0321
260 librerelay.aaroniumii.com 43.6532 -79.3832
261 gnostr.com 40.9017 29.1616
262 nostr.pleb.one 38.6327 -90.1961
263 nostr.mehdibekhtaoui.com 49.4939 -1.54813
264 nostr.tadryanom.me 43.6532 -79.3832
265 relay.orangepill.ovh 49.1689 -0.358841
266 nostr.stakey.net 52.3676 4.90414
267 nostr.rtvslawenia.com 49.4543 11.0746
268 relay.damus.io 43.6532 -79.3832
269 dev-relay.lnfi.network 39.0997 -94.5786
270 slick.mjex.me 39.048 -77.4817
271 wot.sudocarlos.com 51.5072 -0.127586
272 relay04.lnfi.network 39.0997 -94.5786
273 relay.13room.space 43.6532 -79.3832
274 relay.conduit.market 43.6532 -79.3832
275 nostr.chaima.info 51.223 6.78245