slidge 0.2.0a4__py3-none-any.whl → 0.2.0a6__py3-none-any.whl

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/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/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/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")
         )

{slidge-0.2.0a4.dist-info → slidge-0.2.0a6.dist-info}/METADATA

@@ -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.dist-info → slidge-0.2.0a6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 slidge/__init__.py,sha256=S0tUjqpZlzsr8G4Y_1Xt-KCYB07qaknTB0OwHU8k29U,1587
 slidge/__main__.py,sha256=Y12eh1TD_C5MB50KgEAuMffGnRFCvKYFKHD4UYSmHA0,72
-slidge/__version__.py,sha256=DiSDY0IeSP34Y0bfesUNWzvITu9c0Hjquli6h3JVwMk,170
+slidge/__version__.py,sha256=Z2v182VfCCHc2NnkauNdFLVe5MwGg5cg8dRIWwfmsHM,170
 slidge/command/__init__.py,sha256=UYf1mjCYbZ5G7PIgaFTWSQRAzEJkQ6dTH8Fu_e_XnO0,613
 slidge/command/adhoc.py,sha256=5xLLoWyUJqCJB7kAwD2VKYTl_7MObCsgdz-qg_WkWGs,9417
 slidge/command/admin.py,sha256=x_kJ0TJhzf6d3OBIOXFjudZFO8bRYUG919td7OjMCug,6008
@@ -10,7 +10,7 @@ slidge/command/chat_command.py,sha256=kMnxrzmD7LhWgyO1w9Rgz1eA7PhfAJ2Rf34YWjoKrw
 slidge/command/register.py,sha256=fzPcGUoJtainnDOiC13gWV-uYLuJcsmdKGJ-jXT1qIo,6697
 slidge/command/user.py,sha256=nJnoU4t1r9oPkFFHSHHwSY8WOQNLQn9mMcwZp-yZaKA,11422
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
-slidge/contact/contact.py,sha256=E7QEivJQ6GSVqi0BOe_7CohYDqCXHabGiPDe37WWKLI,21916
+slidge/contact/contact.py,sha256=yzemaELpe256B43gUXYc9CLjFhwSjr7-PwkY0uxVQfc,22169
 slidge/contact/roster.py,sha256=2UPuf2XkCdt9mdjhbATxxIH5dyIiJaxA0en8t1BgJuc,9989
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/config.py,sha256=leNcN_TI0Ka1hhzOHx7cBW3fNj5xZwsiv9l8AfRY_vU,7630
@@ -66,7 +66,7 @@ slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=xGPkdSk8-BT6t6lNVo1FEwiFVAttoxCma8Tsyk5r8Kg,5279
 slidge/group/bookmarks.py,sha256=_LDf7A7aWkwPH88v7c-mOp8VJs3gSFM1-uCqSb4ThO8,5825
 slidge/group/participant.py,sha256=VNMtqr98QVuYgiTsJ9BaaIG1noz-xe3ewyKhLeDRhBk,17033
-slidge/group/room.py,sha256=QGi1I5O8PDm_ivQOx5vZUeJ5v_ldrPHs4s-szyM-dCQ,45326
+slidge/group/room.py,sha256=KqVTEwpoVvwoDqAe-eIL7-ASNebuThRL4EAZsFtdCcY,45384
 slidge/main.py,sha256=TbkG5m1SgNmfaZ7TOD5VGTh4Q52XltLJayWnan8M9cw,5986
 slidge/migration.py,sha256=qUrux9dYCtOfFjPIlvGfWjoyqhkdxzaOByJRqTmCoUI,1072
 slidge/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -108,11 +108,11 @@ slidge/util/__init__.py,sha256=BELovoTMPcPPGz3D48esBr8A4BRRHXTvavfgnArBgEc,301
 slidge/util/archive_msg.py,sha256=xXAR0BI5r3d6KKWjae9594izCOv6iI03z2WLuTecNw8,1724
 slidge/util/conf.py,sha256=1j2OnOsCBar1tOObErhXR5RC3Vl3faliOZ1U8J3My58,6613
 slidge/util/db.py,sha256=4LxZj8oBYgiSnyBUnF_ALjr0TblkfNQq_p28sCfkHMY,242
-slidge/util/test.py,sha256=nCldxi9dLPj-c4LqZChR9DbzXFU4WgT0o_Pe80JJIDc,13279
+slidge/util/test.py,sha256=84GCSsWDaf7ukrMUaej2tuedY2Uxje5JljUt3x-V4mM,13645
 slidge/util/types.py,sha256=Gif-Z9NVd_eTei1uM3_KOsdok3B1yMQwdOkOzf9vheE,5224
 slidge/util/util.py,sha256=8JeE0QObNGQr_Tw4OFPwQSz_EB_zh_0t9IJmNNhW0ic,9114
-slidge-0.2.0a4.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.2.0a4.dist-info/METADATA,sha256=idAPh52VqnQnIO6w47GLlGeDUegzVQU0sycTqDezW1I,4723
-slidge-0.2.0a4.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-slidge-0.2.0a4.dist-info/entry_points.txt,sha256=SNl72KSocF5plsu_67xyH6wVWfGTXQbzkQgXbLtzDrQ,47
-slidge-0.2.0a4.dist-info/RECORD,,
+slidge-0.2.0a6.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.2.0a6.dist-info/METADATA,sha256=Y3urIslvpvtG2sPaOfhxpOoRPfxfnRIrxqzuZGT5RrM,4723
+slidge-0.2.0a6.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+slidge-0.2.0a6.dist-info/entry_points.txt,sha256=SNl72KSocF5plsu_67xyH6wVWfGTXQbzkQgXbLtzDrQ,47
+slidge-0.2.0a6.dist-info/RECORD,,