slidge 0.2.4__tar.gz → 0.2.6__tar.gz

{slidge-0.2.4 → slidge-0.2.6}/.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.4 → slidge-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.4
+Version: 0.2.6
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -669,22 +669,22 @@ 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
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aiohttp[speedups]>=3.11.11
-Requires-Dist: alembic>=1.14.0
-Requires-Dist: configargparse>=1.7
+Requires-Dist: aiohttp[speedups]<4,>=3.11.11
+Requires-Dist: alembic<2,>=1.14.0
+Requires-Dist: configargparse<2,>=1.7
 Requires-Dist: defusedxml>=0.7.1
-Requires-Dist: pickle-secure>=0.99.9
-Requires-Dist: pillow>=11.0.0
-Requires-Dist: python-magic>=0.4.27
-Requires-Dist: qrcode>=8.0
-Requires-Dist: slixmpp>=1.8.6
-Requires-Dist: sqlalchemy>=2.0.36
+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<2,>=1.8.6
+Requires-Dist: sqlalchemy<3,>=2
 Requires-Dist: thumbhash>=0.1.2
 
 ![Slidge logo](https://codeberg.org/slidge/slidge/raw/branch/main/dev/assets/slidge-color-small.png)
@@ -693,14 +693,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/main)
+[![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 +751,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 +766,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.4 → slidge-0.2.6}/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/main)
+[![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.6/commitlint.config.js

@@ -0,0 +1,31 @@
+// 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
+          'imprv',  // improvement of an existing feature
+        ]
+      ],
+  },
+}
+
+module.exports = Configuration

{slidge-0.2.4 → slidge-0.2.6}/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.4 → slidge-0.2.6}/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"/>

slidge-0.2.6/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.4 → slidge-0.2.6}/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.6/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.4 → slidge-0.2.6}/pyproject.toml

@@ -3,16 +3,15 @@ name = "slidge"
 description = "XMPP bridging framework"
 requires-python = ">= 3.11"
 dependencies = [
-    "aiohttp[speedups]>=3.11.11",
-    "alembic>=1.14.0",
-    "configargparse>=1.7",
+    "aiohttp[speedups]>=3.11.11,<4",
+    "alembic>=1.14.0,<2",
+    "configargparse>=1.7,<2",
     "defusedxml>=0.7.1",
-    "pickle-secure>=0.99.9",
-    "pillow>=11.0.0",
-    "python-magic>=0.4.27",
-    "qrcode>=8.0",
-    "slixmpp>=1.8.6",
-    "sqlalchemy>=2.0.36",
+    "pillow>=11.0.0,<12",
+    "python-magic>=0.4.27,<0.5",
+    "qrcode>=8.0,<9",
+    "slixmpp>=1.8.6,<2",
+    "sqlalchemy>=2,<3",
     "thumbhash>=0.1.2",
 ]
 authors = [
@@ -24,7 +23,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 keywords = ["xmpp", "gateway", "bridge", "instant messaging"]
-version = "v0.2.4"
+version = "v0.2.6"
 readme = "README.md"
 
 [build-system]
@@ -42,7 +41,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 +115,54 @@ 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 = "^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 = "^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" },
+  { body = ".*security", group = "<!-- 10 -->🛡️ Security" },
+  { message = "^revert", group = "<!-- 11 -->◀️ Revert" },
+  { message = ".*", group = "<!-- 12 -->💼 Other" },
+]

{slidge-0.2.4 → slidge-0.2.6}/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.4"
+__version__ = "v0.2.6"

{slidge-0.2.4 → slidge-0.2.6}/slidge/command/adhoc.py

