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

PeerID 25/n: ReadReceipt (#832)

Browse Source
This commit is contained in:
Islam
2025-10-19 14:30:27 +02:00
committed by GitHub
parent 70caa9e24a
commit 435744a977
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Models/ReadReceipt.swift
+6 -6
View File
@@ -11,11 +11,11 @@ import Foundation
struct ReadReceipt: Codable { struct ReadReceipt: Codable {
let originalMessageID: String let originalMessageID: String
let receiptID: String let receiptID: String
var readerID: String // Who read it var readerID: PeerID // Who read it
let readerNickname: String let readerNickname: String
let timestamp: Date let timestamp: Date
init(originalMessageID: String, readerID: String, readerNickname: String) { init(originalMessageID: String, readerID: PeerID, readerNickname: String) {
self.originalMessageID = originalMessageID self.originalMessageID = originalMessageID
self.receiptID = UUID().uuidString self.receiptID = UUID().uuidString
self.readerID = readerID self.readerID = readerID
@@ -24,7 +24,7 @@ struct ReadReceipt: Codable {
} }
// For binary decoding // For binary decoding
private init(originalMessageID: String, receiptID: String, readerID: String, readerNickname: String, timestamp: Date) { private init(originalMessageID: String, receiptID: String, readerID: PeerID, readerNickname: String, timestamp: Date) {
self.originalMessageID = originalMessageID self.originalMessageID = originalMessageID
self.receiptID = receiptID self.receiptID = receiptID
self.readerID = readerID self.readerID = readerID
@@ -48,7 +48,7 @@ struct ReadReceipt: Codable {
data.appendUUID(receiptID) data.appendUUID(receiptID)
// ReaderID as 8-byte hex string // ReaderID as 8-byte hex string
var readerData = Data() var readerData = Data()
var tempID = readerID var tempID = readerID.id
while tempID.count >= 2 && readerData.count < 8 { while tempID.count >= 2 && readerData.count < 8 {
let hexByte = String(tempID.prefix(2)) let hexByte = String(tempID.prefix(2))
if let byte = UInt8(hexByte, radix: 16) { if let byte = UInt8(hexByte, radix: 16) {
@@ -78,8 +78,8 @@ struct ReadReceipt: Codable {
let receiptID = dataCopy.readUUID(at: &offset) else { return nil } let receiptID = dataCopy.readUUID(at: &offset) else { return nil }
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 = PeerID(hexData: readerIDData)
guard PeerID(str: readerID).isValid else { return nil } guard readerID.isValid else { return nil }
guard let timestamp = dataCopy.readDate(at: &offset), guard let timestamp = dataCopy.readDate(at: &offset),
InputValidator.validateTimestamp(timestamp), InputValidator.validateTimestamp(timestamp),
bitchat/Services/PrivateChatManager.swift
+1 -1
View File
@@ -105,7 +105,7 @@ final class PrivateChatManager: ObservableObject {
// Create read receipt using the simplified method // Create read receipt using the simplified method
let receipt = ReadReceipt( let receipt = ReadReceipt(
originalMessageID: message.id, originalMessageID: message.id,
readerID: meshService?.myPeerID.id ?? "", readerID: meshService?.myPeerID ?? PeerID(str: ""),
readerNickname: meshService?.myNickname ?? "" readerNickname: meshService?.myNickname ?? ""
) )
bitchat/ViewModels/ChatViewModel.swift
+3 -3
View File
@@ -3493,7 +3493,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
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 = peerID.isHex ? peerID : (unifiedPeerService.getPeer(by: peerID)?.peerID ?? peerID) let recipPeer = peerID.isHex ? peerID : (unifiedPeerService.getPeer(by: peerID)?.peerID ?? peerID)
let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID.id, readerNickname: nickname) let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID, readerNickname: nickname)
messageRouter.sendReadReceipt(receipt, to: recipPeer) messageRouter.sendReadReceipt(receipt, to: recipPeer)
sentReadReceipts.insert(message.id) sentReadReceipts.insert(message.id)
} }
@@ -5839,7 +5839,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
} }
if !sentReadReceipts.contains(message.id) { if !sentReadReceipts.contains(message.id) {
if let key { if let key {
let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID.id, 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: PeerID(hexData: key)) messageRouter.sendReadReceipt(receipt, to: PeerID(hexData: key))
sentReadReceipts.insert(message.id) sentReadReceipts.insert(message.id)
@@ -6282,7 +6282,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate {
if !sentReadReceipts.contains(message.id) { if !sentReadReceipts.contains(message.id) {
let receipt = ReadReceipt( let receipt = ReadReceipt(
originalMessageID: message.id, originalMessageID: message.id,
readerID: meshService.myPeerID.id, readerID: meshService.myPeerID,
readerNickname: nickname readerNickname: nickname
) )