mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-08-29 07:27:16 +00:00
refactor: extract BridgeStatusSummary formatter with tests
Move bridge status string assembly into a testable helper used by App Info.
This commit is contained in:
parent
9e53a3fe13
commit
10679fa3e6
63
bitchat/Services/Gateway/BridgeStatusSummary.swift
Normal file
63
bitchat/Services/Gateway/BridgeStatusSummary.swift
Normal file
@ -0,0 +1,63 @@
|
||||
//
|
||||
// BridgeStatusSummary.swift
|
||||
// bitchat
|
||||
//
|
||||
// This is free and unencumbered software released into the public domain.
|
||||
// For more information, see <https://unlicense.org>
|
||||
//
|
||||
|
||||
import Foundation
|
||||
|
||||
/// One-line mesh bridge status for the settings pane.
|
||||
enum BridgeStatusSummary {
|
||||
static func formatted(
|
||||
enabled: Bool,
|
||||
cell: String?,
|
||||
bridgedCount: Int,
|
||||
nearbyOnly: Bool
|
||||
) -> String {
|
||||
if !enabled {
|
||||
return String(
|
||||
localized: "app_info.settings.bridge.status.off",
|
||||
defaultValue: "bridge off — only radio-range mesh traffic",
|
||||
comment: "Bridge status line when the mesh bridge toggle is off"
|
||||
)
|
||||
}
|
||||
let cellPart = cell.map {
|
||||
String(
|
||||
format: String(
|
||||
localized: "app_info.settings.bridge.status.cell",
|
||||
defaultValue: "rendezvous #%@",
|
||||
comment: "Bridge status fragment showing rendezvous cell; %@ is geohash"
|
||||
),
|
||||
locale: .current,
|
||||
$0
|
||||
)
|
||||
} ?? String(
|
||||
localized: "app_info.settings.bridge.status.no_cell",
|
||||
defaultValue: "no rendezvous cell",
|
||||
comment: "Bridge status fragment when no cell is active"
|
||||
)
|
||||
let peoplePart = String(
|
||||
format: String(
|
||||
localized: "app_info.settings.bridge.status.people",
|
||||
defaultValue: "%lld people via bridge",
|
||||
comment: "Bridge status fragment counting bridged participants; %lld is count"
|
||||
),
|
||||
locale: .current,
|
||||
bridgedCount
|
||||
)
|
||||
let composePart = nearbyOnly
|
||||
? String(
|
||||
localized: "app_info.settings.bridge.status.compose_nearby",
|
||||
defaultValue: "compose: nearby only",
|
||||
comment: "Bridge status fragment when outgoing mesh messages stay on radio"
|
||||
)
|
||||
: String(
|
||||
localized: "app_info.settings.bridge.status.compose_bridged",
|
||||
defaultValue: "compose: bridged",
|
||||
comment: "Bridge status fragment when outgoing mesh messages cross the bridge"
|
||||
)
|
||||
return [cellPart, peoplePart, composePart].joined(separator: " · ")
|
||||
}
|
||||
}
|
||||
@ -79,25 +79,12 @@ struct AppInfoView: View {
|
||||
}
|
||||
static let bridgeNoCell = String(localized: "app_info.settings.bridge.no_cell", defaultValue: "no rendezvous cell yet — needs location access or a nearby bridge peer", comment: "Caption under the mesh bridge toggle when the bridge is on but has no geohash cell to meet on")
|
||||
static func bridgeStatusSummary(enabled: Bool, cell: String?, bridgedCount: Int, nearbyOnly: Bool) -> String {
|
||||
if !enabled {
|
||||
return String(localized: "app_info.settings.bridge.status.off", defaultValue: "bridge off — only radio-range mesh traffic", comment: "Bridge status line when the mesh bridge toggle is off")
|
||||
}
|
||||
let cellPart = cell.map {
|
||||
String(
|
||||
format: String(localized: "app_info.settings.bridge.status.cell", defaultValue: "rendezvous #%@", comment: "Bridge status fragment showing rendezvous cell; %@ is geohash"),
|
||||
locale: .current,
|
||||
$0
|
||||
)
|
||||
} ?? String(localized: "app_info.settings.bridge.status.no_cell", defaultValue: "no rendezvous cell", comment: "Bridge status fragment when no cell is active")
|
||||
let peoplePart = String(
|
||||
format: String(localized: "app_info.settings.bridge.status.people", defaultValue: "%lld people via bridge", comment: "Bridge status fragment counting bridged participants; %lld is count"),
|
||||
locale: .current,
|
||||
bridgedCount
|
||||
BridgeStatusSummary.formatted(
|
||||
enabled: enabled,
|
||||
cell: cell,
|
||||
bridgedCount: bridgedCount,
|
||||
nearbyOnly: nearbyOnly
|
||||
)
|
||||
let composePart = nearbyOnly
|
||||
? String(localized: "app_info.settings.bridge.status.compose_nearby", defaultValue: "compose: nearby only", comment: "Bridge status fragment when outgoing mesh messages stay on radio")
|
||||
: String(localized: "app_info.settings.bridge.status.compose_bridged", defaultValue: "compose: bridged", comment: "Bridge status fragment when outgoing mesh messages cross the bridge")
|
||||
return [cellPart, peoplePart, composePart].joined(separator: " · ")
|
||||
}
|
||||
|
||||
// Moved from LocationChannelsSheet; keys unchanged. (The former
|
||||
|
||||
23
bitchatTests/Services/BridgeStatusSummaryTests.swift
Normal file
23
bitchatTests/Services/BridgeStatusSummaryTests.swift
Normal file
@ -0,0 +1,23 @@
|
||||
//
|
||||
// BridgeStatusSummaryTests.swift
|
||||
// bitchatTests
|
||||
//
|
||||
// This is free and unencumbered software released into the public domain.
|
||||
// For more information, see <https://unlicense.org>
|
||||
//
|
||||
|
||||
import Testing
|
||||
@testable import bitchat
|
||||
|
||||
struct BridgeStatusSummaryTests {
|
||||
@Test func offStateDoesNotMentionBridgePeople() {
|
||||
let text = BridgeStatusSummary.formatted(enabled: false, cell: "u4pruy", bridgedCount: 3, nearbyOnly: false)
|
||||
#expect(text.lowercased().contains("bridge off"))
|
||||
}
|
||||
|
||||
@Test func enabledStateIncludesCellAndCount() {
|
||||
let text = BridgeStatusSummary.formatted(enabled: true, cell: "u4pruy", bridgedCount: 2, nearbyOnly: true)
|
||||
#expect(text.contains("u4pruy"))
|
||||
#expect(text.contains("nearby"))
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user