slidge 0.2.0b1__tar.gz → 0.2.2__tar.gz

{slidge-0.2.0b1 → slidge-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slidge
-Version: 0.2.0b1
+Version: 0.2.2
 Summary: XMPP bridging framework
 Home-page: https://sr.ht/~nicoco/slidge/
 License: AGPL-3.0-or-later

{slidge-0.2.0b1 → slidge-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "slidge"
-version = "0.2.0beta1"
+version = "0.2.2"
 description = "XMPP bridging framework"
 authors = ["Nicolas Cedilnik <nicoco@nicoco.fr>"]
 readme = "README.md"

{slidge-0.2.0b1 → slidge-0.2.2}/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__ = "0.2.0beta1"
+__version__ = "0.2.2"

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/command/base.py

@@ -245,7 +245,7 @@ class FormField:
             self.type = "text-private"
 
     def __acceptable_options(self) -> list[str]:
-        if not self.options:
+        if self.options is None:
             raise RuntimeError
         return [x["value"] for x in self.options]
 

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/command/chat_command.py

@@ -175,7 +175,9 @@ class ChatCommandProvider:
                 else:
                     if f.type == "list-multi":
                         msg.reply(
-                            "Multiple selection allowed, use a single space as a separator"
+                            "Multiple selection allowed, use new lines as a separator, ie, "
+                            "one selected item per line. To select no item, reply with a space "
+                            "(the punctuation)."
                         ).send()
                     if f.options:
                         for o in f.options:
@@ -202,7 +204,8 @@ class ChatCommandProvider:
                             ans = "false"
 
                     if f.type.endswith("multi"):
-                        form_values[f.var] = f.validate(ans.split(" "))
+                        choices = [] if ans == " " else ans.split("\n")
+                        form_values[f.var] = f.validate(choices)
                     else:
                         form_values[f.var] = f.validate(ans)
             result = await self.__wrap_handler(

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/command/register.py

@@ -75,7 +75,8 @@ class Register(Command):
         self.xmpp.event("user_register", Iq(sfrom=ifrom.bare))
         return self.SUCCESS_MESSAGE
 
-    async def run(self, _session, _ifrom, *_):
+    async def run(self, _session, ifrom: JID, *_):
+        self.xmpp.raise_if_not_allowed_jid(ifrom)
         return Form(
             title=f"Registration to '{self.xmpp.COMPONENT_NAME}'",
             instructions=self.xmpp.REGISTRATION_INSTRUCTIONS,
@@ -97,7 +98,7 @@ class Register(Command):
                 raise
 
         user = GatewayUser(
-            jid=ifrom.bare,
+            jid=JID(ifrom.bare),
             legacy_module_data=form_values if data is None else data,
         )
 

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/command/user.py

@@ -292,7 +292,7 @@ class Unregister(Command):
         user = self.xmpp.store.users.get(session.user_jid)
         assert user is not None
         await self.xmpp.unregister_user(user)
-        return "OK"
+        return "You are not registered anymore. Bye!"
 
 
 class LeaveGroup(Command):

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/contact/contact.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Generic, Iterable, Optional, Self, Union
 from xml.etree import ElementTree as ET
 
 from slixmpp import JID, Message, Presence
-from slixmpp.exceptions import IqError
+from slixmpp.exceptions import IqError, IqTimeout
 from slixmpp.plugins.xep_0292.stanza import VCard4
 from slixmpp.types import MessageTypes
 
@@ -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.readthedocs.io/en/latest/admin/xmpp_server.html for"
+                " to https://slidge.im/core/admin/privilege.html for"
                 " more info."
             )
             if config.ROSTER_PUSH_PRESENCE_SUBSCRIPTION_REQUEST_FALLBACK:
@@ -463,7 +463,7 @@ class LegacyContact(
                     "slidge is not allowed to manage your roster."
                 )
             return
-        except IqError as e:
+        except (IqError, IqTimeout) as e:
             self.log.warning("Could not add to roster", exc_info=e)
         else:
             # we only broadcast pubsub events for contacts added to the roster

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/contact/roster.py

@@ -4,7 +4,7 @@ import warnings
 from typing import TYPE_CHECKING, AsyncIterator, Generic, Iterator, Optional, Type
 
 from slixmpp import JID
-from slixmpp.exceptions import IqError, XMPPError
+from slixmpp.exceptions import IqError, IqTimeout, XMPPError
 from slixmpp.jid import JID_UNESCAPE_TRANSFORMATIONS, _unescape_node
 
 from ..core.mixins.lock import NamedLockMixin
@@ -210,7 +210,7 @@ class LegacyRoster(
                 self.session.user_jid.bare
             )
             user_roster = iq["roster"]["items"]
-        except (PermissionError, IqError):
+        except (PermissionError, IqError, IqTimeout):
             user_roster = None
 
         with self.__store.session() as orm:
@@ -232,7 +232,7 @@ class LegacyRoster(
                         self.session.user_jid.bare,
                         item,
                     )
-                except (PermissionError, IqError) as e:
+                except (PermissionError, IqError, IqTimeout) as e:
                     warnings.warn(f"Could not add to roster: {e}")
                 else:
                     contact._added_to_roster = True

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/core/dispatcher/presence.py

@@ -154,14 +154,13 @@ class PresenceHandlerMixin(DispatcherMixin):
             # when setting a status message, or going away, etc.
             return
 
-        # We can't use XMPPError here because from must be room@slidge/VALID-USER-NICK
+        # We can't use XMPPError here because XMPPError does not have a way to
+        # add the <x xmlns="http://jabber.org/protocol/muc" /> element
 
-        error_from = JID(muc.jid)
-        error_from.resource = muc.user_nick
         error_stanza = p.error()
         error_stanza.set_to(p.get_from())
-        error_stanza.set_from(error_from)
-        error_stanza.enable("muc_join")
+        error_stanza.set_from(pto)
+        error_stanza.enable("muc_join")  # <x xmlns="http://jabber.org/protocol/muc" />
         error_stanza.enable("error")
         error_stanza["error"]["type"] = "cancel"
         error_stanza["error"]["by"] = muc.jid

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/core/dispatcher/session_dispatcher.py

@@ -2,7 +2,7 @@ import logging
 from typing import TYPE_CHECKING
 
 from slixmpp import Message
-from slixmpp.exceptions import IqError
+from slixmpp.exceptions import IqError, IqTimeout
 from slixmpp.plugins.xep_0084.stanza import Info
 
 from ..session import BaseSession
@@ -59,7 +59,7 @@ class SessionDispatcher(
                 iq = await self.xmpp.plugin["xep_0084"].retrieve_avatar(
                     session.user_jid, hash_, ifrom=self.xmpp.boundjid.bare
                 )
-            except IqError as e:
+            except (IqError, IqTimeout) as e:
                 session.log.warning("Could not fetch the user's avatar: %s", e)
                 return
             bytes_ = iq["pubsub"]["items"]["item"]["avatar_data"]["value"]

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/core/gateway.py

@@ -429,7 +429,7 @@ class BaseGateway(
             try:
                 await self["xep_0100"].add_component_to_roster(user.jid)
                 await self.__add_component_to_mds_whitelist(user.jid)
-            except IqError as e:
+            except (IqError, IqTimeout) as e:
                 # TODO: remove the user when this happens? or at least
                 # this can happen when the user has unsubscribed from the XMPP server
                 log.warning(
@@ -464,7 +464,7 @@ class BaseGateway(
                 "create the MDS node of %s",
                 user_jid,
             )
-        except IqError as e:
+        except (IqError, IqTimeout) as e:
             # conflict this means the node already exists, we can ignore that
             if e.condition != "conflict":
                 log.exception(
@@ -548,7 +548,7 @@ class BaseGateway(
                 self.xmpp.plugin["xep_0084"].stanza.MetaData.namespace,
                 ifrom=self.boundjid.bare,
             )
-        except IqError:
+        except (IqError, IqTimeout):
             self.xmpp.store.users.set_avatar_hash(session.user_pk, None)
             return
         await self.__dispatcher.on_avatar_metadata_info(
@@ -797,6 +797,9 @@ class BaseGateway(
             fut.set_exception(exception)
 
     async def unregister_user(self, user: GatewayUser):
+        self.send_presence(
+            pshow="busy", pstatus="You are not registered to this gateway anymore."
+        )
         await self.xmpp.plugin["xep_0077"].api["user_remove"](None, None, user.jid)
         await self.xmpp.session_cls.kill_by_jid(user.jid)
 

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/core/mixins/attachment.py

@@ -19,7 +19,7 @@ from xml.etree import ElementTree as ET
 import thumbhash
 from PIL import Image, ImageOps
 from slixmpp import JID, Message
-from slixmpp.exceptions import IqError
+from slixmpp.exceptions import IqError, IqTimeout
 from slixmpp.plugins.xep_0363 import FileUploadError
 from slixmpp.plugins.xep_0447.stanza import StatelessFileSharing
 
@@ -65,7 +65,7 @@ class AttachmentMixin(TextMessageMixin):
                 ifrom=config.UPLOAD_REQUESTER or self.xmpp.boundjid,
                 domain=JID(domain),
             )
-        except (FileUploadError, IqError) as e:
+        except (FileUploadError, IqError, IqTimeout) as e:
             warnings.warn(f"Something is wrong with the upload service: {e!r}")
             return None
         finally:
@@ -374,9 +374,20 @@ class AttachmentMixin(TextMessageMixin):
                 if xmpp_id == original_xmpp_id:
                     continue
                 self.retract(xmpp_id, thread)
+
+        if reply_to is not None and reply_to.body:
+            # We cannot have a "quote fallback" for attachments since most (all?)
+            # XMPP clients will only treat a message as an attachment if the
+            # body is the URL and nothing else.
+            reply_to_for_attachment: MessageReference | None = MessageReference(
+                reply_to.legacy_id, reply_to.author
+            )
+        else:
+            reply_to_for_attachment = reply_to
+
         msg = self._make_message(
             when=when,
-            reply_to=reply_to,
+            reply_to=reply_to_for_attachment,
             carbon=carbon,
             mto=mto,
             thread=thread,

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/core/mixins/message.py

@@ -172,7 +172,7 @@ class CarbonMessageMixin(ContentMessageMixin, MarkerMixin):
                 warnings.warn(
                     "Slidge does not have privileges to send message on behalf of"
                     " user.Refer to"
-                    " https://slidge.readthedocs.io/en/latest/admin/xmpp_server.html"
+                    " https://slidge.im/core/admin/privilege.html"
                     " for more info."
                 )
 

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/db/models.py

@@ -235,11 +235,17 @@ class Room(Base):
     updated: Mapped[bool] = mapped_column(default=False)
 
     participants: Mapped[list["Participant"]] = relationship(
-        back_populates="room", primaryjoin="Participant.room_id == Room.id"
+        back_populates="room",
+        primaryjoin="Participant.room_id == Room.id",
+        cascade="all, delete-orphan",
     )
 
     avatar_legacy_id: Mapped[Optional[str]] = mapped_column(nullable=True)
 
+    archive: Mapped[list["ArchivedMessage"]] = relationship(
+        cascade="all, delete-orphan"
+    )
+
 
 class ArchivedMessage(Base):
     """

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/group/room.py

@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, AsyncIterator, Generic, Optional, Self, Union
 from uuid import uuid4
 
 from slixmpp import JID, Iq, Message, Presence
-from slixmpp.exceptions import IqError, XMPPError
+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
@@ -1029,7 +1029,7 @@ class LegacyMUC(
                 # (slixmpp annoying magic)
                 item = ans["pubsub"]["items"]["item"]
                 item["id"] = self.jid
-            except IqError:
+            except (IqError, IqTimeout):
                 item["conference"]["autojoin"] = auto_join
             except PermissionError:
                 warnings.warn(

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/main.py

@@ -112,7 +112,7 @@ def configure():
 
     if not (h := config.HOME_DIR).exists():
         logging.info("Creating directory '%s'", h)
-        h.mkdir()
+        os.makedirs(h)
 
     config.UPLOAD_REQUESTER = config.UPLOAD_REQUESTER or config.JID.bare
 

{slidge-0.2.0b1 → slidge-0.2.2}/slidge/slixfix/__init__.py

@@ -1,12 +1,13 @@
 # This module contains patches for slixmpp; some have pending requests upstream
 # and should be removed on the next slixmpp release.
-import logging
-from collections import defaultdict
+
+# ruff: noqa: F401
 
 import slixmpp.plugins
-from slixmpp import Message
+from slixmpp import Iq, Message
+from slixmpp.exceptions import XMPPError
 from slixmpp.plugins.xep_0050 import XEP_0050, Command
-from slixmpp.plugins.xep_0356.privilege import _VALID_ACCESSES, XEP_0356
+from slixmpp.plugins.xep_0231 import XEP_0231
 from slixmpp.xmlstream import StanzaBase
 
 from . import (  # xep_0356,
@@ -23,36 +24,33 @@ from . import (  # xep_0356,
     xep_0490,
 )
 
-# ruff: noqa: F401
 
+async def _handle_bob_iq(self, iq: Iq):
+    cid = iq["bob"]["cid"]
 
-# TODO: Remove me once https://codeberg.org/poezio/slixmpp/pulls/3541 makes it
-#       to a slixmpp release
-def _handle_privilege(self, msg: StanzaBase):
-    """
-    Called when the XMPP server advertise the component's privileges.
+    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)
 
-    Stores the privileges in this instance's granted_privileges attribute (a dict)
-    and raises the privileges_advertised event
-    """
-    permissions = self.granted_privileges[msg.get_from()]
-    for perm in msg["privilege"]["perms"]:
-        access = perm["access"]
-        if access == "iq":
-            if not perm.get_plugin("namespace", check=True):
-                permissions.iq = defaultdict(lambda: perm["type"])
-            else:
-                for ns in perm["namespaces"]:
-                    permissions.iq[ns["ns"]] = ns["type"]
-        elif access in _VALID_ACCESSES:
-            setattr(permissions, access, perm["type"])
-        else:
-            log.warning("Received an invalid privileged access: %s", access)
-    log.debug("Privileges: %s", self.granted_privileges)
-    self.xmpp.event("privileges_advertised")
-
-
-XEP_0356._handle_privilege = _handle_privilege
+        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()
+
+
+XEP_0231._handle_bob_iq = _handle_bob_iq
 
 
 def session_bind(self, jid):
@@ -98,4 +96,3 @@ slixmpp.plugins.PLUGINS.extend(
 
 
 Message.reply = reply  # type: ignore
-log = logging.getLogger(__name__)