@@ -240,6 +240,14 @@ class AdhocProvider:
         :param iq:  the disco query IQ
         :return: commands accessible to the given JID will be listed
         """
+        if not self.xmpp.jid_validator.match(str(jid)) and jid not in config.ADMINS:
+            raise XMPPError(
+                "forbidden",
+                "You are not authorized to execute adhoc commands on this gateway. "
+                "If this is unexpected, ask your administrator to verify that "
+                "'user-jid-validator' is correctly set in slidge's configuration.",
+            )
+
         all_items = self.xmpp.plugin["xep_0030"].static.get_items(jid, node, None, None)
         log.debug("Static items: %r", all_items)
         if not all_items:

{slidge-0.2.4 → slidge-0.2.6}/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.4 → slidge-0.2.6}/slidge/command/user.py

@@ -172,6 +172,9 @@ class Login(Command):
 
     async def run(self, session: Optional[AnyBaseSession], _ifrom, *_):
         assert session is not None
+        if session.is_logging_in:
+            raise XMPPError("bad-request", "You are already logging in.")
+        session.is_logging_in = True
         try:
             msg = await session.login()
         except Exception as e:
@@ -179,6 +182,8 @@ class Login(Command):
             raise XMPPError(
                 "internal-server-error", etype="wait", text=f"Could not login: {e}"
             )
+        finally:
+            session.is_logging_in = False
         session.logged = True
         session.send_gateway_status(msg or "Re-connected", show="chat")
         session.send_gateway_message(msg or "Re-connected")

{slidge-0.2.4 → slidge-0.2.6}/slidge/contact/contact.py

@@ -448,13 +448,13 @@ class LegacyContact(
             log.debug("Roster push request by plugin ignored (--no-roster-push)")
             return
         try:
-            await self._set_roster(
+            await self.xmpp["xep_0356"].set_roster(
                 jid=self.user_jid, roster_items=self.get_roster_item()
             )
         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:
@@ -490,12 +490,6 @@ class LegacyContact(
                 nick,
             )
 
-    async def _set_roster(self, **kw):
-        try:
-            await self.xmpp["xep_0356"].set_roster(**kw)
-        except PermissionError:
-            await self.xmpp["xep_0356_old"].set_roster(**kw)
-
     def send_friend_request(self, text: Optional[str] = None):
         presence = self._make_presence(ptype="subscribe", pstatus=text, bare=True)
         self._send(presence, nick=True)

{slidge-0.2.4 → slidge-0.2.6}/slidge/core/config.py

@@ -68,7 +68,6 @@ USER_JID_VALIDATOR__DYNAMIC_DEFAULT = True
 ADMINS: tuple[JIDType, ...] = ()
 ADMINS__DOC = "JIDs of the gateway admins"
 
-
 UPLOAD_SERVICE: Optional[str] = None
 UPLOAD_SERVICE__DOC = (
     "JID of an HTTP upload service the gateway can use. "
@@ -76,9 +75,6 @@ UPLOAD_SERVICE__DOC = (
     "discovery."
 )
 
-SECRET_KEY: Optional[str] = None
-SECRET_KEY__DOC = "Encryption for disk storage. Deprecated."
-
 NO_ROSTER_PUSH = False
 NO_ROSTER_PUSH__DOC = "Do not fill users' rosters with legacy contacts automatically"
 
@@ -187,7 +183,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 +216,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.4 → slidge-0.2.6}/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
 
@@ -505,6 +515,7 @@ class BaseGateway(
     @timeit
     async def login_wrap(self, session: "BaseSession"):
         session.send_gateway_status("Logging in…", show="dnd")
+        session.is_logging_in = True
         try:
             status = await session.login()
         except Exception as e:
@@ -798,7 +809,9 @@ class BaseGateway(
 
     async def unregister_user(self, user: GatewayUser):
         self.send_presence(
-            pshow="busy", pstatus="You are not registered to this gateway anymore."
+            pshow="dnd",
+            pstatus="You unregistered from this gateway.",
+            pto=user.jid,
         )
         await self.xmpp.plugin["xep_0077"].api["user_remove"](None, None, user.jid)
         await self.xmpp.session_cls.kill_by_jid(user.jid)
@@ -903,7 +916,6 @@ SLIXMPP_PLUGINS = [
     "xep_0333",  # Chat markers
     "xep_0334",  # Message Processing Hints
     "xep_0356",  # Privileged Entity
-    "xep_0356_old",  # Privileged Entity (old namespace)
     "xep_0363",  # HTTP file upload
     "xep_0385",  # Stateless in-line media sharing
     "xep_0402",  # PEP Native Bookmarks

{slidge-0.2.4 → slidge-0.2.6}/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.4 → slidge-0.2.6}/slidge/core/mixins/message.py

@@ -177,15 +177,12 @@ class CarbonMessageMixin(ContentMessageMixin, MarkerMixin):
         try:
             self.xmpp["xep_0356"].send_privileged_message(msg)
         except PermissionError:
-            try:
-                self.xmpp["xep_0356_old"].send_privileged_message(msg)
-            except PermissionError:
-                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"
-                    " for more info."
-                )
+            warnings.warn(
+                "Slidge does not have privileges to send message on behalf of"
+                " user.Refer to"
+                " https://slidge.im/docs/slidge/main/admin/privilege.html"
+                " for more info."
+            )
 
 
 class InviteMixin(MessageMaker):

{slidge-0.2.4 → slidge-0.2.6}/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.4 → slidge-0.2.6}/slidge/core/session.py

@@ -33,7 +33,7 @@ from ..util.types import (
     ResourceDict,
     Sticker,
 )
-from ..util.util import deprecated
+from ..util.util import deprecated, noop_coro
 
 if TYPE_CHECKING:
     from ..group.participant import LegacyParticipant
@@ -98,6 +98,7 @@ class BaseSession(
         self.ignore_messages = set[str]()
 
         self.contacts: LegacyRoster = LegacyRoster.get_self_or_unique_subclass()(self)
+        self.is_logging_in = False
         self._logged = False
         self.__reset_ready()
 
@@ -527,11 +528,13 @@ class BaseSession(
 
     @logged.setter
     def logged(self, v: bool):
+        self.is_logging_in = False
         self._logged = v
         if self.ready.done():
             if v:
                 return
             self.__reset_ready()
+            self.shutdown(logout=False)
         else:
             if v:
                 self.ready.set_result(True)
@@ -539,12 +542,15 @@ class BaseSession(
     def __repr__(self):
         return f"<Session of {self.user_jid}>"
 
-    def shutdown(self) -> asyncio.Task:
+    def shutdown(self, logout=True) -> asyncio.Task:
         for c in self.contacts:
             c.offline()
         for m in self.bookmarks:
             m.shutdown()
-        return self.xmpp.loop.create_task(self.logout())
+        if logout:
+            return self.xmpp.loop.create_task(self.logout())
+        else:
+            return self.xmpp.loop.create_task(noop_coro())
 
     @staticmethod
     def legacy_to_xmpp_msg_id(legacy_msg_id: LegacyMessageType) -> str:
@@ -657,6 +663,8 @@ class BaseSession(
             return
         for c in session.contacts:
             c.unsubscribe()
+        for m in session.bookmarks:
+            m.shutdown()
         user = cls.xmpp.store.users.get(jid)
         if user is None:
             log.warning("User not found during unregistration")

slidge-0.2.6/slidge/db/alembic/versions/04cf35e3cf85_add_participant_nickname_no_illegal.py

@@ -0,0 +1,33 @@
+"""Add Participant.nickname_no_illegal
+
+Revision ID: 04cf35e3cf85
+Revises: 15b0bd83407a
+Create Date: 2025-02-22 06:57:45.491326
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision: str = "04cf35e3cf85"
+down_revision: Union[str, None] = "15b0bd83407a"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("participant", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("nickname_no_illegal", sa.String(), nullable=True)
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("participant", schema=None) as batch_op:
+        batch_op.drop_column("nickname_no_illegal")