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

Fix/geohash work (#475)

Browse Source 
* Scroll UX: auto-scroll only when last item visible; preserve user position when scrolled up for mesh/geohash/DM; reduce blanking after very long messages

* iOS: re-enable keyboard autocomplete and default capitalization for message input

* Styling: stop blue/underline styling for #hashtags; render as normal text color (self=orange, others=green)

* Geo UI: ensure self shows teleported (face.dashed) if either per-session tag or manager flag is true

* Geo teleported: publish UI updates by assigning @Published Set instead of in-place insert; update on tag receipt and channel switch

---------

Co-authored-by: jack <jackjackbits@users.noreply.github.com>
This commit is contained in:
jack
2025-08-22 11:38:44 +02:00
committed by GitHub
co-authored by jack
parent 2d0f9aff0a
commit 13f8b0c636
3 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/ViewModels/ChatViewModel.swift
+21 -14
View File
@@ -1179,8 +1179,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
self.recordGeoParticipant(pubkeyHex: id.publicKeyHex)
#if os(iOS)
if LocationChannelManager.shared.teleported {
teleportedGeo.insert(id.publicKeyHex.lowercased())
objectWillChange.send()
let key = id.publicKeyHex.lowercased()
teleportedGeo = teleportedGeo.union([key])
}
#endif
}
@@ -1198,9 +1198,8 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
// Track teleport tag for participants
if let teleTag = event.tags.first(where: { $0.first == "t" }), teleTag.count >= 2, teleTag[1] == "teleport" {
let key = event.pubkey.lowercased()
if !self.teleportedGeo.contains(key) {
self.teleportedGeo.insert(key)
DispatchQueue.main.async { [weak self] in self?.objectWillChange.send() }
Task { @MainActor in
self.teleportedGeo = self.teleportedGeo.union([key])
}
}
// Skip our own events (we already locally echoed)
@@ -2826,17 +2825,25 @@ class ChatViewModel: ObservableObject, BitchatDelegate {
result.append(AttributedString(mSuffix).mergingAttributes(light))
}
} else {
var matchStyle = AttributeContainer()
matchStyle.font = .system(size: 14, weight: isSelf ? .bold : .semibold, design: .monospaced)
// Self messages use orange for all tokens; others keep blue for links/hashtags
// Style non-mention matches
if type == "hashtag" {
matchStyle.foregroundColor = isSelf ? .orange : .blue
matchStyle.underlineStyle = .single
} else if type == "url" {
matchStyle.foregroundColor = isSelf ? .orange : .blue
matchStyle.underlineStyle = .single
// Do NOT special-style hashtags: render like normal content (no blue, no underline)
var tagStyle = AttributeContainer()
tagStyle.font = isSelf
? .system(size: 14, weight: .bold, design: .monospaced)
: .system(size: 14, design: .monospaced)
tagStyle.foregroundColor = baseColor
result.append(AttributedString(matchText).mergingAttributes(tagStyle))
} else {
// Keep URL styling (blue + underline for non-self, orange for self)
var matchStyle = AttributeContainer()
matchStyle.font = .system(size: 14, weight: isSelf ? .bold : .semibold, design: .monospaced)
if type == "url" {
matchStyle.foregroundColor = isSelf ? .orange : .blue
matchStyle.underlineStyle = .single
}
result.append(AttributedString(matchText).mergingAttributes(matchStyle))
}
result.append(AttributedString(matchText).mergingAttributes(matchStyle))
}
lastEnd = nsRange.upperBound
}