slidge 0.3.1__tar.gz → 0.3.2__tar.gz

{slidge-0.3.1 → slidge-0.3.2}/PKG-INFO

@@ -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.2/docs/source/admin/config/index.rst

@@ -0,0 +1,57 @@
+Configuration
+=============
+
+.. include:: ../note.rst
+
+By default, slidge uses all config files found in ``/etc/slidge/conf.d/*``.
+You can change this using the ``SLIDGE_CONF_DIR`` env var, eg
+``SLIDGE_CONF_DIR=/path/dir1:/path/dir2:/path/dir3``.
+
+It is recommended to use ``/etc/slidge/conf.d/`` to store configuration options
+common to all slidge components (eg, attachment handling, logging options,
+etc.), and to specify a plugin-specific file on startup, eg:
+
+.. code-block:: bash
+
+    slidge -c /etc/slidge/superduper.conf
+
+.. note::
+  For the debian unofficial package, just edit the ``/etc/slidge/conf.d/common.conf`` and
+  ``/etc/slidge/*.conf`` files, and use :ref:`Debian packages (systemd)` to
+  launch slidge.
+
+Command-line arguments
+----------------------
+
+.. code-block:: text
+
+      -h, --help            show this help message and exit
+      -c, --config CONFIG   Path to a INI config file. [env var: SLIDGE_CONFIG]
+      --log-config LOG_CONFIG
+                            Path to a INI config file to personalise logging output.
+      -q, --quiet           loglevel=WARNING (unused if --log-config is specified) [env var: SLIDGE_QUIET]
+      -d, --debug           loglevel=DEBUG (unused if --log-config is specified) [env var: SLIDGE_DEBUG]
+      --version             show program's version number and exit
+
+
+Regarding the ``--log-config`` argument, refer to the `official python documentation
+<https://docs.python.org/3/library/logging.config.html#configuration-file-format>`_
+for the syntax.
+
+Other options
+-------------
+
+.. warning::
+
+    Because of an ugly mess that will soon™ be fixed, it is impossible to use
+    the config file to turn off boolean arguments that are true by default.
+    As a workaround, use CLI args instead, e.g., ``--some-opt=false``.
+
+The following options can be used:
+
+* in a config file (see top of this page);
+* as command line arguments, prepended with ``--``, e.g., ``--some-option=value``;
+* as environment variables, upper case, prepended with ``SLIDGE_``,
+  and with dashes substituted with underscores, e.g., ``SLIDGE_SOME_OPTION=value``.
+
+.. config-obj:: slidge.core.config

{slidge-0.3.1 → slidge-0.3.2}/docs/source/conf.py

@@ -39,9 +39,9 @@ extensions = [
     "sphinx.ext.extlinks",
     # "sphinx.ext.viewcode",  # crashes build unfortunately
     "sphinx.ext.autodoc.typehints",
-    "sphinx.ext.autosectionlabel",
     "sphinxarg.ext",
     "autoapi.extension",
+    "slidge_sphinx_extensions.config_obj",
 ]
 
 autodoc_typehints = "description"

{slidge-0.3.1 → slidge-0.3.2}/pyproject.toml

@@ -63,6 +63,7 @@ dev = [
     "types-pillow>=10.2.0.20240822",
     "utidylib>=0.10",
     "xmldiff>=2.7.0",
+    "slidge-sphinx-extensions>=0.2.1,<0.3",
 ]
 
 [tool.mypy]
@@ -106,6 +107,8 @@ filterwarnings = [
     "ignore::UserWarning:slidge",
     "ignore:coroutine 'XMLStream._end_stream_wait' was never awaited.*:RuntimeWarning"
 ]
+log_cli = true
+log_level = "DEBUG"
 
 [[tool.uv.index]]
 name = "codeberg"

{slidge-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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-0.3.1 → slidge-0.3.2}/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)