slidge 0.2.7.post1__tar.gz → 0.2.8__tar.gz

{slidge-0.2.7.post1 → slidge-0.2.8}/.woodpecker/test.yaml

@@ -31,7 +31,7 @@ steps:
     image: codeberg.org/slidge/woodpecker-${CI_REPO_NAME}:${PYTHON_VERSION}
     commands:
       - ruff check
-      - ruff format
+      - ruff format --check
 
   mypy:
     image: codeberg.org/slidge/woodpecker-${CI_REPO_NAME}:${PYTHON_VERSION}

{slidge-0.2.7.post1 → slidge-0.2.8}/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
     python3-dev \
     rustc
 
-RUN uv venv /venv
+RUN uv venv /venv --relocatable
 WORKDIR /build
 # Only copy files used to define dependencies, so this step can be in cache
 # as long as we don't touch the deps.

{slidge-0.2.7.post1 → slidge-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.7.post1
+Version: 0.2.8
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -683,7 +683,7 @@ Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: pillow<12,>=11.0.0
 Requires-Dist: python-magic<0.5,>=0.4.27
 Requires-Dist: qrcode<9,>=8.0
-Requires-Dist: slixmpp<1.9.0,>=1.8.6
+Requires-Dist: slixmpp<2,>=1.9.0
 Requires-Dist: sqlalchemy<3,>=2
 Requires-Dist: thumbhash>=0.1.2
 

{slidge-0.2.7.post1 → slidge-0.2.8}/docs/source/admin/daemon.rst

@@ -15,8 +15,12 @@ contributions are welcome).
 
     In this page we assume that you have fulfilled the basic :ref:`XMPP server config`.
 
-Debian packages (systemd)
-=========================
+Debian packages (unofficial)
+============================
+
+These instructions are for the slidge bundle unofficial package hosted on
+`codeberg <https://codeberg.org/slidge/debian>`_. They do not apply to the official
+debian slidge package, which is incompatible with this bundle.
 
 Edit and remove the ``.example`` extension for ``/etc/slidge/conf.d/common.conf``
 and ``/etc/slidge/superduper.conf.example``.

{slidge-0.2.7.post1 → slidge-0.2.8}/docs/source/admin/install.rst

@@ -13,14 +13,8 @@ debian
 ------
 
 A debian package containing slidge and a bunch of legacy modules is available at
-`<https://git.sr.ht/~nicoco/slidge-debian>`_.
-
-Debian packages for *bookworm* (amd64 and arm64)
-are built on each push to master as artifacts of
-this `build job <https://builds.sr.ht/~nicoco/slidge/commits/master/debian.yml?>`_.
-
-A repo is maintained by IGImonster. Refer to the README of
-`<https://git.sr.ht/~nicoco/slidge-debian>`_ for setup instructions.
+`<https://codeberg.org/slidge/debian>`_. See the README there for details and
+instructions.
 
 See :ref:`Debian packages` for information about how to launch slidge as a daemon via systemd.
 

{slidge-0.2.7.post1 → slidge-0.2.8}/pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "pillow>=11.0.0,<12",
     "python-magic>=0.4.27,<0.5",
     "qrcode>=8.0,<9",
-    "slixmpp>=1.8.6,<1.9.0",
+    "slixmpp>=1.9.0,<2",
     "sqlalchemy>=2,<3",
     "thumbhash>=0.1.2",
 ]
@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 keywords = ["xmpp", "gateway", "bridge", "instant messaging"]
-version = "v0.2.7.post1"
+version = "v0.2.8"
 readme = "README.md"
 
 [build-system]
@@ -128,14 +128,20 @@ header = """
 # Changes
 """
 body = """
-{% for group, commits in commits | group_by(attribute="group") %}
+{% for group, all_commits in commits | group_by(attribute="group") %}
+    {%- if group == "cfix" %}{% continue %}{%- endif %}
     ## {{ group | striptags | trim | upper_first }}
-    {% for commit in commits %}
+    {% for commit in all_commits %}
         - {% if commit.scope %}*({{ commit.scope }})* {% endif %}\
             {% if commit.breaking %}[**breaking**] {% endif %}\
-            {{ commit.message | split(pat="\n") | first | upper_first | trim }}\
-            {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif %} \
-            [`{{ commit.id | truncate(length=7, end="") }}`](./commit/{{ commit.id }})\
+            {{ commit.message | split(pat="\n") | first | upper_first | trim }} \
+            ([`{{ commit.id | truncate(length=7, end="") }}`](./commit/{{ commit.id -}})\
+            {% if commit.remote.username %} by @{{ commit.remote.username }}{%- endif -%}
+            {%- for cfix_commit in commits | filter(attribute="group", value="cfix") -%}
+                {%- if cfix_commit.scope and commit.id is starting_with(cfix_commit.scope) -%}
+                    , [`{{ cfix_commit.id | truncate(length=7, end="") }}`](./commit/{{ cfix_commit.id }}){% if cfix_commit.remote.username %} by @{{ cfix_commit.remote.username }}{%- endif -%}
+                {%- endif -%}
+            {%- endfor -%})\
     {% endfor %}
 {% endfor %}\n
 """
