slidge 0.3.0a3__tar.gz → 0.3.0b1__tar.gz

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

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

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/contact/contact.py

@@ -95,7 +95,7 @@ class LegacyContact(
         super().__init__()
 
     @property
-    def jid(self):
+    def jid(self):  # type:ignore[override]
         jid = JID(self.stored.jid)
         jid.resource = self.RESOURCE
         return jid
@@ -298,7 +298,7 @@ class LegacyContact(
             )
         self.commit()
         for p in self.participants:
-            p.nickname = n
+            p.nickname = n or str(self.legacy_id)
 
     def _post_avatar_update(self, cached_avatar) -> None:
         if self.is_friend and self.added_to_roster:

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/core/gateway.py

@@ -472,7 +472,7 @@ class BaseGateway(
         )
 
     @property  # type: ignore
-    def jid(self):
+    def jid(self):  # type:ignore[override]
         # Override to avoid slixmpp deprecation warnings.
         return self.boundjid
 

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/core/mixins/attachment.py

@@ -403,6 +403,37 @@ class AttachmentMixin(TextMessageMixin):
         :param when: when the file was sent, for a "delay" tag (:xep:`0203`)
         :param thread:
         """
+        coro = self.__send_file(
+            attachment,
+            legacy_msg_id,
+            reply_to=reply_to,
+            when=when,
+            thread=thread,
+            **kwargs,
+        )
+        if self.session is NotImplemented:
+            return await coro
+        elif not isinstance(attachment, LegacyAttachment):
+            return await coro
+        elif attachment.legacy_file_id is None:
+            return await coro
+        else:
+            # prevents race conditions where we download the same thing several time
+            # and end up attempting to insert it twice in the DB, raising an
+            # IntegrityError.
+            async with self.session.lock(("attachment", attachment.legacy_file_id)):
+                return await coro
+
+    async def __send_file(
+        self,
+        attachment: LegacyAttachment | Path | str,
+        legacy_msg_id: Optional[LegacyMessageType] = None,
+        *,
+        reply_to: Optional[MessageReference] = None,
+        when: Optional[datetime] = None,
+        thread: Optional[LegacyThreadType] = None,
+        **kwargs,
+    ) -> tuple[Optional[str], list[Message]]:
         store_multi = kwargs.pop("store_multi", True)
         carbon = kwargs.pop("carbon", False)
         mto = kwargs.pop("mto", None)

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/core/mixins/avatar.py

@@ -123,19 +123,26 @@ class AvatarMixin(UpdateInfoMixin):
             else:
                 avatar.path.unlink()
 
-        if cached_avatar is None:
-            self.stored.avatar = None
-        else:
-            self.stored.avatar = cached_avatar.stored
+        stored_avatar = None if cached_avatar is None else cached_avatar.stored
+        self.stored.avatar = stored_avatar
+
         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)
+            with self.xmpp.store.session(expire_on_commit=False) as orm:
+                if orm.object_session(self.stored):
+                    self.log.debug(
+                        "Hit integrity error, attempting to fix by refreshing participants"
+                    )
+                    orm.refresh(self.stored, ["participants"])
+                else:
+                    self.log.debug(
+                        "Hit integrity error, attempting to fix by merging contact.stored"
+                    )
+                    self.stored = orm.merge(self.stored)
+                    self.stored.avatar = stored_avatar
+                orm.add(self.stored)
+                orm.commit()
 
         self._post_avatar_update(cached_avatar)
 

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/core/session.py

@@ -24,6 +24,7 @@ from ..db.models import Contact, GatewayUser
 from ..group.bookmarks import LegacyBookmarks
 from ..group.room import LegacyMUC
 from ..util import ABCSubclassableOnceAtMost
+from ..util.lock import NamedLockMixin
 from ..util.types import (
     LegacyGroupIdType,
     LegacyMessageType,
@@ -50,7 +51,9 @@ class CachedPresence(NamedTuple):
 
 
 class BaseSession(
-    Generic[LegacyMessageType, RecipientType], metaclass=ABCSubclassableOnceAtMost
+    Generic[LegacyMessageType, RecipientType],
+    NamedLockMixin,
+    metaclass=ABCSubclassableOnceAtMost,
 ):
     """
     The session of a registered :term:`User`.
@@ -95,6 +98,7 @@ class BaseSession(
     _bookmarks_cls: Type[LegacyBookmarks]
 
     def __init__(self, user: GatewayUser) -> None:
+        super().__init__()
         self.user = user
         self.log = logging.getLogger(user.jid.bare)
 

slidge-0.3.0b1/slidge/db/alembic/versions/cef02a8b1451_initial_schema.py

@@ -0,0 +1,361 @@
+"""Initial schema
+
+Revision ID: cef02a8b1451
+Revises:
+Create Date: 2025-08-28 12:48:16.890606
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+import slidge
+
+# revision identifiers, used by Alembic.
+revision: str = "cef02a8b1451"
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "avatar",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("hash", sa.String(), nullable=False),
+        sa.Column("height", sa.Integer(), nullable=False),
+        sa.Column("width", sa.Integer(), nullable=False),
+        sa.Column("legacy_id", sa.String(), nullable=True),
+        sa.Column("url", sa.String(), nullable=True),
+        sa.Column("etag", sa.String(), nullable=True),
+        sa.Column("last_modified", sa.String(), nullable=True),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_avatar")),
+        sa.UniqueConstraint("hash", name=op.f("uq_avatar_hash")),
+        sa.UniqueConstraint("legacy_id", name=op.f("uq_avatar_legacy_id")),
+    )
+    op.create_table(
+        "bob",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("file_name", sa.String(), nullable=False),
+        sa.Column("sha_1", sa.String(), nullable=False),
+        sa.Column("sha_256", sa.String(), nullable=False),
+        sa.Column("sha_512", sa.String(), nullable=False),
+        sa.Column("content_type", sa.String(), nullable=False),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_bob")),
+        sa.UniqueConstraint("sha_1", name=op.f("uq_bob_sha_1")),
+        sa.UniqueConstraint("sha_256", name=op.f("uq_bob_sha_256")),
+        sa.UniqueConstraint("sha_512", name=op.f("uq_bob_sha_512")),
+    )
+    op.create_table(
+        "user_account",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("jid", slidge.db.meta.JIDType(), nullable=False),
+        sa.Column(
+            "registration_date",
+            sa.DateTime(),
+            server_default=sa.text("(CURRENT_TIMESTAMP)"),
+            nullable=False,
+        ),
+        sa.Column(
+            "legacy_module_data", slidge.db.meta.JSONEncodedDict(), nullable=False
+        ),
+        sa.Column("preferences", slidge.db.meta.JSONEncodedDict(), nullable=False),
+        sa.Column("avatar_hash", sa.String(), nullable=True),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_user_account")),
+        sa.UniqueConstraint("jid", name=op.f("uq_user_account_jid")),
+    )
+    op.create_table(
+        "attachment",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("user_account_id", sa.Integer(), nullable=False),
+        sa.Column("legacy_file_id", sa.String(), nullable=True),
+        sa.Column("url", sa.String(), nullable=False),
+        sa.Column("sims", sa.String(), nullable=True),
+        sa.Column("sfs", sa.String(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["user_account_id"],
+            ["user_account.id"],
+            name=op.f("fk_attachment_user_account_id_user_account"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_attachment")),
+        sa.UniqueConstraint(
+            "user_account_id",
+            "legacy_file_id",
+            name=op.f("uq_attachment_user_account_id"),
+        ),
+    )
+    with op.batch_alter_table("attachment", schema=None) as batch_op:
+        batch_op.create_index(
+            batch_op.f("ix_attachment_legacy_file_id"), ["legacy_file_id"], unique=False
+        )
+        batch_op.create_index(batch_op.f("ix_attachment_url"), ["url"], unique=False)
+
+    op.create_table(
+        "contact",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("user_account_id", sa.Integer(), nullable=False),
+        sa.Column("legacy_id", sa.String(), nullable=False),
+        sa.Column("jid", slidge.db.meta.JIDType(), nullable=False),
+        sa.Column("avatar_id", sa.Integer(), nullable=True),
+        sa.Column("nick", sa.String(), nullable=True),
+        sa.Column("cached_presence", sa.Boolean(), nullable=False),
+        sa.Column("last_seen", sa.DateTime(), nullable=True),
+        sa.Column("ptype", sa.String(), nullable=True),
+        sa.Column("pstatus", sa.String(), nullable=True),
+        sa.Column("pshow", sa.String(), nullable=True),
+        sa.Column("caps_ver", sa.String(), nullable=True),
+        sa.Column("is_friend", sa.Boolean(), nullable=False),
+        sa.Column("added_to_roster", sa.Boolean(), nullable=False),
+        sa.Column("extra_attributes", slidge.db.meta.JSONEncodedDict(), nullable=True),
+        sa.Column("updated", sa.Boolean(), nullable=False),
+        sa.Column("vcard", sa.String(), nullable=True),
+        sa.Column("vcard_fetched", sa.Boolean(), nullable=False),
+        sa.Column(
+            "client_type",
+            sa.Enum(
+                "bot",
+                "console",
+                "game",
+                "handheld",
+                "pc",
+                "phone",
+                "sms",
+                "tablet",
+                "web",
+                native_enum=False,
+            ),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(
+            ["avatar_id"], ["avatar.id"], name=op.f("fk_contact_avatar_id_avatar")
+        ),
+        sa.ForeignKeyConstraint(
+            ["user_account_id"],
+            ["user_account.id"],
+            name=op.f("fk_contact_user_account_id_user_account"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_contact")),
+        sa.UniqueConstraint(
+            "user_account_id", "jid", name=op.f("uq_contact_user_account_id")
+        ),
+        sa.UniqueConstraint(
+            "user_account_id", "legacy_id", name=op.f("uq_contact_user_account_id")
+        ),
+    )
+    op.create_table(
+        "room",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("user_account_id", sa.Integer(), nullable=False),
+        sa.Column("legacy_id", sa.String(), nullable=False),
+        sa.Column("jid", slidge.db.meta.JIDType(), nullable=False),
+        sa.Column("avatar_id", sa.Integer(), nullable=True),
+        sa.Column("name", sa.String(), nullable=True),
+        sa.Column("description", sa.String(), nullable=True),
+        sa.Column("subject", sa.String(), nullable=True),
+        sa.Column("subject_date", sa.DateTime(), nullable=True),
+        sa.Column("subject_setter", sa.String(), nullable=True),
+        sa.Column("n_participants", sa.Integer(), nullable=True),
+        sa.Column(
+            "muc_type",
+            sa.Enum("GROUP", "CHANNEL", "CHANNEL_NON_ANONYMOUS", name="muctype"),
+            nullable=False,
+        ),
+        sa.Column("user_nick", sa.String(), nullable=True),
+        sa.Column("user_resources", sa.String(), nullable=True),
+        sa.Column("participants_filled", sa.Boolean(), nullable=False),
+        sa.Column("history_filled", sa.Boolean(), nullable=False),
+        sa.Column("extra_attributes", slidge.db.meta.JSONEncodedDict(), nullable=True),
+        sa.Column("updated", sa.Boolean(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["avatar_id"], ["avatar.id"], name=op.f("fk_room_avatar_id_avatar")
+        ),
+        sa.ForeignKeyConstraint(
+            ["user_account_id"],
+            ["user_account.id"],
+            name=op.f("fk_room_user_account_id_user_account"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_room")),
+        sa.UniqueConstraint(
+            "user_account_id", "jid", name="uq_room_user_account_id_jid"
+        ),
+        sa.UniqueConstraint(
+            "user_account_id", "legacy_id", name="uq_room_user_account_id_legacy_id"
+        ),
+    )
+    op.create_table(
+        "contact_sent",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("contact_id", sa.Integer(), nullable=False),
+        sa.Column("msg_id", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["contact_id"],
+            ["contact.id"],
+            name=op.f("fk_contact_sent_contact_id_contact"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_contact_sent")),
+        sa.UniqueConstraint(
+            "contact_id", "msg_id", name=op.f("uq_contact_sent_contact_id")
+        ),
+    )
+    op.create_table(
+        "direct_msg",
+        sa.Column("foreign_key", sa.Integer(), nullable=False),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("legacy_id", sa.String(), nullable=False),
+        sa.Column("xmpp_id", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["foreign_key"],
+            ["contact.id"],
+            name=op.f("fk_direct_msg_foreign_key_contact"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_direct_msg")),
+    )
+    with op.batch_alter_table("direct_msg", schema=None) as batch_op:
+        batch_op.create_index(
+            "ix_direct_msg_legacy_id", ["legacy_id", "foreign_key"], unique=False
+        )
+
+    op.create_table(
+        "direct_thread",
+        sa.Column("foreign_key", sa.Integer(), nullable=False),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("legacy_id", sa.String(), nullable=False),
+        sa.Column("xmpp_id", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["foreign_key"],
+            ["contact.id"],
+            name=op.f("fk_direct_thread_foreign_key_contact"),
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_direct_thread")),
+    )
+    with op.batch_alter_table("direct_thread", schema=None) as batch_op:
+        batch_op.create_index(
+            "ix_direct_direct_thread_id", ["legacy_id", "foreign_key"], unique=False
+        )
+
+    op.create_table(
+        "group_msg",
+        sa.Column("foreign_key", sa.Integer(), nullable=False),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("legacy_id", sa.String(), nullable=False),
+        sa.Column("xmpp_id", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["foreign_key"], ["room.id"], name=op.f("fk_group_msg_foreign_key_room")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_group_msg")),
+    )
+    with op.batch_alter_table("group_msg", schema=None) as batch_op:
+        batch_op.create_index(
+            "ix_group_msg_legacy_id", ["legacy_id", "foreign_key"], unique=False
+        )
+
+    op.create_table(
+        "group_thread",
+        sa.Column("foreign_key", sa.Integer(), nullable=False),
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("legacy_id", sa.String(), nullable=False),
+        sa.Column("xmpp_id", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["foreign_key"], ["room.id"], name=op.f("fk_group_thread_foreign_key_room")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_group_thread")),
+    )
+    with op.batch_alter_table("group_thread", schema=None) as batch_op:
+        batch_op.create_index(
+            "ix_direct_group_thread_id", ["legacy_id", "foreign_key"], unique=False
+        )
+
+    op.create_table(
+        "mam",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("room_id", sa.Integer(), nullable=False),
+        sa.Column("stanza_id", sa.String(), nullable=False),
+        sa.Column("timestamp", sa.DateTime(), nullable=False),
+        sa.Column("author_jid", slidge.db.meta.JIDType(), nullable=False),
+        sa.Column(
+            "source",
+            sa.Enum("LIVE", "BACKFILL", name="archivedmessagesource"),
+            nullable=False,
+        ),
+        sa.Column("legacy_id", sa.String(), nullable=True),
+        sa.Column("stanza", sa.String(), nullable=False),
+        sa.ForeignKeyConstraint(
+            ["room_id"], ["room.id"], name=op.f("fk_mam_room_id_room")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_mam")),
+        sa.UniqueConstraint("room_id", "stanza_id", name=op.f("uq_mam_room_id")),
+    )
+    op.create_table(
+        "participant",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("room_id", sa.Integer(), nullable=False),
+        sa.Column("contact_id", sa.Integer(), nullable=True),
+        sa.Column("is_user", sa.Boolean(), nullable=False),
+        sa.Column(
+            "affiliation",
+            sa.Enum("outcast", "member", "admin", "owner", "none", native_enum=False),
+            nullable=False,
+        ),
+        sa.Column(
+            "role",
+            sa.Enum("moderator", "participant", "visitor", "none", native_enum=False),
+            nullable=False,
+        ),
+        sa.Column("presence_sent", sa.Boolean(), nullable=False),
+        sa.Column("resource", sa.String(), nullable=False),
+        sa.Column("nickname", sa.String(), nullable=False),
+        sa.Column("nickname_no_illegal", sa.String(), nullable=False),
+        sa.Column("hats", sa.JSON(), nullable=False),
+        sa.Column("extra_attributes", slidge.db.meta.JSONEncodedDict(), nullable=True),
+        sa.ForeignKeyConstraint(
+            ["contact_id"],
+            ["contact.id"],
+            name=op.f("fk_participant_contact_id_contact"),
+        ),
+        sa.ForeignKeyConstraint(
+            ["room_id"], ["room.id"], name=op.f("fk_participant_room_id_room")
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_participant")),
+        sa.UniqueConstraint(
+            "room_id", "contact_id", name=op.f("uq_participant_room_id")
+        ),
+        sa.UniqueConstraint("room_id", "resource", name=op.f("uq_participant_room_id")),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("participant")
+    op.drop_table("mam")
+    with op.batch_alter_table("group_thread", schema=None) as batch_op:
+        batch_op.drop_index("ix_direct_group_thread_id")
+
+    op.drop_table("group_thread")
+    with op.batch_alter_table("group_msg", schema=None) as batch_op:
+        batch_op.drop_index("ix_group_msg_legacy_id")
+
+    op.drop_table("group_msg")
+    with op.batch_alter_table("direct_thread", schema=None) as batch_op:
+        batch_op.drop_index("ix_direct_direct_thread_id")
+
+    op.drop_table("direct_thread")
+    with op.batch_alter_table("direct_msg", schema=None) as batch_op:
+        batch_op.drop_index("ix_direct_msg_legacy_id")
+
+    op.drop_table("direct_msg")
+    op.drop_table("contact_sent")
+    op.drop_table("room")
+    op.drop_table("contact")
+    with op.batch_alter_table("attachment", schema=None) as batch_op:
+        batch_op.drop_index(batch_op.f("ix_attachment_url"))
+        batch_op.drop_index(batch_op.f("ix_attachment_legacy_file_id"))
+
+    op.drop_table("attachment")
+    op.drop_table("user_account")
+    op.drop_table("bob")
+    op.drop_table("avatar")
+    # ### end Alembic commands ###

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/group/participant.py

@@ -302,7 +302,7 @@ class LegacyParticipant(
         return p
 
     @property
-    def DISCO_NAME(self):
+    def DISCO_NAME(self):  # type:ignore[override]
         return self.nickname
 
     def __send_presence_if_needed(

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/group/room.py

@@ -18,8 +18,8 @@ from slixmpp.plugins.xep_0469.stanza import NS as PINNING_NS
 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.exc import InvalidRequestError
 from sqlalchemy.orm import Session as OrmSession
-from sqlalchemy.orm.exc import DetachedInstanceError
 
 from ..contact.contact import LegacyContact
 from ..contact.roster import ContactIsUser
@@ -247,48 +247,33 @@ class LegacyMUC(
             return
         async with self.lock("fill participants"):
             parts: list[Participant] = []
-            resources: set[str] = set()
+            resources = set[str]()
+            # During fill_participants(), self.get_participant*() methods may
+            # return a participant with a conflicting nick/resource.
             async for participant in self.fill_participants():
-                if participant.stored.id is not None:
+                if participant.stored.resource in resources:
+                    self.log.warning(
+                        "Participant '%s' was yielded more than once by fill_participants()",
+                        participant.stored.resource,
+                    )
                     continue
-                # During fill_participants(), self.get_participant*() methods may
-                # return a participant with a conflicting nick/resource. There is
-                # a better way to fix this than the logic below, but this better way
-                # has not been found yet.
-                if participant.jid.resource in resources:
-                    if participant.contact is None:
-                        self.log.warning(
-                            "Ditching participant %s", participant.nickname
-                        )
-                        del participant
-                        continue
-                    else:
-                        nickname = (
-                            f"{participant.nickname} ({participant.contact.jid.node})"
-                        )
-                        participant = self._participant_cls(
-                            self,
-                            Participant(nickname=nickname, room=self.stored),
-                            contact=participant.contact,
-                        )
-                resources.add(participant.jid.resource)
                 parts.append(participant.stored)
+                resources.add(participant.stored.resource)
         with self.xmpp.store.session(expire_on_commit=False) as orm:
-            # FIXME: something must be wrong with all these refreshes and merge,
-            #        but I did not manage to get rid of them without getting various
-            #        sqlalchemy exceptions raised everywhere
             orm.add(self.stored)
-            orm.refresh(self.stored)
-            known = {p.resource for p in self.stored.participants}
-            self.stored.participants_filled = True
+            # because self.participants() is async, self.stored  may be out of sync at
+            # this point.
+            with orm.no_autoflush:
+                orm.refresh(self.stored)
             for part in parts:
-                if part.resource in known:
-                    continue
-                part = orm.merge(part)
-                orm.add(part)
-                self.stored.participants.append(part)
+                try:
+                    self.stored.participants.append(part)
+                except InvalidRequestError:
+                    # the participant was already stored in the DB. `part` may even
+                    # be out-of-sync, so it's fine to just ditch it.
+                    pass
+            self.stored.participants_filled = True
             orm.commit()
-            orm.refresh(self.stored)
 
     async def get_participants(
         self, affiliation: Optional[MucAffiliation] = None
@@ -642,6 +627,10 @@ class LegacyMUC(
 
         if user_participant is None:
             user_participant = await self.get_user_participant()
+            with self.xmpp.store.session() as orm:
+                orm.add(self.stored)
+                with orm.no_autoflush:
+                    orm.refresh(self.stored, ["participants"])
         if not user_participant.is_user:
             self.log.warning("is_user flag not set participant on user_participant")
             user_participant.is_user = True  # type:ignore

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge/migration.py

@@ -1,16 +1,13 @@
 import logging
 import shutil
 import sys
+import traceback
 from pathlib import Path
 
 from alembic import command
 from alembic.config import Config
-from slixmpp import JID
 
 from .core import config
-from .db.meta import get_engine
-from .db.models import GatewayUser
-from .db.store import SlidgeStore
 
 
 def remove_avatar_cache_v1() -> None:
@@ -32,7 +29,15 @@ def get_alembic_cfg() -> Config:
 
 def migrate() -> None:
     remove_avatar_cache_v1()
-    command.upgrade(get_alembic_cfg(), "head")
+    try:
+        command.upgrade(get_alembic_cfg(), "head")
+    except Exception as e:
+        traceback.print_exception(e)
+        print(
+            "Something went wrong during the migration. "
+            "This is expected if you upgrade from slidge 0.2, in this case you need to start from a fresh database."
+        )
+        exit(1)
 
 
 def main() -> None:
@@ -41,6 +46,10 @@ def main() -> None:
 
     Usage: python -m slidge.migration "Revision message blah blah blah"
     """
+    dev_db = Path(".") / "dev" / "slidge.sqlite"
+    if dev_db.exists():
+        # always start from a clean state
+        dev_db.unlink()
     alembic_cfg = get_alembic_cfg()
     command.upgrade(alembic_cfg, "head")
     command.revision(alembic_cfg, sys.argv[1], autogenerate=True)

{slidge-0.3.0a3 → slidge-0.3.0b1}/slidge.egg-info/PKG-INFO

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