deltachat-rpc-client 2.33.0__tar.gz → 2.34.0__tar.gz

{deltachat_rpc_client-2.33.0/src/deltachat_rpc_client.egg-info → deltachat_rpc_client-2.34.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deltachat-rpc-client
-Version: 2.33.0
+Version: 2.34.0
 Summary: Python client for Delta Chat core JSON-RPC interface
 License-Expression: MPL-2.0
 Classifier: Development Status :: 5 - Production/Stable

{deltachat_rpc_client-2.33.0 → deltachat_rpc_client-2.34.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "2.33.0"
+version = "2.34.0"
 license = "MPL-2.0"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [

{deltachat_rpc_client-2.33.0 → deltachat_rpc_client-2.34.0}/src/deltachat_rpc_client/chat.py

@@ -219,10 +219,12 @@ class Chat:
         """Mark all messages in this chat as noticed."""
         self._rpc.marknoticed_chat(self.account.id, self.id)
 
-    def add_contact(self, *contact: Union[int, str, Contact]) -> None:
+    def add_contact(self, *contact: Union[int, str, Contact, "Account"]) -> None:
         """Add contacts to this group."""
+        from .account import Account
+
         for cnt in contact:
-            if isinstance(cnt, str):
+            if isinstance(cnt, (str, Account)):
                 contact_id = self.account.create_contact(cnt).id
             elif not isinstance(cnt, int):
                 contact_id = cnt.id
@@ -230,10 +232,12 @@ class Chat:
                 contact_id = cnt
             self._rpc.add_contact_to_chat(self.account.id, self.id, contact_id)
 
-    def remove_contact(self, *contact: Union[int, str, Contact]) -> None:
+    def remove_contact(self, *contact: Union[int, str, Contact, "Account"]) -> None:
         """Remove members from this group."""
+        from .account import Account
+
         for cnt in contact:
-            if isinstance(cnt, str):
+            if isinstance(cnt, (str, Account)):
                 contact_id = self.account.create_contact(cnt).id
             elif not isinstance(cnt, int):
                 contact_id = cnt.id
@@ -249,6 +253,10 @@ class Chat:
         contacts = self._rpc.get_chat_contacts(self.account.id, self.id)
         return [Contact(self.account, contact_id) for contact_id in contacts]
 
+    def num_contacts(self) -> int:
+        """Return number of contacts in this chat."""
+        return len(self.get_contacts())
+
     def get_past_contacts(self) -> list[Contact]:
         """Get past contacts for this chat."""
         past_contacts = self._rpc.get_past_chat_contacts(self.account.id, self.id)

{deltachat_rpc_client-2.33.0 → deltachat_rpc_client-2.34.0/src/deltachat_rpc_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deltachat-rpc-client
-Version: 2.33.0
+Version: 2.34.0
 Summary: Python client for Delta Chat core JSON-RPC interface
 License-Expression: MPL-2.0
 Classifier: Development Status :: 5 - Production/Stable

{deltachat_rpc_client-2.33.0 → deltachat_rpc_client-2.34.0}/tests/test_cross_core.py

@@ -42,3 +42,16 @@ def test_send_and_receive_message(alice_and_remote_bob) -> None:
 
     msg = alice.wait_for_incoming_msg()
     assert msg.get_snapshot().text == "hello"
+
+
+def test_second_device(acfactory, alice_and_remote_bob) -> None:
+    """Test setting up current version as a second device for old version."""
+    _alice, alice_contact_bob, remote_eval = alice_and_remote_bob("2.20.0")
+
+    remote_eval("locals().setdefault('future', bob._rpc.provide_backup.future(bob.id))")
+    qr = remote_eval("bob._rpc.get_backup_qr(bob.id)")
+    new_account = acfactory.get_unconfigured_account()
+    new_account._rpc.get_backup(new_account.id, qr)
+    remote_eval("locals()['future']()")
+
+    assert new_account.get_config("addr") == remote_eval("bob.get_config('addr')")

{deltachat_rpc_client-2.33.0 → deltachat_rpc_client-2.34.0}/tests/test_multitransport.py

@@ -188,6 +188,10 @@ def test_transport_synchronization(acfactory, log) -> None:
     log.section("ac1 changes the primary transport")
     ac1.set_config("configured_addr", transport3["addr"])
 
+    ac1_clone.wait_for_event(EventType.TRANSPORTS_MODIFIED)
+    [transport1, transport3] = ac1_clone.list_transports()
+    assert ac1_clone.get_config("configured_addr") == addr3
+
     log.section("ac1 removes the first transport")
     ac1.delete_transport(transport1["addr"])
 

{deltachat_rpc_client-2.33.0 → deltachat_rpc_client-2.34.0}/tests/test_something.py

@@ -1012,3 +1012,47 @@ def test_message_exists(acfactory):
     ac1.remove()
     assert not message1.exists()
     assert not message2.exists()
+
+
+def test_synchronize_member_list_on_group_rejoin(acfactory, log):
+    """
+    Test that user recreates group member list when it joins the group again.
+    ac1 creates a group with two other accounts: ac2 and ac3
+    Then it removes ac2, removes ac3 and adds ac2 back.
+    ac2 did not see that ac3 is removed, so it should rebuild member list from scratch.
+    """
+    log.section("setting up accounts, accepted with each other")
+    ac1, ac2, ac3 = accounts = acfactory.get_online_accounts(3)
+
+    log.section("ac1: creating group chat with 2 other members")
+    chat = ac1.create_group("title1")
+    chat.add_contact(ac2)
+    chat.add_contact(ac3)
+
+    log.section("ac1: send message to new group chat")
+    msg = chat.send_text("hello")
+    assert chat.num_contacts() == 3
+
+    log.section("checking that the chat arrived correctly")
+    for ac in accounts[1:]:
+        msg = ac.wait_for_incoming_msg().get_snapshot()
+        assert msg.text == "hello"
+        assert msg.chat.num_contacts() == 3
+        msg.chat.accept()
+
+    log.section("ac1: removing ac2")
+    chat.remove_contact(ac2)
+
+    log.section("ac2: wait for a message about removal from the chat")
+    ac2.wait_for_incoming_msg()
+    log.section("ac1: removing ac3")
+    chat.remove_contact(ac3)
+
+    log.section("ac1: adding ac2 back")
+    chat.add_contact(ac2)
+
+    log.section("ac2: check that ac3 is removed")
+    msg = ac2.wait_for_incoming_msg()
+
+    assert chat.num_contacts() == 2
+    assert msg.get_snapshot().chat.num_contacts() == 2