slidge 0.2.0a9__py3-none-any.whl → 0.2.0a10__py3-none-any.whl

slidge/core/mixins/base.py

@@ -6,8 +6,8 @@ from slixmpp import JID
 from ...util.types import MessageOrPresenceTypeVar
 
 if TYPE_CHECKING:
-    from slidge.core.gateway import BaseGateway
-    from slidge.core.session import BaseSession
+    from ..gateway import BaseGateway
+    from ..session import BaseSession
 
 
 class MetaBase(ABCMeta):

slidge/core/mixins/message.py

@@ -214,7 +214,7 @@ class ContentMessageMixin(AttachmentMixin):
         :param archive_only: (only in groups) Do not send this message to user,
             but store it in the archive. Meant to be used during ``MUC.backfill()``
         """
-        if carbon:
+        if carbon and not hasattr(self, "muc"):
             if not correction and self.xmpp.store.sent.was_sent_by_user(
                 self.session.user_pk, str(legacy_msg_id)
             ):
@@ -223,6 +223,11 @@ class ContentMessageMixin(AttachmentMixin):
                     legacy_msg_id,
                 )
                 return
+            if hasattr(self, "muc") and not self.is_user:  # type:ignore
+                log.warning(
+                    "send_text() called with carbon=True on a participant who is not the user",
+                    legacy_msg_id,
+                )
             self.xmpp.store.sent.set_message(
                 self.session.user_pk,
                 str(legacy_msg_id),
@@ -352,11 +357,12 @@ class ContentMessageMixin(AttachmentMixin):
 class CarbonMessageMixin(ContentMessageMixin, MarkerMixin):
     def _privileged_send(self, msg: Message):
         i = msg.get_id()
-        if not i:
-            i = str(uuid.uuid4())
+        if i:
+            self.session.ignore_messages.add(i)
+        else:
+            i = "slidge-carbon-" + str(uuid.uuid4())
             msg.set_id(i)
         msg.del_origin_id()
-        self.session.ignore_messages.add(i)
         try:
             self.xmpp["xep_0356"].send_privileged_message(msg)
         except PermissionError:

slidge/core/pubsub.py

@@ -25,8 +25,9 @@ from ..db.store import ContactStore, SlidgeStore
 from .mixins.lock import NamedLockMixin
 
 if TYPE_CHECKING:
+    from slidge.core.gateway import BaseGateway
+
     from ..contact.contact import LegacyContact
-    from ..core.gateway.base import BaseGateway
 
 VCARD4_NAMESPACE = "urn:xmpp:vcard4"
 

slidge/core/session.py

@@ -31,6 +31,7 @@ from ..util.types import (
     PseudoPresenceShow,
     RecipientType,
     ResourceDict,
+    Sticker,
 )
 from ..util.util import deprecated
 
@@ -225,6 +226,31 @@ class BaseSession(
 
     send_file = deprecated("BaseSession.send_file", on_file)
 
+    async def on_sticker(
+        self,
+        chat: RecipientType,
+        sticker: Sticker,
+        *,
+        reply_to_msg_id: Optional[LegacyMessageType] = None,
+        reply_to_fallback_text: Optional[str] = None,
+        reply_to: Optional[Union["LegacyContact", "LegacyParticipant"]] = None,
+        thread: Optional[LegacyThreadType] = None,
+    ) -> Optional[LegacyMessageType]:
+        """
+        Triggered when the user sends a file using HTTP Upload (:xep:`0363`)
+
+        :param chat: See :meth:`.BaseSession.on_text`
+        :param sticker: The sticker sent by the user.
+        :param reply_to_msg_id: See :meth:`.BaseSession.on_text`
+        :param reply_to_fallback_text: See :meth:`.BaseSession.on_text`
+        :param reply_to: See :meth:`.BaseSession.on_text`
+        :param thread:
+
+        :return: An ID of some sort that can be used later to ack and mark the message
+            as read by the user
+        """
+        raise NotImplementedError
+
     async def on_active(
         self, chat: RecipientType, thread: Optional[LegacyThreadType] = None
     ):
@@ -729,8 +755,8 @@ class BaseSession(
         self.xmpp.re_login(self)
 
     async def get_contact_or_group_or_participant(self, jid: JID, create=True):
-        if jid.bare in (contacts := self.contacts.known_contacts(only_friends=False)):
-            return contacts[jid.bare]
+        if (contact := self.contacts.by_jid_only_if_exists(jid)) is not None:
+            return contact
         if (muc := self.bookmarks.by_jid_only_if_exists(JID(jid.bare))) is not None:
             return await self.__get_muc_or_participant(muc, jid)
         else:

slidge/db/alembic/versions/45c24cc73c91_add_bob.py

@@ -0,0 +1,42 @@
+"""Add BoB
+
+Revision ID: 45c24cc73c91
+Revises: 3071e0fa69d4
+Create Date: 2024-08-01 22:30:07.073935
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "45c24cc73c91"
+down_revision: Union[str, None] = "3071e0fa69d4"
+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(
+        "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"),
+        sa.UniqueConstraint("sha_1"),
+        sa.UniqueConstraint("sha_256"),
+        sa.UniqueConstraint("sha_512"),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("bob")
+    # ### end Alembic commands ###

