deltachat-rpc-client 1.158.0__tar.gz → 1.159.1__tar.gz

{deltachat_rpc_client-1.158.0/src/deltachat_rpc_client.egg-info → deltachat_rpc_client-1.159.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deltachat-rpc-client
-Version: 1.158.0
+Version: 1.159.1
 Summary: Python client for Delta Chat core JSON-RPC interface
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deltachat-rpc-client"
-version = "1.158.0"
+version = "1.159.1"
 description = "Python client for Delta Chat core JSON-RPC interface"
 classifiers = [
     "Development Status :: 5 - Production/Stable",

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/src/deltachat_rpc_client/_utils.py

@@ -1,4 +1,5 @@
 import argparse
+import os
 import re
 import sys
 from threading import Thread
@@ -89,8 +90,8 @@ def _run_cli(
         help="accounts folder (default: current working directory)",
         nargs="?",
     )
-    parser.add_argument("--email", action="store", help="email address")
-    parser.add_argument("--password", action="store", help="password")
+    parser.add_argument("--email", action="store", help="email address", default=os.getenv("DELTACHAT_EMAIL"))
+    parser.add_argument("--password", action="store", help="password", default=os.getenv("DELTACHAT_PASSWORD"))
     args = parser.parse_args(argv[1:])
 
     with Rpc(accounts_dir=args.accounts_dir, **kwargs) as rpc:

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/src/deltachat_rpc_client/account.py

@@ -110,6 +110,11 @@ class Account:
         """Configure an account."""
         yield self._rpc.configure.future(self.id)
 
+    @futuremethod
+    def add_transport(self, params):
+        """Add a new transport."""
+        yield self._rpc.add_transport.future(self.id, params)
+
     def bring_online(self):
         """Start I/O and wait until IMAP becomes IDLE."""
         self.start_io()

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/src/deltachat_rpc_client/const.py

@@ -48,6 +48,7 @@ class EventType(str, Enum):
     MSG_READ = "MsgRead"
     MSG_DELETED = "MsgDeleted"
     CHAT_MODIFIED = "ChatModified"
+    CHAT_DELETED = "ChatDeleted"
     CHAT_EPHEMERAL_TIMER_MODIFIED = "ChatEphemeralTimerModified"
     CONTACTS_CHANGED = "ContactsChanged"
     LOCATION_CHANGED = "LocationChanged"

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/src/deltachat_rpc_client/message.py

@@ -64,6 +64,10 @@ class Message:
     def get_webxdc_status_updates(self, last_known_serial: int = 0) -> list:
         return json.loads(self._rpc.get_webxdc_status_updates(self.account.id, self.id, last_known_serial))
 
+    def get_info(self) -> str:
+        """Return message info."""
+        return self._rpc.get_message_info(self.account.id, self.id)
+
     def get_webxdc_info(self) -> dict:
         return self._rpc.get_webxdc_info(self.account.id, self.id)
 

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/src/deltachat_rpc_client/pytestplugin.py

@@ -34,7 +34,7 @@ class ACFactory:
         addr, password = self.get_credentials()
         account = self.get_unconfigured_account()
         params = {"addr": addr, "password": password}
-        yield account._rpc.add_transport.future(account.id, params)
+        yield account.add_transport.future(params)
 
         assert account.is_configured()
         return account
@@ -79,7 +79,7 @@ class ACFactory:
     ) -> Message:
         if not from_account:
             from_account = (self.get_online_accounts(1))[0]
-        to_contact = from_account.create_contact(to_account.get_config("addr"))
+        to_contact = from_account.create_contact(to_account)
         if group:
             to_chat = from_account.create_group(group)
             to_chat.add_contact(to_contact)

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1/src/deltachat_rpc_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deltachat-rpc-client
-Version: 1.158.0
+Version: 1.159.1
 Summary: Python client for Delta Chat core JSON-RPC interface
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/src/deltachat_rpc_client.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ tests/test_account_events.py
 tests/test_chatlist_events.py
 tests/test_iroh_webxdc.py
 tests/test_key_transfer.py
+tests/test_multidevice.py
 tests/test_securejoin.py
 tests/test_something.py
 tests/test_vcard.py

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/tests/test_account_events.py

@@ -17,7 +17,7 @@ def test_event_on_configuration(acfactory: ACFactory) -> None:
     account = acfactory.get_unconfigured_account()
     account.clear_all_events()
     assert not account.is_configured()
-    future = account._rpc.add_transport.future(account.id, {"addr": addr, "password": password})
+    future = account.add_transport.future({"addr": addr, "password": password})
     while True:
         event = account.wait_for_event()
         if event.kind == EventType.ACCOUNTS_ITEM_CHANGED:

deltachat_rpc_client-1.159.1/tests/test_multidevice.py

@@ -0,0 +1,110 @@
+from imap_tools import AND
+
+from deltachat_rpc_client import EventType
+from deltachat_rpc_client.const import MessageState
+
+
+def test_one_account_send_bcc_setting(acfactory, log, direct_imap):
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1_clone = ac1.clone()
+    ac1_clone.bring_online()
+
+    log.section("send out message without bcc to ourselves")
+    ac1.set_config("bcc_self", "0")
+    chat = ac1.create_chat(ac2)
+    self_addr = ac1.get_config("addr")
+    other_addr = ac2.get_config("addr")
+
+    msg_out = chat.send_text("message1")
+    assert not msg_out.get_snapshot().is_forwarded
+
+    # wait for send out (no BCC)
+    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
+    assert ac1.get_config("bcc_self") == "0"
+
+    assert self_addr not in ev.msg
+    assert other_addr in ev.msg
+
+    log.section("ac1: setting bcc_self=1")
+    ac1.set_config("bcc_self", "1")
+
+    log.section("send out message with bcc to ourselves")
+    msg_out = chat.send_text("message2")
+
+    # wait for send out (BCC)
+    ev = ac1.wait_for_event(EventType.SMTP_MESSAGE_SENT)
+    assert ac1.get_config("bcc_self") == "1"
+
+    # Second client receives only second message, but not the first.
+    ev_msg = ac1_clone.wait_for_event(EventType.MSGS_CHANGED)
+    assert ac1_clone.get_message_by_id(ev_msg.msg_id).get_snapshot().text == msg_out.get_snapshot().text
+
+    # now make sure we are sending message to ourselves too
+    assert self_addr in ev.msg
+    assert self_addr in ev.msg
+
+    # BCC-self messages are marked as seen by the sender device.
+    while True:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.INFO and event.msg.endswith("Marked messages 1 in folder INBOX as seen."):
+            break
+
+    # Check that the message is marked as seen on IMAP.
+    ac1_direct_imap = direct_imap(ac1)
+    ac1_direct_imap.connect()
+    ac1_direct_imap.select_folder("Inbox")
+    assert len(list(ac1_direct_imap.conn.fetch(AND(seen=True)))) == 1
+
+
+def test_multidevice_sync_seen(acfactory, log):
+    """Test that message marked as seen on one device is marked as seen on another."""
+    ac1, ac2 = acfactory.get_online_accounts(2)
+    ac1_clone = ac1.clone()
+    ac1_clone.bring_online()
+
+    ac1.set_config("bcc_self", "1")
+    ac1_clone.set_config("bcc_self", "1")
+
+    ac1_chat = ac1.create_chat(ac2)
+    ac1_clone_chat = ac1_clone.create_chat(ac2)
+    ac2_chat = ac2.create_chat(ac1)
+
+    log.section("Send a message from ac2 to ac1 and check that it's 'fresh'")
+    ac2_chat.send_text("Hi")
+    ac1_message = ac1.wait_for_incoming_msg()
+    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
+    assert ac1_chat.get_fresh_message_count() == 1
+    assert ac1_clone_chat.get_fresh_message_count() == 1
+    assert ac1_message.get_snapshot().state == MessageState.IN_FRESH
+    assert ac1_clone_message.get_snapshot().state == MessageState.IN_FRESH
+
+    log.section("ac1 marks message as seen on the first device")
+    ac1.mark_seen_messages([ac1_message])
+    assert ac1_message.get_snapshot().state == MessageState.IN_SEEN
+
+    log.section("ac1 clone detects that message is marked as seen")
+    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
+    assert ev.chat_id == ac1_clone_chat.id
+
+    log.section("Send an ephemeral message from ac2 to ac1")
+    ac2_chat.set_ephemeral_timer(60)
+    ac1.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
+    ac1.wait_for_incoming_msg()
+    ac1_clone.wait_for_event(EventType.CHAT_EPHEMERAL_TIMER_MODIFIED)
+    ac1_clone.wait_for_incoming_msg()
+
+    ac2_chat.send_text("Foobar")
+    ac1_message = ac1.wait_for_incoming_msg()
+    ac1_clone_message = ac1_clone.wait_for_incoming_msg()
+    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
+    assert "Expires: " not in ac1_clone_message.get_info()
+    assert "Ephemeral timer: 60\n" in ac1_message.get_info()
+    assert "Expires: " not in ac1_clone_message.get_info()
+
+    ac1_message.mark_seen()
+    assert "Expires: " in ac1_message.get_info()
+    ev = ac1_clone.wait_for_event(EventType.MSGS_NOTICED)
+    assert ev.chat_id == ac1_clone_chat.id
+    assert ac1_clone_message.get_snapshot().state == MessageState.IN_SEEN
+    # Test that the timer is started on the second device after synchronizing the seen status.
+    assert "Expires: " in ac1_clone_message.get_info()

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/tests/test_securejoin.py

@@ -89,7 +89,7 @@ def test_qr_securejoin(acfactory, protect):
     assert alice_contact_bob_snapshot.is_verified
 
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(bob.get_config("addr"), alice.get_config("addr"))
+    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))
     assert snapshot.chat.get_basic_snapshot().is_protected == protect
 
     # Test that Bob verified Alice's profile.
