slidge 0.2.1__py3-none-any.whl → 0.2.2__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__ = "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/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,
         )
 

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/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

@@ -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/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-0.2.1.dist-info → slidge-0.2.2.dist-info}/METADATA

@@ -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.dist-info → slidge-0.2.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 slidge/__init__.py,sha256=S0tUjqpZlzsr8G4Y_1Xt-KCYB07qaknTB0OwHU8k29U,1587
 slidge/__main__.py,sha256=ydjUklOoavS4YlGfjRX_8BQN2DaSbaXPMi47RkOgcFI,37
-slidge/__version__.py,sha256=zAb2K_MUCe73QeN4OoSMAmTknNgrQq0UQgxIGSVGFk4,164
+slidge/__version__.py,sha256=7B4XHb2FWMm2Pq-Bo548FLUn87ezWnj1aoWxA4jTkZs,164
 slidge/command/__init__.py,sha256=UYf1mjCYbZ5G7PIgaFTWSQRAzEJkQ6dTH8Fu_e_XnO0,613
 slidge/command/adhoc.py,sha256=-AO4h1N6owSuuqZon5tDL29O6qmEeAd1pcPjGCkzKRs,10065
 slidge/command/admin.py,sha256=TYrzgCIhjcTIwl1IUaFlUd3D98SPyao10gB20zo8b3Q,6187
-slidge/command/base.py,sha256=S_bKUJB0fnKs58PvjgFf15_6cw-8k2bMeSECTmFxQGQ,13155
+slidge/command/base.py,sha256=S-4WnxDuGE3sQTca5L6DjHVBsHqpNuf6zvXffYoP46c,13159
 slidge/command/categories.py,sha256=vF0KGDV9sEn8TNkcMoDRw-u3gEyNHSXghOU2JRHQtKs,351
-slidge/command/chat_command.py,sha256=8_1mqXNLlcwzozbNhZAAYwxavG09rNR_o9G3TwY-lO8,10941
-slidge/command/register.py,sha256=6v-yerYcrME1XahDP-wUgipQDFXV_HVQlYCrKxLDqAA,6751
-slidge/command/user.py,sha256=0pt9k41npv7MRI_0vauuR1JPb7Gf7UE2lOQeL2XNd7U,12065
+slidge/command/chat_command.py,sha256=z-4qp03rK7kCh3_kEozDViwkDg_hVjHvRCiYYJxedBQ,11153
+slidge/command/register.py,sha256=Zlh5PufPE8EeHLNrFgn3adSPsq-erMpW8uOVYRqFOy8,6756
+slidge/command/user.py,sha256=aksfkRUK7xj9n0XM-IfUSS5LrTp0qIHt5K2UkBBT1UE,12099
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
 slidge/contact/contact.py,sha256=fFWnjgf6HKi782htDyDNS_YVx_baHT24oqjBIruuRRQ,23109
 slidge/contact/roster.py,sha256=x3speGdHbZ-VTLoQLQW4s53rBeBvW87W8ZibCCZSLDA,10300
@@ -33,9 +33,9 @@ slidge/core/dispatcher/search.py,sha256=9cGj0wwvyYlP_Yk440Y12sgo4Y1p-JWUDSJP5Zxc
 slidge/core/dispatcher/session_dispatcher.py,sha256=vNaOJpHKGTzIyQJX457IvhbooKFN5JR3HA7XW0AArFI,2868
 slidge/core/dispatcher/util.py,sha256=YtXyVxM3orE7aYWs-GbJumtLTI63OpaQY_t4FMTjoZo,5754
 slidge/core/dispatcher/vcard.py,sha256=Rmx-wCz6Lps0mXCO48HppNQlS3GOgMuzuw9hZYBdlVU,5130
