slidge 0.2.6__py3-none-any.whl → 0.2.7__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__ = "v0.2.6"
+__version__ = "v0.2.7"

slidge/command/adhoc.py

@@ -235,12 +235,17 @@ class AdhocProvider:
         """
         Get items for a disco query
 
-        :param jid: who is requesting the disco
+        :param jid: the entity that should return its items
         :param node: which command node is requested
         :param iq:  the disco query IQ
         :return: commands accessible to the given JID will be listed
         """
-        if not self.xmpp.jid_validator.match(str(jid)) and jid not in config.ADMINS:
+        ifrom = iq.get_from()
+        ifrom_str = str(ifrom)
+        if (
+            not self.xmpp.jid_validator.match(ifrom_str)
+            and ifrom_str not in config.ADMINS
+        ):
             raise XMPPError(
                 "forbidden",
                 "You are not authorized to execute adhoc commands on this gateway. "
@@ -253,8 +258,6 @@ class AdhocProvider:
         if not all_items:
             return DiscoItems()
 
-        ifrom = iq.get_from()
-
         filtered_items = DiscoItems()
         filtered_items["node"] = self.xmpp.plugin["xep_0050"].stanza.Command.namespace
         for item in all_items:

slidge/group/room.py

@@ -14,6 +14,7 @@ from slixmpp.jid import _unescape_node
 from slixmpp.plugins.xep_0004 import Form
 from slixmpp.plugins.xep_0060.stanza import Item
 from slixmpp.plugins.xep_0082 import parse as str_to_datetime
+from slixmpp.plugins.xep_0469.stanza import NS as PINNING_NS
 from slixmpp.xmlstream import ET
 
 from ..contact.contact import LegacyContact
@@ -26,6 +27,7 @@ from ..core.mixins.disco import ChatterDiscoMixin
 from ..core.mixins.lock import NamedLockMixin
 from ..core.mixins.recipient import ReactionRecipientMixin, ThreadRecipientMixin
 from ..db.models import Room
+from ..slixfix.xep_0492.stanza import NS as NOTIFY_NS
 from ..slixfix.xep_0492.stanza import WhenLiteral
 from ..util import ABCSubclassableOnceAtMost
 from ..util.types import (
@@ -231,7 +233,7 @@ class LegacyMUC(
             self._participants_filled = True
             async for p in self.fill_participants():
                 self.__participants_store.update(p)
-                self.__store.set_participants_filled(self.pk)
+            self.__store.set_participants_filled(self.pk)
 
     async def get_participants(self) -> AsyncIterator[LegacyParticipant]:
         assert self.pk is not None
@@ -248,19 +250,21 @@ class LegacyMUC(
         async with self.lock("fill participants"):
             self._participants_filled = True
             # We only fill the participants list if/when the MUC is first
-            # joined by an XMPP client. But we may have instantiated
+            # joined by an XMPP client. But we may have instantiated some before.
             resources = set[str]()
+            async for participant in self.fill_participants():
+                # TODO: batch SQL update at the end of this function for perf?
+                self.__store_participant(participant)
+                yield participant
+                resources.add(participant.jid.resource)
             for db_participant in self.xmpp.store.participants.get_all(
                 self.pk, user_included=True
             ):
                 participant = self.Participant.from_store(
                     self.session, db_participant, muc=self
                 )
-                resources.add(participant.jid.resource)
-                yield participant
-            async for p in self.fill_participants():
-                if p.jid.resource not in resources:
-                    yield p
+                if participant.jid.resource not in resources:
+                    yield participant
             self.__store.set_participants_filled(self.pk)
             return
 
@@ -687,6 +691,8 @@ class LegacyMUC(
         assert self.pk is not None
         p.pk = self.__participants_store.add(self.pk, p.nickname)
         self.__participants_store.update(p)
+        if p._hats:
+            self.__participants_store.set_hats(p.pk, p._hats)
 
     async def get_participant(
         self,
@@ -995,6 +1001,32 @@ class LegacyMUC(
         p["muc"]["status_codes"] = {110, 333}
         p.send()
 
+    async def __get_bookmark(self) -> Item | None:
+        item = Item()
+        item["id"] = self.jid
+
+        iq = Iq(stype="get", sfrom=self.user_jid, sto=self.user_jid)
+        iq["pubsub"]["items"]["node"] = self.xmpp["xep_0402"].stanza.NS
+        iq["pubsub"]["items"].append(item)
+
+        try:
+            ans = await self.xmpp["xep_0356"].send_privileged_iq(iq)
+            if len(ans["pubsub"]["items"]) != 1:
+                return None
+            # this below creates the item if it wasn't here already
+            # (slixmpp annoying magic)
+            item = ans["pubsub"]["items"]["item"]
+            item["id"] = self.jid
+            return item
+        except (IqError, IqTimeout) as exc:
+            warnings.warn(f"Cannot fetch bookmark: {exc}")
+            return None
+        except PermissionError:
+            warnings.warn(
+                "IQ privileges (XEP0356) are not set, we cannot fetch the user bookmarks"
+            )
+            return None
+
     async def add_to_bookmarks(
         self,
         auto_join=True,
@@ -1026,68 +1058,90 @@ class LegacyMUC(
             If set to ``None`` (default), the setting will be untouched. Only the "global"
             notification setting is supported (ie, per client type is not possible).
         """
-        item = Item()
-        item["id"] = self.jid
+        existing = await self.__get_bookmark() if preserve else None
 
-        iq = Iq(stype="get", sfrom=self.user_jid, sto=self.user_jid)
-        iq["pubsub"]["items"]["node"] = self.xmpp["xep_0402"].stanza.NS
-        iq["pubsub"]["items"].append(item)
+        new = Item()
+        new["id"] = self.jid
+        new["conference"]["nick"] = self.user_nick
 
-        is_update = False
-        if preserve:
-            try:
-                ans = await self.xmpp["xep_0356"].send_privileged_iq(iq)
-                is_update = len(ans["pubsub"]["items"]) == 1
-                # this below creates the item if it wasn't here already
-                # (slixmpp annoying magic)
-                item = ans["pubsub"]["items"]["item"]
-                item["id"] = self.jid
-            except (IqError, IqTimeout):
-                item["conference"]["autojoin"] = auto_join
-            except PermissionError:
-                warnings.warn(
-                    "IQ privileges (XEP0356) are not set, we cannot fetch the user bookmarks"
-                )
-            else:
-                # if the bookmark is already present, we preserve it as much as
-                # possible, especially custom <extensions>
-                self.log.debug("Existing: %s", item)
-                # if it's an update, we do not touch the auto join flag
-                if not is_update:
-                    item["conference"]["autojoin"] = auto_join
+        if existing is None:
+            change = True
+            new["conference"]["autojoin"] = auto_join
         else:
-            item["conference"]["autojoin"] = auto_join
-
-        item["conference"]["nick"] = self.user_nick
+            change = False
+            new["conference"]["autojoin"] = existing["conference"]["autojoin"]
+
+        existing_extensions = existing is not None and existing[
+            "conference"
+        ].get_plugin("extensions", check=True)
+
+        # preserving extensions we don't know about is a MUST
+        if existing_extensions:
+            assert existing is not None
+            for el in existing["conference"]["extensions"].xml:
+                if el.tag.startswith(f"{{{NOTIFY_NS}}}"):
+                    if notify is not None:
+                        continue
+                if el.tag.startswith(f"{{{PINNING_NS}}}"):
+                    if pin is not None:
+                        continue
+                new["conference"]["extensions"].append(el)
 
         if pin is not None:
-            item["conference"]["extensions"]["pinned"] = pin
+            if existing_extensions:
+                assert existing is not None
+                existing_pin = (
+                    existing["conference"]["extensions"].get_plugin(
+                        "pinned", check=True
+                    )
+                    is not None
+                )
+                if existing_pin != pin:
+                    change = True
+            new["conference"]["extensions"]["pinned"] = pin
 
         if notify is not None:
-            item["conference"]["extensions"]["notify"].configure(notify)
-
-        iq = Iq(stype="set", sfrom=self.user_jid, sto=self.user_jid)
-        iq["pubsub"]["publish"]["node"] = self.xmpp["xep_0402"].stanza.NS
-        iq["pubsub"]["publish"].append(item)
-
-        iq["pubsub"]["publish_options"] = _BOOKMARKS_OPTIONS
+            new["conference"]["extensions"].enable("notify")
+            if existing_extensions:
+                assert existing is not None
+                existing_notify = existing["conference"]["extensions"].get_plugin(
+                    "notify", check=True
+                )
+                if existing_notify is None:
+                    change = True
+                else:
+                    if existing_notify.get_config() != notify:
+                        change = True
+                    for el in existing_notify:
+                        new["conference"]["extensions"]["notify"].append(el)
+            new["conference"]["extensions"]["notify"].configure(notify)
+
+        if change:
+            iq = Iq(stype="set", sfrom=self.user_jid, sto=self.user_jid)
+            iq["pubsub"]["publish"]["node"] = self.xmpp["xep_0402"].stanza.NS
+            iq["pubsub"]["publish"].append(new)
+
+            iq["pubsub"]["publish_options"] = _BOOKMARKS_OPTIONS
 
-        try:
-            await self.xmpp["xep_0356"].send_privileged_iq(iq)
-        except PermissionError:
-            warnings.warn(
-                "IQ privileges (XEP0356) are not set, we cannot add bookmarks for the user"
-            )
-            # fallback by forcing invitation
-            invite = True
-        except IqError as e:
-            warnings.warn(
-                f"Something went wrong while trying to set the bookmarks: {e}"
-            )
-            # fallback by forcing invitation
-            invite = True
+            try:
+                await self.xmpp["xep_0356"].send_privileged_iq(iq)
+            except PermissionError:
+                warnings.warn(
+                    "IQ privileges (XEP0356) are not set, we cannot add bookmarks for the user"
+                )
+                # fallback by forcing invitation
+                invite = True
+            except IqError as e:
+                warnings.warn(
+                    f"Something went wrong while trying to set the bookmarks: {e}"
+                )
+                # fallback by forcing invitation
+                invite = True
+        else:
+            self.log.debug("Bookmark does not need updating.")
+            return
 
-        if invite or (config.ALWAYS_INVITE_WHEN_ADDING_BOOKMARKS and not is_update):
+        if invite or (config.ALWAYS_INVITE_WHEN_ADDING_BOOKMARKS and existing is None):
             self.session.send_gateway_invite(
                 self, reason="This group could not be added automatically for you"
             )

slidge/slixfix/xep_0492/stanza.py

@@ -51,7 +51,7 @@ class Notify(ElementBase):
         self.append(element)
 
     def get_config(
-            self, client_type: Optional[ClientType] = None
+        self, client_type: Optional[ClientType] = None
     ) -> Optional[WhenLiteral]:
         """
         Get the chat notification settings for this bookmark.
@@ -67,7 +67,6 @@ class Notify(ElementBase):
                 return cast(WhenLiteral, child.name)
         return None
 
-
 class _Base(ElementBase):
     namespace = NS
     interfaces = {"client-type"}
@@ -75,14 +74,17 @@ class _Base(ElementBase):
 
 class Never(_Base):
     name = "never"
+    plugin_attrib = name
 
 
 class Always(_Base):
     name = "always"
+    plugin_attrib = name
 
 
 class OnMention(_Base):
     name = "on-mention"
+    plugin_attrib = name
 
 
 class Advanced(ElementBase):
@@ -100,3 +102,6 @@ _CLASS_MAP = {
 def register_plugin():
     register_stanza_plugin(Extensions, Notify)
     register_stanza_plugin(Notify, Advanced)
+    register_stanza_plugin(Notify, Never, iterable=True)
+    register_stanza_plugin(Notify, Always, iterable=True)
+    register_stanza_plugin(Notify, OnMention, iterable=True)

slidge/util/util.py

@@ -218,18 +218,18 @@ class SlidgeLogger(logging.Logger):
 log = logging.getLogger(__name__)
 
 
-def get_version():
+def get_version() -> str:
     try:
         git = subprocess.check_output(
-            ["git", "rev-parse", "HEAD"], stderr=subprocess.DEVNULL
+            ["git", "rev-parse", "HEAD"],
+            stderr=subprocess.DEVNULL,
+            cwd=Path(__file__).parent,
         ).decode()
     except (FileNotFoundError, subprocess.CalledProcessError):
-        pass
+        return "NO_VERSION"
     else:
         return "git-" + git[:10]
 
-    return "NO_VERSION"
-
 
 def merge_resources(resources: dict[str, ResourceDict]) -> Optional[ResourceDict]:
     if len(resources) == 0:

{slidge-0.2.6.dist-info → slidge-0.2.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: slidge
-Version: 0.2.6
+Version: 0.2.7
 Summary: XMPP bridging framework
 Author-email: Nicolas Cedilnik <nicoco@nicoco.fr>
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE

{slidge-0.2.6.dist-info → slidge-0.2.7.dist-info}/RECORD

@@ -1,11 +1,11 @@
 slidge/__init__.py,sha256=S0tUjqpZlzsr8G4Y_1Xt-KCYB07qaknTB0OwHU8k29U,1587
 slidge/__main__.py,sha256=ydjUklOoavS4YlGfjRX_8BQN2DaSbaXPMi47RkOgcFI,37
-slidge/__version__.py,sha256=LukT7r82VsYYhRUhnpDW_6t1xNzuYY3v380h-wU8KCg,165
+slidge/__version__.py,sha256=4G6eK4xrrezi8g1TxDqa6IID1uzOe-SonV8sT5-MrUs,165
 slidge/main.py,sha256=vMJzhvUxbeuIXuHxXXs6lm_ShBjXiS9B5Li5Ge4vWPo,6238
 slidge/migration.py,sha256=4BJmPIRB56_WIhRTqBFIIBXuvnhhBjjOMl4CE7jY6oc,1541
 slidge/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/command/__init__.py,sha256=UYf1mjCYbZ5G7PIgaFTWSQRAzEJkQ6dTH8Fu_e_XnO0,613
-slidge/command/adhoc.py,sha256=FEkE5UapIP_yrmrzGn5yIHCubOZijoI_muu1AtCqGOM,10472
+slidge/command/adhoc.py,sha256=bYLXcYJjbqPE9nBhrEQevqYFh9AS7Ei3m1vTZBIggrc,10557
 slidge/command/admin.py,sha256=TYrzgCIhjcTIwl1IUaFlUd3D98SPyao10gB20zo8b3Q,6187
 slidge/command/base.py,sha256=EDcEl5dJcooSmLarXI2fmBq6QtU7h-7MOM3DDsxXmTU,13447
 slidge/command/categories.py,sha256=vF0KGDV9sEn8TNkcMoDRw-u3gEyNHSXghOU2JRHQtKs,351
@@ -81,7 +81,7 @@ slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=IPqklzo0UN3lPHckfsKW9c4nl3m_9XGY4u0eehrhe8k,5281
 slidge/group/bookmarks.py,sha256=AvFL34bEX6n3OP1Np309T5hrLK9GnjkjdyLJ3uiLZyc,6616
 slidge/group/participant.py,sha256=cUuyJRGq8AIHrwtubje5cyb5hHY2hGLtGboBju4SI0c,17781
-slidge/group/room.py,sha256=Ar7mSSZRqjDPaXtRuq1da-ZqdJ-fibVtEZDcfpZtpXY,46856
+slidge/group/room.py,sha256=IilOT_Z5P-gh0lo5KLFc054z6sOrxJQ6MvjPmLKXiRs,49011
 slidge/slixfix/__init__.py,sha256=Og6_EAuWst6paWmDiGqeqQH6Iof6V8Vkr5pyYisgjsw,4282
 slidge/slixfix/delivery_receipt.py,sha256=3bWdZH3-X3CZJXmnI_TpjkTUUK-EY4Ktm78lW0-40fc,1366
 slidge/slixfix/roster.py,sha256=KvDjh9q7pqaZf69H93okfib13cc95uVZUJ6rzpqmDaU,1704
@@ -100,15 +100,15 @@ slidge/slixfix/xep_0292/__init__.py,sha256=_MvS9wGra6ig3P_dPAVlCPDJkiOFvUWGjaRsH
 slidge/slixfix/xep_0292/vcard4.py,sha256=jL-TOW3eG2QXLduSLNq03L8HoUNmvy8kTZI5ojvo6GE,358
 slidge/slixfix/xep_0492/__init__.py,sha256=kjWVeX3SG_2ohHx0fuMh1gmM2G57Bl6SRo7Mfv6sglA,161
 slidge/slixfix/xep_0492/notify.py,sha256=8EPSdU3rTzWkHNm8oFr0tK2PmMJ6hBAIr88GoOmHTuQ,340
-slidge/slixfix/xep_0492/stanza.py,sha256=gL0ixpV07Q9eqTXIOjdLVPtim45izuwaLk0iCoZ8e7c,2649
+slidge/slixfix/xep_0492/stanza.py,sha256=TlwyAHozA6zu32QoBb6M12xqWR-ytT0F9XVFqZkd4d4,2895
 slidge/util/__init__.py,sha256=BELovoTMPcPPGz3D48esBr8A4BRRHXTvavfgnArBgEc,301
 slidge/util/archive_msg.py,sha256=xXAR0BI5r3d6KKWjae9594izCOv6iI03z2WLuTecNw8,1724
 slidge/util/conf.py,sha256=1j2OnOsCBar1tOObErhXR5RC3Vl3faliOZ1U8J3My58,6613
 slidge/util/test.py,sha256=l1VHBsw5Uzk2t7wtkfb9kWvtehcYhw1t_d567JAJFKA,14135
 slidge/util/types.py,sha256=R_xfS5mRL0XUJIoDpnaAkZlTOoLPerduXBFftaVwIAI,5489
-slidge/util/util.py,sha256=4GdRZwHYUPkteEi8oux--qLwMiXnVLl_ojMDaKbEQCE,9629
-slidge-0.2.6.dist-info/METADATA,sha256=ShWfovgJtP9yPJYaEZqHg0Rd62blhfP78go2AsRfeoM,44841
-slidge-0.2.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-slidge-0.2.6.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.2.6.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.2.6.dist-info/RECORD,,
+slidge/util/util.py,sha256=IfyYLkujW6Pk0kvHpfkpQwejFDHSe5oR4_bczEUnhjs,9678
+slidge-0.2.7.dist-info/METADATA,sha256=u5B3zAw9h1inyIcHrGvr23-GNtI7Ba4gHNXLRmTtktc,44841
+slidge-0.2.7.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+slidge-0.2.7.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.2.7.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.2.7.dist-info/RECORD,,

{slidge-0.2.6.dist-info → slidge-0.2.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.1)
 Root-Is-Purelib: true
 Tag: py3-none-any