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

GetMessagesByContentHash + Other API Fixes
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
Sarah Jamie Lewis 2021-11-19 11:50:37 -08:00
parent 3cc56fb011
commit 6723bdf558
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib.go
View File

@ -454,14 +454,14 @@ func LoadProfiles(pass string) {
application.LoadProfiles(pass) application.LoadProfiles(pass)
} }
//export c_AcceptConversations //export c_AcceptConversation
func c_AcceptConversations(profilePtr *C.char, profileLen C.int, conversation_id C.int) { func c_AcceptConversation(profilePtr *C.char, profileLen C.int, conversation_id C.int) {
AcceptConversations(C.GoStringN(profilePtr, profileLen), int(conversation_id)) AcceptConversation(C.GoStringN(profilePtr, profileLen), int(conversation_id))
} }
// AcceptConversations takes in a profileOnion and a handle to either a group or a peer and authorizes the handle // AcceptConversations takes in a profileOnion and a handle to either a group or a peer and authorizes the handle
// for further action (e.g. messaging / connecting to the server / joining the group etc.) // for further action (e.g. messaging / connecting to the server / joining the group etc.)
func AcceptConversations(profileOnion string, conversation_id int) { func AcceptConversation(profileOnion string, conversation_id int) {
profile := application.GetPeer(profileOnion) profile := application.GetPeer(profileOnion)
profile.AcceptConversation(int(conversation_id)) profile.AcceptConversation(int(conversation_id))
} }

5
utils/eventHandler.go
View File

@ -151,9 +151,9 @@ func (eh *EventHandler) handleAppBusEvent(e *event.Event) string {
continue continue
} }
name, exists := conversationInfo.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.Name) name, exists := conversationInfo.GetAttribute(attr.PublicScope, attr.ProfileZone, constants.Name)
if !exists { if !exists {
name, exists = conversationInfo.GetAttribute(attr.PeerScope, attr.ProfileZone, constants.Name) name, exists = conversationInfo.GetAttribute(attr.LocalScope, attr.ProfileZone, constants.Name)
if !exists { if !exists {
name = conversationInfo.Handle name = conversationInfo.Handle
} }
@ -351,6 +351,7 @@ func (eh *EventHandler) startHandlingPeer(onion string) {
eventBus.Subscribe(event.AppError, q) eventBus.Subscribe(event.AppError, q)
eventBus.Subscribe(event.IndexedAcknowledgement, q) eventBus.Subscribe(event.IndexedAcknowledgement, q)
eventBus.Subscribe(event.IndexedFailure, q) eventBus.Subscribe(event.IndexedFailure, q)
eventBus.Subscribe(event.ContactCreated, q)
eventBus.Subscribe(event.NewMessageFromGroup, q) eventBus.Subscribe(event.NewMessageFromGroup, q)
eventBus.Subscribe(event.MessageCounterResync, q) eventBus.Subscribe(event.MessageCounterResync, q)
eventBus.Subscribe(event.GroupCreated, q) eventBus.Subscribe(event.GroupCreated, q)