-slidge/core/gateway.py,sha256=dVmJw8vv1RhjOSMofBGCW5K5ZnN7QWBbc1bzv6qsuJ8,36390
+slidge/core/gateway.py,sha256=m7XN4ACd_txLl4zoAJNJjKT0BFJu6yUfJmhVfUkV7XM,36512
 slidge/core/mixins/__init__.py,sha256=muReAzgvENgMvlfm0Fpe6BQFfm2EMjoDe9ZhGgo6Vig,627
-slidge/core/mixins/attachment.py,sha256=MkpnCtz3wLwU6MEqVLJ5p3QiGrCdWEFp5e7AVmYzhjo,19645
+slidge/core/mixins/attachment.py,sha256=LLZ_BFJfYIFtmzX4N2rhBARppyHz5AMLGkspMixkxmg,20128
 slidge/core/mixins/avatar.py,sha256=kGIIZzLSNuxF9bIvt5Bv03_uT_pU5QV1kS7cRu6-GUA,7874
 slidge/core/mixins/base.py,sha256=MOd-pas38_52VawQVlxWtBtmTKC6My9G0ZaCeQxOJbs,748
 slidge/core/mixins/db.py,sha256=5Qpegd7D8e5TLXLLINYcf_DuVdN-7wNmsfztUuFYPcU,442
@@ -72,7 +72,7 @@ slidge/db/alembic/versions/c4a8ec35a0e8_per_room_user_nick.py,sha256=jjQmlRv6nqd
 slidge/db/alembic/versions/e91195719c2c_store_users_avatars_persistently.py,sha256=8Ga3VFgKrzMs_-B8OPtfP-0rey_MFaDg-QGtSbaft3o,640
 slidge/db/avatar.py,sha256=FfRt2Vu11ZKD9F3x1_drawvUd-TDE3mp7SE3BZ9hOOg,6467
 slidge/db/meta.py,sha256=v1Jf-npZ28QwdGpsLQWLBHEbEP3-jnPrygRg05tJ_Iw,1831
-slidge/db/models.py,sha256=HL9pv0y2YQzdn4bkewhJmWEctOPleJ4pu8EyUzm3Fzc,13859
+slidge/db/models.py,sha256=0NUJfa3lPKHhwV2zE4p7QVYCVs3yn9egFg2u9mssk5c,13964
 slidge/db/store.py,sha256=KDQ0rp7h6FHgONTYBvucytE7n6Fhsgxgo0pgX18dsTA,46696
 slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=xGPkdSk8-BT6t6lNVo1FEwiFVAttoxCma8Tsyk5r8Kg,5279
@@ -124,8 +124,8 @@ slidge/util/db.py,sha256=4LxZj8oBYgiSnyBUnF_ALjr0TblkfNQq_p28sCfkHMY,242
 slidge/util/test.py,sha256=xnGXK0wvua49ncQm4linIfH24Ux6oCkm5A71k2V80zI,14007
 slidge/util/types.py,sha256=R_xfS5mRL0XUJIoDpnaAkZlTOoLPerduXBFftaVwIAI,5489
 slidge/util/util.py,sha256=An4BRIHktZGXnu4kCwaKYaSye_PlyuxEm_4SC9YvPhc,9594
-slidge-0.2.1.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.2.1.dist-info/METADATA,sha256=JVLGbnKy6awjd8vjQk9-8OtvuusZDSm6tpzKzrcU3xg,5003
-slidge-0.2.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-slidge-0.2.1.dist-info/entry_points.txt,sha256=btz6mbzx1X6fjFWAS_Bo5qNi8PtxUsDgunt-6r4JDHw,43
-slidge-0.2.1.dist-info/RECORD,,
+slidge-0.2.2.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.2.2.dist-info/METADATA,sha256=RtbebnKhLTIHGQxNMCKlDIL0xGE37uiDZoAswMjRA6k,5003
+slidge-0.2.2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+slidge-0.2.2.dist-info/entry_points.txt,sha256=btz6mbzx1X6fjFWAS_Bo5qNi8PtxUsDgunt-6r4JDHw,43
+slidge-0.2.2.dist-info/RECORD,,