slidge 0.3.0a1__tar.gz → 0.3.0a3__tar.gz

{slidge-0.3.0a1 → slidge-0.3.0a3}/PKG-INFO

@@ -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 → slidge-0.3.0a3}/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-0.3.0a1 → slidge-0.3.0a3}/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-0.3.0a1 → slidge-0.3.0a3}/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-0.3.0a1 → slidge-0.3.0a3}/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-0.3.0a3/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-0.3.0a1 → slidge-0.3.0a3}/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-0.3.0a1 → slidge-0.3.0a3}/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-0.3.0a1 → slidge-0.3.0a3}/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 → slidge-0.3.0a3}/slidge.egg-info/PKG-INFO

@@ -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 → slidge-0.3.0a3}/slidge.egg-info/SOURCES.txt

@@ -128,6 +128,7 @@ slidge/db/alembic/versions/2461390c0af2_store_contacts_caps_verstring_in_db.py
 slidge/db/alembic/versions/29f5280c61aa_store_subject_setter_in_room.py
 slidge/db/alembic/versions/2b1f45ab7379_store_room_subject_setter_by_nickname.py
 slidge/db/alembic/versions/3071e0fa69d4_add_contact_client_type.py
+slidge/db/alembic/versions/3231d2c623bc_add_unique_contraint_for_attachment_.py
 slidge/db/alembic/versions/45c24cc73c91_add_bob.py
 slidge/db/alembic/versions/4dbd23a3f868_new_avatar_store.py
 slidge/db/alembic/versions/54ce3cde350c_use_hash_for_avatar_filenames.py

{slidge-0.3.0a1 → slidge-0.3.0a3}/tests/test_shakespeare.py

@@ -463,7 +463,8 @@ class TestAimShakespeareBase(Base):
             """
         )
         assert len(unregistered) == 1
-        assert unregistered[0].jid == "romeo@montague.lit"
+        assert unregistered[0].user.jid == "romeo@montague.lit"
+        unregistered.clear()
 
     def test_jid_validator(self):
         self.xmpp.jid_validator = re.compile(".*@noteverybody")