slidge 0.3.0b4__tar.gz → 0.3.2__tar.gz

{slidge-0.3.0b4 → slidge-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0b4
+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.0b4 → 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.0b4 → 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.0b4 → slidge-0.3.2}/slidge/__init__.py

@@ -4,7 +4,6 @@ The main slidge package.
 Contains importable classes for a minimal function :term:`Legacy Module`.
 """
 
-import sys
 import warnings
 from importlib.metadata import PackageNotFoundError, version
 from typing import Any

{slidge-0.3.0b4 → slidge-0.3.2}/slidge/command/user.py

@@ -34,8 +34,9 @@ class Search(Command):
     async def run(
         self, session: Optional[AnyBaseSession], _ifrom: JID, *args: str
     ) -> Union[Form, SearchResult, None]:
+        assert session is not None
+        await session.ready
         if args:
-            assert session is not None
             return await session.on_search(
                 {self.xmpp.SEARCH_FIELDS[0].var: " ".join(args)}
             )
@@ -70,6 +71,8 @@ class SyncContacts(Command):
     CATEGORY = CONTACTS
 
     async def run(self, session: Optional[AnyBaseSession], _ifrom, *_) -> Confirmation:
+        assert session is not None
+        await session.ready
         return Confirmation(
             prompt="Are you sure you want to sync your roster?",
             success=None,
@@ -133,6 +136,7 @@ class ListContacts(Command):
         self, session: Optional[AnyBaseSession], _ifrom: JID, *_
     ) -> TableResult:
         assert session is not None
+        await session.ready
         contacts = sorted(
             session.contacts, key=lambda c: c.name.casefold() if c.name else ""
         )
@@ -152,7 +156,7 @@ class ListGroups(Command):
 
     async def run(self, session, _ifrom, *_):
         assert session is not None
-        await session.bookmarks.fill()
+        await session.ready
         groups = sorted(session.bookmarks, key=lambda g: g.DISCO_NAME.casefold())
         return TableResult(
             description="Your groups",
@@ -201,6 +205,7 @@ class CreateGroup(Command):
 
     async def run(self, session: Optional[AnyBaseSession], _ifrom, *_):
         assert session is not None
+        await session.ready
         contacts = session.contacts.known_contacts(only_friends=True)
         return Form(
             title="Create a new group",
@@ -260,20 +265,34 @@ class Preferences(Command):
             instructions=self.HELP,
             fields=fields,
             handler=self.finish,  # type:ignore
+            handler_kwargs={"previous": current},
         )
 
     async def finish(
-        self, form_values: UserPreferences, session: Optional[AnyBaseSession], *_
+        self,
+        form_values: UserPreferences,
+        session: Optional[AnyBaseSession],
+        *_,
+        previous,
     ) -> str:
         assert session is not None
+        if previous == form_values:
+            return "No preference was changed"
+
         user = session.user
         user.preferences.update(form_values)  # type:ignore
-        if form_values["sync_avatar"]:
+        self.xmpp.store.users.update(user)
+
+        try:
+            await session.on_preferences(previous, form_values)  # type:ignore[arg-type]
+        except NotImplementedError:
+            pass
+
+        if not previous["sync_avatar"] and form_values["sync_avatar"]:
             await self.xmpp.fetch_user_avatar(session)
         else:
             user.avatar_hash = None
 
-        self.xmpp.store.users.update(user)
         return "Your preferences have been updated."
 
 
@@ -308,7 +327,7 @@ class LeaveGroup(Command):
 
     async def run(self, session, _ifrom, *_):
         assert session is not None
-        await session.bookmarks.fill()
+        await session.ready
         groups = sorted(session.bookmarks, key=lambda g: g.DISCO_NAME.casefold())
         return Form(
             title="Leave a group",

{slidge-0.3.0b4 → slidge-0.3.2}/slidge/contact/contact.py

@@ -325,6 +325,7 @@ class LegacyContact(
         email: Optional[str] = None,
         country: Optional[str] = None,
         locality: Optional[str] = None,
+        pronouns: Optional[str] = None,
     ) -> None:
         vcard = VCard4()
         vcard.add_impp(f"xmpp:{self.jid.bare}")
@@ -357,6 +358,8 @@ class LegacyContact(
             vcard.add_address(country, locality)
         elif country:
             vcard.add_address(country, locality)
+        if pronouns:
+            vcard["pronouns"]["text"] = pronouns
 
         self.stored.vcard = str(vcard)
         self.stored.vcard_fetched = True
@@ -408,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.0b4 → 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.0b4 → 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.0b4 → 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.0b4 → slidge-0.3.2}/slidge/core/dispatcher/muc/misc.py

@@ -1,6 +1,14 @@
 import logging
 
-from slixmpp import JID, CoroutineCallback, Iq, Message, Presence, StanzaPath
+from slixmpp import (
+    JID,
+    CoroutineCallback,
+    Iq,
+    MatchXMLMask,
+    Message,
+    Presence,
+    StanzaPath,
+)
 from slixmpp.exceptions import XMPPError
 
 from ..util import DispatcherMixin, exceptions_to_xmpp_errors
@@ -23,6 +31,15 @@ class MucMiscMixin(DispatcherMixin):
         )
         xmpp.add_event_handler("groupchat_subject", self.on_groupchat_subject)
         xmpp.add_event_handler("groupchat_message_error", self.__on_group_chat_error)
+        xmpp.register_handler(
+            CoroutineCallback(
+                "muc_thread_subject",
+                MatchXMLMask(
+                    "<message xmlns='jabber:component:accept' type='groupchat'><subject/><thread/></message>"
+                ),
+                self.on_thread_subject,
+            )
+        )
 
     async def __on_group_chat_error(self, msg: Message) -> None:
         condition = msg["error"].get_condition()
@@ -43,7 +60,7 @@ class MucMiscMixin(DispatcherMixin):
             # (not sure why?), but is of no consequence
             log.debug("%s was not in the resources of %s", resource, muc)
         else:
-            log.info(
+            log.debug(
                 "Removed %s from the resources of %s because of error", resource, muc
             )
 
@@ -106,6 +123,14 @@ class MucMiscMixin(DispatcherMixin):
             )
         await muc.on_set_subject(msg["subject"])
 
+    @exceptions_to_xmpp_errors
+    async def on_thread_subject(self, msg: Message):
+        if msg["body"]:
+            return
+        session, muc, thread = await self._get_session_recipient_thread(msg)
+        assert thread is not None
+        await muc.on_set_thread_subject(thread, msg["subject"])  # type:ignore[union-attr]
+
 
 KICKABLE_ERRORS = {
     "gone",

{slidge-0.3.0b4 → slidge-0.3.2}/slidge/core/dispatcher/presence.py

@@ -4,6 +4,7 @@ from slixmpp import JID, Presence
 from slixmpp.exceptions import XMPPError
 
 from ...contact.roster import ContactIsUser
+from ...util.types import AnyBaseSession
 from ...util.util import merge_resources
 from ..session import BaseSession
 from .util import DispatcherMixin, exceptions_to_xmpp_errors
@@ -70,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:
@@ -98,7 +100,7 @@ class PresenceHandlerMixin(DispatcherMixin):
             reply.send()
 
     @exceptions_to_xmpp_errors
-    async def on_presence(self, p: Presence):
+    async def on_presence(self, p: Presence) -> None:
         if p.get_plugin("muc_join", check=True):
             # handled in on_groupchat_join
             # without this early return, since we switch from and to in this
@@ -112,31 +114,8 @@ class PresenceHandlerMixin(DispatcherMixin):
 
         pto = p.get_to()
         if pto == self.xmpp.boundjid.bare:
-            session.log.debug("Received a presence from %s", p.get_from())
-            if (ptype := p.get_type()) not in _USEFUL_PRESENCES:
-                return
-            if not session.user.preferences.get("sync_presence", False):
-                session.log.debug("User does not want to sync their presence")
-                return
-            # NB: get_type() returns either a proper presence type or
-            #     a presence show if available. Weird, weird, weird slix.
-            resources = self.xmpp.roster[self.xmpp.boundjid.bare][
-                p.get_from()
-            ].resources
-            try:
-                await session.on_presence(
-                    p.get_from().resource,
-                    ptype,  # type: ignore
-                    p["status"],
-                    resources,
-                    merge_resources(resources),
-                )
-            except NotImplementedError:
-                pass
-            if p.get_type() == "available":
-                await self.xmpp.pubsub.on_presence_available(p, None)
-                for contact in session.contacts:
-                    await self.xmpp.pubsub.on_presence_available(p, contact)
+            await self._on_presence_to_component(session, p)
+            return
 
         if p.get_type() == "available":
             try:
@@ -181,6 +160,33 @@ class PresenceHandlerMixin(DispatcherMixin):
         )
         error_stanza.send()
 
+    async def _on_presence_to_component(
+        self, session: AnyBaseSession, p: Presence
+    ) -> None:
+        session.log.debug("Received a presence from %s", p.get_from())
+        if (ptype := p.get_type()) not in _USEFUL_PRESENCES:
+            return
+        if not session.user.preferences.get("sync_presence", False):
+            session.log.debug("User does not want to sync their presence")
+            return
+        # NB: get_type() returns either a proper presence type or
+        #     a presence show if available. Weird, weird, weird slix.
+        resources = self.xmpp.roster[self.xmpp.boundjid.bare][p.get_from()].resources
+        try:
+            await session.on_presence(
+                p.get_from().resource,
+                ptype,  # type: ignore
+                p["status"],
+                resources,
+                merge_resources(resources),
+            )
+        except NotImplementedError:
+            pass
+        if p.get_type() == "available":
+            await self.xmpp.pubsub.on_presence_available(p, None)
+            for contact in session.contacts:
+                await self.xmpp.pubsub.on_presence_available(p, contact)
+
 
 _USEFUL_PRESENCES = {"available", "unavailable", "away", "chat", "dnd", "xa"}
 

{slidge-0.3.0b4 → 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.0b4 → 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.0b4 → 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)