permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 22:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify the usages of splitSuffix() (#683)

Browse Source
This commit is contained in:
Islam
2025-09-26 11:13:18 +02:00
committed by GitHub
parent d01538a2ea
commit eb5bc96a3c
2 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Views/GeohashPeopleList.swift
+1 -14
View File
@@ -64,7 +64,7 @@ struct GeohashPeopleList: View {
let rowColor: Color = isMe ? .orange : assignedColor let rowColor: Color = isMe ? .orange : assignedColor
Image(systemName: icon).font(.bitchatSystem(size: 12)).foregroundColor(rowColor) Image(systemName: icon).font(.bitchatSystem(size: 12)).foregroundColor(rowColor)
let (base, suffix) = splitSuffix(from: person.displayName) let (base, suffix) = person.displayName.splitSuffix()
HStack(spacing: 0) { HStack(spacing: 0) {
Text(base) Text(base)
.font(.bitchatSystem(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
@@ -129,16 +129,3 @@ struct GeohashPeopleList: View {
} }
} }
} }
// 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, "")
}
bitchat/Views/MeshPeerList.swift
+1 -14
View File
@@ -82,7 +82,7 @@ struct MeshPeerList: View {
} }
let displayName = isMe ? viewModel.nickname : peer.nickname let displayName = isMe ? viewModel.nickname : peer.nickname
let (base, suffix) = splitSuffix(from: displayName) let (base, suffix) = displayName.splitSuffix()
HStack(spacing: 0) { HStack(spacing: 0) {
Text(base) Text(base)
.font(.bitchatSystem(size: 14, design: .monospaced)) .font(.bitchatSystem(size: 14, design: .monospaced))
@@ -166,16 +166,3 @@ struct MeshPeerList: View {
} }
} }
} }
// 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, "")
}