slidge 0.2.12__py3-none-any.whl → 0.3.0a0__py3-none-any.whl

slidge/db/models.py

@@ -6,24 +6,13 @@ from typing import Optional
 import sqlalchemy as sa
 from slixmpp import JID
 from slixmpp.types import MucAffiliation, MucRole
-from sqlalchemy import ForeignKey, Index, UniqueConstraint
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy import JSON, ForeignKey, Index, UniqueConstraint
+from sqlalchemy.orm import Mapped, declared_attr, mapped_column, relationship
 
 from ..util.types import ClientType, MucType
 from .meta import Base, JSONSerializable, JSONSerializableTypes
 
 
-class XmppToLegacyEnum(IntEnum):
-    """
-    XMPP-client generated IDs, used in the XmppToLegacyIds table to keep track
-    of corresponding legacy IDs
-    """
-
-    DM = 1
-    GROUP_CHAT = 2
-    THREAD = 3
-
-
 class ArchivedMessageSource(IntEnum):
     """
     Whether an archived message comes from ``LegacyMUC.backfill()`` or was received
@@ -63,16 +52,7 @@ class GatewayUser(Base):
     rooms: Mapped[list["Room"]] = relationship(
         back_populates="user", cascade="all, delete-orphan"
     )
-    xmpp_to_legacy: Mapped[list["XmppToLegacyIds"]] = relationship(
-        cascade="all, delete-orphan"
-    )
     attachments: Mapped[list["Attachment"]] = relationship(cascade="all, delete-orphan")
-    multi_legacy: Mapped[list["LegacyIdsMulti"]] = relationship(
-        cascade="all, delete-orphan"
-    )
-    multi_xmpp: Mapped[list["XmppIdsMulti"]] = relationship(
-        cascade="all, delete-orphan"
-    )
 
     def __repr__(self) -> str:
         return f"User(id={self.id!r}, jid={self.jid!r})"
@@ -109,11 +89,12 @@ class Avatar(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
 
-    filename: Mapped[str] = mapped_column(unique=True)
     hash: Mapped[str] = mapped_column(unique=True)
     height: Mapped[int] = mapped_column()
     width: Mapped[int] = mapped_column()
 
+    legacy_id: Mapped[Optional[str]] = mapped_column(unique=True, nullable=True)
+
     # this is only used when avatars are available as HTTP URLs and do not
     # have a legacy_id
     url: Mapped[Optional[str]] = mapped_column(default=None)
@@ -137,13 +118,17 @@ class Contact(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True)
     user_account_id: Mapped[int] = mapped_column(ForeignKey("user_account.id"))
-    user: Mapped[GatewayUser] = relationship(back_populates="contacts")
+    user: Mapped[GatewayUser] = relationship(lazy=True, back_populates="contacts")
     legacy_id: Mapped[str] = mapped_column(nullable=False)
 
     jid: Mapped[JID] = mapped_column()
 
-    avatar_id: Mapped[int] = mapped_column(ForeignKey("avatar.id"), nullable=True)
-    avatar: Mapped[Avatar] = relationship(back_populates="contacts")
+    avatar_id: Mapped[Optional[int]] = mapped_column(
+        ForeignKey("avatar.id"), nullable=True
+    )
+    avatar: Mapped[Optional[Avatar]] = relationship(
+        lazy=False, back_populates="contacts"
+    )
 
     nick: Mapped[Optional[str]] = mapped_column(nullable=True)
 
@@ -170,10 +155,13 @@ class Contact(Base):
 
     participants: Mapped[list["Participant"]] = relationship(back_populates="contact")
 
-    avatar_legacy_id: Mapped[Optional[str]] = mapped_column(nullable=True)
-
     client_type: Mapped[ClientType] = mapped_column(nullable=False, default="pc")
 
+    messages: Mapped[list["DirectMessages"]] = relationship(
+        cascade="all, delete-orphan"
+    )
+    threads: Mapped[list["DirectThreads"]] = relationship(cascade="all, delete-orphan")
+
 
 class ContactSent(Base):
     """
@@ -207,13 +195,15 @@ class Room(Base):
     __tablename__ = "room"
     id: Mapped[int] = mapped_column(primary_key=True)
     user_account_id: Mapped[int] = mapped_column(ForeignKey("user_account.id"))
-    user: Mapped[GatewayUser] = relationship(back_populates="rooms")
+    user: Mapped[GatewayUser] = relationship(lazy=True, back_populates="rooms")
     legacy_id: Mapped[str] = mapped_column(nullable=False)
 
     jid: Mapped[JID] = mapped_column(nullable=False)
 