@@ -148,21 +154,23 @@ conventional_commits = true
 filter_unconventional = false
 commit_parsers = [
   { message = "^feat", group = "<!-- 0 -->🚀 Features" },
-  { message = "^imprv", group = "<!-- 1 -->✨ Improvements" },
-  { message = "^fix", group = "<!-- 2 -->🐛 Bug Fixes" },
-  { message = "^compat", group = "<!-- 3 -->💑 Compatibility" },
-  { message = "^refactor", group = "<!-- 4 -->🚜 Refactor" },
-  { message = "^doc", group = "<!-- 5 -->📚 Documentation" },
-  { message = "^perf", group = "<!-- 6 -->⚡ Performance" },
-  { message = "^style", group = "<!-- 7 -->🎨 Styling" },
-  { message = "^test", group = "<!-- 8 -->🧪 Testing" },
+  { message = "^imprv", group = "<!-- 01 -->✨ Improvements" },
+  { message = "^fix", group = "<!-- 02 -->🐛 Bug Fixes" },
+  { message = "^compat", group = "<!-- 03 -->💑 Compatibility" },
+  { message = "^refactor", group = "<!-- 04 -->🚜 Refactor" },
+  { message = "^doc", group = "<!-- 05 -->📚 Documentation" },
+  { message = "^perf", group = "<!-- 06 -->⚡ Performance" },
+  { message = "^style", group = "<!-- 07 -->🎨 Styling" },
+  { message = "^test", group = "<!-- 08 -->🧪 Testing" },
   { message = "^chore\\(release\\): prepare for", skip = true },
   { message = "^chore\\(deps.*\\)", skip = true },
   { message = "^chore\\(pr\\)", skip = true },
   { message = "^chore\\(pull\\)", skip = true },
-  { message = "^cfix", skip = true },
-  { message = "^chore|^ci", group = "<!-- 9 -->⚙️ Miscellaneous Tasks" },
+  { message = "^build\\(lockfile\\)", skip = true },
+  { message = "^chore\\(lockfile\\)", skip = true },
+  { message = "^chore|^ci", group = "<!-- 09 -->⚙️ Miscellaneous Tasks" },
   { body = ".*security", group = "<!-- 10 -->🛡️ Security" },
   { message = "^revert", group = "<!-- 11 -->◀️ Revert" },
-  { message = ".*", group = "<!-- 12 -->💼 Other" },
+  { message = "^cfix", group = "cfix" },
+  { message = ".*", group = "<!-- 13 -->💼 Other" },
 ]

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/__version__.py

@@ -2,4 +2,4 @@ from slidge.util.util import get_version  # noqa: F401
 
 # this is modified before publish, but if someone cloned from the repo,
 # it can help
-__version__ = "v0.2.7.post1"
+__version__ = "v0.2.8"

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/contact/contact.py

