slidge 0.3.0a1__py3-none-any.whl → 0.3.0a3__py3-none-any.whl

slidge/core/gateway.py

@@ -906,16 +906,15 @@ class BaseGateway(
         await self.xmpp.plugin["xep_0077"].api["user_remove"](None, None, user.jid)
         await self.xmpp._session_cls.kill_by_jid(user.jid)
 
-    async def unregister(self, user: GatewayUser) -> None:
+    async def unregister(self, session: BaseSession) -> None:
         """
         Optionally override this if you need to clean additional
         stuff after a user has been removed from the persistent user store.
 
         By default, this just calls :meth:`BaseSession.logout`.
 
-        :param user:
+        :param session: The session of the user who just unregistered
         """
-        session = self.get_session_from_user(user)
         try:
             await session.logout()
         except NotImplementedError:

slidge/core/mixins/attachment.py

@@ -141,11 +141,14 @@ class AttachmentMixin(TextMessageMixin):
             return r.status < 400
 
     async def __get_stored(self, attachment: LegacyAttachment) -> Attachment:
-        if attachment.legacy_file_id is not None:
+        if attachment.legacy_file_id is not None and self.session is not NotImplemented:
             with self.xmpp.store.session() as orm:
                 stored = (
                     orm.query(Attachment)
-                    .filter_by(legacy_file_id=str(attachment.legacy_file_id))
+                    .filter_by(
+                        legacy_file_id=str(attachment.legacy_file_id),
+                        user_account_id=self.session.user_pk,
+                    )
                     .one_or_none()
                 )
                 if stored is not None:

slidge/core/mixins/avatar.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Optional
 
 from PIL import UnidentifiedImageError
 from slixmpp import JID
+from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import DetachedInstanceError
 
 from ...db.avatar import CachedAvatar, avatar_cache
@@ -126,7 +127,16 @@ class AvatarMixin(UpdateInfoMixin):
             self.stored.avatar = None
         else:
             self.stored.avatar = cached_avatar.stored
-        self.commit(merge=True)
+        try:
+            self.commit(merge=True)
+        except IntegrityError as e:
+            self.log.debug(
+                "Hit integrity error, attempting to fix by refreshing participants"
+            )
+            with self.xmpp.store.session() as orm:
+                orm.refresh(self.stored, ["participants"])
+            self.commit(merge=True)
+
         self._post_avatar_update(cached_avatar)
 
     def get_cached_avatar(self) -> Optional["CachedAvatar"]:

slidge/core/session.py

@@ -704,8 +704,8 @@ class BaseSession(
             log.warning("User not found during unregistration")
             return
 
+        await cls.xmpp.unregister(session)
         with cls.xmpp.store.session() as orm:
-            await cls.xmpp.unregister(session.user)
             orm.delete(session.user)
             orm.commit()
 

slidge/db/alembic/versions/3231d2c623bc_add_unique_contraint_for_attachment_.py

@@ -0,0 +1,33 @@
+"""Add unique contraint for attachment user/file_id
+
+Revision ID: 3231d2c623bc
+Revises: 75a62b74b239
+Create Date: 2025-05-14 06:08:15.425495
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "3231d2c623bc"
+down_revision: Union[str, None] = "75a62b74b239"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    with op.batch_alter_table("attachment", schema=None) as batch_op:
+        batch_op.create_unique_constraint(
+            batch_op.f("uq_attachment_user_account_id"),
+            ["user_account_id", "legacy_file_id"],
+        )
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("attachment", schema=None) as batch_op:
+        batch_op.drop_constraint(
+            batch_op.f("uq_attachment_user_account_id"), type_="unique"
+        )

slidge/db/models.py

@@ -300,6 +300,7 @@ class Attachment(Base):
     """
 
     __tablename__ = "attachment"
+    __table_args__ = (UniqueConstraint("user_account_id", "legacy_file_id"),)
 
     id: Mapped[int] = mapped_column(primary_key=True)
     user_account_id: Mapped[int] = mapped_column(ForeignKey("user_account.id"))

slidge/db/store.py

@@ -324,9 +324,10 @@ class MAMStore:
         if before_id is not None:
             stamp = session.execute(
                 select(ArchivedMessage.timestamp).where(
-                    ArchivedMessage.stanza_id == before_id
+                    ArchivedMessage.stanza_id == before_id,
+                    ArchivedMessage.room_id == room_pk,
                 )
-            ).scalar()
+            ).scalar_one_or_none()
             if stamp is None:
                 raise XMPPError(
                     "item-not-found",
@@ -336,9 +337,10 @@ class MAMStore:
         if after_id is not None:
             stamp = session.execute(
                 select(ArchivedMessage.timestamp).where(
-                    ArchivedMessage.stanza_id == after_id
+                    ArchivedMessage.stanza_id == after_id,
+                    ArchivedMessage.room_id == room_pk,
                 )
-            ).scalar()
+            ).scalar_one_or_none()
             if stamp is None:
                 raise XMPPError(
                     "item-not-found",

slidge/group/room.py

@@ -19,6 +19,7 @@ from slixmpp.plugins.xep_0492.stanza import NS as NOTIFY_NS
 from slixmpp.plugins.xep_0492.stanza import WhenLiteral
 from slixmpp.xmlstream import ET
 from sqlalchemy.orm import Session as OrmSession
+from sqlalchemy.orm.exc import DetachedInstanceError
 
 from ..contact.contact import LegacyContact
 from ..contact.roster import ContactIsUser
@@ -87,17 +88,6 @@ class LegacyMUC(
     This is just a flag on archive responses that most clients ignore anyway.
     """
 
-    KEEP_BACKFILLED_PARTICIPANTS = False
-    """
-    Set this to ``True`` if the participant list is not full after calling
-    ``fill_participants()``. This is a workaround for networks with huge
-    participant lists which do not map really well the MUCs where all presences
-    are sent on join.
-    It allows to ensure that the participants that last spoke (within the
-    ``fill_history()`` method are effectively participants, thus making possible
-    for XMPP clients to fetch their avatars.
-    """
-
     _ALL_INFO_FILLED_ON_STARTUP = False
     """
     Set this to true if the fill_participants() / fill_participants() design does not
@@ -320,10 +310,6 @@ class LegacyMUC(
             return
         async with self.lock("fill history"):
             log.debug("Fetching history for %s", self)
-            if not self.KEEP_BACKFILLED_PARTICIPANTS:
-                with self.xmpp.store.session() as orm:
-                    orm.add(self.stored)
-                    participants = list(self.stored.participants)
             try:
                 before, after = self.archive.get_hole_bounds()
                 if before is not None:
@@ -339,8 +325,7 @@ class LegacyMUC(
                 return
             except Exception as e:
                 self.log.exception("Could not backfill", exc_info=e)
-            if not self.KEEP_BACKFILLED_PARTICIPANTS:
-                self.stored.participants = participants
+
             self.stored.history_filled = True
             self.commit(merge=True)
 

{slidge-0.3.0a1.dist-info → slidge-0.3.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0a1
+Version: 0.3.0a3
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later

{slidge-0.3.0a1.dist-info → slidge-0.3.0a3.dist-info}/RECORD

@@ -16,9 +16,9 @@ slidge/contact/contact.py,sha256=ubqd3aH-TOcv5hsHGPSlDGyojQXn3wjalrO7l_LfZk8,194
 slidge/contact/roster.py,sha256=TAPvaPWUn77CHt8la_BLfQRkZZJhlG-hn2wEQZbGzJ8,9706
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/config.py,sha256=1HxHQ5BOnYghi8V5KbCQ6sUsNnXzAZAIoFA5PrMqH4E,6060
-slidge/core/gateway.py,sha256=IpnHk0D-MXBY2-oPu8u-WrO6bV2Smq95Quqeec5-DEI,40930
+slidge/core/gateway.py,sha256=yQMMWQL-VTVNOecSQ18frroTd6brWbaiDqEQBUI9cAE,40931
 slidge/core/pubsub.py,sha256=-YK49tEdz_SLM3O8Y9zvu3p5KYhxgNpqbsD57rOIdNI,12141
-slidge/core/session.py,sha256=Arz8hQ99o_DJd4NnhRTPaeurywD48xahpjbUVFR8Lkk,29382
+slidge/core/session.py,sha256=bVvSpLOrT7aj36gXtQV6fNZRG556V_Vc55mA_f9bEWI,29373
 slidge/core/dispatcher/__init__.py,sha256=1EXcjXietUKlxEqdrCWCV3xZ3q_DSsjHoqWrPMbtYao,84
 slidge/core/dispatcher/caps.py,sha256=gISaHtFwFDXtkSrSsAkZfPiHQyXfmXg3v_YYU0w9iDg,2254
 slidge/core/dispatcher/disco.py,sha256=xVPyBFnnkON-JjjM1oydRa-dqnDbwAZER2MGQACRhVk,2309
@@ -39,8 +39,8 @@ slidge/core/dispatcher/muc/misc.py,sha256=FYo5FdmzksEuUCfCLLOOm8_8plXtZFQP8IzvzV
 slidge/core/dispatcher/muc/owner.py,sha256=dDAxpRaA8H_NJQNIyBNixck2oG4GHZeEQqPhKd7MmDQ,3359
 slidge/core/dispatcher/muc/ping.py,sha256=EgKKS9AvMnW-vINGcoGbtk6NdbN9A7zVaGfT5T7F6YE,1699
 slidge/core/mixins/__init__.py,sha256=Zea39CCwjJU5XfHwcYPEZ9Sin8z1BZxoV68G2RwC3nE,386
-slidge/core/mixins/attachment.py,sha256=nR_ZHaPbrrXi3Ko8we6vhlu6GD0k4lU6JD3PPzsnFwU,20484
-slidge/core/mixins/avatar.py,sha256=X5tS6jJmjEoHC6O9kMgkNJoXM8eCY53tzW8kv2NOyv4,5346
+slidge/core/mixins/attachment.py,sha256=kCEZzEozujHQP5Eq_Y2g3RL67dUSe0WOLIcoQ0s17pk,20632
+slidge/core/mixins/avatar.py,sha256=L6uMTHa4e9GLu3EXQWoc8Cu3k8fnSKTC2rvSDl5n1qE,5714
 slidge/core/mixins/base.py,sha256=MOd-pas38_52VawQVlxWtBtmTKC6My9G0ZaCeQxOJbs,748
 slidge/core/mixins/db.py,sha256=a6idm-FgHWfDK-MJZWy5AkkBlyY8JmwOB8xAFmm0E9g,1934
 slidge/core/mixins/disco.py,sha256=jk3Z1B6zTuisHv8VKNRJodIo0ee5btYHh2ZrlflPj_Q,3670
@@ -52,8 +52,8 @@ slidge/core/mixins/recipient.py,sha256=b0uFnpym-hOFgYxGjXT1xQcZ4YRbDSBftPcNWLzSw
 slidge/db/__init__.py,sha256=EBDH1JSEhgqYcli2Bw11CRC749wJk8AOucgBzmhDSvU,105
 slidge/db/avatar.py,sha256=MXFd1oe0eL5CCUYbc5CpsIcbio3cY3xVoKt39RAoj9I,8240
 slidge/db/meta.py,sha256=NtjGWcqPfG7uPfwR_cC6_23zyo8ftqgKX8CbP9IBq6U,2185
-slidge/db/models.py,sha256=xkTveglIbJDwcm1YEF7urEC1LTlwyXYrxgT4Vppdmmg,12763
-slidge/db/store.py,sha256=nRR0oAAHg16YX8zffavFh0i8d2QnZgyf0Zexev3M3sM,19261
+slidge/db/models.py,sha256=8z5bbaEINfU1Qx12iyHu4zRD9s3PwC6oUOz-PyBoqYg,12841
+slidge/db/store.py,sha256=shgBqGutbAeMD6T3sqH7Qo4IKs9TWwjwfH5-NDpj-kY,19399
 slidge/db/alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/db/alembic/env.py,sha256=hsBlRNs0zF5diSHGRSa8Fi3qRVQDA2rJdR41AEIdvxc,1642
 slidge/db/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
@@ -65,6 +65,7 @@ slidge/db/alembic/versions/2461390c0af2_store_contacts_caps_verstring_in_db.py,s
 slidge/db/alembic/versions/29f5280c61aa_store_subject_setter_in_room.py,sha256=f8TFS28CXjGhvIn41UYMoHYeODfqhKfo4O7gk-JwA1E,1134
 slidge/db/alembic/versions/2b1f45ab7379_store_room_subject_setter_by_nickname.py,sha256=CMVP2wFz6s7t57eWdSaGtck8BXzfVPJhHE5AoWi34tI,1359
 slidge/db/alembic/versions/3071e0fa69d4_add_contact_client_type.py,sha256=jCdwCOnX9VDgnqIFFHGKaPA7w87Hm9nvR1rMY0LrA30,1394
+slidge/db/alembic/versions/3231d2c623bc_add_unique_contraint_for_attachment_.py,sha256=eWO-j092aqrcYxUQwAGXNY7OMpgGi-a9zlg3Q9IB-Hk,926
 slidge/db/alembic/versions/45c24cc73c91_add_bob.py,sha256=UjMySZ5LaInyPt0KbAxx0rF4GQhZh8CwBeqHtNPdG1c,1249
 slidge/db/alembic/versions/4dbd23a3f868_new_avatar_store.py,sha256=JhT83RJfXlKu2y8iB4twtuINGfa9YKNh6jURXVedHOc,4002
 slidge/db/alembic/versions/54ce3cde350c_use_hash_for_avatar_filenames.py,sha256=aNwlpXCHI_TEnVt2w-C8OrdH02-FhgrKbZkEqt40ay4,1495
@@ -84,7 +85,7 @@ slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=DKwyde15-Op2rXuQBvdSmFcAKhUyWuorpEFcRSmDHec,5956
 slidge/group/bookmarks.py,sha256=UWrUjZMWlDmwKFRuNEqxZSx4cvXFib4AP_l388ApJa8,7086
 slidge/group/participant.py,sha256=6atjdHEgbfhPjPAkOVAQFFuCv5b8TO279HPHq-qpqIE,17651
-slidge/group/room.py,sha256=KKj1mmASoRH80AfI-IZMOeahdThEEGu77-DFUw0ZsZo,49299
+slidge/group/room.py,sha256=p6qtDVJMFFrpPzYrBob6yC2Ct_boMVUViNs5N3CJwCI,48519
 slidge/slixfix/__init__.py,sha256=LvaYZQYjr4l_45AYYpod1dB3MUaZye18vKF-4H8Bm20,4758
 slidge/slixfix/delivery_receipt.py,sha256=JmogxsiXYEbTmCM4fvC5wkQs0jBsaJtKl4j_B_18riE,1415
 slidge/slixfix/roster.py,sha256=DjjHQqCsKsPChUxV7S0Pm4IAgjfrwgm5tcTdJi3N_gY,1670
@@ -109,9 +110,9 @@ slidge/util/lock.py,sha256=ZnUi3LGiz271-YeYKo9JzxovJCoSwlP9P65pNyHIO9o,1029
 slidge/util/test.py,sha256=_E6er2BtQlpyzTUmp4u8C9KhBYzbLrmTwSVgxGObKHU,13988
 slidge/util/types.py,sha256=xJ84ZvaUOU_VVJSjEMysgNSl05k0_O9YKbyW-JUrsMI,5635
 slidge/util/util.py,sha256=4hihLCl4SsB5S14TT3bP8tDPP_Zg9rYbSfLdLB9-G_Q,9332
-slidge-0.3.0a1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.0a1.dist-info/METADATA,sha256=8jkX8qNCMMIHufnOQRQk4Sd0_Z-pvC6iqOYsOd95RPc,5056
-slidge-0.3.0a1.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-slidge-0.3.0a1.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.0a1.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.0a1.dist-info/RECORD,,
+slidge-0.3.0a3.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.3.0a3.dist-info/METADATA,sha256=JxQ19ez_SI8I7ycRYJd7M107KolTsrZH3wdgFyDPBmY,5056
+slidge-0.3.0a3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+slidge-0.3.0a3.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.3.0a3.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.3.0a3.dist-info/RECORD,,

{slidge-0.3.0a1.dist-info → slidge-0.3.0a3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any