slidge/db/models.py

@@ -386,3 +386,16 @@ class Participant(Base):
     )
 
     extra_attributes: Mapped[Optional[JSONSerializable]] = mapped_column(default=None)
+
+
+class Bob(Base):
+    __tablename__ = "bob"
+
+    id: Mapped[int] = mapped_column(primary_key=True)
+    file_name: Mapped[str] = mapped_column(nullable=False)
+
+    sha_1: Mapped[str] = mapped_column(nullable=False, unique=True)
+    sha_256: Mapped[str] = mapped_column(nullable=False, unique=True)
+    sha_512: Mapped[str] = mapped_column(nullable=False, unique=True)
+
+    content_type: Mapped[Optional[str]] = mapped_column(nullable=False)

slidge/db/store.py

@@ -1,27 +1,33 @@
 from __future__ import annotations
 
+import hashlib
 import json
 import logging
+import uuid
 from contextlib import contextmanager
 from datetime import datetime, timedelta, timezone
+from mimetypes import guess_extension
 from typing import TYPE_CHECKING, Collection, Iterator, Optional, Type
 
 from slixmpp import JID, Iq, Message, Presence
 from slixmpp.exceptions import XMPPError
+from slixmpp.plugins.xep_0231.stanza import BitsOfBinary
 from sqlalchemy import Engine, delete, select, update
-from sqlalchemy.orm import Session, attributes
+from sqlalchemy.orm import Session, attributes, load_only
 from sqlalchemy.sql.functions import count
 
+from ..core import config
 from ..util.archive_msg import HistoryMessage
 from ..util.types import URL, CachedPresence, ClientType
 from ..util.types import Hat as HatTuple
-from ..util.types import MamMetadata, MucAffiliation, MucRole
+from ..util.types import MamMetadata, MucAffiliation, MucRole, Sticker
 from .meta import Base
 from .models import (
     ArchivedMessage,
     ArchivedMessageSource,
     Attachment,
     Avatar,
+    Bob,
     Contact,
     ContactSent,
     GatewayUser,
@@ -87,6 +93,7 @@ class SlidgeStore(EngineMixin):
         self.rooms = RoomStore(engine)
         self.sent = SentStore(engine)
         self.participants = ParticipantStore(engine)
+        self.bob = BobStore(engine)
 
 
 class UserStore(EngineMixin):
@@ -973,6 +980,15 @@ class RoomStore(UpdatedMixin):
                 select(Room).where(Room.user_account_id == user_pk)
             ).scalars()
 
+    def get_all_jid_and_names(self, user_pk: int) -> Iterator[Room]:
+        with self.session() as session:
+            yield from session.scalars(
+                select(Room)
+                .filter(Room.user_account_id == user_pk)
+                .options(load_only(Room.jid, Room.name))
+                .order_by(Room.name)
+            ).all()
+
 
 class ParticipantStore(EngineMixin):
     def __init__(self, *a, **kw):
@@ -1120,5 +1136,115 @@ class ParticipantStore(EngineMixin):
             ).scalar()
 
 
