slidge 0.2.0a4__tar.gz → 0.2.0a6__tar.gz

{slidge-0.2.0a4 → slidge-0.2.0a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slidge
-Version: 0.2.0a4
+Version: 0.2.0a6
 Summary: XMPP bridging framework
 Home-page: https://sr.ht/~nicoco/slidge/
 License: AGPL-3.0-or-later

{slidge-0.2.0a4 → slidge-0.2.0a6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "slidge"
-version = "0.2.0alpha4"
+version = "0.2.0alpha6"
 description = "XMPP bridging framework"
 authors = ["Nicolas Cedilnik <nicoco@nicoco.fr>"]
 readme = "README.md"

{slidge-0.2.0a4 → slidge-0.2.0a6}/slidge/__version__.py

@@ -2,4 +2,4 @@ from slidge.util.util import get_version  # noqa: F401
 
 # this is modified before publish, but if someone cloned from the repo,
 # it can help
-__version__ = "0.2.0alpha4"
+__version__ = "0.2.0alpha6"

{slidge-0.2.0a4 → slidge-0.2.0a6}/slidge/contact/contact.py

@@ -196,15 +196,19 @@ class LegacyContact(
     def __ensure_pk(self):
         if self.contact_pk is not None:
             return
+        # This happens for legacy modules that don't follow the Roster.fill /
+        # populate contact attributes in Contact.update_info() method.
+        # This results in (even) less optimised SQL writes and read, but
+        # we allow it because it fits some legacy network libs better.
         with self.xmpp.store.session() as orm:
             orm.commit()
             stored = self.xmpp.store.contacts.get_by_legacy_id(
                 self.user_pk, str(self.legacy_id)
             )
             if stored is None:
-                self.log.error("Cannot find our primary key!", stack_info=True)
-                raise RuntimeError("Cannot find our primary key!")
-            self.contact_pk = stored.id
+                self.contact_pk = self.xmpp.store.contacts.update(self, commit=True)
+            else:
+                self.contact_pk = stored.id
         assert self.contact_pk is not None
 
     def __get_subscription_string(self):

{slidge-0.2.0a4 → slidge-0.2.0a6}/slidge/group/room.py

@@ -758,6 +758,7 @@ class LegacyMUC(
         await self.session.contacts.ready
 
         if self.pk is not None:
+            c._LegacyContact__ensure_pk()  # type: ignore
             assert c.contact_pk is not None
             with self.__store.session():
                 stored = self.__participants_store.get_by_contact(self.pk, c.contact_pk)

{slidge-0.2.0a4 → slidge-0.2.0a6}/slidge/util/test.py

@@ -218,7 +218,10 @@ class SlidgeTest(SlixTestPlus):
         engine = self.db_engine = create_engine("sqlite+pysqlite:///:memory:")
         Base.metadata.create_all(engine)
         BaseGateway.store = SlidgeStore(engine)
-        self.xmpp = BaseGateway.get_self_or_unique_subclass()()
+        try:
+            self.xmpp = BaseGateway.get_self_or_unique_subclass()()
+        except Exception:
+            raise
         self.xmpp.TEST_MODE = True
         PepNick.contact_store = self.xmpp.store.contacts
         PepAvatar.store = self.xmpp.store
@@ -266,7 +269,7 @@ class SlidgeTest(SlixTestPlus):
             slidge.db.store._session = None
         Base.metadata.drop_all(self.xmpp.store._engine)
 
-    def setup_logged_session(self):
+    def setup_logged_session(self, n_contacts=0):
         user = self.xmpp.store.users.new(
             JID("romeo@montague.lit/gajim"), {"username": "romeo", "city": ""}
         )
@@ -284,12 +287,18 @@ class SlidgeTest(SlixTestPlus):
         assert "logging in" in stanza["status"].lower(), stanza
         stanza = self.next_sent()
         assert "syncing contacts" in stanza["status"].lower(), stanza
+        if BaseGateway.get_self_or_unique_subclass().GROUPS:
+            stanza = self.next_sent()
+            assert "syncing groups" in stanza["status"].lower(), stanza
+        for _ in range(n_contacts):
+            probe = self.next_sent()
+            assert probe.get_type() == "probe"
         stanza = self.next_sent()
         assert "yup" in stanza["status"].lower(), stanza
-
         self.romeo: BaseSession = BaseSession.get_self_or_unique_subclass().from_jid(
             JID("romeo@montague.lit")
         )
+
         self.juliet: LegacyContact = self.run_coro(
             self.romeo.contacts.by_legacy_id("juliet")
         )