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

Fix read receipts for existing messages when opening chat

Browse Source 
- Added delay to ensure messages are loaded before checking
- Fixed logic to check if message is FROM the other person (not TO them)
- Added onAppear handler to send read receipts when view loads
- Added detailed logging to debug the flow
- Now correctly identifies received messages that need read receipts
This commit is contained in:
jack
2025-07-06 22:42:08 +02:00
parent fbe779e684
commit e93d02afd0
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/ViewModels/ChatViewModel.swift
+12 -5
View File
@@ -879,16 +879,23 @@ class ChatViewModel: ObservableObject {
} }
func startPrivateChat(with peerID: String) { func startPrivateChat(with peerID: String) {
print("[Delivery] Starting private chat with peer \(peerID)")
selectedPrivateChatPeer = peerID selectedPrivateChatPeer = peerID
unreadPrivateMessages.remove(peerID) unreadPrivateMessages.remove(peerID)
// Initialize chat history if needed // Initialize chat history if needed
if privateChats[peerID] == nil { if privateChats[peerID] == nil {
privateChats[peerID] = [] privateChats[peerID] = []
print("[Delivery] Initialized empty chat history for peer \(peerID)")
} else {
print("[Delivery] Found existing chat history with \(privateChats[peerID]?.count ?? 0) messages for peer \(peerID)")
} }
// Send read receipts for unread messages from this peer // Send read receipts for unread messages from this peer
markPrivateMessagesAsRead(from: peerID) // Add a small delay to ensure UI has updated
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
self?.markPrivateMessagesAsRead(from: peerID)
}
} }
func endPrivateChat() { func endPrivateChat() {
@@ -901,15 +908,15 @@ class ChatViewModel: ObservableObject {
return return
} }
print("[Delivery] Checking \(messages.count) messages from peer \(peerID) for read receipts") print("[Delivery] Checking \(messages.count) messages in chat with peer \(peerID) for read receipts")
// Find messages from the peer that haven't been read yet // Find messages from the peer that haven't been read yet
for message in messages { for message in messages {
// Only send read receipts for messages from the other peer (not our own) // Only send read receipts for messages from the other peer (not our own)
// and only if the status is delivered (not already read) print("[Delivery] Message \(message.id) from \(message.sender), senderPeerID: \(message.senderPeerID ?? "nil"), myNickname: \(nickname), status: \(message.deliveryStatus?.displayText ?? "none")")
print("[Delivery] Message \(message.id) from \(message.sender), senderPeerID: \(message.senderPeerID ?? "nil"), status: \(message.deliveryStatus?.displayText ?? "none")")
if message.senderPeerID == peerID { // Check if this is a message FROM the other person TO us
if message.sender != nickname && message.senderPeerID != nil {
if let status = message.deliveryStatus { if let status = message.deliveryStatus {
switch status { switch status {
case .sent, .delivered: case .sent, .delivered:
bitchat/Views/ContentView.swift
+12 -1
View File
@@ -531,7 +531,18 @@ struct ContentView: View {
.onChange(of: viewModel.selectedPrivateChatPeer) { newPeerID in .onChange(of: viewModel.selectedPrivateChatPeer) { newPeerID in
// When switching to a private chat, send read receipts // When switching to a private chat, send read receipts
if let peerID = newPeerID { if let peerID = newPeerID {
viewModel.markPrivateMessagesAsRead(from: peerID) // Small delay to ensure messages are loaded
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
viewModel.markPrivateMessagesAsRead(from: peerID)
}
}
}
.onAppear {
// Also check when view appears
if let peerID = viewModel.selectedPrivateChatPeer {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
viewModel.markPrivateMessagesAsRead(from: peerID)
}
} }
} }
} }