cwtch.im
/
libcwtch-go
Archived
3
0
Fork 1
Code Issues 2 Pull Requests Releases 26 Wiki Activity

symantic arg changes in GetMessageByID; GetMessagesByContentHash cleanup and streamline, returns singled EnhancedMessage with LocalIndex
continuous-integration/drone/pr Build is pending Details

This commit is contained in:
Dan Ballard 2022-01-20 00:51:19 -05:00
parent 84d451fb46
commit c58be05110
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib.go
View File

@ -572,6 +572,7 @@ func c_GetMessage(profile_ptr *C.char, profile_len C.int, conversation_id C.int,
type EnhancedMessage struct { type EnhancedMessage struct {
model.Message model.Message
ID int // the actual ID of the message in the database (not the row number) ID int // the actual ID of the message in the database (not the row number)
LocalIndex int // local index in the DB (row #). Can be empty (most calls supply it) but lookup by hash will fill it
ContactImage string ContactImage string
Attributes map[string]string Attributes map[string]string
} }
@ -611,7 +612,7 @@ func c_GetMessageByID(profile_ptr *C.char, profile_len C.int, conversation_id C.
return C.CString(GetMessageByID(profile, int(conversation_id), int(message_index))) return C.CString(GetMessageByID(profile, int(conversation_id), int(message_index)))
} }
func GetMessageByID(profileOnion string, conversationID int, messageIndex int) string { func GetMessageByID(profileOnion string, conversationID int, messageID int) string {
var message EnhancedMessage var message EnhancedMessage
// There is an edge case that can happen on Android when the app is shutdown while fetching messages... // There is an edge case that can happen on Android when the app is shutdown while fetching messages...
// The worker threads that are spawned can become activated again when the app is opened attempt to finish their job... // The worker threads that are spawned can become activated again when the app is opened attempt to finish their job...
@ -620,7 +621,7 @@ func GetMessageByID(profileOnion string, conversationID int, messageIndex int) s
// these requests complete almost immediately v.s. being stalled for seconds to minutes on large groups. // these requests complete almost immediately v.s. being stalled for seconds to minutes on large groups.
if application != nil { if application != nil {
profile := application.GetPeer(profileOnion) profile := application.GetPeer(profileOnion)
dbmessage, attr, err := profile.GetChannelMessage(conversationID, 0, messageIndex) dbmessage, attr, err := profile.GetChannelMessage(conversationID, 0, messageID)
if err == nil { if err == nil {
time, _ := time.Parse(time.RFC3339Nano, attr[constants2.AttrSentTimestamp]) time, _ := time.Parse(time.RFC3339Nano, attr[constants2.AttrSentTimestamp])
message.Message = model.Message{ message.Message = model.Message{
@ -630,7 +631,7 @@ func GetMessageByID(profileOnion string, conversationID int, messageIndex int) s
PeerID: attr[constants2.AttrAuthor], PeerID: attr[constants2.AttrAuthor],
Timestamp: time, Timestamp: time,
} }
message.ID = messageIndex message.ID = messageID
message.Attributes = attr message.Attributes = attr
message.ContactImage = utils.RandomProfileImage(message.PeerID) message.ContactImage = utils.RandomProfileImage(message.PeerID)
} }
@ -648,7 +649,7 @@ func c_GetMessagesByContentHash(profile_ptr *C.char, profile_len C.int, conversa
} }
func GetMessagesByContentHash(profileOnion string, handle int, contentHash string) string { func GetMessagesByContentHash(profileOnion string, handle int, contentHash string) string {
var indexedMessages []model.LocallyIndexedMessage var message EnhancedMessage
if application != nil { if application != nil {
profile := application.GetPeer(profileOnion) profile := application.GetPeer(profileOnion)
offset, err := profile.GetChannelMessageByContentHash(handle, 0, contentHash) offset, err := profile.GetChannelMessageByContentHash(handle, 0, contentHash)
@ -656,21 +657,23 @@ func GetMessagesByContentHash(profileOnion string, handle int, contentHash strin
messages, err := profile.GetMostRecentMessages(handle, 0, offset, 1) messages, err := profile.GetMostRecentMessages(handle, 0, offset, 1)
if err == nil { if err == nil {
time, _ := time.Parse(time.RFC3339Nano, messages[0].Attr[constants2.AttrSentTimestamp]) time, _ := time.Parse(time.RFC3339Nano, messages[0].Attr[constants2.AttrSentTimestamp])
msg := model.Message{ message.Message = model.Message{
Message: messages[0].Body, Message: messages[0].Body,
Acknowledged: messages[0].Attr[constants2.AttrAck] == constants2.True, Acknowledged: messages[0].Attr[constants2.AttrAck] == constants2.True,
Error: messages[0].Attr[constants2.AttrErr], Error: messages[0].Attr[constants2.AttrErr],
PeerID: messages[0].Attr[constants2.AttrAuthor], PeerID: messages[0].Attr[constants2.AttrAuthor],
Timestamp: time, Timestamp: time,
} }
// TODO this is mostly unused at this point, consider cleaning is up in 1.6 message.ID = messages[0].ID
indexedMessages = append(indexedMessages, model.LocallyIndexedMessage{LocalIndex: offset, Message: msg}) message.Attributes = messages[0].Attr
message.ContactImage = utils.RandomProfileImage(message.PeerID)
message.LocalIndex = offset
} else { } else {
log.Errorf("error fetching local index {} ", err) log.Errorf("error fetching local index {} ", err)
} }
} }
} }
bytes, _ := json.Marshal(indexedMessages) bytes, _ := json.Marshal(message)
return string(bytes) return string(bytes)
} }