add new Rpc API: GetChatSecurejoinQrCode, importVcardContents, makeVcard

Author: adbenitez

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+## Added
+
+- new Rpc API: `GetChatSecurejoinQrCode`, `importVcardContents`, `makeVcard`
+
 ## v1.2.14
 
 ## Added

deltachat/acfactory.go

@@ -198,47 +198,43 @@ func (factory *AcFactory) NextMsg(rpc *Rpc, accId AccountId) *MsgSnapshot {
 	return msg
 }
 
-// Introduce two accounts to each other creating a 1:1 chat between them and exchanging messages.
+// Introduce two accounts to each other creating a 1:1 chat between them.
 func (factory *AcFactory) IntroduceEachOther(rpc1 *Rpc, accId1 AccountId, rpc2 *Rpc, accId2 AccountId) {
-	chatId := factory.CreateChat(rpc1, accId1, rpc2, accId2)
-	_, err := rpc1.MiscSendTextMessage(accId1, chatId, "hi")
+	qrdata, err := rpc1.GetChatSecurejoinQrCode(accId1, option.None[ChatId]())
 	if err != nil {
 		panic(err)
 	}
-	factory.WaitForEventInChat(rpc1, accId1, chatId, EventMsgsChanged{})
-	snapshot := factory.NextMsg(rpc2, accId2)
-	if snapshot.Text != "hi" {
-		panic("unexpected message: " + snapshot.Text)
-	}
-
-	err = rpc2.AcceptChat(accId2, snapshot.ChatId)
+	_, err = rpc2.SecureJoin(accId2, qrdata)
 	if err != nil {
 		panic(err)
 	}
-	_, err = rpc2.MiscSendTextMessage(accId2, snapshot.ChatId, "hello")
-	if err != nil {
-		panic(err)
+
+	for {
+		event := factory.WaitForEvent(rpc1, accId1, EventSecurejoinInviterProgress{}).(EventSecurejoinInviterProgress)
+		if event.Progress == 1000 {
+			break
+		}
 	}
-	factory.WaitForEventInChat(rpc2, accId2, snapshot.ChatId, EventMsgsChanged{})
-	snapshot = factory.NextMsg(rpc1, accId1)
-	if snapshot.Text != "hello" {
-		panic("unexpected message: " + snapshot.Text)
+
+	for {
+		event := factory.WaitForEvent(rpc2, accId2, EventSecurejoinJoinerProgress{}).(EventSecurejoinJoinerProgress)
+		if event.Progress == 1000 {
+			break
+		}
 	}
 }
 
 // Create a 1:1 chat with accId2 in the chatlist of accId1.
 func (factory *AcFactory) CreateChat(rpc1 *Rpc, accId1 AccountId, rpc2 *Rpc, accId2 AccountId) ChatId {
-	addr2, err := rpc2.GetConfig(accId2, "configured_addr")
+	vcard, err := rpc2.makeVcard(accId2, []ContactId{ContactSelf})
 	if err != nil {
 		panic(err)
 	}
-
-	contactId, err := rpc1.CreateContact(accId1, addr2.Unwrap(), "")
+	ids, err := rpc1.importVcardContents(accId1, vcard)
 	if err != nil {
 		panic(err)
 	}
-
-	chatId, err := rpc1.CreateChatByContactId(accId1, contactId)
+	chatId, err := rpc1.CreateChatByContactId(accId1, ids[0])
 	if err != nil {
 		panic(err)
 	}

deltachat/rpc.go

@@ -336,6 +336,15 @@ func (rpc *Rpc) GetChatEncryptionInfo(accountId AccountId, chatId ChatId) (strin
 	return data, err
 }
 
+// Get QR code text that will offer a [SecureJoin](https://securejoin.delta.chat/) invitation.
+// If `chatId` is a group chat ID, SecureJoin QR code for the group is returned.
+// If `chatId` is unset, setup contact QR code is returned.
+func (rpc *Rpc) GetChatSecurejoinQrCode(accountId AccountId, chatId option.Option[ChatId]) (string, error) {
+	var data string
+	err := rpc.Transport.CallResult(rpc.Context, &data, "get_chat_securejoin_qr_code", accountId, chatId)
+	return data, err
+}
+
 // Get Join-Group QR code text and SVG data.
 func (rpc *Rpc) GetChatSecurejoinQrCodeSvg(accountId AccountId, chatId option.Option[ChatId]) (string, string, error) {
 	var data [2]string
@@ -609,6 +618,22 @@ func (rpc *Rpc) CreateContact(accountId AccountId, email string, name string) (C
 	return id, err
 }
 
+// Imports contacts from a vCard.
+//
+// Returns the ids of created/modified contacts in the order they appear in the vCard.
+func (rpc *Rpc) importVcardContents(accountId AccountId, vcard string) ([]ContactId, error) {
+	var ids []ContactId
+	err := rpc.Transport.CallResult(rpc.Context, &ids, "import_vcard_contents", accountId, vcard)
+	return ids, err
+}
+
+// Returns a vCard containing contacts with the given ids.
+func (rpc *Rpc) makeVcard(accountId AccountId, contacts []ContactId) (string, error) {
+	var vcard string
+	err := rpc.Transport.CallResult(rpc.Context, &vcard, "make_vcard", accountId, contacts)
+	return vcard, err
+}
+
 // Returns contact id of the created or existing DM chat with that contact
 func (rpc *Rpc) CreateChatByContactId(accountId AccountId, contactId ContactId) (ChatId, error) {
 	var id ChatId