slidge 0.3.2__py3-none-any.whl → 0.3.3__py3-none-any.whl

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

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

@@ -10,9 +10,9 @@ slidge/command/base.py,sha256=h6lQ6ypb5uNrppZ_N8mS7ObJpnOINYZS6QokGlWVgAk,13527
 slidge/command/categories.py,sha256=vF0KGDV9sEn8TNkcMoDRw-u3gEyNHSXghOU2JRHQtKs,351
 slidge/command/chat_command.py,sha256=r_qalygOCsEoS-OgWw8IIlAzTufhXNjduONbeoepUIA,11557
 slidge/command/register.py,sha256=BduDI31Kx8CbWWEdjybimTA5Wcfhn-Jkt8sSPsySCpo,6724
-slidge/command/user.py,sha256=xt7NTb8Fdj_Mx91BgiszSii6QF67LtsyowQ1vhBJSIU,12660
+slidge/command/user.py,sha256=3aJ60bvXGyCqjgBH1r6HPbBh4IwgH40rHBilTkeFiv4,13325
 slidge/contact/__init__.py,sha256=WMMaHk7UW7YT9EH2LtPdkU0bHQaOp4ikBhbBQskmoc8,191
-slidge/contact/contact.py,sha256=ASNjGj-fxueC7rReMw4qMDUQxJ58W1F8i4Ipu_wfsTE,19617
+slidge/contact/contact.py,sha256=pexE6DU1WsxUoTeF-nENuEqOi7quYQtQot1hD816cl8,19565
 slidge/contact/roster.py,sha256=ZbhPC_5opMXdKrdCaQZiHTErxQD4EyWn5Susl6W7M6k,10003
 slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/config.py,sha256=yFD1RGBZ6Xl115oMqDiF7DFkShlNjF9HEB56Eb_BR_E,7664
@@ -20,7 +20,7 @@ slidge/core/gateway.py,sha256=G_ZX8ibKFe-oEXXOY-eRVkZjqRb_VdadIhTezwZEUCA,41698
 slidge/core/pubsub.py,sha256=2Em3PvYz-PX-WM7ZqkEU9estNYCyQ--JdJq22DhrUlA,12145
 slidge/core/session.py,sha256=XJRZrtAmwqqjaqkLEUPK8xUBxdJrKeraubYYNiiuT7I,29897
 slidge/core/dispatcher/__init__.py,sha256=1EXcjXietUKlxEqdrCWCV3xZ3q_DSsjHoqWrPMbtYao,84
-slidge/core/dispatcher/caps.py,sha256=gISaHtFwFDXtkSrSsAkZfPiHQyXfmXg3v_YYU0w9iDg,2254
+slidge/core/dispatcher/caps.py,sha256=7gvJLeushBtiyqCzBapzbwallH7l3tVN9PYe8MXiKIo,2237
 slidge/core/dispatcher/disco.py,sha256=xVPyBFnnkON-JjjM1oydRa-dqnDbwAZER2MGQACRhVk,2309
 slidge/core/dispatcher/presence.py,sha256=MkSOY7uZQnujTwhIU_nVxygTul63VBaPjTT3X4iTMu4,7090
 slidge/core/dispatcher/registration.py,sha256=R4bsyiR8elbLKiFMYv2E54VAUg6qTo-_2CzdbCOZjrY,3419
@@ -42,17 +42,17 @@ slidge/core/mixins/__init__.py,sha256=Zea39CCwjJU5XfHwcYPEZ9Sin8z1BZxoV68G2RwC3n
 slidge/core/mixins/attachment.py,sha256=k-4nwteql4TmhsZDLqPVgzVyuaRQzk-JEOG-k7w-VxM,23938
 slidge/core/mixins/avatar.py,sha256=0E0mQxdTUcJQrYXlBkYqkNl4bYuga4cIC1s4XA2rED8,5559
 slidge/core/mixins/base.py,sha256=getXMptzJwIc4fEbeMoJCSKcC3awi8UbKnx5FVCthjc,783
-slidge/core/mixins/db.py,sha256=lryMfRB-1-St2f7TZqW4sCl4xrWPWNlwgvn37T8wQPE,2678
+slidge/core/mixins/db.py,sha256=MlaTJcZjOZAL77oise0kY12tvx-SzPLcxS29QxxwEMM,3160
 slidge/core/mixins/disco.py,sha256=mrYhWO9qpnLMAVtKKqwbDh6CNOH2dPNERpyfmWzZGg8,3684
 slidge/core/mixins/message.py,sha256=xk4bgiJF9ATe-rgtH4sHU8hUwecBF4KjGIujm90mbXQ,8014
 slidge/core/mixins/message_maker.py,sha256=jdY0dhpN_RcKwajI0XrV194ruNW120Gfdq333B1Fv1o,6556
 slidge/core/mixins/message_text.py,sha256=Unzmwr8TnPC2uuZ2fFiIalOGpQF7YYyT1AbB8i0l6Qc,9637
