slidge 0.2.7__py3-none-any.whl → 0.2.8__py3-none-any.whl

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"
+__version__ = "v0.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/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/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/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/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/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/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/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/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/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/slixfix/__init__.py

@@ -3,13 +3,12 @@
 
 # ruff: noqa: F401
 
+import logging
+
 import slixmpp.plugins
-from slixmpp import Iq, Message
-from slixmpp.exceptions import _DEFAULT_ERROR_TYPES, XMPPError
-from slixmpp.plugins.xep_0004.stanza.field import FormField
+import slixmpp.stanza.roster
+from slixmpp import InvalidJID, Message
 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
@@ -20,38 +19,25 @@ from . import (
     xep_0100,
     xep_0153,
     xep_0292,
-    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"]
+# 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
 
-    if iq["type"] == "result":
-        await self.api["set_bob"](iq["from"], None, iq["to"], args=iq["bob"])
-        self.xmpp.event("bob", iq)
-    elif iq["type"] == "get":
-        data = await self.api["get_bob"](iq["to"], None, iq["from"], args=cid)
 
-        if data is None:
-            raise XMPPError(
-                "item-not-found",
-                f"Bits of binary '{cid}' is not available.",
-            )
-
-        if isinstance(data, Iq):
-            data["id"] = iq["id"]
-            data.send()
-            return
-
-        iq = iq.reply()
-        iq.append(data)
-        iq.send()
+slixmpp.stanza.roster.Roster.get_items = get_items  # type:ignore
 
 
 def set_pinned(self, val: bool):
@@ -65,9 +51,6 @@ def set_pinned(self, val: bool):
 Pinned.set_pinned = set_pinned
 
 
-XEP_0231._handle_bob_iq = _handle_bob_iq
-
-
 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
@@ -101,52 +84,9 @@ def reply(self, body=None, clear=True):
 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_0492",
     ]
 )

slidge/util/jid_escaping.py

@@ -0,0 +1,52 @@
+from functools import lru_cache
+
+JID_ESCAPE_SEQUENCES = {
+    "\\20",
+    "\\22",
+    "\\26",
+    "\\27",
+    "\\2f",
+    "\\3a",
+    "\\3c",
+    "\\3e",
+    "\\40",
+    "\\5c",
+}
+
+
+JID_UNESCAPE_TRANSFORMATIONS = {
+    "\\20": " ",
+    "\\22": '"',
+    "\\26": "&",
+    "\\27": "'",
+    "\\2f": "/",
+    "\\3a": ":",
+    "\\3c": "<",
+    "\\3e": ">",
+    "\\40": "@",
+    "\\5c": "\\",
+}
+
+
+@lru_cache(1000)
+def unescape_node(node: str):
+    """Unescape a local portion of a JID."""
+    unescaped = []
+    seq = ""
+    for i, char in enumerate(node):
+        if char == "\\":
+            seq = node[i : i + 3]
+            if seq not in JID_ESCAPE_SEQUENCES:
+                seq = ""
+        if seq:
+            if len(seq) == 3:
+                unescaped.append(JID_UNESCAPE_TRANSFORMATIONS.get(seq, char))
+
+            # Pop character off the escape sequence, and ignore it
+            seq = seq[1:]
+        else:
+            unescaped.append(char)
+    return "".join(unescaped)
+
+
+ESCAPE_TABLE = "".maketrans({v: k for k, v in JID_UNESCAPE_TRANSFORMATIONS.items()})

{slidge-0.2.7.dist-info → slidge-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.7
+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<2,>=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.dist-info → slidge-0.2.8.dist-info}/RECORD

@@ -1,6 +1,6 @@
 slidge/__init__.py,sha256=S0tUjqpZlzsr8G4Y_1Xt-KCYB07qaknTB0OwHU8k29U,1587
 slidge/__main__.py,sha256=ydjUklOoavS4YlGfjRX_8BQN2DaSbaXPMi47RkOgcFI,37
