slidge 0.2.3.post1__tar.gz → 0.2.5__tar.gz

{slidge-0.2.3.post1 → slidge-0.2.5}/.woodpecker/package.yaml

@@ -13,6 +13,10 @@ steps:
   version:
     image: codeberg.org/slidge/woodpecker-version
 
+  changelog:
+    image: codeberg.org/slidge/woodpecker-generate-changelog
+    pull: true
+
   build:
     image: *image
     commands:
@@ -49,3 +53,4 @@ steps:
         - dist/slidge*
       api_key:
         from_secret: CODEBERG_TOKEN
+      note: CHANGELOG

{slidge-0.2.3.post1 → slidge-0.2.5}/.woodpecker/test.yaml

@@ -60,5 +60,5 @@ steps:
       token:
         from_secret: CODEBERG_TOKEN
       html-root: htmlcov
-      root: coverage
+      prefix: coverage
     <<: *only-once

{slidge-0.2.3.post1 → slidge-0.2.5}/Dockerfile

@@ -71,7 +71,7 @@ FROM base AS dev
 
 USER root
 
-COPY --from=docker.io/nicocool84/slidge-prosody-dev:latest \
+COPY --from=codeberg.org/slidge/prosody-slidge-dev:latest \
   /etc/prosody/certs/localhost.crt \
   /usr/local/share/ca-certificates/
 RUN update-ca-certificates

