slidge 0.2.3.post1__tar.gz → 0.2.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.3.post1
+Version: 0.2.4
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -693,7 +693,7 @@ 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.codeberg.page/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-0.2.3.post1 → slidge-0.2.4}/README.md

@@ -4,7 +4,7 @@
 
 
 [![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.codeberg.page/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-0.2.3.post1 → slidge-0.2.4}/doap.xml

@@ -485,6 +485,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 +510,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.4}/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.4}/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.3.post1 → slidge-0.2.4}/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.4"
 readme = "README.md"
 
 [build-system]

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

{slidge-0.2.3.post1 → slidge-0.2.4}/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.4}/slidge/core/gateway.py

@@ -913,7 +913,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.4}/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.4}/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)

{slidge-0.2.3.post1 → slidge-0.2.4}/slidge/slixfix/__init__.py

@@ -5,17 +5,30 @@
 
 import slixmpp.plugins
 from slixmpp import Iq, Message
-from slixmpp.exceptions import XMPPError
+from slixmpp.exceptions import _DEFAULT_ERROR_TYPES, XMPPError
+from slixmpp.plugins.xep_0004.stanza.field import FormField
 from slixmpp.plugins.xep_0050 import XEP_0050, Command
 from slixmpp.plugins.xep_0231 import XEP_0231
 from slixmpp.plugins.xep_0425.stanza import Moderate
+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, xep_0356_old
+from . import (
+    link_preview,
+    xep_0077,
+    xep_0100,
+    xep_0153,
+    xep_0292,
+    xep_0356_old,
+    xep_0492,
+)
 
 # TODO: remove this when the fix is included in slixmpp
 Moderate.interfaces.add("id")
 
+_DEFAULT_ERROR_TYPES["policy-violation"] = "modify"  # type:ignore
+
 
 async def _handle_bob_iq(self, iq: Iq):
     cid = iq["bob"]["cid"]
@@ -42,6 +55,17 @@ async def _handle_bob_iq(self, iq: Iq):
         iq.send()
 
 
+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
+
+
 XEP_0231._handle_bob_iq = _handle_bob_iq
 
 
@@ -75,13 +99,56 @@ def reply(self, body=None, clear=True):
     return new_message
 
 
+Message.reply = reply  # type: ignore
+
+
+FormField.set_value_base = FormField.set_value  # type:ignore
+
+
+def set_value(self: FormField, value):
+    if not self._type:
+        if isinstance(value, bool):
+            self._type = "boolean"
+        elif isinstance(value, str):
+            self._type = "text-single"
+        elif isinstance(value, (list, tuple)):
+            self._type = "text-multi"
+
+    FormField.set_value_base(self, value)
+
+
+def get_value(self, convert=True, convert_list=False):
+    valsXML = self.xml.findall("{%s}value" % self.namespace)
+    if len(valsXML) == 0:
+        return None
+    elif self._type == "boolean":
+        if convert:
+            return valsXML[0].text in self.true_values
+        return valsXML[0].text
+    elif self._type in self.multi_value_types or len(valsXML) > 1:
+        values = []
+        for valXML in valsXML:
+            if valXML.text is None:
+                valXML.text = ""
+            values.append(valXML.text)
+        if self._type == "text-multi" and convert_list:
+            values = "\n".join(values)
+        return values
+    else:
+        if valsXML[0].text is None:
+            return ""
+        return valsXML[0].text
+
+
+FormField.set_value = set_value  # type:ignore
+FormField.get_value = get_value  # type:ignore
+
+
 slixmpp.plugins.PLUGINS.extend(
     [
         "link_preview",
         "xep_0292_provider",
         "xep_0356_old",
+        "xep_0492",
     ]
 )
-
-
-Message.reply = reply  # type: ignore

slidge-0.2.4/slidge/slixfix/xep_0492/__init__.py

@@ -0,0 +1,8 @@
+from slixmpp.plugins.base import register_plugin
+
+from . import stanza
+from .notify import XEP_0492
+
+register_plugin(XEP_0492)
+
+__all__ = ["stanza", "XEP_0492"]

slidge-0.2.4/slidge/slixfix/xep_0492/notify.py