-slidge/__version__.py,sha256=4G6eK4xrrezi8g1TxDqa6IID1uzOe-SonV8sT5-MrUs,165
+slidge/__version__.py,sha256=Zirtlo5Bp-7eCiwh-NWenCh2s-v0fenKkV8OFlv_O1Y,165
 slidge/main.py,sha256=vMJzhvUxbeuIXuHxXXs6lm_ShBjXiS9B5Li5Ge4vWPo,6238
 slidge/migration.py,sha256=4BJmPIRB56_WIhRTqBFIIBXuvnhhBjjOMl4CE7jY6oc,1541
 slidge/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -13,11 +13,11 @@ slidge/command/chat_command.py,sha256=z-4qp03rK7kCh3_kEozDViwkDg_hVjHvRCiYYJxedB
 slidge/command/register.py,sha256=BduDI31Kx8CbWWEdjybimTA5Wcfhn-Jkt8sSPsySCpo,6724
 slidge/command/user.py,sha256=fLh5d7XTSXicj6g0I80F5n6BFaA20PaYoXFkfDOR4zA,12303
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
-slidge/contact/contact.py,sha256=ITcjW_3VMdVEHQfqxscpIULnofZBJ841wvnYwOvk1Tc,22934
-slidge/contact/roster.py,sha256=x3speGdHbZ-VTLoQLQW4s53rBeBvW87W8ZibCCZSLDA,10300
+slidge/contact/contact.py,sha256=CLWuNLvWuODi1mlT6MFGx9s3y8yGPM8ZEsH-Ih6QEn8,22929
+slidge/contact/roster.py,sha256=19EYyX-usuevMob9AgnQmSt6APdE5MxMroHOYmVYt-w,10205
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/config.py,sha256=OjJfpXJaDhMxRB-vYA0cqkSf0fwMt-HMThM8GS1htCg,7964
-slidge/core/gateway.py,sha256=qdvLGh5GF823mACVw5j1WLYMzsSmeGpmQFuWvz5Z9AU,37028
+slidge/core/gateway.py,sha256=6qu3Ca5e3Kxtfm343zz43Iqjpw7cxZ1A7LC3bUdkDLo,37457
 slidge/core/pubsub.py,sha256=BoeYE__ptmRAn4x55Hn_6JWRA4nM-XJgDemG5Cy5kN4,11959
 slidge/core/session.py,sha256=Y6psOKm_lv4q7yXARiLuijvSebuS64NjqSNF1WARtHM,28439
 slidge/core/dispatcher/__init__.py,sha256=1EXcjXietUKlxEqdrCWCV3xZ3q_DSsjHoqWrPMbtYao,84
@@ -26,7 +26,7 @@ slidge/core/dispatcher/disco.py,sha256=j56VY9NIFzwPEWFKQQZ7YIqS9GdD-ZaF_K8a2L-Jv
 slidge/core/dispatcher/presence.py,sha256=X4i-JjQ423gXiveJH7sjdwW_67rJiSYS7jIvkm1XsJg,6421
 slidge/core/dispatcher/registration.py,sha256=Xmbw9NF3LUppCOa3XzreopdKDitZnwl_5HE-kds74n8,3155
 slidge/core/dispatcher/search.py,sha256=9cGj0wwvyYlP_Yk440Y12sgo4Y1p-JWUDSJP5Zxch0M,3296
-slidge/core/dispatcher/session_dispatcher.py,sha256=vNaOJpHKGTzIyQJX457IvhbooKFN5JR3HA7XW0AArFI,2868
+slidge/core/dispatcher/session_dispatcher.py,sha256=Gzq2IPThhzQ0_mCVKPCNHypIXgL-WnZalTyLMjUX9Hs,3148
 slidge/core/dispatcher/util.py,sha256=YtXyVxM3orE7aYWs-GbJumtLTI63OpaQY_t4FMTjoZo,5754
 slidge/core/dispatcher/vcard.py,sha256=Rmx-wCz6Lps0mXCO48HppNQlS3GOgMuzuw9hZYBdlVU,5130
 slidge/core/dispatcher/message/__init__.py,sha256=vpDGOc_U9XvkUU_ws9n9-5M2NPJ87XGTVpuIxM7Z99k,223
@@ -47,7 +47,7 @@ slidge/core/mixins/db.py,sha256=5Qpegd7D8e5TLXLLINYcf_DuVdN-7wNmsfztUuFYPcU,442
 slidge/core/mixins/disco.py,sha256=jk3Z1B6zTuisHv8VKNRJodIo0ee5btYHh2ZrlflPj_Q,3670
 slidge/core/mixins/lock.py,sha256=Vf1rrkbyNbSprr38WGfZiMgTB7AdbqH8ppFHY8N2yXE,975
 slidge/core/mixins/message.py,sha256=X8Ka8j0nOnBcecYE_YuK8_J7MeO5-R0TIZw4X8c7R3Y,7846