+class BobStore(EngineMixin):
+    _ATTR_MAP = {
+        "sha-1": "sha_1",
+        "sha1": "sha_1",
+        "sha-256": "sha_256",
+        "sha256": "sha_256",
+        "sha-512": "sha_512",
+        "sha512": "sha_512",
+    }
+
+    _ALG_MAP = {
+        "sha_1": hashlib.sha1,
+        "sha_256": hashlib.sha256,
+        "sha_512": hashlib.sha512,
+    }
+
+    def __init__(self, *a, **k):
+        super().__init__(*a, **k)
+        self.root_dir = config.HOME_DIR / "slidge_stickers"
+        self.root_dir.mkdir(exist_ok=True)
+
+    @staticmethod
+    def __split_cid(cid: str) -> list[str]:
+        return cid.removesuffix("@bob.xmpp.org").split("+")
+
+    def __get_condition(self, cid: str):
+        alg_name, digest = self.__split_cid(cid)
+        attr = self._ATTR_MAP.get(alg_name)
+        if attr is None:
+            log.warning("Unknown hash algo: %s", alg_name)
+            return None
+        return getattr(Bob, attr) == digest
+
+    def get(self, cid: str) -> Bob | None:
+        with self.session() as session:
+            try:
+                return session.query(Bob).filter(self.__get_condition(cid)).scalar()
+            except ValueError:
+                log.warning("Cannot get Bob with CID: %s", cid)
+                return None
+
+    def get_sticker(self, cid: str) -> Sticker | None:
+        bob = self.get(cid)
+        if bob is None:
+            return None
+        return Sticker(
+            self.root_dir / bob.file_name,
+            bob.content_type,
+            {h: getattr(bob, h) for h in self._ALG_MAP},
+        )
+
+    def get_bob(self, _jid, _node, _ifrom, cid: str) -> BitsOfBinary | None:
+        stored = self.get(cid)
+        if stored is None:
+            return None
+        bob = BitsOfBinary()
+        bob["data"] = (self.root_dir / stored.file_name).read_bytes()
+        if stored.content_type is not None:
+            bob["type"] = stored.content_type
+        bob["cid"] = cid
+        return bob
+
+    def del_bob(self, _jid, _node, _ifrom, cid: str) -> None:
+        with self.session() as orm:
+            try:
+                file_name = orm.scalar(
+                    delete(Bob)
+                    .where(self.__get_condition(cid))
+                    .returning(Bob.file_name)
+                )
+            except ValueError:
+                log.warning("Cannot delete Bob with CID: %s", cid)
+                return None
+            if file_name is None:
+                log.warning("No BoB with CID: %s", cid)
+                return None
+            (self.root_dir / file_name).unlink()
+            orm.commit()
+
+    def set_bob(self, _jid, _node, _ifrom, bob: BitsOfBinary) -> None:
+        cid = bob["cid"]
+        try:
+            alg_name, digest = self.__split_cid(cid)
+        except ValueError:
+            log.warning("Cannot set Bob with CID: %s", cid)
+            return
+        attr = self._ATTR_MAP.get(alg_name)
+        if attr is None:
+            log.warning("Cannot set BoB with unknown hash algo: %s", alg_name)
+            return None
+        with self.session() as orm:
+            existing = self.get(bob["cid"])
+            if existing is not None:
+                log.debug("Bob already known")
+                return
+            bytes_ = bob["data"]
+            path = self.root_dir / uuid.uuid4().hex
+            if bob["type"]:
+                path = path.with_suffix(guess_extension(bob["type"]) or "")
+            path.write_bytes(bytes_)
+            hashes = {k: v(bytes_).hexdigest() for k, v in self._ALG_MAP.items()}
+            if hashes[attr] != digest:
+                raise ValueError(
+                    "The given CID does not correspond to the result of our hash"
+                )
+            row = Bob(file_name=path.name, content_type=bob["type"] or None, **hashes)
+            orm.add(row)
+            orm.commit()
+
+
 log = logging.getLogger(__name__)
 _session: Optional[Session] = None

slidge/{core/gateway → slixfix}/delivery_receipt.py

@@ -11,7 +11,7 @@ from slixmpp import JID, Message
 from slixmpp.types import MessageTypes
 
 if TYPE_CHECKING:
-    from .base import BaseGateway
+    from slidge.core.gateway import BaseGateway
 
 
 class DeliveryReceipt:

