update to new JSONRPC API

deltachat · Oct 27, 2023 · 4172ea5 · 4172ea5
1 parent bdfae9f
commit 4172ea5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/deltachat/acfactory.go b/deltachat/acfactory.go
@@ -324,12 +324,15 @@ func (self *AcFactory) WaitForEvent(rpc *Rpc, accId AccountId, event Event) Even
 			fmt.Printf("WARNING: Waiting for event in account %v, but got event for account %v, discarding event %#v.\n", accId, accId2, event)
 			continue
 		}
-		if self.Debug {
-			fmt.Printf("Waiting for event %v, got: %v\n", event.eventType(), ev.eventType())
-		}
 		if ev.eventType() == event.eventType() {
+			if self.Debug {
+				fmt.Printf("Got awaited event %v\n", ev.eventType())
+			}
 			return ev
 		}
+		if self.Debug {
+			fmt.Printf("Waiting for event %v, got: %v\n", event.eventType(), ev.eventType())
+		}
 	}
 }
 

diff --git a/deltachat/event.go b/deltachat/event.go
@@ -45,7 +45,7 @@ type _Event struct {
 }
 
 type _EventData struct {
-	Type               eventType
+	Kind               eventType
 	Msg                string
 	File               string
 	ChatId             ChatId
@@ -61,7 +61,7 @@ type _EventData struct {
 
 func (self *_EventData) ToEvent() Event {
 	var event Event
-	switch self.Type {
+	switch self.Kind {
 	case eventTypeInfo:
 		event = EventInfo{Msg: self.Msg}
 	case eventTypeSmtpConnected: