slidge 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

slidge/contact/contact.py

@@ -411,7 +411,7 @@ class LegacyContact(
             # we only broadcast pubsub events for contacts added to the roster
             # so if something was set before, we need to push it now
             self.added_to_roster = True
-            self.send_last_presence()
+            self.send_last_presence(force=True)
 
     async def __broadcast_pubsub_items(self) -> None:
         if not self.is_friend:

slidge/contact/roster.py

@@ -4,7 +4,7 @@ import warnings
 from typing import TYPE_CHECKING, AsyncIterator, Generic, Iterator, Optional, Type
 
 from slixmpp import JID
-from slixmpp.exceptions import IqError, IqTimeout
+from slixmpp.exceptions import IqError, IqTimeout, XMPPError
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session as OrmSession
 
@@ -92,6 +92,10 @@ class LegacyRoster(
         # :return:
         # """
         username = contact_jid.node
+        if not username:
+            raise XMPPError(
+                "bad-request", "Contacts must have a local part in their JID"
+            )
         contact_jid = JID(contact_jid.bare)
         async with self.lock(("username", username)):
             legacy_id = await self.jid_username_to_legacy_id(username)
@@ -239,6 +243,7 @@ class LegacyRoster(
                 warnings.warn(f"Could not add to roster: {e}")
             else:
                 contact.added_to_roster = True
+                contact.send_last_presence(force=True)
         orm.commit()
         self.__filling = False
 

slidge/core/config.py

@@ -1,22 +1,26 @@
-from datetime import timedelta
 from pathlib import Path
-from typing import Optional, Self
+from typing import Optional
 
 from slixmpp import JID as JIDType
 
+# REQUIRED, so not default value
 
-class _TimedeltaSeconds(timedelta):
-    def __new__(cls, s: str) -> Self:
-        return super().__new__(cls, seconds=int(s))
 
+class _Categories:
+    MANDATORY = (0, "Mandatory settings")
+    BASE = (10, "Basic configuration")
+    ATTACHMENTS = (20, "Attachments")
+    LOG = (30, "Logging")
+    ADVANCED = (40, "Advanced settings")
 
-# REQUIRED, so not default value
 
 LEGACY_MODULE: str
 LEGACY_MODULE__DOC = (
-    "Importable python module containing (at least) "
-    "a BaseGateway and a LegacySession subclass"
+    "Importable python module containing (at least) a BaseGateway and a LegacySession subclass. "
+    "NB: this is not needed if you use a gateway-specific entrypoint, e.g., `slidgram` or "
+    "`python -m slidgram`."
 )
+LEGACY_MODULE__CATEGORY = _Categories.BASE
 
 SERVER: str = "localhost"
 SERVER__DOC = (
@@ -27,17 +31,21 @@ SERVER__DOC = (
     "you change this."
 )
 SERVER__SHORT = "s"
+SERVER__CATEGORY = _Categories.BASE
 
 SECRET: str
 SECRET__DOC = "The gateway component's secret (required to connect to the XMPP server)"
+SECRET__CATEGORY = _Categories.MANDATORY
 
 JID: JIDType
 JID__DOC = "The gateway component's JID"
 JID__SHORT = "j"
+JID__CATEGORY = _Categories.MANDATORY
 
 PORT: str = "5347"
 PORT__DOC = "The XMPP server's port for incoming component connections"
 PORT__SHORT = "p"
+PORT__CATEGORY = _Categories.BASE
 
 # Dynamic default (depends on other values)
 
@@ -47,6 +55,7 @@ HOME_DIR__DOC = (
     "Defaults to /var/lib/slidge/${SLIDGE_JID}. "
 )
 HOME_DIR__DYNAMIC_DEFAULT = True
+HOME_DIR__CATEGORY = _Categories.BASE
 
 DB_URL: str
 DB_URL__DOC = (
@@ -54,6 +63,7 @@ DB_URL__DOC = (
     "Defaults to sqlite:///${HOME_DIR}/slidge.sqlite"
 )
 DB_URL__DYNAMIC_DEFAULT = True
+DB_URL__CATEGORY = _Categories.ADVANCED
 
 USER_JID_VALIDATOR: str
 USER_JID_VALIDATOR__DOC = (
@@ -62,11 +72,13 @@ USER_JID_VALIDATOR__DOC = (
     "you probably want to change that to .*@example.com"
 )
 USER_JID_VALIDATOR__DYNAMIC_DEFAULT = True
+USER_JID_VALIDATOR__CATEGORY = _Categories.BASE
 
 # Optional, so default value + type hint if default is None
 
 ADMINS: tuple[JIDType, ...] = ()
 ADMINS__DOC = "JIDs of the gateway admins"
+ADMINS__CATEGORY = _Categories.BASE
 
 UPLOAD_SERVICE: Optional[str] = None
 UPLOAD_SERVICE__DOC = (
@@ -74,11 +86,13 @@ UPLOAD_SERVICE__DOC = (
     "This is optional, as it should be automatically determined via service"
     "discovery."
 )
+UPLOAD_SERVICE__CATEGORY = _Categories.ATTACHMENTS
 
 AVATAR_SIZE = 200
 AVATAR_SIZE__DOC = (
     "Maximum image size (width and height), image ratio will be preserved"
 )
+AVATAR_SIZE__CATEGORY = _Categories.ADVANCED
 
 USE_ATTACHMENT_ORIGINAL_URLS = False
 USE_ATTACHMENT_ORIGINAL_URLS__DOC = (
@@ -86,11 +100,13 @@ USE_ATTACHMENT_ORIGINAL_URLS__DOC = (
     "let XMPP clients directly download them from this URL. Note that this will "
     "probably leak your client IP to the legacy network."
 )
+USE_ATTACHMENT_ORIGINAL_URLS__CATEGORY = _Categories.ATTACHMENTS
 
 UPLOAD_REQUESTER: Optional[str] = None
 UPLOAD_REQUESTER__DOC = (
     "Set which JID should request the upload slots. Defaults to the component JID."
 )
+UPLOAD_REQUESTER__CATEGORY = _Categories.ATTACHMENTS
 
 NO_UPLOAD_PATH: Optional[str] = None
 NO_UPLOAD_PATH__DOC = (
@@ -98,38 +114,45 @@ NO_UPLOAD_PATH__DOC = (
     "You need to set NO_UPLOAD_URL_PREFIX too if you use this option, and configure "
     "an web server to serve files in this dir."
 )
+NO_UPLOAD_PATH__CATEGORY = _Categories.ATTACHMENTS
 
 NO_UPLOAD_URL_PREFIX: Optional[str] = None
 NO_UPLOAD_URL_PREFIX__DOC = (
     "Base URL that servers files in the dir set in the no-upload-path option, "
     "eg https://example.com:666/slidge-attachments/"
 )
+NO_UPLOAD_URL_PREFIX__CATEGORY = _Categories.ATTACHMENTS
 
 NO_UPLOAD_METHOD: str = "copy"
 NO_UPLOAD_METHOD__DOC = (
     "Whether to 'copy', 'move', 'hardlink' or 'symlink' the files in no-upload-path."
 )
+NO_UPLOAD_METHOD__CATEGORY = _Categories.ATTACHMENTS
 
 NO_UPLOAD_FILE_READ_OTHERS = False
 NO_UPLOAD_FILE_READ_OTHERS__DOC = (
     "After writing a file in NO_UPLOAD_PATH, change its permission so that 'others' can"
     " read it."
 )
+NO_UPLOAD_FILE_READ_OTHERS__CATEGORY = _Categories.ATTACHMENTS
 
-IGNORE_DELAY_THRESHOLD = _TimedeltaSeconds("300")
+IGNORE_DELAY_THRESHOLD = 300
 IGNORE_DELAY_THRESHOLD__DOC = (
     "Threshold, in seconds, below which the <delay> information is stripped "
     "out of emitted stanzas."
 )
+IGNORE_DELAY_THRESHOLD__CATEGORY = _Categories.ADVANCED
 
 PARTIAL_REGISTRATION_TIMEOUT = 3600
 PARTIAL_REGISTRATION_TIMEOUT__DOC = (
     "Timeout before registration and login. Only useful for legacy networks where "
     "a single step registration process is not enough."
 )
+PARTIAL_REGISTRATION_TIMEOUT__CATEGORY = _Categories.ADVANCED
 
 QR_TIMEOUT = 60
 QR_TIMEOUT__DOC = "Timeout for QR code flashing confirmation."
+QR_TIMEOUT__CATEGORY = _Categories.ADVANCED
 
 FIX_FILENAME_SUFFIX_MIME_TYPE = False
 FIX_FILENAME_SUFFIX_MIME_TYPE__DOC = (
@@ -138,9 +161,11 @@ FIX_FILENAME_SUFFIX_MIME_TYPE__DOC = (
     " Therefore the MIME Type of the file is checked, if the suffix is not valid for"
     " that MIME Type, a valid one will be picked."
 )
+FIX_FILENAME_SUFFIX_MIME_TYPE__CATEGORY = _Categories.ATTACHMENTS
 
 LOG_FILE: Optional[Path] = None
 LOG_FILE__DOC = "Log to a file instead of stdout/err"
+LOG_FILE__CATEGORY = _Categories.LOG
 
 LOG_FORMAT: str = "%(levelname)s:%(name)s:%(message)s"
 LOG_FORMAT__DOC = (
@@ -148,41 +173,50 @@ LOG_FORMAT__DOC = (
     "https://docs.python.org/3/library/logging.html#logrecord-attributes "
     "for available options."
 )
+LOG_FORMAT__CATEGORY = _Categories.LOG
 
 MAM_MAX_DAYS = 7
 MAM_MAX_DAYS__DOC = "Maximum number of days for group archive retention."
+MAM_MAX_DAYS__CATEGORY = _Categories.BASE
 
 ATTACHMENT_MAXIMUM_FILE_NAME_LENGTH = 200
 ATTACHMENT_MAXIMUM_FILE_NAME_LENGTH__DOC = (
     "Some legacy network provide ridiculously long filenames, strip above this limit, "
     "preserving suffix."
 )
+ATTACHMENT_MAXIMUM_FILE_NAME_LENGTH__CATEGORY = _Categories.ATTACHMENTS
 
 AVATAR_RESAMPLING_THREADS = 2
 AVATAR_RESAMPLING_THREADS__DOC = (
     "Number of additional threads to use for avatar resampling. Even in a single-core "
     "context, this makes avatar resampling non-blocking."
 )
+AVATAR_RESAMPLING_THREADS__CATEGORY = _Categories.ADVANCED
 
 DEV_MODE = False
 DEV_MODE__DOC = (
     "Enables an interactive python shell via chat commands, for admins."
     "Not safe to use in prod, but great during dev."
 )
+DEV_MODE__CATEGORY = _Categories.ADVANCED
+
 
 STRIP_LEADING_EMOJI_ADHOC = False
 STRIP_LEADING_EMOJI_ADHOC__DOC = (
     "Strip the leading emoji in ad-hoc command names, if present, in case you "
     "are a emoji-hater."
 )
+STRIP_LEADING_EMOJI_ADHOC__CATEGORY = _Categories.ADVANCED
 
 COMPONENT_NAME: Optional[str] = None
 COMPONENT_NAME__DOC = (
     "Overrides the default component name with a custom one. This is seen in service discovery and as the nickname "
     "of the component in chat windows."
 )
+COMPONENT_NAME__CATEGORY = _Categories.ADVANCED
 
 WELCOME_MESSAGE: Optional[str] = None
 WELCOME_MESSAGE__DOC = (
     "Overrides the default welcome message received by newly registered users."
 )
+WELCOME_MESSAGE__CATEGORY = _Categories.ADVANCED

slidge/core/dispatcher/message/message.py

@@ -315,6 +315,7 @@ class MessageContentMixin(DispatcherMixin):
             raise XMPPError(
                 "policy-violation",
                 text=error_msg,
+                clear=False,
             )
 
         await session.on_react(recipient, legacy_id, emojis, thread=thread)

slidge/core/dispatcher/presence.py

@@ -71,6 +71,7 @@ class PresenceHandlerMixin(DispatcherMixin):
             return
 
         await contact.on_friend_accept()
+        contact.send_last_presence(force=True)
 
     @exceptions_to_xmpp_errors
     async def _handle_unsubscribed(self, pres: Presence) -> None:

slidge/core/dispatcher/registration.py

@@ -60,7 +60,7 @@ class RegistrationMixin(DispatcherMixin):
             )
             orm.add(user)
             orm.commit()
-        log.info("New user: %s", user)
+            log.info("New user: %s", user)
 
     async def _user_modify(
         self, _gateway_jid, _node, ifrom: JID, form_dict: dict[str, Optional[str]]

slidge/core/dispatcher/search.py

@@ -3,7 +3,6 @@ from typing import TYPE_CHECKING
 from slixmpp import JID, CoroutineCallback, Iq, StanzaPath
 from slixmpp.exceptions import XMPPError
 
-from ...db.models import GatewayUser
 from .util import DispatcherMixin, exceptions_to_xmpp_errors
 
 if TYPE_CHECKING:
@@ -32,10 +31,7 @@ class SearchMixin(DispatcherMixin):
         """
         Prepare the search form using :attr:`.BaseSession.SEARCH_FIELDS`
         """
-        with self.xmpp.store.session() as orm:
-            user = orm.query(GatewayUser).one_or_none()
-        if user is None:
-            raise XMPPError(text="Search is only allowed for registered users")
+        await self._get_session(iq)
 
         xmpp = self.xmpp
 

slidge/core/dispatcher/util.py

@@ -172,7 +172,9 @@ def exceptions_to_xmpp_errors(cb: HandlerType) -> HandlerType:
         except NotImplementedError:
             log.debug("NotImplementedError raised in %s", cb)
             raise XMPPError(
-                "feature-not-implemented", "Not implemented by the legacy module"
+                "feature-not-implemented",
+                f"{cb.__name__} is not implemented by the legacy module",
+                clear=False,
             )
         except Exception as e:
             log.error("Failed to handle incoming stanza: %s", args, exc_info=e)

slidge/core/gateway.py

@@ -330,6 +330,7 @@ class BaseGateway(
         self.jid_validator: re.Pattern = re.compile(config.USER_JID_VALIDATOR)
         self.qr_pending_registrations = dict[str, asyncio.Future[Optional[dict]]]()
 
+        self.register_plugins()
         self.__setup_legacy_module_subclasses()
 
         self.get_session_from_stanza: Callable[
@@ -339,7 +340,6 @@ class BaseGateway(
             self._session_cls.from_user
         )
 
-        self.register_plugins()
         self.__register_slixmpp_events()
         self.__register_slixmpp_api()
         self.roster.set_backend(RosterBackend(self))
@@ -390,6 +390,16 @@ class BaseGateway(
         bookmarks_cls = LegacyBookmarks.get_self_or_unique_subclass()
         roster_cls = LegacyRoster.get_self_or_unique_subclass()
 
+        if contact_cls.REACTIONS_SINGLE_EMOJI:  # type:ignore[attr-defined]
+            form = Form()
+            form["type"] = "result"
+            form.add_field(
+                "FORM_TYPE", "hidden", value="urn:xmpp:reactions:0:restrictions"
+            )
+            form.add_field("max_reactions_per_user", value="1", type="number")
+            form.add_field("scope", value="domain")
+            self.plugin["xep_0128"].add_extended_info(data=form)
+
         session_cls.xmpp = self  # type:ignore[attr-defined]
         contact_cls.xmpp = self  # type:ignore[attr-defined]
         muc_cls.xmpp = self  # type:ignore[attr-defined]
@@ -1002,6 +1012,7 @@ SLIXMPP_PLUGINS = [
     "xep_0106",  # JID Escaping
     "xep_0115",  # Entity capabilities
     "xep_0122",  # Data Forms Validation
+    "xep_0128",  # Service Discovery Extensions
     "xep_0153",  # vCard-Based Avatars (for MUC avatars)
     "xep_0172",  # User nickname
     "xep_0184",  # Message Delivery Receipts

slidge/core/mixins/attachment.py

@@ -162,15 +162,12 @@ class AttachmentMixin(TextMessageMixin):
             legacy_file_id=None
             if attachment.legacy_file_id is None
             else str(attachment.legacy_file_id),
-            url=attachment.url,
+            url=attachment.url if config.USE_ATTACHMENT_ORIGINAL_URLS else None,
         )
 
     async def __get_url(
         self, attachment: LegacyAttachment, stored: Attachment
     ) -> tuple[bool, Optional[Path], str]:
-        if attachment.url and config.USE_ATTACHMENT_ORIGINAL_URLS:
-            return False, None, attachment.url
-
         file_name = attachment.name
         content_type = attachment.content_type
         file_path = attachment.path
@@ -221,7 +218,9 @@ class AttachmentMixin(TextMessageMixin):
 
         assert isinstance(file_path, Path)
         if config.FIX_FILENAME_SUFFIX_MIME_TYPE:
-            file_name = str(fix_suffix(file_path, content_type, file_name))
+            file_name, content_type = fix_suffix(file_path, content_type, file_name)
+            attachment.content_type = content_type
+            attachment.name = file_name
 
         if config.NO_UPLOAD_PATH:
             local_path, new_url = await self.__no_upload(
@@ -312,6 +311,50 @@ class AttachmentMixin(TextMessageMixin):
         stored.sfs = str(sfs)
         msg.append(sfs)
 
+    async def __set_sfs_and_sims_without_download(
+        self, msg: Message, attachment: LegacyAttachment
+    ) -> None:
+        assert attachment.url is not None
+
+        if not any(
+            (
+                attachment.content_type,
+                attachment.name,
+                attachment.disposition,
+            )
+        ):
+            return
+
+        sims = self.xmpp.plugin["xep_0385"].stanza.Sims()
+        ref = self.xmpp["xep_0372"].stanza.Reference()
+
+        ref["uri"] = attachment.url
+        ref["type"] = "data"
+        sims["sources"].append(ref)
+        sims.enable("file")
+
+        xep_0447_stanza = self.xmpp.plugin["xep_0447"].stanza
+        sfs = xep_0447_stanza.StatelessFileSharing()
+        url_data = xep_0447_stanza.UrlData()
+        url_data["target"] = attachment.url
+        sfs["sources"].append(url_data)
+        sfs.enable("file")
+
+        if attachment.content_type:
+            sims["file"]["media-type"] = attachment.content_type
+            sfs["file"]["media-type"] = attachment.content_type
+        if attachment.caption:
+            sims["file"]["desc"] = attachment.caption
+            sfs["file"]["desc"] = attachment.caption
+        if attachment.name:
+            sims["file"]["name"] = attachment.name
+            sfs["file"]["name"] = attachment.name
+        if attachment.disposition:
+            sfs["disposition"] = attachment.disposition
+
+        msg.append(sims)
+        msg.append(sfs)
+
     def __send_url(
         self,
         msg: Message,
@@ -325,6 +368,9 @@ class AttachmentMixin(TextMessageMixin):
     ) -> list[Message]:
         msg["oob"]["url"] = uploaded_url
         msg["body"] = uploaded_url
+        if msg.get_plugin("sfs", check=True):
+            msg["fallback"].enable("body")
+            msg["fallback"]["for"] = self.xmpp.plugin["xep_0447"].stanza.NAMESPACE
         if caption:
             m1 = self._send(msg, carbon=carbon, **kwargs)
             m2 = self.send_text(
@@ -465,7 +511,10 @@ class AttachmentMixin(TextMessageMixin):
             new_url = stored.url
         else:
             is_temp, local_path, new_url = await self.__get_url(attachment, stored)
-            if new_url is None:
+            if new_url is None or (
+                local_path is not None and local_path.stat().st_size == 0
+            ):
+                log.warning("Something went wrong with this attachment: %s", attachment)
                 msg["body"] = (
                     "I tried to send a file, but something went wrong. "
                     "Tell your slidge admin to check the logs."
@@ -474,8 +523,13 @@ class AttachmentMixin(TextMessageMixin):
                 return None, [self._send(msg, **kwargs)]
 
         stored.url = new_url
-        thumbnail = await self.__set_sims(msg, new_url, local_path, attachment, stored)
-        self.__set_sfs(msg, new_url, local_path, attachment, stored, thumbnail)
+        if config.USE_ATTACHMENT_ORIGINAL_URLS and attachment.url:
+            await self.__set_sfs_and_sims_without_download(msg, attachment)
+        else:
+            thumbnail = await self.__set_sims(
+                msg, new_url, local_path, attachment, stored
+            )
+            self.__set_sfs(msg, new_url, local_path, attachment, stored, thumbnail)
 
         if self.session is not NotImplemented:
             with self.xmpp.store.session(expire_on_commit=False) as orm:

slidge/core/mixins/message_maker.py

@@ -112,7 +112,7 @@ class MessageMaker(BaseSender):
             if when.tzinfo is None:
                 when = when.astimezone(timezone.utc)
             if self.STRIP_SHORT_DELAY:
-                delay = datetime.now().astimezone(timezone.utc) - when
+                delay = (datetime.now().astimezone(timezone.utc) - when).seconds
                 if delay < config.IGNORE_DELAY_THRESHOLD:
                     return
             msg["delay"].set_stamp(when)

slidge/core/mixins/message_text.py

@@ -191,7 +191,7 @@ class TextMessageMixin(MessageMaker):
         xmpp_id = kwargs.pop("xmpp_id", None)
         if not xmpp_id:
             xmpp_id = self._legacy_to_xmpp(legacy_msg_id)
-        self.xmpp["xep_0444"].set_reactions(msg, to_id=xmpp_id, reactions=emojis)
+        self.xmpp["xep_0444"].set_reactions(msg, to_id=xmpp_id, reactions=set(emojis))
         self.__add_reaction_fallback(msg, legacy_msg_id, emojis)
         self._send(msg, **kwargs)
 

slidge/core/mixins/presence.py

@@ -46,6 +46,8 @@ def _clear_last_seen_task(contact_pk: int, _task) -> None:
 class PresenceMixin(BaseSender, DBMixin):
     _ONLY_SEND_PRESENCE_CHANGES = False
 
+    # this attribute actually only exists for contacts and not participants
+    _updating_info: bool
     stored: Contact | Participant
 
     def __init__(self, *a, **k) -> None:
@@ -55,15 +57,24 @@ class PresenceMixin(BaseSender, DBMixin):
         # to DB at the end of update_info()
         self.cached_presence: Optional[CachedPresence] = None
 
+    def __is_contact(self) -> bool:
+        return isinstance(self.stored, Contact)
+
     def __stored(self) -> Contact | None:
-        if isinstance(self.stored, Contact):
+        if self.__is_contact():
+            assert isinstance(self.stored, Contact)
             return self.stored
         else:
+            assert isinstance(self.stored, Participant)
             try:
                 return self.stored.contact
             except DetachedInstanceError:
                 with self.xmpp.store.session() as orm:
                     orm.add(self.stored)
+                    if self.stored.contact is None:
+                        return None
+                    orm.refresh(self.stored.contact)
+                    orm.merge(self.stored)
                     return self.stored.contact
 
     @property
@@ -85,15 +96,22 @@ class PresenceMixin(BaseSender, DBMixin):
         )
 
     def _store_last_presence(self, new: CachedPresence) -> None:
-        stored = self.__stored()
-        if stored is not None:
-            stored.cached_presence = True
-            for k, v in new._asdict().items():
-                setattr(stored, k, v)
+        stored_contact = self.__stored()
+        if stored_contact is None:
+            return
+        stored_contact.cached_presence = True
+        for k, v in new._asdict().items():
+            setattr(stored_contact, k, v)
+        if self.__is_contact() and self._updating_info:
+            return
+        with self.xmpp.store.session(expire_on_commit=False) as orm:
             try:
-                self.commit()
+                orm.add(stored_contact)
             except InvalidRequestError:
-                self.commit(merge=True)
+                stored_contact = orm.merge(stored_contact)
+                orm.add(stored_contact)
+
+            orm.commit()
 
     def _make_presence(
         self,

slidge/core/session.py

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

slidge/db/models.py

@@ -7,7 +7,7 @@ import sqlalchemy as sa
 from slixmpp import JID
 from slixmpp.types import MucAffiliation, MucRole
 from sqlalchemy import JSON, ForeignKey, Index, UniqueConstraint
-from sqlalchemy.orm import Mapped, declared_attr, mapped_column, relationship
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from ..util.types import ClientType, MucType
 from .meta import Base, JSONSerializable, JSONSerializableTypes

slidge/db/store.py

@@ -7,9 +7,10 @@ from datetime import datetime, timedelta, timezone
 from mimetypes import guess_extension
 from typing import Collection, Iterator, Optional, Type
 
+import sqlalchemy as sa
 from slixmpp.exceptions import XMPPError
 from slixmpp.plugins.xep_0231.stanza import BitsOfBinary
-from sqlalchemy import Engine, delete, select, update
+from sqlalchemy import Engine, delete, event, select, update
 from sqlalchemy.exc import InvalidRequestError
 from sqlalchemy.orm import Session, attributes, sessionmaker
 
@@ -20,6 +21,7 @@ from .meta import Base
 from .models import (
     ArchivedMessage,
     ArchivedMessageSource,
+    Avatar,
     Bob,
     Contact,
     ContactSent,
@@ -213,6 +215,7 @@ class ContactStore(UpdatedMixin):
     def __init__(self, session: Session) -> None:
         super().__init__(session)
         session.execute(update(Contact).values(cached_presence=False))
+        session.execute(update(Contact).values(caps_ver=None))
 
     @staticmethod
     def add_to_sent(session: Session, contact_pk: int, msg_id: str) -> None:
@@ -589,4 +592,29 @@ class BobStore:
         session.add(row)
 
 
+@event.listens_for(sa.orm.Session, "after_flush")
+def _check_avatar_orphans(session, flush_context):
+    if not session.deleted:
+        return
+
+    potentially_orphaned = set()
+    for obj in session.deleted:
+        if isinstance(obj, (Contact, Room)) and obj.avatar_id:
+            potentially_orphaned.add(obj.avatar_id)
+    if not potentially_orphaned:
+        return
+
+    result = session.execute(
+        sa.delete(Avatar).where(
+            sa.and_(
+                Avatar.id.in_(potentially_orphaned),
+                sa.not_(sa.exists().where(Contact.avatar_id == Avatar.id)),
+                sa.not_(sa.exists().where(Room.avatar_id == Avatar.id)),
+            )
+        )
+    )
+    deleted_count = result.rowcount
+    log.debug(f"Auto-deleted %s orphaned avatars", deleted_count)
+
+
 log = logging.getLogger(__name__)

slidge/group/room.py

@@ -296,7 +296,7 @@ class LegacyMUC(
         self, affiliation: Optional[MucAffiliation] = None
     ) -> AsyncIterator[LegacyParticipantType]:
         await self.__fill_participants()
-        with self.xmpp.store.session(expire_on_commit=False) as orm:
+        with self.xmpp.store.session(expire_on_commit=False, autoflush=False) as orm:
             orm.add(self.stored)
             for db_participant in self.stored.participants:
                 if (
@@ -524,6 +524,9 @@ class LegacyMUC(
         if s := self.subject:
             form.add_field("muc#roominfo_subject", value=s)
 
+        if name := self.name:
+            form.add_field("muc#roomconfig_roomname", value=name)
+
         if self._set_avatar_task is not None:
             await self._set_avatar_task
         avatar = self.get_avatar()
@@ -652,7 +655,7 @@ class LegacyMUC(
                 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")
+            self.log.warning("is_user flag not set on user_participant")
             user_participant.is_user = True
         user_participant.send_initial_presence(
             user_full_jid,

slidge/util/test.py

@@ -42,7 +42,7 @@ from slidge import (
 
 from ..command import Command
 from ..core import config
-from ..core.config import _TimedeltaSeconds
+from ..core.session import _sessions
 from ..db import SlidgeStore
 from ..db.avatar import avatar_cache
 from ..db.meta import Base
@@ -206,7 +206,7 @@ class SlidgeTest(SlixTestPlus):
         user_jid_validator = ".*"
         admins: list[str] = []
         upload_requester = None
-        ignore_delay_threshold = _TimedeltaSeconds("300")
+        ignore_delay_threshold = 300
 
     @classmethod
     def setUpClass(cls) -> None:
@@ -281,6 +281,7 @@ class SlidgeTest(SlixTestPlus):
         self.db_engine.echo = False
         super().tearDown()
         Base.metadata.drop_all(self.xmpp.store._engine)
+        _sessions.clear()
 
     def setup_logged_session(self, n_contacts: int = 0) -> None:
         with self.xmpp.store.session() as orm:

slidge/util/util.py

@@ -34,7 +34,9 @@ except ImportError as e:
     )
 
 
-def fix_suffix(path: Path, mime_type: Optional[str], file_name: Optional[str]) -> Path:
+def fix_suffix(
+    path: Path, mime_type: Optional[str], file_name: Optional[str]
+) -> tuple[str, str]:
     guessed = magic.from_file(path, mime=True)
     if guessed == mime_type:
         log.debug("Magic and given MIME match")
@@ -53,15 +55,15 @@ def fix_suffix(path: Path, mime_type: Optional[str], file_name: Optional[str]) -
 
     if suffix in valid_suffix_list:
         log.debug("Suffix %s is in %s", suffix, valid_suffix_list)
-        return name
+        return str(name), guessed
 
     valid_suffix = mimetypes.guess_extension(mime_type.split(";")[0], strict=False)
     if valid_suffix is None:
         log.debug("No valid suffix found")
-        return name
+        return str(name), guessed
 
     log.debug("Changing suffix of %s to %s", file_name or path.name, valid_suffix)
-    return name.with_suffix(valid_suffix)
+    return str(name.with_suffix(valid_suffix)), guessed
 
 
 class SubclassableOnce(type):

{slidge-0.3.1.dist-info → slidge-0.3.2.dist-info}/METADATA

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

{slidge-0.3.1.dist-info → slidge-0.3.2.dist-info}/RECORD

@@ -12,26 +12,26 @@ slidge/command/chat_command.py,sha256=r_qalygOCsEoS-OgWw8IIlAzTufhXNjduONbeoepUI
 slidge/command/register.py,sha256=BduDI31Kx8CbWWEdjybimTA5Wcfhn-Jkt8sSPsySCpo,6724
 slidge/command/user.py,sha256=xt7NTb8Fdj_Mx91BgiszSii6QF67LtsyowQ1vhBJSIU,12660
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
-slidge/contact/contact.py,sha256=uXHxfEsBNjTE0Tdk1s1_YETIazU03-pvaScd3QQmlu0,19607
-slidge/contact/roster.py,sha256=uZ3iCl8oa7kEpIptUVa9p1k51bSvbuQq1pUGnf_zru8,9791
+slidge/contact/contact.py,sha256=ASNjGj-fxueC7rReMw4qMDUQxJ58W1F8i4Ipu_wfsTE,19617
+slidge/contact/roster.py,sha256=ZbhPC_5opMXdKrdCaQZiHTErxQD4EyWn5Susl6W7M6k,10003
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
-slidge/core/config.py,sha256=1HxHQ5BOnYghi8V5KbCQ6sUsNnXzAZAIoFA5PrMqH4E,6060
-slidge/core/gateway.py,sha256=5GImsd1b7KKcwIZcNSWgVieezrnp5dJCv7IlmOvWkRc,41192
+slidge/core/config.py,sha256=yFD1RGBZ6Xl115oMqDiF7DFkShlNjF9HEB56Eb_BR_E,7664
+slidge/core/gateway.py,sha256=G_ZX8ibKFe-oEXXOY-eRVkZjqRb_VdadIhTezwZEUCA,41698
 slidge/core/pubsub.py,sha256=2Em3PvYz-PX-WM7ZqkEU9estNYCyQ--JdJq22DhrUlA,12145
-slidge/core/session.py,sha256=leHLahwpI5_hqR6xv0juw_BQJnpuPqVmhOIwYEiPnx8,29861
+slidge/core/session.py,sha256=XJRZrtAmwqqjaqkLEUPK8xUBxdJrKeraubYYNiiuT7I,29897
 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
-slidge/core/dispatcher/presence.py,sha256=3qGsiMGzTDnOpMbCRJ8RCrRGiSU-pAyOLJHphbZF5pw,7043
-slidge/core/dispatcher/registration.py,sha256=Qa3fYZFJ4NaVz-FsnXorCmMQ9WyO7oZte1Zvro5f74E,3415
-slidge/core/dispatcher/search.py,sha256=bL5cwMOtsfnX5IH-t60S1PudpeMWZnF4-qksrKDuDyc,3411
+slidge/core/dispatcher/presence.py,sha256=MkSOY7uZQnujTwhIU_nVxygTul63VBaPjTT3X4iTMu4,7090
+slidge/core/dispatcher/registration.py,sha256=R4bsyiR8elbLKiFMYv2E54VAUg6qTo-_2CzdbCOZjrY,3419
+slidge/core/dispatcher/search.py,sha256=j7LGht2M36FfhXRzcdZiV-8OdCVsVHb2vJb6p3pIbpk,3202
 slidge/core/dispatcher/session_dispatcher.py,sha256=ysgPhns7NgUxhmkgEwRv-yDkSnUIXEdc-FsgqDqQAkE,3466
-slidge/core/dispatcher/util.py,sha256=DsMWz7yS67E2Y2pcnXUkuVMTa9F_Ok0JIxjhqhdYpD0,6161
+slidge/core/dispatcher/util.py,sha256=yxNevqjjLOzApLpqIRFHNQmpsahwZn55qCsNkOSXohc,6225
 slidge/core/dispatcher/vcard.py,sha256=qHZZShq3Iyvgh1FkcAgGhdKXF5m1VUqeb4EWkY0cbFw,5203
 slidge/core/dispatcher/message/__init__.py,sha256=gNeZZ0wtCI9JBqMe6tpumwV1TjY0mnPWTJc94uFTN-I,244
 slidge/core/dispatcher/message/chat_state.py,sha256=RbtM_nlZyvOHusZkDEP0TXA4wMp_N435490eE4wW8U0,2143
 slidge/core/dispatcher/message/marker.py,sha256=WZyf72_SM6sDGPMEOzhu93o2KbgxSxNF25jwsiM7h2A,2439
-slidge/core/dispatcher/message/message.py,sha256=RK1sX4cBSvPZLiUGYoT-pdCB01ll1761Ryr7Tu0AuBc,16202
+slidge/core/dispatcher/message/message.py,sha256=h-oNEC6In3dH2TpMgRVyMAvZjvWDczaq8nowOzVz_R4,16231
 slidge/core/dispatcher/muc/__init__.py,sha256=60YUr0i8PCZEPyNNTynJueRbbxF5pqzdyVf8z_XFXmM,290
 slidge/core/dispatcher/muc/admin.py,sha256=1tDZ9hHD6q5SqCjsYOpDimPB3Iyl21YO5RnK1goEGso,3284
 slidge/core/dispatcher/muc/mam.py,sha256=7vfmMI_mJOIrc9KCbtTibJSowhZTBBFwXWc84Ikpu3I,2994
@@ -39,21 +39,21 @@ slidge/core/dispatcher/muc/misc.py,sha256=DgUCSVwcv7kD5xmkS59E-TGf9yWDZiu6NBHgVS
 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=6c1gZNydVZHgHB-_PjBLbT_9ntBSNG0AWqlv9Cgcku8,21906
+slidge/core/mixins/attachment.py,sha256=k-4nwteql4TmhsZDLqPVgzVyuaRQzk-JEOG-k7w-VxM,23938
 slidge/core/mixins/avatar.py,sha256=0E0mQxdTUcJQrYXlBkYqkNl4bYuga4cIC1s4XA2rED8,5559
 slidge/core/mixins/base.py,sha256=getXMptzJwIc4fEbeMoJCSKcC3awi8UbKnx5FVCthjc,783
 slidge/core/mixins/db.py,sha256=lryMfRB-1-St2f7TZqW4sCl4xrWPWNlwgvn37T8wQPE,2678
 slidge/core/mixins/disco.py,sha256=mrYhWO9qpnLMAVtKKqwbDh6CNOH2dPNERpyfmWzZGg8,3684
 slidge/core/mixins/message.py,sha256=xk4bgiJF9ATe-rgtH4sHU8hUwecBF4KjGIujm90mbXQ,8014
-slidge/core/mixins/message_maker.py,sha256=NaIQzpjYHKMuuqfqncviB6AE-q50-YhhstxZ-WhLWhE,6546
-slidge/core/mixins/message_text.py,sha256=-hlGDzQ9dya-ZCPBe3v7UrpBetQa36N3YIACRxBt8Yc,9632
-slidge/core/mixins/presence.py,sha256=DPNatkVIkw7GmHrkyUlUgsGhp0VUgaUgSBuhGalbe8c,9791
+slidge/core/mixins/message_maker.py,sha256=jdY0dhpN_RcKwajI0XrV194ruNW120Gfdq333B1Fv1o,6556
+slidge/core/mixins/message_text.py,sha256=Unzmwr8TnPC2uuZ2fFiIalOGpQF7YYyT1AbB8i0l6Qc,9637
+slidge/core/mixins/presence.py,sha256=hNttLzQ83q6jTQumG-ATpTj85DiUpF50FebYQV_Nazg,10530
 slidge/core/mixins/recipient.py,sha256=b0uFnpym-hOFgYxGjXT1xQcZ4YRbDSBftPcNWLzSwEI,1336
 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=8z5bbaEINfU1Qx12iyHu4zRD9s3PwC6oUOz-PyBoqYg,12841
-slidge/db/store.py,sha256=ZksmZlFaTia7eWy_trALc_iTEkk2x7CIlEQeYkHW21g,19408
+slidge/db/models.py,sha256=HMSiNY0j-sm0VsikkVED1swPhX687613uW7NEHB8UTs,12826
+slidge/db/store.py,sha256=yhvYgoXpbueprjVUXBmA25wFyEbzDXMxVzqv8aZi5tw,20308
 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
@@ -62,7 +62,7 @@ slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=gNHpGlUstPtBcnBgOarSYzkZHo9E8bNxl_ZY3wM6wHg,6108
 slidge/group/bookmarks.py,sha256=eiXtlgirE59dBi1BT1349wCrGuHDkCoak1phCepzkqI,7653
 slidge/group/participant.py,sha256=2yDJL2bL0w-EiWjq6V96UEhXUgmih5-GpKsoKfG2zdY,18734
-slidge/group/room.py,sha256=lXzICLkv980o0JS-3HZTbvf2MD0ZlIw4-Y-xiU6lEew,49481
+slidge/group/room.py,sha256=QXNEbJBY5gbSpVbr1-u-M2YOoIU1qGhWM7SvtdyiETs,49583
 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
@@ -84,12 +84,12 @@ slidge/util/archive_msg.py,sha256=hGNquu38ouSWSc-kz_oAYPXwjhUVZNSedIpwkrXHSd0,18
 slidge/util/conf.py,sha256=Wv-xr1fQfz6jDCBpj2e5Nm-igMpdIjsYsVfoY8grJoo,7380
 slidge/util/jid_escaping.py,sha256=QJ2Yj_j1gTmiO9g2r187iVCu7kia_O5ABhRiLAO2TG4,1073
 slidge/util/lock.py,sha256=ZnUi3LGiz271-YeYKo9JzxovJCoSwlP9P65pNyHIO9o,1029
-slidge/util/test.py,sha256=_E6er2BtQlpyzTUmp4u8C9KhBYzbLrmTwSVgxGObKHU,13988
+slidge/util/test.py,sha256=o86wX1ksnvAgN47k5facDPc4zgiK7J5oWyThgJsv_vQ,13986
 slidge/util/types.py,sha256=nilphTeJU3yb0MSqb86tZeWXis495oDvHSDDBs0hn_4,5747
-slidge/util/util.py,sha256=PBdHtcRIQi6Dy-yHASS_xiRGQ4Pv4i6QSSZAAELPnmQ,9536
-slidge-0.3.1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.1.dist-info/METADATA,sha256=UEfy2L6fzCOoHu2yfUhlh0SI7cQW6LrC6XNhJySfYoo,5054
-slidge-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-slidge-0.3.1.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.1.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.1.dist-info/RECORD,,
+slidge/util/util.py,sha256=g6jFu5xgAtRA9FBCIBJT3079t_bQKZYOUvi9L5pTbbk,9595
+slidge-0.3.2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.3.2.dist-info/METADATA,sha256=Ptqr6X39gL1nyceti9rOscoPzsVcCBb8u93QsqRV6zU,5054
+slidge-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+slidge-0.3.2.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.3.2.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.3.2.dist-info/RECORD,,