slidge 0.2.1__tar.gz → 0.2.2__tar.gz

{slidge-0.2.1 → slidge-0.2.2}/PKG-INFO

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

{slidge-0.2.1 → slidge-0.2.2}/pyproject.toml

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

{slidge-0.2.1 → 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.1"
+__version__ = "0.2.2"

{slidge-0.2.1 → 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.1 → 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.1 → slidge-0.2.2}/slidge/command/register.py

@@ -98,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.1 → 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.1 → slidge-0.2.2}/slidge/core/gateway.py

@@ -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.1 → slidge-0.2.2}/slidge/core/mixins/attachment.py

@@ -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.1 → slidge-0.2.2}/slidge/db/models.py

@@ -242,6 +242,10 @@ class Room(Base):
 
     avatar_legacy_id: Mapped[Optional[str]] = mapped_column(nullable=True)
 
+    archive: Mapped[list["ArchivedMessage"]] = relationship(
+        cascade="all, delete-orphan"
+    )
+
 
 class ArchivedMessage(Base):
     """