-slidge/core/mixins/message_maker.py,sha256=TcCutHi0sIwL6beJNkN7XyR0aDIbA0xZyxd2Gc9ulG4,6022
+slidge/core/mixins/message_maker.py,sha256=_sa0YWyxnvI0DcPgoh6h1CxLbYF73Ezw1LRZN2CNRTM,6025
 slidge/core/mixins/message_text.py,sha256=pCY4tezEuwB2ZuUyUi72i4v9AJkxp_SWF1jrFsn94Ns,8096
 slidge/core/mixins/presence.py,sha256=yywo6KAw8C7GaZSMrSMuioNfhW08MrnobHt8XbHd0q8,7891
 slidge/core/mixins/recipient.py,sha256=b0uFnpym-hOFgYxGjXT1xQcZ4YRbDSBftPcNWLzSwEI,1336
@@ -55,7 +55,7 @@ slidge/db/__init__.py,sha256=EBDH1JSEhgqYcli2Bw11CRC749wJk8AOucgBzmhDSvU,105
 slidge/db/avatar.py,sha256=z5e72STv8PdN6zkNyKlLqF7NFxHwCa6IjwgFpzu5ghE,8033
 slidge/db/meta.py,sha256=v1Jf-npZ28QwdGpsLQWLBHEbEP3-jnPrygRg05tJ_Iw,1831
 slidge/db/models.py,sha256=MSVNW04x05qfxahvjCYRDFjfFP-XXp-lOHnK5IqFCXw,14046
-slidge/db/store.py,sha256=ETk6oUUEz8-YUFGCh7nspSJH7dFOj8qeIWLQhX4nOH8,47051
+slidge/db/store.py,sha256=AjbeYAbhd_7KHS094vTEPiuecu_ntIAlpyzsrCIjHHE,47155
 slidge/db/alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/db/alembic/env.py,sha256=hsBlRNs0zF5diSHGRSa8Fi3qRVQDA2rJdR41AEIdvxc,1642
 slidge/db/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
@@ -78,11 +78,11 @@ slidge/db/alembic/versions/b64b1a793483_add_source_and_legacy_id_for_archived_.p
 slidge/db/alembic/versions/c4a8ec35a0e8_per_room_user_nick.py,sha256=jjQmlRv6nqdm5q6LbwVpSUSkTBj1c76Hiq8e8q77q3g,933
 slidge/db/alembic/versions/e91195719c2c_store_users_avatars_persistently.py,sha256=8Ga3VFgKrzMs_-B8OPtfP-0rey_MFaDg-QGtSbaft3o,640
 slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
-slidge/group/archive.py,sha256=IPqklzo0UN3lPHckfsKW9c4nl3m_9XGY4u0eehrhe8k,5281
-slidge/group/bookmarks.py,sha256=AvFL34bEX6n3OP1Np309T5hrLK9GnjkjdyLJ3uiLZyc,6616
-slidge/group/participant.py,sha256=cUuyJRGq8AIHrwtubje5cyb5hHY2hGLtGboBju4SI0c,17781
-slidge/group/room.py,sha256=IilOT_Z5P-gh0lo5KLFc054z6sOrxJQ6MvjPmLKXiRs,49011
-slidge/slixfix/__init__.py,sha256=Og6_EAuWst6paWmDiGqeqQH6Iof6V8Vkr5pyYisgjsw,4282
+slidge/group/archive.py,sha256=AUzVtXlHiCreyY3jp1XMt0G7LDNm-qOU-4CEPQ89ics,5445
+slidge/group/bookmarks.py,sha256=uGw_XtF0nloZ7rhNLdKM0nNZZb5C6SBfTsLyZryxjxY,6592
+slidge/group/participant.py,sha256=h9Cz4liCWzCaysvDk4wr8-zHvLOyIoM3vvQWzHCdpFE,17690
+slidge/group/room.py,sha256=UlmgIwZDjCyxXtAjQGVHo1xZoU9lq2WR7blwC9BAriY,49019
+slidge/slixfix/__init__.py,sha256=opamnCRI89KtCY2jfUrzij423hROgMF_Jw8Rrv1i0pw,2515
 slidge/slixfix/delivery_receipt.py,sha256=3bWdZH3-X3CZJXmnI_TpjkTUUK-EY4Ktm78lW0-40fc,1366
 slidge/slixfix/roster.py,sha256=KvDjh9q7pqaZf69H93okfib13cc95uVZUJ6rzpqmDaU,1704
 slidge/slixfix/link_preview/__init__.py,sha256=TDPTSEH5FQxgGpQpQIde-D72AHg-6YVWG-tOj4KpKmU,290