@@ -563,7 +563,7 @@ def test_securejoin_after_contact_resetup(acfactory) -> None:
 
     # ac1 waits for member added message and creates a QR code.
     snapshot = ac1.get_message_by_id(ac1.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(ac1.get_config("addr"), ac3.get_config("addr"))
+    assert snapshot.text == "Member Me added by {}.".format(ac3.get_config("addr"))
     ac1_qr_code = snapshot.chat.get_qr_code()
 
     # ac2 verifies ac1
@@ -646,7 +646,7 @@ def test_withdraw_securejoin_qr(acfactory):
     alice.clear_all_events()
 
     snapshot = bob.get_message_by_id(bob.wait_for_incoming_msg_event().msg_id).get_snapshot()
-    assert snapshot.text == "Member Me ({}) added by {}.".format(bob.get_config("addr"), alice.get_config("addr"))
+    assert snapshot.text == "Member Me added by {}.".format(alice.get_config("addr"))
     assert snapshot.chat.get_basic_snapshot().is_protected
     bob_chat.leave()
 

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/tests/test_something.py

@@ -63,8 +63,7 @@ def test_acfactory(acfactory) -> None:
 def test_configure_starttls(acfactory) -> None:
     addr, password = acfactory.get_credentials()
     account = acfactory.get_unconfigured_account()
-    account._rpc.add_transport(
-        account.id,
+    account.add_transport(
         {
             "addr": addr,
             "password": password,
@@ -81,8 +80,7 @@ def test_configure_ip(acfactory) -> None:
     ip_address = socket.gethostbyname(addr.rsplit("@")[-1])
 
     with pytest.raises(JsonRpcError):
-        account._rpc.add_transport(
-            account.id,
+        account.add_transport(
             {
                 "addr": addr,
                 "password": password,
@@ -96,8 +94,7 @@ def test_configure_alternative_port(acfactory) -> None:
     """Test that configuration with alternative port 443 works."""
     addr, password = acfactory.get_credentials()
     account = acfactory.get_unconfigured_account()
-    account._rpc.add_transport(
-        account.id,
+    account.add_transport(
         {
             "addr": addr,
             "password": password,
@@ -111,8 +108,7 @@ def test_configure_alternative_port(acfactory) -> None:
 def test_list_transports(acfactory) -> None:
     addr, password = acfactory.get_credentials()
     account = acfactory.get_unconfigured_account()
-    account._rpc.add_transport(
-        account.id,
+    account.add_transport(
         {
             "addr": addr,
             "password": password,
@@ -424,7 +420,7 @@ def test_wait_next_messages(acfactory) -> None:
     addr, password = acfactory.get_credentials()
     bot = acfactory.get_unconfigured_account()
     bot.set_config("bot", "1")
-    bot._rpc.add_transport(bot.id, {"addr": addr, "password": password})
+    bot.add_transport({"addr": addr, "password": password})
     assert bot.is_configured()
 
     # There are no old messages and the call returns immediately.
@@ -607,7 +603,7 @@ def test_reactions_for_a_reordering_move(acfactory, direct_imap):
 
     addr, password = acfactory.get_credentials()
     ac2 = acfactory.get_unconfigured_account()
-    ac2._rpc.add_transport(ac2.id, {"addr": addr, "password": password})
+    ac2.add_transport({"addr": addr, "password": password})
     ac2.set_config("mvbox_move", "1")
     assert ac2.is_configured()
 
@@ -797,3 +793,35 @@ def test_rename_group(acfactory):
         alice_group.set_name(name)
         bob.wait_for_incoming_msg_event()
         assert bob_chat.get_basic_snapshot().name == name
+
+
+def test_get_all_accounts_deadlock(rpc):
+    """Regression test for get_all_accounts deadlock."""
+    for _ in range(100):
+        all_accounts = rpc.get_all_accounts.future()
+        rpc.add_account()
+        all_accounts()
+
+
+def test_delete_deltachat_folder(acfactory, direct_imap):
+    """Test that DeltaChat folder is recreated if user deletes it manually."""
+    ac1 = acfactory.new_configured_account()
+    ac1.set_config("mvbox_move", "1")
+    ac1.bring_online()
+
+    ac1_direct_imap = direct_imap(ac1)
+    ac1_direct_imap.conn.folder.delete("DeltaChat")
+    assert "DeltaChat" not in ac1_direct_imap.list_folders()
+
+    # Wait until new folder is created and UIDVALIDITY is updated.
+    while True:
+        event = ac1.wait_for_event()
+        if event.kind == EventType.INFO and "uid/validity change folder DeltaChat" in event.msg:
+            break
+
+    ac2 = acfactory.get_online_account()
+    ac2.create_chat(ac1).send_text("hello")
+    msg = ac1.wait_for_incoming_msg().get_snapshot()
+    assert msg.text == "hello"
+
+    assert "DeltaChat" in ac1_direct_imap.list_folders()

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/tests/test_vcard.py

@@ -1,8 +1,7 @@
 def test_vcard(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_contact_charlie = alice.create_contact("charlie@example.org", "Charlie")
 
     alice_chat_bob = alice_contact_bob.create_chat()

{deltachat_rpc_client-1.158.0 → deltachat_rpc_client-1.159.1}/tests/test_webxdc.py

@@ -1,8 +1,7 @@
 def test_webxdc(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")
 
@@ -45,8 +44,7 @@ def test_webxdc(acfactory) -> None:
 def test_webxdc_insert_lots_of_updates(acfactory) -> None:
     alice, bob = acfactory.get_online_accounts(2)
 
-    bob_addr = bob.get_config("addr")
-    alice_contact_bob = alice.create_contact(bob_addr, "Bob")
+    alice_contact_bob = alice.create_contact(bob, "Bob")
     alice_chat_bob = alice_contact_bob.create_chat()
     message = alice_chat_bob.send_message(text="Let's play chess!", file="../test-data/webxdc/chess.xdc")