-    avatar_id: Mapped[int] = mapped_column(ForeignKey("avatar.id"), nullable=True)
-    avatar: Mapped[Avatar] = relationship(back_populates="rooms")
+    avatar_id: Mapped[Optional[int]] = mapped_column(
+        ForeignKey("avatar.id"), nullable=True
+    )
+    avatar: Mapped[Optional[Avatar]] = relationship(lazy=False, back_populates="rooms")
 
     name: Mapped[Optional[str]] = mapped_column(nullable=True)
     description: Mapped[Optional[str]] = mapped_column(nullable=True)
@@ -223,7 +213,7 @@ class Room(Base):
 
     n_participants: Mapped[Optional[int]] = mapped_column(default=None)
 
-    muc_type: Mapped[Optional[MucType]] = mapped_column(default=MucType.GROUP)
+    muc_type: Mapped[MucType] = mapped_column(default=MucType.CHANNEL)
 
     user_nick: Mapped[Optional[str]] = mapped_column()
     user_resources: Mapped[Optional[str]] = mapped_column(nullable=True)
@@ -240,12 +230,13 @@ class Room(Base):
         cascade="all, delete-orphan",
     )
 
-    avatar_legacy_id: Mapped[Optional[str]] = mapped_column(nullable=True)
-
     archive: Mapped[list["ArchivedMessage"]] = relationship(
         cascade="all, delete-orphan"
     )
 
+    messages: Mapped[list["GroupMessages"]] = relationship(cascade="all, delete-orphan")
+    threads: Mapped[list["GroupThreads"]] = relationship(cascade="all, delete-orphan")
+
 
 class ArchivedMessage(Base):
     """
@@ -267,23 +258,40 @@ class ArchivedMessage(Base):
     stanza: Mapped[str] = mapped_column(nullable=False)
 
 
-class XmppToLegacyIds(Base):
+class _LegacyToXmppIdsBase:
     """