@@ -0,0 +1,16 @@
+from slixmpp.plugins import BasePlugin
+from . import stanza
+
+
+class XEP_0492(BasePlugin):
+    """
+    XEP-0492: Chat notification settings
+    """
+
+    name = "xep_0492"
+    description = "XEP-0492: Chat notification settings"
+    dependencies = {"xep_0402"}
+    stanza = stanza
+
+    def plugin_init(self):
+        stanza.register_plugin()

slidge-0.2.4/slidge/slixfix/xep_0492/stanza.py

@@ -0,0 +1,102 @@
+from typing import Literal, Optional, cast
+
+from slixmpp import register_stanza_plugin
+from slixmpp.plugins.xep_0402.stanza import Extensions
+from slixmpp.xmlstream import ElementBase
+
+from ...util.types import ClientType
+
+NS = "urn:xmpp:notification-settings:0"
+
+WhenLiteral = Literal["never", "always", "on-mention"]
+
+
+class Notify(ElementBase):
+    """
+    Chat notification settings element
+
+
+    To enable it on a Conference element, use configure() like this:
+
+    .. code-block::python
+
+        # C being a Conference element
+        C['extensions']["notify"].configure("always", client_type="pc")
+
+    Which will add the <notify> element to the <extensions> element.
+    """
+
+    namespace = NS
+    name = "notify"
+    plugin_attrib = "notify"
+    interfaces = {"notify"}
+
+    def configure(self, when: WhenLiteral, client_type: Optional[ClientType] = None) -> None:
+        """
+        Configure the chat notification settings for this bookmark.
+
+        This method ensures that there are no conflicting settings, e.g.,
+        both a <never /> and a <always /> element.
+        """
+        cls = _CLASS_MAP[when]
+        element = cls()
+        if client_type is not None:
+            element["client-type"] = client_type
+
+        match = client_type if client_type is not None else ""
+        for child in self:
+            if isinstance(child, _Base) and child["client-type"] == match:
+                self.xml.remove(child.xml)
+
+        self.append(element)
+
+    def get_config(
+            self, client_type: Optional[ClientType] = None
+    ) -> Optional[WhenLiteral]:
+        """
+        Get the chat notification settings for this bookmark.
+
+        :param client_type: Optionally, get the notification for a specific client type.
+            If unset, returns the global notification setting.
+
+        :return: The chat notification setting as a string, or None if unset.
+        """
+        match = client_type if client_type is not None else ""
+        for child in self:
+            if isinstance(child, _Base) and child["client-type"] == match:
+                return cast(WhenLiteral, child.name)
+        return None
+
+
+class _Base(ElementBase):
+    namespace = NS
+    interfaces = {"client-type"}
+
+
+class Never(_Base):
+    name = "never"
+
+
+class Always(_Base):
+    name = "always"
+
+
+class OnMention(_Base):
+    name = "on-mention"
+
+
+class Advanced(ElementBase):
+    namespace = NS
+    name = plugin_attrib = "advanced"
+
+
+_CLASS_MAP = {
+    "never": Never,
+    "always": Always,
+    "on-mention": OnMention,
+}
+
+
+def register_plugin():
+    register_stanza_plugin(Extensions, Notify)
+    register_stanza_plugin(Notify, Advanced)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.3.post1
+Version: 0.2.4
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
@@ -693,7 +693,7 @@ 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.codeberg.page/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-0.2.3.post1 → slidge-0.2.4}/slidge.egg-info/SOURCES.txt

@@ -164,6 +164,9 @@ slidge/slixfix/xep_0292/vcard4.py
 slidge/slixfix/xep_0356_old/__init__.py
 slidge/slixfix/xep_0356_old/privilege.py
 slidge/slixfix/xep_0356_old/stanza.py
+slidge/slixfix/xep_0492/__init__.py
+slidge/slixfix/xep_0492/notify.py
+slidge/slixfix/xep_0492/stanza.py
 slidge/util/__init__.py
 slidge/util/archive_msg.py
 slidge/util/conf.py

{slidge-0.2.3.post1 → slidge-0.2.4}/tests/test_feature_restriction.py

@@ -31,7 +31,7 @@ async def test_single_emoji():
     form = await x.restricted_emoji_extended_feature()
     values = form.get_values()
     assert values.get("max_reactions_per_user") is None
-    assert values.get("allowlist") == "♥"
+    assert values.get("allowlist") == ["♥"]
 
 
 @pytest.mark.asyncio