slidge 0.2.1__py3-none-any.whl → 0.2.3.post1__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__ = "0.2.1"
+__version__ = "v0.2.3.post1"

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/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/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,
         )
 
@@ -119,9 +119,7 @@ class Register(Command):
         elif self.xmpp.REGISTRATION_TYPE == RegistrationType.QRCODE:
             self.xmpp.qr_pending_registrations[  # type:ignore
                 user.jid.bare
-            ] = (
-                self.xmpp.loop.create_future()
-            )
+            ] = self.xmpp.loop.create_future()
             qr_text = await self.xmpp.get_qr_text(user)
             qr = qrcode.make(qr_text)
             with tempfile.NamedTemporaryFile(

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/contact/contact.py

@@ -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.im/core/admin/privilege.html for"
+                " to https://slidge.codeberg.page/docs/main/admin/privilege.html for"
                 " more info."
             )
             if config.ROSTER_PUSH_PRESENCE_SUBSCRIPTION_REQUEST_FALLBACK:

slidge/core/dispatcher/muc/admin.py

@@ -11,7 +11,7 @@ class MucAdminMixin(DispatcherMixin):
         self.xmpp.register_handler(
             CoroutineCallback(
                 "MUCModerate",
-                StanzaPath("iq/apply_to/moderate"),
+                StanzaPath("iq/moderate"),
                 self.on_user_moderation,
             )
         )
@@ -35,12 +35,11 @@ class MucAdminMixin(DispatcherMixin):
         assert isinstance(iq, Iq)
         muc = await self.get_muc_from_stanza(iq)
 
-        apply_to = iq["apply_to"]
-        xmpp_id = apply_to["id"]
+        moderate = iq["moderate"]
+        xmpp_id = iq["moderate"]["id"]
         if not xmpp_id:
             raise XMPPError("bad-request", "Missing moderated message ID")
 