{slidge-0.2.3.post1/slidge.egg-info → slidge-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.3.post1
+Version: 0.2.5
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -669,7 +669,8 @@ Project-URL: Homepage, https://codeberg.org/slidge/
 Project-URL: Issues, https://codeberg.org/slidge/slidge/issues
 Project-URL: Repository, https://codeberg.org/slidge/slidge/
 Project-URL: Chat room, https://conference.nicoco.fr:5281/muc_log/slidge/
-Project-URL: Documentation, https://slidge.codeberg.page/docs/main
+Project-URL: Documentation, https://slidge.im/docs/slidge/main
+Project-URL: changelog, https://codeberg.org/slidge/slidge/releases
 Keywords: xmpp,gateway,bridge,instant messaging
 Classifier: Topic :: Internet :: XMPP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
@@ -693,14 +694,14 @@ Requires-Dist: thumbhash>=0.1.2
 
 
 [![woodpecker CI status](https://ci.codeberg.org/api/badges/14027/status.svg)](https://ci.codeberg.org/repos/14027)
-[![coverage](https://slidge.codeberg.page/coverage/main/coverage.svg)](https://slidge.im/coverage)
+[![coverage](https://slidge.im/coverage/main/coverage.svg)](https://slidge.im/coverage/main)
 
 [![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
 [![debian unstable version](https://badges.debian.net/badges/debian/unstable/python3-slidge/version.svg)](https://packages.debian.org/unstable/python3-slidge)
 
 Slidge is an XMPP (puppeteer) gateway library in python.
 It makes
-[writing gateways to other chat networks](https://slidge.im/core/dev/tutorial.html)
+[writing gateways to other chat networks](https://slidge.im/docs/slidge/main/dev/tutorial.html)
 (*legacy modules*) as frictionless as possible.
 It supports fancy IM features, such as
 [(emoji) reactions](https://xmpp.org/extensions/xep-0444.html),
@@ -751,7 +752,7 @@ class Session(BaseSession):
         self.legacy_client.send_message(text=text, destination=chat.legacy_id)
 ```
 
-There's more in [the tutorial](https://slidge.codeberg.page/docs/main/dev/tutorial.html)!
+There's more in [the tutorial](https://slidge.im/docs/slidge/main/dev/tutorial.html)!
 
 Installation
 ------------
@@ -766,7 +767,7 @@ bundle.
 Slidge is available on
 [codeberg](https://codeberg.org/slidge/-/packages) (python packages and containers)
 and [pypi](https://pypi.org/project/slidge/).
-Refer to [the docs](https://slidge.codeberg.page/docs/main/admin/install.html) for details.
+Refer to [the docs](https://slidge.im/docs/slidge/main/admin/install.html) for details.
 
 About privacy
 -------------

{slidge-0.2.3.post1 → slidge-0.2.5}/README.md

@@ -4,14 +4,14 @@
 
 
 [![woodpecker CI status](https://ci.codeberg.org/api/badges/14027/status.svg)](https://ci.codeberg.org/repos/14027)
-[![coverage](https://slidge.codeberg.page/coverage/main/coverage.svg)](https://slidge.im/coverage)
+[![coverage](https://slidge.im/coverage/main/coverage.svg)](https://slidge.im/coverage/main)
 
 [![pypi version](https://badge.fury.io/py/slidge.svg)](https://pypi.org/project/slidge/)
 [![debian unstable version](https://badges.debian.net/badges/debian/unstable/python3-slidge/version.svg)](https://packages.debian.org/unstable/python3-slidge)
 
 Slidge is an XMPP (puppeteer) gateway library in python.
 It makes
-[writing gateways to other chat networks](https://slidge.im/core/dev/tutorial.html)
+[writing gateways to other chat networks](https://slidge.im/docs/slidge/main/dev/tutorial.html)
 (*legacy modules*) as frictionless as possible.
 It supports fancy IM features, such as
 [(emoji) reactions](https://xmpp.org/extensions/xep-0444.html),
@@ -62,7 +62,7 @@ class Session(BaseSession):
         self.legacy_client.send_message(text=text, destination=chat.legacy_id)
 ```
 
-There's more in [the tutorial](https://slidge.codeberg.page/docs/main/dev/tutorial.html)!
+There's more in [the tutorial](https://slidge.im/docs/slidge/main/dev/tutorial.html)!
 
 Installation
 ------------
@@ -77,7 +77,7 @@ bundle.
 Slidge is available on
 [codeberg](https://codeberg.org/slidge/-/packages) (python packages and containers)
 and [pypi](https://pypi.org/project/slidge/).
-Refer to [the docs](https://slidge.codeberg.page/docs/main/admin/install.html) for details.
+Refer to [the docs](https://slidge.im/docs/slidge/main/admin/install.html) for details.
 
 About privacy
 -------------

slidge-0.2.5/commitlint.config.js

@@ -0,0 +1,30 @@
+// This files defines the allowed "headers" for the commit messages.
+// Following the rules makes the changelog generation easier.
+// They come from angular conventions, unless commented.
+const Configuration = {
+  extends: ['@commitlint/config-conventional'],
+  rules: {
+    'type-enum':
+      [
+        2,
+        'always',
+        [
+          'build',
+          'chore',
+          'ci',
+          'docs',
+          'feat',
+          'fix',
+          'perf',
+          'refactor',
+          'revert',
+          'style',
+          'test',
+          'compat',  // workaround to play nice with non-compliant clients or servers; ideally reverted once fixed upstream
+          'cfix', // fixes an unreleased commit, should not appear in changelog
+        ]
+      ],
+  },
+}
+
+module.exports = Configuration

{slidge-0.2.3.post1 → slidge-0.2.5}/dev/confs/slidge-example.ini

@@ -1,4 +1,4 @@
-# More info at https://slidge.codeberg.page/docs/main/admin/config
+# More info at https://slidge.im/docs/slidge/main/admin/config
 
 # The slidge 'plugin' to use, ie, the name of the legacy service
 # legacy-module=slidge.plugins.discord

{slidge-0.2.3.post1 → slidge-0.2.5}/doap.xml

@@ -410,6 +410,12 @@
             <xmpp:note>Will implement if useful for a plugin.</xmpp:note>
         </xmpp:SupportedXep>
     </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0384.html"/>
+            <xmpp:status>complete</xmpp:status>
+        </xmpp:SupportedXep>
+    </implements>
     <implements>
         <xmpp:SupportedXep>
             <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0385.html"/>
@@ -485,6 +491,14 @@
             <xmpp:note>Legacy service to XMPP attachments have SFS metadata when possible. Not supported from XMPP to legacy service</xmpp:note>
         </xmpp:SupportedXep>
     </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0469.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.1.0</xmpp:version>
+            <xmpp:note>Relies on being a privileged entity (XEP-0356), to edit bookmark entries.</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
     <implements>
         <xmpp:SupportedXep>
             <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0486.html"/>
@@ -502,5 +516,13 @@
             <xmpp:note>Slidge supports listening to MDS events and triggering "legacy MDS" events, if added to the PEP MDS node, which is done automatically if XEP-0356 IQ privileges are set. Slidge also support updating MDS node in reaction to "legacy MDS" events.</xmpp:note>
         </xmpp:SupportedXep>
     </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0492.html"/>
+            <xmpp:status>partial</xmpp:status>
+            <xmpp:version>0.1.0</xmpp:version>
+            <xmpp:note>Per client-type setting is not supported.</xmpp:note>
+        </xmpp:SupportedXep>
+    </implements>
 </Project>
 </rdf:RDF>

{slidge-0.2.3.post1 → slidge-0.2.5}/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - prosody
 
   prosody:
-    image: docker.io/nicocool84/slidge-prosody-dev:latest
+    image: codeberg.org/slidge/slidge-prosody-dev:latest
     ports:
       - "127.0.0.1:5281:5281"  # XMPP port for clients to connect to
       - "127.0.0.1:5222:5222"  # prosody's http_file_share

{slidge-0.2.3.post1 → slidge-0.2.5}/docs/source/admin/install.rst

@@ -5,7 +5,7 @@ Installation
 Dockerhub
 ---------
 
-Containers for arm64 and amd64 are available on `docker hub <https://hub.docker.com/u/nicocool84>`_.
+Containers for arm64 and amd64 are available on `codeberg <https://codeberg.org/slidge/-/packages?q=&type=container>`_.
 The slidge-whatsapp arm64 container is kindly provided by `raver <https://hub.docker.com/u/ravermeister>`_.
 See :ref:`Containers` for more details.
 

slidge-0.2.5/docs/source/admin/note.rst

@@ -0,0 +1,12 @@
+.. note::
+
+  For legacy module-specific options, refer to their own docs:
+  `matridge <https://slidge.im/docs/matridge/main/config.html>`_,
+  `matteridge <https://slidge.im/docs/matteridge/main/config.html>`_,
+  `messlidger <https://slidge.im/docs/messlidger/main/config.html>`_,
+  `skidge <https://slidge.im/docs/skidge/main/config.html>`_,
+  `sleamdge <https://slidge.im/docs/sleamdge/main/config.html>`_,
+  `slidcord <https://slidge.im/docs/slidcord/main/config.html>`_,
+  `slidge-whatsapp <https://slidge.im/docs/slidge-whatsapp/main/config.html>`_,
+  `slidgnal <https://slidge.im/docs/slidgnal/main/config.html>`_,
+  `slidgram <https://slidge.im/docs/slidgram/main/config.html>`_.

{slidge-0.2.3.post1 → slidge-0.2.5}/docs/source/dev/tutorial.rst

@@ -40,7 +40,7 @@ Put this in a file called ``superduper.py``:
             contact = await self.contacts.by_legacy_id(msg.sender)
             contact.send_text(msg.text)
 
-        async def send_text(self, chat: Recipient, text: str, *kwargs):
+        async def on_text(self, chat: Recipient, text: str, *kwargs):
             self.legacy.send_message(text=text, destination=chat.legacy_id)
 
 
@@ -123,7 +123,7 @@ From XMPP to legacy
 
 .. code-block:: python
 
-        async def send_text(self, chat: Recipient, text: str, **kwargs):
+        async def on_text(self, chat: Recipient, text: str, **kwargs):
             self.legacy.send_message(text=text, destination=chat.legacy_id)
 
 When our user sends a message to ``something@superduper.example.org``,

slidge-0.2.5/docs/source/user/note.rst

@@ -0,0 +1,13 @@
+.. note::
+
+  These are the generic user docs for slidge. For
+  :term:`Legacy Network`-specific docs, follow these links:
+  `matridge <https://slidge.im/docs/matridge/main/user.html>`_,
+  `matteridge <https://slidge.im/docs/matteridge/main/user.html>`_,
+  `messlidger <https://slidge.im/docs/messlidger/main/user.html>`_,
+  `skidge <https://slidge.im/docs/skidge/main/user.html>`_,
+  `sleamdge <https://slidge.im/docs/sleamdge/main/user.html>`_,
+  `slidcord <https://slidge.im/docs/slidcord/main/user.html>`_,
+  `slidge-whatsapp <https://slidge.im/docs/slidge-whatsapp/main/user.html>`_,
+  `slidgnal <https://slidge.im/docs/slidgnal/main/user.html>`_,
+  `slidgram <https://slidge.im/docs/slidgram/main/user.html>`_.

{slidge-0.2.3.post1 → slidge-0.2.5}/pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 keywords = ["xmpp", "gateway", "bridge", "instant messaging"]
-version = "v0.2.3.post1"
+version = "v0.2.5"
 readme = "README.md"
 
 [build-system]
@@ -42,7 +42,8 @@ Homepage = "https://codeberg.org/slidge/"
 Issues = "https://codeberg.org/slidge/slidge/issues"
 Repository = "https://codeberg.org/slidge/slidge/"
 "Chat room" = "https://conference.nicoco.fr:5281/muc_log/slidge/"
-Documentation = "https://slidge.codeberg.page/docs/main"
+Documentation = "https://slidge.im/docs/slidge/main"
+changelog = "https://codeberg.org/slidge/slidge/releases"
 
 [dependency-groups]
 dev = [
@@ -115,3 +116,53 @@ publish-url = "https://codeberg.org/api/packages/slidge/pypi"
 # FIXME: remove this when the setuptools upstream bug is fixed
 # https://github.com/astral-sh/uv/issues/9513#issuecomment-2519527822
 license-files = []
+
+
+[tool.git-cliff.remote.gitea]
+owner = "slidge"
+repo = "slidge"
+
+[tool.git-cliff.changelog]
+header = """
+<!-- write something cool about the release here! -->
+
+# Changes
+"""
+body = """
+{% for group, commits in commits | group_by(attribute="group") %}
+    ## {{ group | striptags | trim | upper_first }}
+    {% for commit in 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 }})\
+    {% endfor %}
+{% endfor %}\n
+"""
+footer = """
+<!-- generated by git-cliff -->
+"""
+
+[tool.git-cliff.git]
+conventional_commits = true
+filter_unconventional = false
+commit_parsers = [
+  { message = "^feat", group = "<!-- 0 -->🚀 Features" },
+  { message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },
+  { message = "^compat", group = "<!-- 2 -->💑 Compatibility" },
+  { message = "^refactor", group = "<!-- 3 -->🚜 Refactor" },
+  { message = "^doc", group = "<!-- 4 -->📚 Documentation" },
+  { message = "^perf", group = "<!-- 5 -->⚡ Performance" },
+  { message = "^style", group = "<!-- 6 -->🎨 Styling" },
+  { message = "^test", group = "<!-- 7 -->🧪 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 = "<!-- 8 -->⚙️ Miscellaneous Tasks" },
+  { body = ".*security", group = "<!-- 9 -->🛡️ Security" },
+  { message = "^revert", group = "<!-- 10 -->◀️ Revert" },
+  { message = ".*", group = "<!-- 11 -->💼 Other" },
+]

{slidge-0.2.3.post1 → slidge-0.2.5}/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.3.post1"
+__version__ = "v0.2.5"

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/command/base.py

@@ -293,12 +293,16 @@ class FormField:
         return value
 
     def __validate_list_multi(self, value: list[str]) -> Union[list[str], list[JID]]:
+        # COMPAT: all the "if v" and "if not v" are workarounds for https://codeberg.org/slidge/slidge/issues/43
+        # They should be reverted once the bug is fixed upstream, cf https://soprani.ca/todo/390
         for v in value:
             if v not in self.__acceptable_options():
+                if not v:
+                    continue
                 raise XMPPError("not-acceptable", f"Not a valid option: '{v}'")
         if self.type == "list-multi":
-            return value
-        return [JID(v) for v in value]
+            return [v for v in value if v]
+        return [JID(v) for v in value if v]
 
     def get_xml(self) -> SlixFormField:
         """

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/contact/contact.py

@@ -454,7 +454,7 @@ class LegacyContact(
         except PermissionError:
             warnings.warn(
                 "Slidge does not have privileges to add contacts to the roster. Refer"
-                " to https://slidge.codeberg.page/docs/main/admin/privilege.html for"
+                " to https://slidge.im/docs/slidge/main/admin/privilege.html for"
                 " more info."
             )
             if config.ROSTER_PUSH_PRESENCE_SUBSCRIPTION_REQUEST_FALLBACK:

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/core/config.py

@@ -187,7 +187,7 @@ MAM_MAX_DAYS__DOC = "Maximum number of days for group archive retention."
 CORRECTION_EMPTY_BODY_AS_RETRACTION = True
 CORRECTION_EMPTY_BODY_AS_RETRACTION__DOC = (
     "Treat last message correction to empty message as a retraction. "
-    "(this is what cheogram do for retraction)"
+    "(this is what cheogram does for retraction)"
 )
 
 ATTACHMENT_MAXIMUM_FILE_NAME_LENGTH = 200
@@ -220,3 +220,14 @@ STRIP_LEADING_EMOJI_ADHOC__DOC = (
     "Strip the leading emoji in ad-hoc command names, if present, in case you "
     "are a emoji-hater."
 )
+
+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."
+)
+
+WELCOME_MESSAGE: Optional[str] = None
+WELCOME_MESSAGE__DOC = (
+    "Overrides the default welcome message received by newly registered users."
+)

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/core/dispatcher/message/message.py

@@ -296,7 +296,10 @@ class MessageContentMixin(DispatcherMixin):
                 # no need to carbon for groups, we just don't echo the stanza
                 entity.react(legacy_id, carbon=True)  # type: ignore
             await session.on_react(entity, legacy_id, [], thread=thread)
-            raise XMPPError("not-acceptable", text=error_msg)
+            raise XMPPError(
+                "policy-violation",  # type:ignore
+                text=error_msg,
+            )
 
         await session.on_react(entity, legacy_id, emojis, thread=thread)
         if isinstance(entity, LegacyMUC):

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/core/gateway.py

@@ -254,6 +254,10 @@ class BaseGateway(
     http: aiohttp.ClientSession
 
     def __init__(self):
+        if config.COMPONENT_NAME:
+            self.COMPONENT_NAME = config.COMPONENT_NAME
+        if config.WELCOME_MESSAGE:
+            self.WELCOME_MESSAGE = config.WELCOME_MESSAGE
         self.log = log
         self.datetime_started = datetime.now()
         self.xmpp = self  # ugly hack to work with the BaseSender mixin :/
@@ -416,8 +420,14 @@ class BaseGateway(
         await self.plugin["xep_0115"].update_caps(jid=self.boundjid)
 
         if self.COMPONENT_AVATAR is not None:
-            cached_avatar = await avatar_cache.convert_or_get(self.COMPONENT_AVATAR)
-            self.avatar_pk = cached_avatar.pk
+            try:
+                cached_avatar = await avatar_cache.convert_or_get(self.COMPONENT_AVATAR)
+            except Exception as e:
+                log.exception("Could not set the component avatar.", exc_info=e)
+                cached_avatar = None
+            else:
+                assert cached_avatar is not None
+                self.avatar_pk = cached_avatar.pk
         else:
             cached_avatar = None
 
@@ -913,7 +923,9 @@ SLIXMPP_PLUGINS = [
     "xep_0444",  # Message reactions
     "xep_0447",  # Stateless File Sharing
     "xep_0461",  # Message replies
+    "xep_0469",  # Bookmark Pinning
     "xep_0490",  # Message Displayed Synchronization
+    "xep_0492",  # Chat Notification Settings
 ]
 
 LOG_STRIP_ELEMENTS = ["data", "binval"]

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/core/mixins/attachment.py

@@ -178,6 +178,7 @@ class AttachmentMixin(TextMessageMixin):
             file_path = temp_dir / file_name
             if file_url:
                 async with self.session.http.get(file_url) as r:
+                    r.raise_for_status()
                     with file_path.open("wb") as f:
                         f.write(await r.read())
 

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/core/mixins/message.py

@@ -183,7 +183,7 @@ class CarbonMessageMixin(ContentMessageMixin, MarkerMixin):
                 warnings.warn(
                     "Slidge does not have privileges to send message on behalf of"
                     " user.Refer to"
-                    " https://slidge.codeberg.page/docs/main/admin/privilege.html"
+                    " https://slidge.im/docs/slidge/main/admin/privilege.html"
                     " for more info."
                 )
 

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/core/mixins/recipient.py

@@ -21,9 +21,9 @@ class ReactionRecipientMixin:
         form["type"] = "result"
         form.add_field("FORM_TYPE", "hidden", value="urn:xmpp:reactions:0:restrictions")
         if self.REACTIONS_SINGLE_EMOJI:
-            form.add_field("max_reactions_per_user", value="1")
+            form.add_field("max_reactions_per_user", value="1", type="number")
         if available:
-            form.add_field("allowlist", value=list(available))
+            form.add_field("allowlist", value=list(available), type="text-multi")
         return form
 
     async def available_emojis(

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/core/pubsub.py

@@ -207,7 +207,8 @@ class PubSubComponent(NamedLockMixin, BasePlugin):
     ) -> PepAvatar:
         if stanza.get_to() == self.xmpp.boundjid.bare:
             item = PepAvatar()
-            item.set_avatar_from_cache(avatar_cache.get_by_pk(self.xmpp.avatar_pk))
+            if hasattr(self.xmpp, "avatar_pk"):
+                item.set_avatar_from_cache(avatar_cache.get_by_pk(self.xmpp.avatar_pk))
             return item
 
         if contact is None:

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/db/avatar.py

@@ -14,6 +14,7 @@ from multidict import CIMultiDictProxy
 from PIL.Image import Image
 from PIL.Image import open as open_image
 from sqlalchemy import select
+from sqlalchemy.orm.exc import DetachedInstanceError
 
 from slidge.core import config
 from slidge.db.models import Avatar
@@ -102,6 +103,7 @@ class AvatarCache:
             if response.status == HTTPStatus.NOT_MODIFIED:
                 log.debug("Using avatar cache for %s", url)
                 raise NotModified
+            response.raise_for_status()
             return (
                 open_image(io.BytesIO(await response.read())),
                 response.headers,
@@ -141,7 +143,24 @@ class AvatarCache:
                     )
                 except NotModified:
                     assert stored is not None
-                    return CachedAvatar.from_store(stored, self.dir)
+                    try:
+                        return CachedAvatar.from_store(stored, self.dir)
+                    except DetachedInstanceError:
+                        # This is an awful hack to prevent errors on startup under certain conditions,
+                        # because we basically misused SQLAlchemy pretty bad in slidge.db.store.EngineMixin.session().
+                        # cf https://codeberg.org/slidge/slidge/issues/36
+                        # and https://docs.sqlalchemy.org/en/20/orm/session_basics.html#session-faq-threadsafe
+                        # It may be related to threads as we only have reports of this for slidge-whatsapp and skidge
+                        # which are the only implementations that uses threads.
+                        # In any case, a proper fix implies a major refactoring in which we spawn and close SQLAlchemy
+                        # "ORM Session"s with a reasonable, well-thought lifetime, instead of how we do it now, where we
+                        # basically just brute-forced our way into having something usable but with poor performance.
+                        # Databases, asyncio, and concurrency in general are hard… :(
+                        # Oh, and getting rid of the convoluted mess that this giant method is would also probably
+                        # be a good idea.
+                        stored = self.store.get_by_url(avatar)
+                        assert stored is not None
+                        return CachedAvatar.from_store(stored, self.dir)
         else:
             img = await self._get_image(avatar)
             response_headers = None

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/db/store.py

@@ -58,6 +58,8 @@ class EngineMixin:
     def __init__(self, engine: Engine):
         self._engine = engine
 
+    # TODO: we should not have a global Session object but instead build Sessions with different parameters
+    #       depending on the context (startup, incoming XMPP event, incoming legacy event).
     @contextmanager
     def session(self, **session_kwargs) -> Iterator[Session]:
         global _session

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/group/participant.py

@@ -70,6 +70,7 @@ class LegacyParticipant(
         is_system=False,
         role: MucRole = "participant",
         affiliation: MucAffiliation = "member",
+        resource: str | None = None,
     ):
         self.session = session = muc.session
         self.xmpp = session.xmpp
@@ -83,7 +84,13 @@ class LegacyParticipant(
 
         self._nickname = nickname
 
-        self.__update_jid(nickname)
+        if resource is None:
+            self.__update_jid(nickname)
+        else:
+            self._nickname_no_illegal = resource
+            self.jid = JID(self.muc.jid)
+            self.jid.resource = resource
+
         log.debug("Instantiation of: %r", self)
 
         self.contact: Optional["LegacyContact"] = None
@@ -510,6 +517,7 @@ class LegacyParticipant(
             stored.nickname,
             role=stored.role,
             affiliation=stored.affiliation,
+            resource=stored.resource,
         )
         part.pk = stored.id
         if contact is not None:

{slidge-0.2.3.post1 → slidge-0.2.5}/slidge/group/room.py

@@ -26,6 +26,7 @@ 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 WhenLiteral
 from ..util import ABCSubclassableOnceAtMost
 from ..util.types import (
     HoleBound,
@@ -994,7 +995,14 @@ class LegacyMUC(
         p["muc"]["status_codes"] = {110, 333}
         p.send()
 
-    async def add_to_bookmarks(self, auto_join=True, invite=False, preserve=True):
+    async def add_to_bookmarks(
+        self,
+        auto_join=True,
+        invite=False,
+        preserve=True,
+        pin: bool | None = None,
+        notify: WhenLiteral | None = None,
+    ):
         """
         Add the MUC to the user's XMPP bookmarks (:xep:`0402')
 
@@ -1012,6 +1020,11 @@ class LegacyMUC(
             settings.
         :param preserve: preserve auto-join and bookmarks extensions
             set by the user outside slidge
+        :param pin: Pin the group chat bookmark :xep:`0469`. Requires privileged entity.
+            If set to ``None`` (default), the bookmark pinning status will be untouched.
+        :param notify: Chat notification setting: :xep:`0492`. Requires privileged entity.
+            If set to ``None`` (default), the setting will be untouched. Only the "global"
+            notification setting is supported (ie, per client type is not possible).
         """
         item = Item()
         item["id"] = self.jid
@@ -1046,6 +1059,13 @@ class LegacyMUC(
             item["conference"]["autojoin"] = auto_join
 
         item["conference"]["nick"] = self.user_nick
+
+        if pin is not None:
+            item["conference"]["extensions"]["pinned"] = pin
+
+        if notify is not None:
+            item["conference"]["extensions"]["notify"].configure(notify)
+
         iq = Iq(stype="set", sfrom=self.user_jid, sto=self.user_jid)
         iq["pubsub"]["publish"]["node"] = self.xmpp["xep_0402"].stanza.NS
         iq["pubsub"]["publish"].append(item)