cwtch.im
/
cwtch
16
21
Fork 15
Code Issues 11 Pull Requests 1 Releases 163 Wiki Activity

Add additional information to DeleteContact event #516

Merged
sarah merged 1 commits from deletecontactfix into master 2023-06-13 17:07:02 +00:00
Conversation 1 Commits 1 Files Changed 2 +6 -1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
peer/cwtch_peer.go
View File

@ -769,7 +769,8 @@ func (cp *cwtchPeer) DeleteConversation(id int) error {
defer cp.mutex.Unlock() defer cp.mutex.Unlock()
ci, err := cp.storage.GetConversation(id) ci, err := cp.storage.GetConversation(id)
if err == nil && ci != nil { if err == nil && ci != nil {
cp.eventBus.Publish(event.NewEventList(event.DeleteContact, event.RemotePeer, ci.Handle)) log.Debugf("deleting %v", ci)
cp.eventBus.Publish(event.NewEventList(event.DeleteContact, event.RemotePeer, ci.Handle, event.ConversationID, id))
return cp.storage.DeleteConversation(id) return cp.storage.DeleteConversation(id)
} }
return fmt.Errorf("could not delete conversation, did not exist") return fmt.Errorf("could not delete conversation, did not exist")

4
testing/cwtch_peer_server_integration_test.go
View File

@ -383,6 +383,10 @@ func TestCwtchPeerIntegration(t *testing.T) {
checkMessage(t, carol, carolGroupConversationID, 5, carolLines[0]) checkMessage(t, carol, carolGroupConversationID, 5, carolLines[0])
checkMessage(t, carol, carolGroupConversationID, 6, bobLines[2]) checkMessage(t, carol, carolGroupConversationID, 6, bobLines[2])
// Have bob clean up some conversations...
log.Infof("Bob cleanup conversation")
bob.DeleteConversation(1)
dan commented 2023-06-12 22:41:24 +00:00
Review
Copy Link

add time.Sleep(1) so that we dont just test teh event fires to bus but it gets picked up

add `time.Sleep(1)` so that we dont just test teh event fires to bus but it gets picked up
sarah commented 2023-06-13 17:06:56 +00:00
Review
Copy Link

DeleteConversation is atomic.

DeleteConversation is atomic.
log.Infof("Shutting down Bob...") log.Infof("Shutting down Bob...")
app.ShutdownPeer(bob.GetOnion()) app.ShutdownPeer(bob.GetOnion())
time.Sleep(time.Second * 3) time.Sleep(time.Second * 3)