slidge/util/test.py

@@ -287,7 +287,11 @@ class SlidgeTest(SlixTestPlus):
             session.execute(delete(Contact))
             session.commit()
 
-        self.run_coro(self.xmpp._on_user_register(Iq(sfrom="romeo@montague.lit/gajim")))
+        self.run_coro(
+            self.xmpp._BaseGateway__dispatcher._on_user_register(
+                Iq(sfrom="romeo@montague.lit/gajim")
+            )
+        )
         welcome = self.next_sent()
         assert welcome["body"]
         stanza = self.next_sent()

slidge/util/types.py

@@ -207,3 +207,9 @@ class CachedPresence(NamedTuple):
     ptype: Optional[PresenceTypes] = None
     pstatus: Optional[str] = None
     pshow: Optional[PresenceShows] = None
+
+
+class Sticker(NamedTuple):
+    path: Path
+    content_type: Optional[str]
+    hashes: dict[str, str]

slidge/util/util.py

@@ -7,7 +7,7 @@ from abc import ABCMeta
 from functools import wraps
 from pathlib import Path
 from time import time
-from typing import TYPE_CHECKING, Callable, NamedTuple, Optional, Type
+from typing import TYPE_CHECKING, Callable, NamedTuple, Optional, Type, TypeVar
 
 from .types import Mention, ResourceDict
 
@@ -276,7 +276,10 @@ def deprecated(name: str, new: Callable):
     return wrapped
 
 
-def dict_to_named_tuple(data: dict, cls: Type[NamedTuple]):
+T = TypeVar("T", bound=NamedTuple)
+
+
+def dict_to_named_tuple(data: dict, cls: Type[T]) -> T:
     return cls(*(data.get(f) for f in cls._fields))  # type:ignore
 
 