@@ -218,7 +218,7 @@ class LegacyContact(
         self.log.name = f"{self.user_jid.bare}:contact:{self}"
 
     def __repr__(self):
-        return f"<Contact #{self.contact_pk} '{self.name}' ({self.legacy_id} - {self.jid.local})'>"
+        return f"<Contact #{self.contact_pk} '{self.name}' ({self.legacy_id} - {self.jid.user})'>"
 
     def __ensure_pk(self):
         if self.contact_pk is not None:
@@ -617,7 +617,7 @@ class LegacyContact(
         contact = cls(
             session,
             cls.xmpp.LEGACY_CONTACT_ID_TYPE(stored.legacy_id),
-            stored.jid.username,  # type: ignore
+            stored.jid.user,  # type: ignore
             *args,  # type: ignore
             **kwargs,  # type: ignore
         )

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/contact/roster.py

@@ -5,12 +5,12 @@ from typing import TYPE_CHECKING, AsyncIterator, Generic, Iterator, Optional, Ty
 
 from slixmpp import JID
 from slixmpp.exceptions import IqError, IqTimeout, XMPPError
-from slixmpp.jid import JID_UNESCAPE_TRANSFORMATIONS, _unescape_node
 
 from ..core.mixins.lock import NamedLockMixin
 from ..db.models import Contact
 from ..db.store import ContactStore
 from ..util import SubclassableOnce
+from ..util.jid_escaping import ESCAPE_TABLE, unescape_node
 from ..util.types import LegacyContactType, LegacyUserIdType
 from .contact import LegacyContact
 
@@ -198,7 +198,7 @@ class LegacyRoster(
         :param jid_username: User part of a JID, ie "user" in "user@example.com"
         :return: An identifier for the user on the legacy network.
         """
-        return _unescape_node(jid_username)
+        return unescape_node(jid_username)
 
     async def _fill(self):
         try:
@@ -259,5 +259,4 @@ class LegacyRoster(
         yield
 
 
-ESCAPE_TABLE = "".maketrans({v: k for k, v in JID_UNESCAPE_TRANSFORMATIONS.items()})
 log = logging.getLogger(__name__)

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/core/dispatcher/session_dispatcher.py

@@ -52,7 +52,6 @@ class SessionDispatcher(
         if session.user.avatar_hash == hash_:
             session.log.debug("We already know this avatar hash")
             return
-        self.xmpp.store.users.set_avatar_hash(session.user_pk, None)
 
         if hash_:
             try:
@@ -67,6 +66,7 @@ class SessionDispatcher(
             height = info["height"]
             width = info["width"]
         else:
+            self.xmpp.store.users.set_avatar_hash(session.user_pk, None)
             bytes_ = type_ = height = width = hash_ = None
         try:
             await session.on_avatar(bytes_, hash_, type_, width, height)
@@ -79,6 +79,11 @@ class SessionDispatcher(
             session.send_gateway_message(
                 f"Something went wrong trying to set your avatar: {e!r}"
             )
+        else:
+            self.xmpp.store.users.set_avatar_hash(session.user_pk, hash_)
+            for room in session.bookmarks:
+                participant = await room.get_user_participant()
+                participant.send_last_presence(force=True, no_cache_online=True)
 
 
 log = logging.getLogger(__name__)

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/core/gateway.py

@@ -559,8 +559,18 @@ class BaseGateway(
                 self.xmpp.plugin["xep_0084"].stanza.MetaData.namespace,
                 ifrom=self.boundjid.bare,
             )
-        except (IqError, IqTimeout):
-            self.xmpp.store.users.set_avatar_hash(session.user_pk, None)
+        except IqTimeout:
+            self.log.warning("Iq timeout trying to fetch user avatar")
+            return
+        except IqError as e:
+            self.log.debug("Iq error when trying to fetch user avatar: %s", e)
+            if e.condition == "item-not-found":
+                try:
+                    await session.on_avatar(None, None, None, None, None)
+                except NotImplementedError:
+                    pass
+                else:
+                    self.xmpp.store.users.set_avatar_hash(session.user_pk, None)
             return
         await self.__dispatcher.on_avatar_metadata_info(
             session, iq["pubsub"]["items"]["item"]["avatar_metadata"]["info"]

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/core/mixins/message_maker.py

@@ -4,7 +4,7 @@ from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Iterable, Optional, cast
 from uuid import uuid4
 
-from slixmpp import Message
+from slixmpp import JID, Message
 from slixmpp.types import MessageTypes
 
 from ...db.models import GatewayUser
@@ -120,14 +120,14 @@ class MessageMaker(BaseSender):
                         DeprecationWarning,
                     )
                 if muc:
-                    jid = copy(muc.jid)
+                    jid = JID(muc.jid)
                     jid.resource = fallback_nick = muc.user_nick
                     msg["reply"]["to"] = jid
                 else:
                     msg["reply"]["to"] = self.session.user_jid
                     # TODO: here we should use preferably use the PEP nick of the user
                     # (but it doesn't matter much)
-                    fallback_nick = self.session.user_jid.local
+                    fallback_nick = self.session.user_jid.user
             else:
                 if muc:
                     if hasattr(entity, "muc"):

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/db/store.py

@@ -443,6 +443,7 @@ class ContactStore(UpdatedMixin):
                     break
             for row_id in to_del:
                 session.execute(delete(ContactSent).where(ContactSent.id == row_id))
+            session.commit()
         return result
 
     def set_friend(self, contact_pk: int, is_friend: bool) -> None:
@@ -751,6 +752,8 @@ class MultiStore(EngineMixin):
             ).scalar()
             if multi is None:
                 return None
+            if multi.legacy_ids_multi is None:
+                return None
             return multi.legacy_ids_multi.legacy_id
 
 

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/group/archive.py

@@ -150,19 +150,27 @@ def archivable(msg: Message):
     :return:
     """
 
-    if msg.get_plugin("hint", check=True) and msg["hint"] == "no-store":
+    if msg.get_plugin("no-store", check=True):
         return False
 
+    if msg.get_plugin("no-permanent-store", check=True):
+        return False
+
+    if msg.get_plugin("store", check=True):
+        return True
+
     if msg["body"]:
         return True
 
-    if msg.get_plugin("apply_to", check=True):
-        # retractions
+    if msg.get_plugin("retract", check=True):
         return True
 
     if msg.get_plugin("reactions", check=True):
         return True
 
+    if msg.get_plugin("displayed", check=True):
+        return True
+
     return False
 
 

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/group/bookmarks.py

@@ -4,12 +4,11 @@ from typing import TYPE_CHECKING, Generic, Iterator, Optional, Type
 
 from slixmpp import JID
 from slixmpp.exceptions import XMPPError
-from slixmpp.jid import _unescape_node
 
-from ..contact.roster import ESCAPE_TABLE
 from ..core.mixins.lock import NamedLockMixin
 from ..db.models import Room
 from ..util import SubclassableOnce
+from ..util.jid_escaping import ESCAPE_TABLE, unescape_node
 from ..util.types import LegacyGroupIdType, LegacyMUCType
 from .archive import MessageArchive
 from .room import LegacyMUC
@@ -83,14 +82,14 @@ class LegacyBookmarks(
         :param username:
         :return:
         """
-        return _unescape_node(username)
+        return unescape_node(username)
 
     async def by_jid(self, jid: JID) -> LegacyMUCType:
         if jid.resource:
             jid = JID(jid.bare)
         async with self.lock(("bare", jid.bare)):
-            assert isinstance(jid.local, str)
-            legacy_id = await self.jid_local_part_to_legacy_id(jid.local)
+            assert isinstance(jid.user, str)
+            legacy_id = await self.jid_local_part_to_legacy_id(jid.user)
             if self.get_lock(("legacy_id", legacy_id)):
                 self.log.debug("Not instantiating %s after all", jid)
                 return await self.by_legacy_id(legacy_id)

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/group/participant.py

@@ -1,6 +1,5 @@
 import logging
 import string
-import stringprep
 import uuid
 import warnings
 from copy import copy
@@ -10,9 +9,7 @@ from typing import TYPE_CHECKING, Optional, Self, Union
 
 from slixmpp import JID, InvalidJID, Message, Presence
 from slixmpp.plugins.xep_0045.stanza import MUCAdminItem
-from slixmpp.stringprep import StringprepError, resourceprep
 from slixmpp.types import MessageTypes, OptJid
-from slixmpp.util.stringprep_profiles import StringPrepError, prohibit_output
 
 from ..contact import LegacyContact
 from ..core.mixins import (
@@ -175,39 +172,22 @@ class LegacyParticipant(
         self.send_last_presence(force=True, no_cache_online=True)
 
     def __update_jid(self, unescaped_nickname: Optional[str]):
-        j: JID = copy(self.muc.jid)
-
-        if self.is_system:
-            self.jid = j
-            self._nickname_no_illegal = ""
+        if not unescaped_nickname:
+            self.jid = JID(self.muc.jid)
+            if self.is_system:
+                self._nickname_no_illegal = ""
+            else:
+                warnings.warn(
+                    "Only the system participant is allowed to not have a nickname"
+                )
+                nickname = f"unnamed-{uuid.uuid4()}"
+                self.jid.resource = self._nickname_no_illegal = nickname
             return
 
-        nickname = unescaped_nickname
-
-        if nickname:
-            nickname = self._nickname_no_illegal = strip_illegal_chars(nickname)
-        else:
-            warnings.warn(
-                "Only the system participant is allowed to not have a nickname"
-            )
-            nickname = f"unnamed-{uuid.uuid4()}"
-
-        assert isinstance(nickname, str)
-
-        try:
-            # workaround for https://codeberg.org/poezio/slixmpp/issues/3480
-            prohibit_output(nickname, [stringprep.in_table_a1])
-            resourceprep(nickname)
-        except (StringPrepError, StringprepError):
-            nickname = nickname.encode("punycode").decode()
-
-        # at this point there still might be control chars
-        try:
-            j.resource = nickname
-        except InvalidJID:
-            j.resource = strip_non_printable(nickname)
-
-        self.jid = j
+        self._nickname_no_illegal, self.jid = escape_nickname(
+            self.muc.jid,
+            unescaped_nickname,
+        )
 
     def send_configuration_change(self, codes: tuple[int]):
         if not self.is_system:
@@ -270,7 +250,7 @@ class LegacyParticipant(
                 if user_full_jid:
                     p["muc"]["jid"] = user_full_jid
                 else:
-                    jid = copy(self.user_jid)
+                    jid = JID(self.user_jid)
                     try:
                         jid.resource = next(
                             iter(self.muc.get_user_resources())  # type:ignore
@@ -539,4 +519,22 @@ class LegacyParticipant(
         return part
 
 
+def escape_nickname(muc_jid: JID, nickname: str) -> tuple[str, JID]:
+    nickname = nickname_no_illegal = strip_illegal_chars(nickname)
+
+    jid = JID(muc_jid)
+
+    try:
+        jid.resource = nickname
+    except InvalidJID:
+        nickname = nickname.encode("punycode").decode()
+        try:
+            jid.resource = nickname
+        except InvalidJID:
+            # at this point there still might be control chars
+            jid.resource = strip_non_printable(nickname)
+
+    return nickname_no_illegal, jid
+
+
 log = logging.getLogger(__name__)

{slidge-0.2.7.post1 → slidge-0.2.8}/slidge/group/room.py

@@ -10,11 +10,12 @@ from uuid import uuid4
 
 from slixmpp import JID, Iq, Message, Presence
 from slixmpp.exceptions import IqError, IqTimeout, XMPPError
-from slixmpp.jid import _unescape_node
 from slixmpp.plugins.xep_0004 import Form
 from slixmpp.plugins.xep_0060.stanza import Item
 from slixmpp.plugins.xep_0082 import parse as str_to_datetime
 from slixmpp.plugins.xep_0469.stanza import NS as PINNING_NS
+from slixmpp.plugins.xep_0492.stanza import NS as NOTIFY_NS
+from slixmpp.plugins.xep_0492.stanza import WhenLiteral
 from slixmpp.xmlstream import ET
 
 from ..contact.contact import LegacyContact
@@ -27,9 +28,8 @@ from ..core.mixins.disco import ChatterDiscoMixin
 from ..core.mixins.lock import NamedLockMixin
 from ..core.mixins.recipient import ReactionRecipientMixin, ThreadRecipientMixin
 from ..db.models import Room
-from ..slixfix.xep_0492.stanza import NS as NOTIFY_NS
-from ..slixfix.xep_0492.stanza import WhenLiteral
 from ..util import ABCSubclassableOnceAtMost
+from ..util.jid_escaping import unescape_node
 from ..util.types import (
     HoleBound,
     LegacyGroupIdType,
@@ -42,7 +42,7 @@ from ..util.types import (
 )
 from ..util.util import deprecated, timeit, with_session
 from .archive import MessageArchive
-from .participant import LegacyParticipant
+from .participant import LegacyParticipant, escape_nickname
 
 if TYPE_CHECKING:
     from ..core.gateway import BaseGateway
@@ -184,7 +184,7 @@ class LegacyMUC(
         self.log = logging.getLogger(f"{self.user_jid}:muc:{self}")
 
     def __repr__(self):
-        return f"<MUC #{self.pk} '{self.name}' ({self.legacy_id} - {self.jid.local})'>"
+        return f"<MUC #{self.pk} '{self.name}' ({self.legacy_id} - {self.jid.user})'>"
 
     @property
     def subject_date(self) -> Optional[datetime]:
@@ -515,8 +515,7 @@ class LegacyMUC(
         return r
 
     def shutdown(self):
-        user_jid = copy(self.jid)
-        user_jid.resource = self.user_nick
+        _, user_jid = escape_nickname(self.jid, self.user_nick)
         for user_full_jid in self.user_full_jids():
             presence = self.xmpp.make_presence(
                 pfrom=user_jid, pto=user_full_jid, ptype="unavailable"
@@ -528,14 +527,13 @@ class LegacyMUC(
 
     def user_full_jids(self):
         for r in self._user_resources:
-            j = copy(self.user_jid)
+            j = JID(self.user_jid)
             j.resource = r
             yield j
 
     @property
     def user_muc_jid(self):
-        user_muc_jid = copy(self.jid)
-        user_muc_jid.resource = self.user_nick
+        _, user_muc_jid = escape_nickname(self.jid, self.user_nick)
         return user_muc_jid
 
     def _legacy_to_xmpp(self, legacy_id: LegacyMessageType):
@@ -782,7 +780,7 @@ class LegacyMUC(
                         self.session, stored, muc=self, contact=c
                     )
 
-        nickname = c.name or _unescape_node(c.jid_username)
+        nickname = c.name or unescape_node(c.jid_username)
 
         if self.pk is None:
             nick_available = True
@@ -990,7 +988,7 @@ class LegacyMUC(
 
         :param r: The resource to kick
         """
-        pto = self.user_jid
+        pto = JID(self.user_jid)
         pto.resource = r
         p = self.xmpp.make_presence(
             pfrom=(await self.get_user_participant()).jid, pto=pto

slidge-0.2.8/slidge/slixfix/__init__.py

@@ -0,0 +1,92 @@
+# This module contains patches for slixmpp; some have pending requests upstream
+# and should be removed on the next slixmpp release.
+
+# ruff: noqa: F401
+
+import logging
+
+import slixmpp.plugins
+import slixmpp.stanza.roster
+from slixmpp import InvalidJID, Message
+from slixmpp.plugins.xep_0050 import XEP_0050, Command
+from slixmpp.plugins.xep_0469.stanza import NS as PINNED_NS
+from slixmpp.plugins.xep_0469.stanza import Pinned
+from slixmpp.xmlstream import StanzaBase
+
+from . import (
+    link_preview,
+    xep_0077,
+    xep_0100,
+    xep_0153,
+    xep_0292,
+)
+
+
+# TODO: remove this when we pin slixmpp > 1.9.0
+def get_items(self):
+    items = {}
+    for item in self["substanzas"]:
+        if isinstance(item, slixmpp.stanza.roster.RosterItem):
+            try:
+                items[item["jid"]] = item.values
+            except InvalidJID:
+                logging.warning("Invalid JID in roster: %s", item)
+                continue
+            del items[item["jid"]]["jid"]
+            del items[item["jid"]]["lang"]
+    return items
+
+
+slixmpp.stanza.roster.Roster.get_items = get_items  # type:ignore
+
+
+def set_pinned(self, val: bool):
+    extensions = self.parent()
+    if val:
+        extensions.enable("pinned")
+    else:
+        extensions._del_sub(f"{{{PINNED_NS}}}pinned")
+
+
+Pinned.set_pinned = set_pinned
+
+
+def session_bind(self, jid):
+    self.xmpp["xep_0030"].add_feature(Command.namespace)
+    # awful hack to for the disco items: we need to comment this line
+    # related issue: https://todo.sr.ht/~nicoco/slidge/131
+    # self.xmpp['xep_0030'].set_items(node=Command.namespace, items=tuple())
+
+
+XEP_0050.session_bind = session_bind  # type:ignore
+
+
+def reply(self, body=None, clear=True):
+    """
+    Overrides slixmpp's Message.reply(), since it strips to sender's resource
+    for mtype=groupchat, and we do not want that, because when we raise an XMPPError,
+    we actually want to preserve the resource.
+    (this is called in RootStanza.exception() to handle XMPPErrors)
+    """
+    new_message = StanzaBase.reply(self, clear)
+    new_message["thread"] = self["thread"]
+    new_message["parent_thread"] = self["parent_thread"]
+
+    del new_message["id"]
+    if self.stream is not None and self.stream.use_message_ids:
+        new_message["id"] = self.stream.new_id()
+
+    if body is not None:
+        new_message["body"] = body
+    return new_message
+
+
+Message.reply = reply  # type: ignore
+
+
+slixmpp.plugins.PLUGINS.extend(
+    [
+        "link_preview",
+        "xep_0292_provider",
+    ]
+)