-    XMPP-client generated IDs, and mapping to the corresponding legacy IDs
+    XMPP-client generated IDs, and mapping to the corresponding legacy IDs.
+
+    A single legacy ID can map to several XMPP ids.
     """
 
-    __tablename__ = "xmpp_to_legacy_ids"
-    __table_args__ = (
-        Index("xmpp_legacy", "user_account_id", "xmpp_id", "legacy_id", unique=True),
-    )
     id: Mapped[int] = mapped_column(primary_key=True)
-    user_account_id: Mapped[int] = mapped_column(ForeignKey("user_account.id"))
-    user: Mapped[GatewayUser] = relationship(back_populates="xmpp_to_legacy")
-
-    xmpp_id: Mapped[str] = mapped_column(nullable=False)
     legacy_id: Mapped[str] = mapped_column(nullable=False)
+    xmpp_id: Mapped[str] = mapped_column(nullable=False)
+
+
+class DirectMessages(_LegacyToXmppIdsBase, Base):
+    __tablename__ = "direct_msg"
+    __table_args__ = (Index("ix_direct_msg_legacy_id", "legacy_id", "foreign_key"),)
+    foreign_key: Mapped[int] = mapped_column(ForeignKey("contact.id"), nullable=False)
+
+
+class GroupMessages(_LegacyToXmppIdsBase, Base):
+    __tablename__ = "group_msg"
+    __table_args__ = (Index("ix_group_msg_legacy_id", "legacy_id", "foreign_key"),)
+    foreign_key: Mapped[int] = mapped_column(ForeignKey("room.id"), nullable=False)
 
-    type: Mapped[XmppToLegacyEnum] = mapped_column(nullable=False)
+
+class DirectThreads(_LegacyToXmppIdsBase, Base):
+    __tablename__ = "direct_thread"
+    __table_args__ = (Index("ix_direct_direct_thread_id", "legacy_id", "foreign_key"),)
+    foreign_key: Mapped[int] = mapped_column(ForeignKey("contact.id"), nullable=False)
+
+
+class GroupThreads(_LegacyToXmppIdsBase, Base):
+    __tablename__ = "group_thread"
+    __table_args__ = (Index("ix_direct_group_thread_id", "legacy_id", "foreign_key"),)
+    foreign_key: Mapped[int] = mapped_column(ForeignKey("room.id"), nullable=False)
 
 
 class Attachment(Base):
@@ -303,81 +311,26 @@ class Attachment(Base):
     sfs: Mapped[Optional[str]] = mapped_column()
 
 
-class LegacyIdsMulti(Base):
-    """
-    Legacy messages with multiple attachments are split as several XMPP messages,
-    this table and the next maps a single legacy ID to multiple XMPP IDs.
-    """
-
-    __tablename__ = "legacy_ids_multi"
-    __table_args__ = (
-        Index(
-            "legacy_ids_multi_user_account_id_legacy_id",
-            "user_account_id",
-            "legacy_id",
-            unique=True,
-        ),
-    )
-    id: Mapped[int] = mapped_column(primary_key=True)
-    user_account_id: Mapped[int] = mapped_column(ForeignKey("user_account.id"))
-
-    legacy_id: Mapped[str] = mapped_column(nullable=False)
-    xmpp_ids: Mapped[list["XmppIdsMulti"]] = relationship(
-        back_populates="legacy_ids_multi", cascade="all, delete-orphan"
-    )
-
-
-class XmppIdsMulti(Base):
-    __tablename__ = "xmpp_ids_multi"
-    __table_args__ = (
-        Index(
-            "legacy_ids_multi_user_account_id_xmpp_id",
-            "user_account_id",
-            "xmpp_id",
-            unique=True,
-        ),
-    )
-    id: Mapped[int] = mapped_column(primary_key=True)
-    user_account_id: Mapped[int] = mapped_column(ForeignKey("user_account.id"))
-
-    xmpp_id: Mapped[str] = mapped_column(nullable=False)
-
-    legacy_ids_multi_id: Mapped[int] = mapped_column(ForeignKey("legacy_ids_multi.id"))
-    legacy_ids_multi: Mapped[LegacyIdsMulti] = relationship(back_populates="xmpp_ids")
-
-
-participant_hats = sa.Table(
-    "participant_hats",
-    Base.metadata,
-    sa.Column("participant_id", ForeignKey("participant.id"), primary_key=True),
-    sa.Column("hat_id", ForeignKey("hat.id"), primary_key=True),
-)
-
-
-class Hat(Base):
-    __tablename__ = "hat"
-    __table_args__ = (UniqueConstraint("title", "uri"),)
-
-    id: Mapped[int] = mapped_column(primary_key=True)
-    title: Mapped[str] = mapped_column()
-    uri: Mapped[str] = mapped_column()
-    participants: Mapped[list["Participant"]] = relationship(
-        secondary=participant_hats, back_populates="hats"
-    )
-
-
 class Participant(Base):
     __tablename__ = "participant"
+    __table_args__ = (
+        UniqueConstraint("room_id", "resource"),
+        UniqueConstraint("room_id", "contact_id"),
+    )
 
     id: Mapped[int] = mapped_column(primary_key=True)
 
     room_id: Mapped[int] = mapped_column(ForeignKey("room.id"), nullable=False)
     room: Mapped[Room] = relationship(
-        back_populates="participants", primaryjoin=Room.id == room_id
+        lazy=False, back_populates="participants", primaryjoin=Room.id == room_id
     )
 
-    contact_id: Mapped[int] = mapped_column(ForeignKey("contact.id"), nullable=True)
-    contact: Mapped[Contact] = relationship(lazy=False, back_populates="participants")
+    contact_id: Mapped[Optional[int]] = mapped_column(
+        ForeignKey("contact.id"), nullable=True
+    )
+    contact: Mapped[Optional[Contact]] = relationship(
+        lazy=False, back_populates="participants"
+    )
 
     is_user: Mapped[bool] = mapped_column(default=False)
 
@@ -386,13 +339,11 @@ class Participant(Base):
 
     presence_sent: Mapped[bool] = mapped_column(default=False)
 
-    resource: Mapped[Optional[str]] = mapped_column(default=None)
-    nickname: Mapped[str] = mapped_column(nullable=True, default=None)
-    nickname_no_illegal: Mapped[str] = mapped_column(nullable=True, default=None)
+    resource: Mapped[str] = mapped_column(nullable=False)
+    nickname: Mapped[str] = mapped_column(nullable=False, default=None)
+    nickname_no_illegal: Mapped[str] = mapped_column(nullable=False, default=None)
 
-    hats: Mapped[list["Hat"]] = relationship(
-        secondary=participant_hats, back_populates="participants"
-    )
+    hats: Mapped[list[tuple[str, str]]] = mapped_column(JSON, default=list)
 
     extra_attributes: Mapped[Optional[JSONSerializable]] = mapped_column(default=None)