{slidge-0.2.0a9.dist-info → slidge-0.2.0a10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slidge
-Version: 0.2.0a9
+Version: 0.2.0a10
 Summary: XMPP bridging framework
 Home-page: https://sr.ht/~nicoco/slidge/
 License: AGPL-3.0-or-later
@@ -16,6 +16,7 @@ Requires-Dist: ConfigArgParse (>=1.5.3,<2.0.0)
 Requires-Dist: Pillow (>=10,<11)
 Requires-Dist: aiohttp[speedups] (>=3.8.3,<4.0.0)
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
+Requires-Dist: defusedxml (>=0.7.1,<0.8.0)
 Requires-Dist: pickle-secure (>=0.99.9,<0.100.0)
 Requires-Dist: python-magic (>=0.4.27,<0.5.0)
 Requires-Dist: qrcode (>=7.4.1,<8.0.0)

{slidge-0.2.0a9.dist-info → slidge-0.2.0a10.dist-info}/RECORD

@@ -1,45 +1,52 @@
 slidge/__init__.py,sha256=S0tUjqpZlzsr8G4Y_1Xt-KCYB07qaknTB0OwHU8k29U,1587
 slidge/__main__.py,sha256=Y12eh1TD_C5MB50KgEAuMffGnRFCvKYFKHD4UYSmHA0,72
-slidge/__version__.py,sha256=9y4M-LYXgK7-PIasL6QWLN6L5LRaek-yXy_SekzwWrg,170
+slidge/__version__.py,sha256=05G747WHKOvpl1x4M5U-3t3qszlgbNfnUxAxrATG8ck,171
 slidge/command/__init__.py,sha256=UYf1mjCYbZ5G7PIgaFTWSQRAzEJkQ6dTH8Fu_e_XnO0,613
-slidge/command/adhoc.py,sha256=5xLLoWyUJqCJB7kAwD2VKYTl_7MObCsgdz-qg_WkWGs,9417
+slidge/command/adhoc.py,sha256=9PsTsGMPKAK_YXQpwdcH9SSDki8YQ49OZ5p65W5HA6k,9412
 slidge/command/admin.py,sha256=x_kJ0TJhzf6d3OBIOXFjudZFO8bRYUG919td7OjMCug,6008
-slidge/command/base.py,sha256=xTlzxAbTWTpbFgQ0FxKjmp3ZImzempwJvGn9UiVUUTc,13044
+slidge/command/base.py,sha256=7NSzPZdBLZElrm3smzvFKgP0GUggxXdkhclxIKCjtT8,13036
 slidge/command/categories.py,sha256=BJCfaga2qoAxnHfgHD7I_RKZuBA5nnNOukkWHJwsUFE,99
 slidge/command/chat_command.py,sha256=VBs6IuDka1IyyMzz0ZyE9zMImaEzUZLcnffxq_vwb4M,10565
 slidge/command/register.py,sha256=fzPcGUoJtainnDOiC13gWV-uYLuJcsmdKGJ-jXT1qIo,6697
 slidge/command/user.py,sha256=uFheYOprhypkHEEl6qSTEM7T2N28xXaDi7v1he-AET8,11512
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
 slidge/contact/contact.py,sha256=kKtJ9NPLS9DPVyyahx_K-Mtp5k5UQdQJZavC1XCmWlc,23104
-slidge/contact/roster.py,sha256=YF5NiParDKYNqW52fu1xSVW1skR-guy7YzIQ5kDYoDk,9874
+slidge/contact/roster.py,sha256=AQTfmM4hrlxkXSM7ZX-C8P9NDN5RqNMNuPrSjt_3MJM,10223
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/config.py,sha256=leNcN_TI0Ka1hhzOHx7cBW3fNj5xZwsiv9l8AfRY_vU,7630
-slidge/core/gateway/__init__.py,sha256=rZckY2gAE-mon77_DSsAW1XtWqhBAETE2d4FqZ8pJXk,58
-slidge/core/gateway/base.py,sha256=Dxy39bAgOvJ-vN1RA9PU821YYuvkp_V06y_-vUDW7bU,38752
-slidge/core/gateway/caps.py,sha256=jemB4tB_2MTAxqQw5Bs4b7qNQ8gLPuAve0aoH6TzLEs,1937
-slidge/core/gateway/delivery_receipt.py,sha256=AT_9gvZrtWpSRsDJcYjE8CmF7TW-YBbUPdqNW5zWAdo,1352
-slidge/core/gateway/disco.py,sha256=uazgDXSDb5KrardjPCvElItARcxkeBRohtx82A2BlCQ,2203
-slidge/core/gateway/mam.py,sha256=ZUZXX7YcpK1WHq8RlgYrXo2zrLm5pOM1sVzON61mXYQ,2418
-slidge/core/gateway/muc_admin.py,sha256=PslX1gZK_PhY2VaeAPP1nEzThMaBBGPRgs-wiJ35zJQ,1033
-slidge/core/gateway/ping.py,sha256=_zzPkjqvxjTxLNP1jbj0WVLMaybxbYqrKDRM5jHSDjs,1729
-slidge/core/gateway/presence.py,sha256=Ls8IY4uNQaW8F3F1CpRhfyFIVbd_py_VkZyJKMMei8s,2732
-slidge/core/gateway/registration.py,sha256=JXwIQ-QqZCPXEmCU2G8FvIYDGvD8L8CqGb_Qkbycgt0,2303
-slidge/core/gateway/search.py,sha256=08ds6gvzX3EnTH-AU8X8J8JKEKYaSrRGTFwwClTT-Rc,3495
-slidge/core/gateway/session_dispatcher.py,sha256=FBCbMNNa3SQCd2n_NEdD5q7cjdEgUHGuI_DIWh5cTUY,33202
-slidge/core/gateway/vcard_temp.py,sha256=cnzHZO6qF8OUWSvBieEdNAV_Ndv1ixZOzBCBXy2Vopw,4637
+slidge/core/dispatcher/__init__.py,sha256=1EXcjXietUKlxEqdrCWCV3xZ3q_DSsjHoqWrPMbtYao,84
+slidge/core/dispatcher/caps.py,sha256=vzCAXo_bhALuLEpJWtyJTzVfWx96g1AsWD8_wkoDl0Y,2028
+slidge/core/dispatcher/disco.py,sha256=j56VY9NIFzwPEWFKQQZ7YIqS9GdD-ZaF_K8a2L-JvRk,2006
+slidge/core/dispatcher/message/__init__.py,sha256=vpDGOc_U9XvkUU_ws9n9-5M2NPJ87XGTVpuIxM7Z99k,223
+slidge/core/dispatcher/message/chat_state.py,sha256=sCdEpzbgmvBmTovNOCv9uY6v0eJZcWVvDYAGlAV3FJ4,1735
+slidge/core/dispatcher/message/marker.py,sha256=VbD1-2QeOCC4EbrS-wpJxHwIcmvPF4Q4qd0eiv95c7I,2451
+slidge/core/dispatcher/message/message.py,sha256=HwauW2kGionLyDWG01OSa9a14gYzoovJuJvGbfB4nt4,15296
+slidge/core/dispatcher/muc/__init__.py,sha256=V8URHLJ_y7mk-7Id6FzRuczb1Uq_Z69fhxvzHuVLH1w,269
+slidge/core/dispatcher/muc/admin.py,sha256=s21V2LEqc0e_DIpipEhhQdpae762lW1lVqj4wjFhX8M,3364
+slidge/core/dispatcher/muc/mam.py,sha256=1ROVP4ZPEVEH-HR5qRV4YwHz-V15uu5gyhv1ZwwKhk8,2821
+slidge/core/dispatcher/muc/misc.py,sha256=L5I2nt23qvQ-2qS5qgW3hSg6Z7DKnGvwxgXqn_WLvpQ,3943
+slidge/core/dispatcher/muc/owner.py,sha256=Vwwz15fdLq40XTnyDcMmRtMOXdY3T3_BwpSV3Nr8FNw,3290
+slidge/core/dispatcher/muc/ping.py,sha256=lb1VQPhiUPZ19KhbofRXMVCcY6wwQ2w-asnqtANaAwA,1660
+slidge/core/dispatcher/presence.py,sha256=ZxAmC34yxKxbk_-h6g_S8pTssL7ovULm3q2ishpYaB4,6393
+slidge/core/dispatcher/registration.py,sha256=Xmbw9NF3LUppCOa3XzreopdKDitZnwl_5HE-kds74n8,3155
+slidge/core/dispatcher/search.py,sha256=9cGj0wwvyYlP_Yk440Y12sgo4Y1p-JWUDSJP5Zxch0M,3296
+slidge/core/dispatcher/session_dispatcher.py,sha256=_njTftgpUKKMP-hgAo99Hu0YrIa6E9OTzSYdiMW000w,2844
+slidge/core/dispatcher/util.py,sha256=x_vC7OXcaDaSz3RPPGnK9fOvimmMaKPM3RkgmHvU0Qw,5676
+slidge/core/dispatcher/vcard.py,sha256=Rmx-wCz6Lps0mXCO48HppNQlS3GOgMuzuw9hZYBdlVU,5130
+slidge/core/gateway.py,sha256=NhIgxZKPnOpwsx50OKgyZyk9nfU8ZlUSMddwIDIhFcw,36351
 slidge/core/mixins/__init__.py,sha256=muReAzgvENgMvlfm0Fpe6BQFfm2EMjoDe9ZhGgo6Vig,627
 slidge/core/mixins/attachment.py,sha256=5Xa_GkSL_rRTC45TRjW98jztk__4M5P-3EG4IF91K0c,19022
 slidge/core/mixins/avatar.py,sha256=kGIIZzLSNuxF9bIvt5Bv03_uT_pU5QV1kS7cRu6-GUA,7874
-slidge/core/mixins/base.py,sha256=9hjf2Pw5r0poSi1Abv-_znk83Kngsu9EXTf05gpFDdI,768
+slidge/core/mixins/base.py,sha256=MOd-pas38_52VawQVlxWtBtmTKC6My9G0ZaCeQxOJbs,748
 slidge/core/mixins/db.py,sha256=5Qpegd7D8e5TLXLLINYcf_DuVdN-7wNmsfztUuFYPcU,442
 slidge/core/mixins/disco.py,sha256=jk3Z1B6zTuisHv8VKNRJodIo0ee5btYHh2ZrlflPj_Q,3670
 slidge/core/mixins/lock.py,sha256=mVzwVVEoq1hrAMgGLh4K84BTLt7JTJ33B8HSGSorTdY,913
-slidge/core/mixins/message.py,sha256=jJz_peNQmDf0uVQcI7TWG7oUaSGjUL8eiulNicGgWhI,15071
+slidge/core/mixins/message.py,sha256=6X0MskF1fC9Ih8aLRfdqNe7H3jpnFGEJb0EykRKze0c,15384
 slidge/core/mixins/message_maker.py,sha256=TcCutHi0sIwL6beJNkN7XyR0aDIbA0xZyxd2Gc9ulG4,6022
 slidge/core/mixins/presence.py,sha256=yywo6KAw8C7GaZSMrSMuioNfhW08MrnobHt8XbHd0q8,7891
 slidge/core/mixins/recipient.py,sha256=U-YppozUO8pA94jmD3-qmhkykTebPNaOVWc3JDPC9w8,1302
-slidge/core/pubsub.py,sha256=ITOhgUKdYh6oJBpmZ8nevDQlYT4WJMC-k7Z76YchXqY,11906
-slidge/core/session.py,sha256=iYRdG_CZYiH-a4A69vqKLf-vnSF_N-XnxEF1veBMCWk,27182
+slidge/core/pubsub.py,sha256=oTiS5KFQJAmsgkhOsvfvthT-LkuZGQSCrrUG0JskNkI,11907
+slidge/core/session.py,sha256=nQexpCd1jlHOhQPnFI4ri-5odp3N2pU5HO4l7WFetZY,28148
 slidge/db/__init__.py,sha256=EBDH1JSEhgqYcli2Bw11CRC749wJk8AOucgBzmhDSvU,105
 slidge/db/alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/db/alembic/env.py,sha256=hsBlRNs0zF5diSHGRSa8Fi3qRVQDA2rJdR41AEIdvxc,1642
@@ -50,6 +57,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=O5BY1vpbtuYT5j6i3EMuuJAf6loIYT1kco8c-c6TF5g,1391
+slidge/db/alembic/versions/45c24cc73c91_add_bob.py,sha256=UjMySZ5LaInyPt0KbAxx0rF4GQhZh8CwBeqHtNPdG1c,1249
 slidge/db/alembic/versions/5bd48bfdffa2_lift_room_legacy_id_constraint.py,sha256=cObfqUzqdNezIeJdHe7YKFwRwtelXk8y1PwZ75chXDc,1629
 slidge/db/alembic/versions/82a4af84b679_add_muc_history_filled.py,sha256=g37po0ydp8ZmzJrE5oFV7GscnploxjCtPDpw28SqVGk,1429
 slidge/db/alembic/versions/8b993243a536_add_vcard_content_to_contact_table.py,sha256=18tG8B03Kq8Qz_-mMd28Beed6jow8XNTtrz7gT5QY3g,1210
@@ -62,8 +70,8 @@ slidge/db/alembic/versions/c4a8ec35a0e8_per_room_user_nick.py,sha256=jjQmlRv6nqd
 slidge/db/alembic/versions/e91195719c2c_store_users_avatars_persistently.py,sha256=8Ga3VFgKrzMs_-B8OPtfP-0rey_MFaDg-QGtSbaft3o,640
 slidge/db/avatar.py,sha256=FfRt2Vu11ZKD9F3x1_drawvUd-TDE3mp7SE3BZ9hOOg,6467
 slidge/db/meta.py,sha256=v1Jf-npZ28QwdGpsLQWLBHEbEP3-jnPrygRg05tJ_Iw,1831
-slidge/db/models.py,sha256=yO4hM0VE1cQdDqWiZU1YW5ZjzwSnHUTavkGbkAMEB9A,13297
-slidge/db/store.py,sha256=jBkjTVXIg_N558rEfaDWzQ7mnIYMp2ziTk0o9KRVioo,42071
+slidge/db/models.py,sha256=bsZCEtBDkvwiZiJNyp0cqxLHphtCUBIGnOPIaaG9opc,13738
+slidge/db/store.py,sha256=1p-wAgG4K_QUehnmqRz-zvmW_PbXYYVq5qYMViF0cNY,46432
 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
@@ -73,6 +81,7 @@ slidge/main.py,sha256=8oND7xpR3eLw7b62fT61UhYlmNp_9gv3tNz2N3xR7-c,6232
 slidge/migration.py,sha256=4BJmPIRB56_WIhRTqBFIIBXuvnhhBjjOMl4CE7jY6oc,1541
 slidge/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/slixfix/__init__.py,sha256=7GevigEt68hwgwHqXcsFogN5jRXRHPeqR6kwODCH4hc,3055
+slidge/slixfix/delivery_receipt.py,sha256=3bWdZH3-X3CZJXmnI_TpjkTUUK-EY4Ktm78lW0-40fc,1366
 slidge/slixfix/link_preview/__init__.py,sha256=TDPTSEH5FQxgGpQpQIde-D72AHg-6YVWG-tOj4KpKmU,290
 slidge/slixfix/link_preview/link_preview.py,sha256=9PgdfnoyVMHnXS0w5OFp0wz3ku96Ck-HtRXbVUlDi1U,448
 slidge/slixfix/link_preview/stanza.py,sha256=YAXoNw2MD0a3nzvldGKlvSemjUMbUEG23regzmj4Ntc,2664
@@ -110,11 +119,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=S8Kp5uJlWYPvnw8HMHUPlbrvsqwdBLs9MI99svMfjLg,13832
-slidge/util/types.py,sha256=o_5rbwfL_3e73JPT1t9o3kyDpJscFHzn4_bt8i3LoSk,5386
-slidge/util/util.py,sha256=8JeE0QObNGQr_Tw4OFPwQSz_EB_zh_0t9IJmNNhW0ic,9114
-slidge-0.2.0a9.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.2.0a9.dist-info/METADATA,sha256=UYbPeUa9y7-m4f1ulm4CFYAdKYoGbf53gC-n_lf6aoI,4962
-slidge-0.2.0a9.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-slidge-0.2.0a9.dist-info/entry_points.txt,sha256=SNl72KSocF5plsu_67xyH6wVWfGTXQbzkQgXbLtzDrQ,47
-slidge-0.2.0a9.dist-info/RECORD,,
+slidge/util/test.py,sha256=movqj7rxDPZG4RF46CN1z73PSYAHIc_LuudquGRwLVU,13909
+slidge/util/types.py,sha256=R_xfS5mRL0XUJIoDpnaAkZlTOoLPerduXBFftaVwIAI,5489
+slidge/util/util.py,sha256=DyJWO2pmE-RiB9Rsy6TUTcvB-BDlmLZBW4PELx4arFQ,9156
+slidge-0.2.0a10.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.2.0a10.dist-info/METADATA,sha256=_sFwLHhxETI7mHO1Hoetd6FVtNVYpyHHnboPxJucnkU,5006
+slidge-0.2.0a10.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+slidge-0.2.0a10.dist-info/entry_points.txt,sha256=SNl72KSocF5plsu_67xyH6wVWfGTXQbzkQgXbLtzDrQ,47
+slidge-0.2.0a10.dist-info/RECORD,,

slidge/core/gateway/__init__.py

@@ -1,3 +0,0 @@
-from .base import BaseGateway
-
-__all__ = ("BaseGateway",)

slidge/core/gateway/muc_admin.py

@@ -1,35 +0,0 @@
-from typing import TYPE_CHECKING
-
-from slixmpp import CoroutineCallback, Iq, StanzaPath
-from slixmpp.exceptions import XMPPError
-
-if TYPE_CHECKING:
-    from .base import BaseGateway
-
-
-class MucAdmin:
-    def __init__(self, xmpp: "BaseGateway"):
-        self.xmpp = xmpp
-        xmpp.register_handler(
-            CoroutineCallback(
-                "muc#admin",
-                StanzaPath("iq@type=get/mucadmin_query"),
-                self._handle_admin,  # type: ignore
-            )
-        )
-
-    async def _handle_admin(self, iq: Iq):
-        muc = await self.xmpp.get_muc_from_stanza(iq)
-
-        affiliation = iq["mucadmin_query"]["item"]["affiliation"]
-
-        if not affiliation:
-            raise XMPPError("bad-request")
-
-        reply = iq.reply()
-        reply.enable("mucadmin_query")
-        async for participant in muc.get_participants():
-            if not participant.affiliation == affiliation:
-                continue
-            reply["mucadmin_query"].append(participant.mucadmin_item())
-        reply.send()