-slidge/core/mixins/presence.py,sha256=hNttLzQ83q6jTQumG-ATpTj85DiUpF50FebYQV_Nazg,10530
+slidge/core/mixins/presence.py,sha256=SiKd-RUIHybrxs5Ie6Ig3aunQ7Is9t6c7TOm-2HbjbA,10252
 slidge/core/mixins/recipient.py,sha256=b0uFnpym-hOFgYxGjXT1xQcZ4YRbDSBftPcNWLzSwEI,1336
 slidge/db/__init__.py,sha256=EBDH1JSEhgqYcli2Bw11CRC749wJk8AOucgBzmhDSvU,105
 slidge/db/avatar.py,sha256=MXFd1oe0eL5CCUYbc5CpsIcbio3cY3xVoKt39RAoj9I,8240
 slidge/db/meta.py,sha256=NtjGWcqPfG7uPfwR_cC6_23zyo8ftqgKX8CbP9IBq6U,2185
-slidge/db/models.py,sha256=HMSiNY0j-sm0VsikkVED1swPhX687613uW7NEHB8UTs,12826
+slidge/db/models.py,sha256=n_Xmgtfug-ygE2CL0ezvEgeyaSM6dgn7YfaYm78B_7c,12819
 slidge/db/store.py,sha256=yhvYgoXpbueprjVUXBmA25wFyEbzDXMxVzqv8aZi5tw,20308
 slidge/db/alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 slidge/db/alembic/env.py,sha256=hsBlRNs0zF5diSHGRSa8Fi3qRVQDA2rJdR41AEIdvxc,1642
@@ -62,7 +62,7 @@ slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=gNHpGlUstPtBcnBgOarSYzkZHo9E8bNxl_ZY3wM6wHg,6108
 slidge/group/bookmarks.py,sha256=eiXtlgirE59dBi1BT1349wCrGuHDkCoak1phCepzkqI,7653
 slidge/group/participant.py,sha256=2yDJL2bL0w-EiWjq6V96UEhXUgmih5-GpKsoKfG2zdY,18734
-slidge/group/room.py,sha256=QXNEbJBY5gbSpVbr1-u-M2YOoIU1qGhWM7SvtdyiETs,49583
+slidge/group/room.py,sha256=03c6WrSptld6SqA_ndxPJOU9Cz7s0Qq-R8PvXdi-r3A,49523
 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
@@ -85,11 +85,11 @@ slidge/util/conf.py,sha256=Wv-xr1fQfz6jDCBpj2e5Nm-igMpdIjsYsVfoY8grJoo,7380
 slidge/util/jid_escaping.py,sha256=QJ2Yj_j1gTmiO9g2r187iVCu7kia_O5ABhRiLAO2TG4,1073
 slidge/util/lock.py,sha256=ZnUi3LGiz271-YeYKo9JzxovJCoSwlP9P65pNyHIO9o,1029
 slidge/util/test.py,sha256=o86wX1ksnvAgN47k5facDPc4zgiK7J5oWyThgJsv_vQ,13986
-slidge/util/types.py,sha256=nilphTeJU3yb0MSqb86tZeWXis495oDvHSDDBs0hn_4,5747
+slidge/util/types.py,sha256=BA1vhByeaeni3Z5FTIVYafORpU44OOJOTMByL-QqfLs,5870
 slidge/util/util.py,sha256=g6jFu5xgAtRA9FBCIBJT3079t_bQKZYOUvi9L5pTbbk,9595
-slidge-0.3.2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.2.dist-info/METADATA,sha256=Ptqr6X39gL1nyceti9rOscoPzsVcCBb8u93QsqRV6zU,5054
-slidge-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-slidge-0.3.2.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.2.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.2.dist-info/RECORD,,
+slidge-0.3.3.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.3.3.dist-info/METADATA,sha256=Q_WFVFDDTzOc3M9AuY_eRg5zpclCTxaNzqeP0Rp7gRU,5054
+slidge-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+slidge-0.3.3.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
+slidge-0.3.3.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
+slidge-0.3.3.dist-info/RECORD,,