-        moderate = apply_to["moderate"]
         if not moderate["retract"]:
             raise XMPPError(
                 "feature-not-implemented",

slidge/core/dispatcher/presence.py

@@ -165,9 +165,9 @@ class PresenceHandlerMixin(DispatcherMixin):
         error_stanza["error"]["type"] = "cancel"
         error_stanza["error"]["by"] = muc.jid
         error_stanza["error"]["condition"] = "not-acceptable"
-        error_stanza["error"][
-            "text"
-        ] = "Slidge does not let you change your nickname in groups."
+        error_stanza["error"]["text"] = (
+            "Slidge does not let you change your nickname in groups."
+        )
         error_stanza.send()
 
 

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/core/mixins/attachment.py

@@ -20,11 +20,11 @@ import thumbhash
 from PIL import Image, ImageOps
 from slixmpp import JID, Message
 from slixmpp.exceptions import IqError, IqTimeout
+from slixmpp.plugins.xep_0264.stanza import Thumbnail
 from slixmpp.plugins.xep_0363 import FileUploadError
 from slixmpp.plugins.xep_0447.stanza import StatelessFileSharing
 
 from ...db.avatar import avatar_cache
-from ...slixfix.xep_0264.stanza import Thumbnail
 from ...util.types import (
     LegacyAttachment,
     LegacyMessageType,
@@ -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/core/mixins/avatar.py

@@ -3,6 +3,7 @@ from hashlib import sha1
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
+from PIL import UnidentifiedImageError
 from slixmpp import JID
 
 from ...db.avatar import CachedAvatar, avatar_cache
@@ -100,6 +101,11 @@ class AvatarMixin:
         else:
             try:
                 cached_avatar = await avatar_cache.convert_or_get(a)
+            except UnidentifiedImageError:
+                self.session.log.warning("%s is not a valid avatar", a)
+                self._avatar_pk = None
+                self.__avatar_unique_id = uid
+                return
             except Exception as e:
                 self.session.log.error("Failed to set avatar %s", a, exc_info=e)
                 self._avatar_pk = None

slidge/core/mixins/message.py

@@ -4,8 +4,8 @@ import warnings
 from typing import TYPE_CHECKING, Optional
 
 from slixmpp import Iq, Message
+from slixmpp.plugins.xep_0004 import Form
 
-from ...slixfix.xep_0490.mds import PUBLISH_OPTIONS
 from ...util.types import ChatState, LegacyMessageType, Marker
 from .attachment import AttachmentMixin
 from .message_maker import MessageMaker
@@ -14,6 +14,17 @@ from .message_text import TextMessageMixin
 if TYPE_CHECKING:
     from ...group import LegacyMUC
 
+# this is for MDS
+PUBLISH_OPTIONS = Form()
+PUBLISH_OPTIONS["type"] = "submit"
+PUBLISH_OPTIONS.add_field(
+    "FORM_TYPE", "hidden", value="http://jabber.org/protocol/pubsub#publish-options"
+)
+PUBLISH_OPTIONS.add_field("pubsub#persist_items", value="true")
+PUBLISH_OPTIONS.add_field("pubsub#max_items", value="max")
+PUBLISH_OPTIONS.add_field("pubsub#send_last_published_item", value="never")
+PUBLISH_OPTIONS.add_field("pubsub#access_model", value="whitelist")
+
 
 class ChatStateMixin(MessageMaker):
     def __init__(self):
@@ -172,7 +183,7 @@ class CarbonMessageMixin(ContentMessageMixin, MarkerMixin):
                 warnings.warn(
                     "Slidge does not have privileges to send message on behalf of"
                     " user.Refer to"
-                    " https://slidge.im/core/admin/privilege.html"
+                    " https://slidge.codeberg.page/docs/main/admin/privilege.html"
                     " for more info."
                 )
 

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):
     """

slidge/db/store.py

@@ -18,9 +18,16 @@ from sqlalchemy.sql.functions import count
 
 from ..core import config
 from ..util.archive_msg import HistoryMessage
-from ..util.types import URL, CachedPresence, ClientType
+from ..util.types import (
+    URL,
+    CachedPresence,
+    ClientType,
+    MamMetadata,
+    MucAffiliation,
+    MucRole,
+    Sticker,
+)
 from ..util.types import Hat as HatTuple
-from ..util.types import MamMetadata, MucAffiliation, MucRole, Sticker
 from .meta import Base
 from .models import (
     ArchivedMessage,
@@ -545,7 +552,6 @@ class MAMStore(EngineMixin):
         sender: Optional[str] = None,
         flip=False,
     ) -> Iterator[HistoryMessage]:
-
         with self.session() as session:
             q = select(ArchivedMessage).where(ArchivedMessage.room_id == room_pk)
             if start_date is not None:

slidge/group/archive.py

@@ -49,9 +49,9 @@ class MessageArchive:
                 new_msg["muc"]["jid"] = participant.muc.jid
             else:
                 log.warning("No real JID for participant in this group")
-                new_msg["muc"][
-                    "jid"
-                ] = f"{uuid.uuid4()}@{participant.xmpp.boundjid.bare}"
+                new_msg["muc"]["jid"] = (
+                    f"{uuid.uuid4()}@{participant.xmpp.boundjid.bare}"
+                )
 
         self.__store.add_message(
             self.room_pk,

slidge/group/participant.py

@@ -322,7 +322,10 @@ class LegacyParticipant(
         legacy_msg_id=None,
         **send_kwargs,
     ) -> MessageOrPresenceTypeVar:
-        stanza["occupant-id"]["id"] = self.__occupant_id
+        if stanza.get_from().resource:
+            stanza["occupant-id"]["id"] = self.__occupant_id
+        else:
+            stanza["occupant-id"]["id"] = "room"
         self.__add_nick_element(stanza)
         if not self.is_user and isinstance(stanza, Presence):
             if stanza["type"] == "unavailable" and not self._presence_sent:
@@ -459,11 +462,14 @@ class LegacyParticipant(
 
         for i in msg_ids:
             m = self.muc.get_system_participant()._make_message()
-            m["apply_to"]["id"] = i
-            m["apply_to"]["moderated"].enable("retract")
-            m["apply_to"]["moderated"]["by"] = self.jid
+            m["retract"]["id"] = i
+            if self.is_system:
+                m["retract"].enable("moderated")
+            else:
+                m["retract"]["moderated"]["by"] = self.jid
+                m["retract"]["moderated"]["occupant-id"]["id"] = self.__occupant_id
             if reason:
-                m["apply_to"]["moderated"]["reason"] = reason
+                m["retract"]["reason"] = reason
             self._send(m)
 
     def set_room_subject(

slidge/main.py

@@ -10,7 +10,7 @@ Use the long version of the CLI arg without the double dash prefix inside this
 INI file, eg ``debug=true``.
 
 An example configuration file is available at
-https://git.sr.ht/~nicoco/slidge/tree/master/item/dev/confs/slidge-example.ini
+https://codeberg.org/slidge/slidge/src/branch/main/dev/confs/slidge-example.ini
 """
 
 import asyncio

slidge/slixfix/__init__.py

@@ -8,21 +8,13 @@ from slixmpp import Iq, Message
 from slixmpp.exceptions import XMPPError
 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.xmlstream import StanzaBase
 
-from . import (  # xep_0356,
-    link_preview,
-    xep_0077,
-    xep_0100,
-    xep_0153,
-    xep_0264,
-    xep_0292,
-    xep_0313,
-    xep_0317,
-    xep_0356_old,
-    xep_0424,
-    xep_0490,
-)
+from . import link_preview, xep_0077, xep_0100, xep_0153, xep_0292, xep_0356_old
+
+# TODO: remove this when the fix is included in slixmpp
+Moderate.interfaces.add("id")
 
 
 async def _handle_bob_iq(self, iq: Iq):
@@ -86,11 +78,8 @@ def reply(self, body=None, clear=True):
 slixmpp.plugins.PLUGINS.extend(
     [
         "link_preview",
-        "xep_0264",
         "xep_0292_provider",
-        "xep_0317",
         "xep_0356_old",
-        "xep_0490",
     ]
 )
 

slidge/slixfix/xep_0153/__init__.py

@@ -4,7 +4,6 @@
 # See the file LICENSE for copying permission.
 from slixmpp.plugins.base import register_plugin
 
-from .stanza import VCardTempUpdate
 from .vcard_avatar import XEP_0153
 
 register_plugin(XEP_0153)

slidge/slixfix/xep_0153/vcard_avatar.py

@@ -1,17 +1,8 @@
-# Slixmpp: The Slick XMPP Library
-# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
-# This file is part of Slixmpp.
-# See the file LICENSE for copying permission.
-import logging
-
 from slixmpp.plugins.base import BasePlugin
+from slixmpp.plugins.xep_0153 import VCardTempUpdate, stanza
 from slixmpp.stanza import Presence
 from slixmpp.xmlstream import register_stanza_plugin
 
-from . import VCardTempUpdate, stanza
-
-log = logging.getLogger(__name__)
-
 
 class XEP_0153(BasePlugin):
     name = "xep_0153"

slidge/util/test.py

@@ -5,7 +5,14 @@ from pathlib import Path
 from typing import Optional, Union
 from xml.dom.minidom import parseString
 
-import xmldiff.main
+try:
+    import xmldiff.main
+
+    XML_DIFF_PRESENT = True
+except ImportError:
+    xmldiff = None
+    XML_DIFF_PRESENT = False
+
 from slixmpp import (
     JID,
     ElementBase,
@@ -157,7 +164,7 @@ class SlixTestPlus(SlixTest):
                 result = self.compare(xml, stanza.xml, stanza2.xml)
             stanza_class.namespace = old_ns
 
-            if not result:
+            if XML_DIFF_PRESENT and not result:
                 debug += str(
                     xmldiff.main.diff_texts(tostring(xml), tostring(stanza.xml))
                 )