@@ -98,17 +98,15 @@ slidge/slixfix/xep_0153/__init__.py,sha256=hsEldnLuzvcp0NqSscxPV7FJl-6GFP372vlDg
 slidge/slixfix/xep_0153/vcard_avatar.py,sha256=py-qzj1jmmzsM4GCTKLRW7cAdAmSVjodp6q0r5B0RqQ,458
 slidge/slixfix/xep_0292/__init__.py,sha256=_MvS9wGra6ig3P_dPAVlCPDJkiOFvUWGjaRsHj1woUg,98
 slidge/slixfix/xep_0292/vcard4.py,sha256=jL-TOW3eG2QXLduSLNq03L8HoUNmvy8kTZI5ojvo6GE,358
-slidge/slixfix/xep_0492/__init__.py,sha256=kjWVeX3SG_2ohHx0fuMh1gmM2G57Bl6SRo7Mfv6sglA,161
-slidge/slixfix/xep_0492/notify.py,sha256=8EPSdU3rTzWkHNm8oFr0tK2PmMJ6hBAIr88GoOmHTuQ,340
-slidge/slixfix/xep_0492/stanza.py,sha256=TlwyAHozA6zu32QoBb6M12xqWR-ytT0F9XVFqZkd4d4,2895
 slidge/util/__init__.py,sha256=BELovoTMPcPPGz3D48esBr8A4BRRHXTvavfgnArBgEc,301
 slidge/util/archive_msg.py,sha256=xXAR0BI5r3d6KKWjae9594izCOv6iI03z2WLuTecNw8,1724
 slidge/util/conf.py,sha256=1j2OnOsCBar1tOObErhXR5RC3Vl3faliOZ1U8J3My58,6613
+slidge/util/jid_escaping.py,sha256=pWJTrB6-M923a_rEE-nxPmiDTOx9UCMa8UgE7JbLC0c,1066
 slidge/util/test.py,sha256=l1VHBsw5Uzk2t7wtkfb9kWvtehcYhw1t_d567JAJFKA,14135
 slidge/util/types.py,sha256=R_xfS5mRL0XUJIoDpnaAkZlTOoLPerduXBFftaVwIAI,5489
 slidge/util/util.py,sha256=IfyYLkujW6Pk0kvHpfkpQwejFDHSe5oR4_bczEUnhjs,9678
-slidge-0.2.7.dist-info/METADATA,sha256=u5B3zAw9h1inyIcHrGvr23-GNtI7Ba4gHNXLRmTtktc,44841
-slidge-0.2.7.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-slidge-0.2.7.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.2.7.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.2.7.dist-info/RECORD,,
+slidge-0.2.8.dist-info/METADATA,sha256=_Ugh-_g55rL-uqTZ16WU-Nfo--8JO74xfLfIh75twEg,44841
+slidge-0.2.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+slidge-0.2.8.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.2.8.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.2.8.dist-info/RECORD,,

{slidge-0.2.7.dist-info → slidge-0.2.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

slidge/slixfix/xep_0492/__init__.py

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

slidge/slixfix/xep_0492/notify.py

@@ -1,16 +0,0 @@
-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/slixfix/xep_0492/stanza.py

@@ -1,107 +0,0 @@
-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"
-    plugin_attrib = name
-
-
-class Always(_Base):
-    name = "always"
-    plugin_attrib = name
-
-
-class OnMention(_Base):
-    name = "on-mention"
-    plugin_attrib = name
-
-
-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)
-    register_stanza_plugin(Notify, Never, iterable=True)
-    register_stanza_plugin(Notify, Always, iterable=True)
-    register_stanza_plugin(Notify, OnMention, iterable=True)