slidge 0.3.2__tar.gz → 0.3.3__tar.gz

{slidge-0.3.2 → slidge-0.3.3}/PKG-INFO

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

{slidge-0.3.2 → slidge-0.3.3}/docs/source/admin/privilege.rst

@@ -79,11 +79,10 @@ Privileges with ejabberd
           both: slidge_rule
         message:
           outgoing: slidge_rule
+        iq:
+          "http://jabber.org/protocol/pubsub":
+            both: slidge_rule
+          "http://jabber.org/protocol/pubsub#owner":
+            set: slidge_rule
       mod_roster:
         versioning: true
-
-    iq:
-      "http://jabber.org/protocol/pubsub":
-        both: slidge_rule
-      "http://jabber.org/protocol/pubsub#owner":
-        set: slidge_rule

{slidge-0.3.2 → slidge-0.3.3}/slidge/command/user.py

@@ -6,7 +6,7 @@ from slixmpp import JID
 from slixmpp.exceptions import XMPPError
 
 from ..group.room import LegacyMUC
-from ..util.types import AnyBaseSession, LegacyGroupIdType, UserPreferences
+from ..util.types import AnyBaseSession, LegacyGroupIdType, MucType, UserPreferences
 from .base import (
     Command,
     CommandAccess,
@@ -157,7 +157,9 @@ class ListGroups(Command):
     async def run(self, session, _ifrom, *_):
         assert session is not None
         await session.ready
-        groups = sorted(session.bookmarks, key=lambda g: g.DISCO_NAME.casefold())
+        groups = sorted(
+            session.bookmarks, key=lambda g: (g.name or g.jid.localpart).casefold()
+        )
         return TableResult(
             description="Your groups",
             fields=[FormField("name"), FormField("jid", type="jid-single")],
@@ -364,3 +366,21 @@ class LeaveGroup(Command):
     async def finish(session: AnyBaseSession, _ifrom, group: LegacyMUC) -> None:
         await session.on_leave_group(group.legacy_id)
         await session.bookmarks.remove(group, reason="You left this group via slidge.")
+
+
+class InviteInGroups(Command):
+    NAME = "💌 Re-invite me in my groups"
+    HELP = "Ask the gateway to send invitations for all your private groups"
+    CHAT_COMMAND = "re-invite"
+    NODE = GROUPS.node + "/" + CHAT_COMMAND
+    ACCESS = CommandAccess.USER_LOGGED
+    CATEGORY = GROUPS
+
+    async def run(self, session, _ifrom, *_):
+        assert session is not None
+        await session.ready
+        for muc in session.bookmarks:
+            if muc.type == MucType.GROUP:
+                session.send_gateway_invite(
+                    muc, reason="You asked to be re-invited in all groups."
+                )

{slidge-0.3.2 → slidge-0.3.3}/slidge/contact/contact.py

@@ -120,8 +120,7 @@ class LegacyContact(
     def is_friend(self, value: bool) -> None:
         if value == self.is_friend:
             return
-        self.stored.is_friend = value
-        self.commit()
+        self.update_stored_attribute(is_friend=value)
 
     @property
     def added_to_roster(self) -> bool:
@@ -131,8 +130,7 @@ class LegacyContact(
     def added_to_roster(self, value: bool) -> None:
         if value == self.added_to_roster:
             return
-        self.stored.added_to_roster = value
-        self.commit()
+        self.update_stored_attribute(added_to_roster=value)
 
     @property
     def participants(self) -> Iterator["LegacyParticipant"]:
@@ -170,8 +168,7 @@ class LegacyContact(
     def client_type(self, value: ClientType) -> None:
         if self.stored.client_type == value:
             return
-        self.stored.client_type = value
-        self.commit()
+        self.update_stored_attribute(client_type=value)
 
     def _set_logger(self) -> None:
         self.log = logging.getLogger(f"{self.user_jid.bare}:contact:{self}")
@@ -290,13 +287,12 @@ class LegacyContact(
     def name(self, n: Optional[str]) -> None:
         if self.stored.nick == n:
             return
-        self.stored.nick = n
+        self.update_stored_attribute(nick=n)
         self._set_logger()
         if self.is_friend and self.added_to_roster:
             self.xmpp.pubsub.broadcast_nick(
                 user_jid=self.user_jid, jid=self.jid.bare, nick=n
             )
-        self.commit()
         for p in self.participants:
             p.nickname = n or str(self.legacy_id)
 
@@ -361,14 +357,11 @@ class LegacyContact(
         if pronouns:
             vcard["pronouns"]["text"] = pronouns
 
-        self.stored.vcard = str(vcard)
-        self.stored.vcard_fetched = True
+        self.update_stored_attribute(vcard=str(vcard), vcard_fetched=True)
         self.session.create_task(
             self.xmpp.pubsub.broadcast_vcard_event(self.jid, self.user_jid, vcard)
         )
 
-        self.commit()
-
     def get_roster_item(self):
         item = {
             "subscription": self.__get_subscription_string(),

{slidge-0.3.2 → slidge-0.3.3}/slidge/core/dispatcher/caps.py

@@ -57,8 +57,7 @@ class CapsMixin(DispatcherMixin):
                 ver = contact.stored.caps_ver
             else:
                 ver = await contact.get_caps_ver(pfrom)
-                contact.stored.caps_ver = ver
-                contact.commit()
+                contact.update_stored_attribute(caps_ver=ver)
         else:
             ver = await caps.get_verstring(pfrom)
 

{slidge-0.3.2 → slidge-0.3.3}/slidge/core/mixins/db.py

@@ -2,6 +2,8 @@ import logging
 import typing
 from contextlib import contextmanager
 
+import sqlalchemy as sa
+
 from ...db.models import Base, Contact, Room
 
 if typing.TYPE_CHECKING:
@@ -86,3 +88,16 @@ class UpdateInfoMixin(DBMixin):
         else:
             self.stored.extra_attributes = self.serialize_extra_attributes()
             super().commit(merge=merge)
+
+    def update_stored_attribute(self, **kwargs) -> None:
+        for key, value in kwargs.items():
+            setattr(self.stored, key, value)
+        if self._updating_info:
+            return
+        with self.xmpp.store.session() as orm:
+            orm.execute(
+                sa.update(self.stored.__class__)
+                .where(self.stored.__class__.id == self.stored.id)
+                .values(**kwargs)
+            )
+            orm.commit()

{slidge-0.3.2 → slidge-0.3.3}/slidge/core/mixins/presence.py

@@ -96,22 +96,14 @@ class PresenceMixin(BaseSender, DBMixin):
         )
 
     def _store_last_presence(self, new: CachedPresence) -> None:
-        stored_contact = self.__stored()
-        if stored_contact is None:
-            return
-        stored_contact.cached_presence = True
-        for k, v in new._asdict().items():
-            setattr(stored_contact, k, v)
-        if self.__is_contact() and self._updating_info:
+        if self.__is_contact():
+            contact = self
+        elif (contact := getattr(self, "contact", None)) is None:  # type:ignore[assignment]
             return
-        with self.xmpp.store.session(expire_on_commit=False) as orm:
-            try:
-                orm.add(stored_contact)
-            except InvalidRequestError:
-                stored_contact = orm.merge(stored_contact)
-                orm.add(stored_contact)
-
-            orm.commit()
+        contact.update_stored_attribute(  # type:ignore[attr-defined]
+            cached_presence=True,
+            **new._asdict(),
+        )
 
     def _make_presence(
         self,

{slidge-0.3.2 → slidge-0.3.3}/slidge/db/models.py

@@ -9,7 +9,7 @@ from slixmpp.types import MucAffiliation, MucRole
 from sqlalchemy import JSON, ForeignKey, Index, UniqueConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from ..util.types import ClientType, MucType
+from ..util.types import ClientType, Hat, MucType
 from .meta import Base, JSONSerializable, JSONSerializableTypes
 
 
@@ -344,7 +344,7 @@ class Participant(Base):
     nickname: Mapped[str] = mapped_column(nullable=False, default=None)
     nickname_no_illegal: Mapped[str] = mapped_column(nullable=False, default=None)
 
-    hats: Mapped[list[tuple[str, str]]] = mapped_column(JSON, default=list)
+    hats: Mapped[list[Hat]] = mapped_column(JSON, default=list)
 
     extra_attributes: Mapped[Optional[JSONSerializable]] = mapped_column(default=None)
 

{slidge-0.3.2 → slidge-0.3.3}/slidge/group/room.py

@@ -169,8 +169,7 @@ class LegacyMUC(
     def type(self, type_: MucType) -> None:
         if self.type == type_:
             return
-        self.stored.muc_type = type_
-        self.commit()
+        self.update_stored_attribute(muc_type=type_)
 
     @property
     def n_participants(self):
@@ -180,8 +179,7 @@ class LegacyMUC(
     def n_participants(self, n_participants: Optional[int]) -> None:
         if self.stored.n_participants == n_participants:
             return
-        self.stored.n_participants = n_participants
-        self.commit()
+        self.update_stored_attribute(n_participants=n_participants)
 
     @property
     def user_jid(self):
@@ -203,8 +201,7 @@ class LegacyMUC(
     def subject_date(self, when: Optional[datetime]) -> None:
         if self.subject_date == when:
             return
-        self.stored.subject_date = when
-        self.commit()
+        self.update_stored_attribute(subject_date=when)
 
     def __send_configuration_change(self, codes) -> None:
         part = self.get_system_participant()
@@ -222,18 +219,16 @@ class LegacyMUC(
     def user_nick(self, nick: str) -> None:
         if nick == self.user_nick:
             return
-        self.stored.user_nick = nick
-        self.commit()
+        self.update_stored_attribute(user_nick=nick)
 
     def add_user_resource(self, resource: str) -> None:
         stored_set = self.get_user_resources()
         if resource in stored_set:
             return
         stored_set.add(resource)
-        self.stored.user_resources = (
-            json.dumps(list(stored_set)) if stored_set else None
+        self.update_stored_attribute(
+            user_resources=(json.dumps(list(stored_set)) if stored_set else None)
         )
-        self.commit()
 
     def get_user_resources(self) -> set[str]:
         stored_str = self.stored.user_resources
@@ -246,10 +241,9 @@ class LegacyMUC(
         if resource not in stored_set:
             return
         stored_set.remove(resource)
-        self.stored.user_resources = (
-            json.dumps(list(stored_set)) if stored_set else None
+        self.update_stored_attribute(
+            user_resources=(json.dumps(list(stored_set)) if stored_set else None)
         )
-        self.commit()
 
     @asynccontextmanager
     async def lock(self, id_: str) -> AsyncIterator[None]:
@@ -346,8 +340,7 @@ class LegacyMUC(
     def name(self, n: str | None) -> None:
         if self.name == n:
             return
-        self.stored.name = n
-        self.commit()
+        self.update_stored_attribute(name=n)
         self._set_logger()
         self.__send_configuration_change((104,))
 
@@ -359,8 +352,7 @@ class LegacyMUC(
     def description(self, d: str) -> None:
         if self.description == d:
             return
-        self.stored.description = d
-        self.commit()
+        self.update_stored_attribute(description=d)
         self.__send_configuration_change((104,))
 
     def on_presence_unavailable(self, p: Presence) -> None:
@@ -440,8 +432,7 @@ class LegacyMUC(
         if s == self.subject:
             return
 
-        self.stored.subject = s
-        self.commit()
+        self.update_stored_attribute(subject=s)
         self.__get_subject_setter_participant().set_room_subject(
             s, None, self.subject_date, False
         )
@@ -464,8 +455,7 @@ class LegacyMUC(
         if subject_setter == self.subject_setter:
             return
         assert isinstance(subject_setter, str | None)
-        self.stored.subject_setter = subject_setter
-        self.commit()
+        self.update_stored_attribute(subject_setter=subject_setter)
 
     def __get_subject_setter_participant(self) -> LegacyParticipant:
         if self.subject_setter is None:

{slidge-0.3.2 → slidge-0.3.3}/slidge/util/types.py

@@ -178,6 +178,8 @@ class Mention(NamedTuple):
 class Hat(NamedTuple):
     uri: str
     title: str
+    hue: float = 0.0  # Default value is not great here, but an OK workaround for the
+    # slixmpp 1.11→1.12 API update
 
 
 class UserPreferences(TypedDict):

{slidge-0.3.2 → slidge-0.3.3}/slidge.egg-info/PKG-INFO

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

{slidge-0.3.2 → slidge-0.3.3}/tests/test_muc.py

@@ -4525,9 +4525,11 @@ class TestHats(Base):
               </x>
               <hats xmlns="urn:xmpp:hats:0">
                 <hat uri="uri1"
-                     title="title1" />
+                     title="title1"
+                     hue="0.0" />
                 <hat uri="uri2"
-                     title="title2" />
+                     title="title2"
+                     hue="0.0" />
               </hats>
               <occupant-id xmlns="urn:xmpp:occupant-id:0"
                            id="uuid" />
@@ -4546,9 +4548,11 @@ class TestHats(Base):
               </x>
               <hats xmlns="urn:xmpp:hats:0">
                 <hat uri="uri1"
-                     title="title1" />
+                     title="title1"
+                     hue="0.0" />
                 <hat uri="uri3"
-                     title="title3" />
+                     title="title3"
+                     hue="0.0" />
               </hats>
               <occupant-id xmlns="urn:xmpp:occupant-id:0"
                            id="uuid" />