slidge 0.3.0b3__py3-none-any.whl → 0.3.0b4__py3-none-any.whl

slidge/core/gateway.py

@@ -172,6 +172,13 @@ class BaseGateway(
             required=True,
             type="boolean",
         ),
+        FormField(
+            var="reaction_fallback",
+            label="Receive fallback messages for reactions (for legacy XMPP clients)",
+            value="false",
+            required=True,
+            type="boolean",
+        ),
     ]
 
     ROSTER_GROUP: str = "slidge"

slidge/core/mixins/base.py

@@ -31,6 +31,8 @@ class Base:
 
 
 class BaseSender(Base):
+    is_participant = False
+
     def _send(
         self, stanza: MessageOrPresenceTypeVar, **send_kwargs
     ) -> MessageOrPresenceTypeVar:

slidge/core/mixins/message_text.py

@@ -2,6 +2,9 @@ import logging
 from datetime import datetime
 from typing import Iterable, Optional
 
+from slixmpp import Message
+
+from ...util.archive_msg import HistoryMessage
 from ...util.types import (
     LegacyMessageType,
     LegacyThreadType,
@@ -9,6 +12,7 @@ from ...util.types import (
     MessageReference,
     ProcessingHint,
 )
+from ...util.util import add_quote_prefix
 from .message_maker import MessageMaker
 
 
@@ -188,8 +192,33 @@ class TextMessageMixin(MessageMaker):
         if not xmpp_id:
             xmpp_id = self._legacy_to_xmpp(legacy_msg_id)
         self.xmpp["xep_0444"].set_reactions(msg, to_id=xmpp_id, reactions=emojis)
+        self.__add_reaction_fallback(msg, legacy_msg_id, emojis)
         self._send(msg, **kwargs)
 
+    def __add_reaction_fallback(
+        self,
+        msg: Message,
+        legacy_msg_id: LegacyMessageType,
+        emojis: Iterable[str] = (),
+    ) -> None:
+        if not self.session.user.preferences.get("reaction_fallback", False):
+            return
+        msg["fallback"]["for"] = self.xmpp.plugin["xep_0444"].namespace
+        msg["fallback"].enable("body")
+        msg["body"] = " ".join(emojis)
+        if not self.is_participant:
+            return
+        with self.xmpp.store.session() as orm:
+            archived = self.xmpp.store.mam.get_by_legacy_id(
+                orm, self.muc.stored.id, str(legacy_msg_id)
+            )
+            if archived is None:
+                return
+            history_msg = HistoryMessage(archived.stanza)
+            msg["body"] = (
+                add_quote_prefix(history_msg.stanza["body"]) + "\n" + msg["body"]
+            )
+
     def retract(
         self,
         legacy_msg_id: LegacyMessageType,

slidge/core/mixins/presence.py

@@ -62,8 +62,9 @@ class PresenceMixin(BaseSender, DBMixin):
             try:
                 return self.stored.contact
             except DetachedInstanceError:
-                self.merge()
-                return self.stored.contact
+                with self.xmpp.store.session() as orm:
+                    orm.add(self.stored)
+                    return self.stored.contact
 
     @property
     def __contact_pk(self) -> int | None:

slidge/group/archive.py

@@ -1,5 +1,6 @@
 import logging
 import uuid
+import warnings
 from copy import copy
 from datetime import datetime, timezone
 from typing import TYPE_CHECKING, Collection, Optional
@@ -48,7 +49,9 @@ class MessageArchive:
             elif participant.is_system:
                 new_msg["muc"]["jid"] = participant.muc.jid
             else:
-                log.warning("No real JID for participant in this group")
+                warnings.warn(
+                    f"No real JID for participant '{participant.nickname}' in '{self.room.name}'"
+                )
                 new_msg["muc"]["jid"] = (
                     f"{uuid.uuid4()}@{participant.xmpp.boundjid.bare}"
                 )

slidge/group/bookmarks.py

@@ -158,7 +158,7 @@ class LegacyBookmarks(
                 stored = Room(
                     user_account_id=self.session.user_pk,
                     jid=jid,
-                    legacy_id=legacy_id,
+                    legacy_id=str(legacy_id),
                 )
             return await self.__update_if_needed(stored)
 

slidge/group/participant.py

@@ -6,8 +6,8 @@ from copy import copy
 from datetime import datetime
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Optional, Union
+from xml.etree import ElementTree as ET
 
-import sqlalchemy as sa
 from slixmpp import JID, InvalidJID, Message, Presence
 from slixmpp.plugins.xep_0045.stanza import MUCAdminItem
 from slixmpp.types import MessageTypes, OptJid
@@ -51,6 +51,8 @@ class LegacyParticipant(
     A legacy participant of a legacy group chat.
     """
 
+    is_participant = True
+
     mtype: MessageTypes = "groupchat"
     _can_send_carbon = False
     USE_STANZA_ID = True
@@ -93,6 +95,13 @@ class LegacyParticipant(
             self.merge()
             return self.stored.is_user
 
+    @is_user.setter
+    def is_user(self, is_user: bool) -> None:
+        with self.xmpp.store.session(expire_on_commit=True) as orm:
+            orm.add(self.stored)
+            self.stored.is_user = is_user
+            orm.commit()
+
     @property
     def jid(self) -> JID:
         jid = JID(self.muc.jid)
@@ -510,7 +519,11 @@ class LegacyParticipant(
         if when is not None:
             msg["delay"].set_stamp(when)
             msg["delay"]["from"] = self.muc.jid
-        msg["subject"] = subject or str(self.muc.name)
+        if subject:
+            msg["subject"] = subject
+        else:
+            # may be simplified if slixmpp lets it do it more easily some day
+            msg.xml.append(ET.Element(f"{{{msg.namespace}}}subject"))
         self._send(msg, full_jid)
 
 

slidge/group/room.py

@@ -431,8 +431,8 @@ class LegacyMUC(
         yield
 
     @property
-    def subject(self):
-        return self.stored.subject
+    def subject(self) -> str:
+        return self.stored.subject or ""
 
     @subject.setter
     def subject(self, s: str) -> None:
@@ -652,7 +652,7 @@ class LegacyMUC(
                     orm.refresh(self.stored, ["participants"])
         if not user_participant.is_user:
             self.log.warning("is_user flag not set participant on user_participant")
-            user_participant.is_user = True  # type:ignore
+            user_participant.is_user = True
         user_participant.send_initial_presence(
             user_full_jid,
             presence_id=join_presence["id"],
@@ -680,8 +680,12 @@ class LegacyMUC(
                 maxstanzas=maxstanzas,
                 since=since,
             )
+        if self.HAS_SUBJECT:
+            subject = self.subject or ""
+        else:
+            subject = self.description or self.name or ""
         self.__get_subject_setter_participant().set_room_subject(
-            self.subject if self.HAS_SUBJECT else (self.description or self.name or ""),
+            subject,
             user_full_jid,
             self.subject_date,
         )

slidge/migration.py

@@ -1,5 +1,4 @@
 import logging
-import shutil
 import sys
 import traceback
 from pathlib import Path
@@ -7,15 +6,6 @@ from pathlib import Path
 from alembic import command
 from alembic.config import Config
 
-from .core import config
-
-
-def remove_avatar_cache_v1() -> None:
-    old_dir = config.HOME_DIR / "slidge_avatars"
-    if old_dir.exists():
-        log.info("Avatar cache dir v1 found, clearing it.")
-        shutil.rmtree(old_dir)
-
 
 def get_alembic_cfg() -> Config:
     alembic_cfg = Config()
@@ -28,7 +18,6 @@ def get_alembic_cfg() -> Config:
 
 
 def migrate() -> None:
-    remove_avatar_cache_v1()
     try:
         command.upgrade(get_alembic_cfg(), "head")
     except Exception as e:

slidge/util/util.py

@@ -324,3 +324,10 @@ def strip_leading_emoji(text: str) -> str:
 
 async def noop_coro() -> None:
     pass
+
+
+def add_quote_prefix(text: str):
+    """
+    Return multi-line text with leading quote marks (i.e. the ">" character).
+    """
+    return "\n".join(("> " + x).strip() for x in text.split("\n")).strip()

{slidge-0.3.0b3.dist-info → slidge-0.3.0b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slidge
-Version: 0.3.0b3
+Version: 0.3.0b4
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License-Expression: AGPL-3.0-or-later

{slidge-0.3.0b3.dist-info → slidge-0.3.0b4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 slidge/__init__.py,sha256=OWGOMz8wl6I6XNUT9ipE9IFD-OinS8zQGGn4U_z3IWw,1835
 slidge/__main__.py,sha256=ydjUklOoavS4YlGfjRX_8BQN2DaSbaXPMi47RkOgcFI,37
 slidge/main.py,sha256=bUdAau6TorsPpDRBPfzvUolHlXF5K-BY9aJdSmNUcyw,7109
-slidge/migration.py,sha256=Y_PJ9ahHwcgwP1gnGByIiUJSxTu2DYFpmNiPdOpVgoQ,1545
+slidge/migration.py,sha256=b0Bi1D6QObpBhwZy33LvtYy3ObIx56pUdxgLfoQglh4,1271
 slidge/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/command/__init__.py,sha256=UYf1mjCYbZ5G7PIgaFTWSQRAzEJkQ6dTH8Fu_e_XnO0,613
 slidge/command/adhoc.py,sha256=NCHammJdl30eHniiYukYQZKp1IeI-5qv5u9NncLNSNM,10760
@@ -16,7 +16,7 @@ slidge/contact/contact.py,sha256=AZSpBInijGXn5hP_eJQhdyCOcUnzM62h65ZliyFZWhg,194
 slidge/contact/roster.py,sha256=uZ3iCl8oa7kEpIptUVa9p1k51bSvbuQq1pUGnf_zru8,9791
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/config.py,sha256=1HxHQ5BOnYghi8V5KbCQ6sUsNnXzAZAIoFA5PrMqH4E,6060
-slidge/core/gateway.py,sha256=0nuWlig6K4urNowoEKCVkSvEVH46BhR70A52fH6O4AE,40956
+slidge/core/gateway.py,sha256=5GImsd1b7KKcwIZcNSWgVieezrnp5dJCv7IlmOvWkRc,41192
 slidge/core/pubsub.py,sha256=-YK49tEdz_SLM3O8Y9zvu3p5KYhxgNpqbsD57rOIdNI,12141
 slidge/core/session.py,sha256=Rji81tCEVI5zpKtKpMIuclKvDR0XuHZRki8ivIhtNnQ,29500
 slidge/core/dispatcher/__init__.py,sha256=1EXcjXietUKlxEqdrCWCV3xZ3q_DSsjHoqWrPMbtYao,84
@@ -41,13 +41,13 @@ slidge/core/dispatcher/muc/ping.py,sha256=EgKKS9AvMnW-vINGcoGbtk6NdbN9A7zVaGfT5T
 slidge/core/mixins/__init__.py,sha256=Zea39CCwjJU5XfHwcYPEZ9Sin8z1BZxoV68G2RwC3nE,386
 slidge/core/mixins/attachment.py,sha256=6c1gZNydVZHgHB-_PjBLbT_9ntBSNG0AWqlv9Cgcku8,21906
 slidge/core/mixins/avatar.py,sha256=0E0mQxdTUcJQrYXlBkYqkNl4bYuga4cIC1s4XA2rED8,5559
-slidge/core/mixins/base.py,sha256=iGu1yPFgivouhXx0ckgbO7HbpFHOnbJnEWEUvwSg8KU,755
+slidge/core/mixins/base.py,sha256=getXMptzJwIc4fEbeMoJCSKcC3awi8UbKnx5FVCthjc,783
 slidge/core/mixins/db.py,sha256=a6idm-FgHWfDK-MJZWy5AkkBlyY8JmwOB8xAFmm0E9g,1934
 slidge/core/mixins/disco.py,sha256=mrYhWO9qpnLMAVtKKqwbDh6CNOH2dPNERpyfmWzZGg8,3684
 slidge/core/mixins/message.py,sha256=xk4bgiJF9ATe-rgtH4sHU8hUwecBF4KjGIujm90mbXQ,8014
 slidge/core/mixins/message_maker.py,sha256=d9lMurnWCr7Y-pyyUkLoQYykb6lCCZuBNKFOe2hcY3A,6552
-slidge/core/mixins/message_text.py,sha256=UUbY-hdsMEUHe3b2h2Rwkaic43iDiaaUoEmuyw6FezY,8564
-slidge/core/mixins/presence.py,sha256=YPGdAPyVocjV7UJgIGupgf-arKJUYni67b3I7ajsKJE,9697
+slidge/core/mixins/message_text.py,sha256=-hlGDzQ9dya-ZCPBe3v7UrpBetQa36N3YIACRxBt8Yc,9632
+slidge/core/mixins/presence.py,sha256=ijIxjX38DtvPuiBkoxduHp0TBPHSjKLi03rDZvlquEY,9768
 slidge/core/mixins/recipient.py,sha256=b0uFnpym-hOFgYxGjXT1xQcZ4YRbDSBftPcNWLzSwEI,1336
 slidge/db/__init__.py,sha256=EBDH1JSEhgqYcli2Bw11CRC749wJk8AOucgBzmhDSvU,105
 slidge/db/avatar.py,sha256=MXFd1oe0eL5CCUYbc5CpsIcbio3cY3xVoKt39RAoj9I,8240
@@ -59,10 +59,10 @@ slidge/db/alembic/env.py,sha256=hsBlRNs0zF5diSHGRSa8Fi3qRVQDA2rJdR41AEIdvxc,1642
 slidge/db/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 slidge/db/alembic/versions/cef02a8b1451_initial_schema.py,sha256=D1K-flfTM9Vkk0YFzg6HbmoDyEb2u5c751aXk2YzVVg,14881
 slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
-slidge/group/archive.py,sha256=DKwyde15-Op2rXuQBvdSmFcAKhUyWuorpEFcRSmDHec,5956
-slidge/group/bookmarks.py,sha256=qOaopMQNoGUB05Kq4aYRmoE-DOtXmSAAGwfCs1hcWB4,7648
-slidge/group/participant.py,sha256=eMwUgbEtxGjWMmIqUfS8uSKlaStitZ3D68M_RixQeso,17676
-slidge/group/room.py,sha256=E3uiroLmqwM52Lw6zT4wUQmVjmxx6wkeF3f87bIt3VU,49026
+slidge/group/archive.py,sha256=aBcklo24UbpzIC8o7DrjaMb0zYzNlLbqoAHKOiltMAQ,6046
+slidge/group/bookmarks.py,sha256=eiXtlgirE59dBi1BT1349wCrGuHDkCoak1phCepzkqI,7653
+slidge/group/participant.py,sha256=mR_SJKA3WEONHdopZz2GtKuC8Srx9-V0-REhPxdZ_Gc,18118
+slidge/group/room.py,sha256=3CiwiTYx0R6Ud5lP6otD6QEjwU3ZicUHKf3gJPmrUBo,49098
 slidge/slixfix/__init__.py,sha256=LvaYZQYjr4l_45AYYpod1dB3MUaZye18vKF-4H8Bm20,4758
 slidge/slixfix/delivery_receipt.py,sha256=JmogxsiXYEbTmCM4fvC5wkQs0jBsaJtKl4j_B_18riE,1415
 slidge/slixfix/roster.py,sha256=DjjHQqCsKsPChUxV7S0Pm4IAgjfrwgm5tcTdJi3N_gY,1670
@@ -86,10 +86,10 @@ slidge/util/jid_escaping.py,sha256=QJ2Yj_j1gTmiO9g2r187iVCu7kia_O5ABhRiLAO2TG4,1
 slidge/util/lock.py,sha256=ZnUi3LGiz271-YeYKo9JzxovJCoSwlP9P65pNyHIO9o,1029
 slidge/util/test.py,sha256=_E6er2BtQlpyzTUmp4u8C9KhBYzbLrmTwSVgxGObKHU,13988
 slidge/util/types.py,sha256=nilphTeJU3yb0MSqb86tZeWXis495oDvHSDDBs0hn_4,5747
-slidge/util/util.py,sha256=4hihLCl4SsB5S14TT3bP8tDPP_Zg9rYbSfLdLB9-G_Q,9332
-slidge-0.3.0b3.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.0b3.dist-info/METADATA,sha256=ZAjh2fLNz60lo8cZygLkm89isXqMPbSYvWnHvCVAPr8,5056
-slidge-0.3.0b3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-slidge-0.3.0b3.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.0b3.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.0b3.dist-info/RECORD,,
+slidge/util/util.py,sha256=PBdHtcRIQi6Dy-yHASS_xiRGQ4Pv4i6QSSZAAELPnmQ,9536
+slidge-0.3.0b4.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.3.0b4.dist-info/METADATA,sha256=JT5D6Cw0DTljYUdK527OLNco4wD2OddL70PjRJMsaH0,5056
+slidge-0.3.0b4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+slidge-0.3.0b4.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.3.0b4.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.3.0b4.dist-info/RECORD,,