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

slidge/core/mixins/attachment.py

@@ -303,6 +303,10 @@ class AttachmentMixin(TextMessageMixin):
         )
         if attachment.name:
             sfs["file"]["name"] = attachment.name
+        if attachment.disposition:
+            sfs["disposition"] = attachment.disposition
+        else:
+            del sfs["disposition"]
         if thumbnail is not None:
             sfs["file"].append(thumbnail)
         stored.sfs = str(sfs)

slidge/core/mixins/base.py

@@ -19,7 +19,7 @@ class Base:
     xmpp: "BaseGateway" = NotImplemented
 
     jid: JID = NotImplemented
-    name: str = NotImplemented
+    name: str | None = NotImplemented
 
     @property
     def user_jid(self):

slidge/core/mixins/disco.py

@@ -13,7 +13,7 @@ class BaseDiscoMixin(Base):
     DISCO_NAME: str = NotImplemented
     DISCO_LANG = None
 
-    def _get_disco_name(self):
+    def _get_disco_name(self) -> str | None:
         if self.DISCO_NAME is NotImplemented:
             return self.xmpp.COMPONENT_NAME
         return self.DISCO_NAME or self.xmpp.COMPONENT_NAME

slidge/db/store.py

@@ -478,7 +478,7 @@ class ParticipantStore:
 
     @staticmethod
     def get_all(
-        session, room_pk: int, user_included: bool = True
+        session: Session, room_pk: int, user_included: bool = True
     ) -> Iterator[Participant]:
         query = select(Participant).where(Participant.room_id == room_pk)
         if not user_included:

slidge/group/bookmarks.py

@@ -1,6 +1,6 @@
 import abc
 import logging
-from typing import TYPE_CHECKING, Generic, Iterator, Optional, Type
+from typing import TYPE_CHECKING, Generic, Iterator, Literal, Optional, Type, overload
 
 from slixmpp import JID
 from slixmpp.exceptions import XMPPError
@@ -119,13 +119,31 @@ class LegacyBookmarks(
                 return self.from_store(stored)
         return None
 
-    async def by_legacy_id(self, legacy_id: LegacyGroupIdType) -> LegacyMUCType:
+    @overload
+    async def by_legacy_id(self, legacy_id: LegacyGroupIdType) -> "LegacyMUCType": ...
+
+    @overload
+    async def by_legacy_id(
+        self, legacy_id: LegacyGroupIdType, create: Literal[False]
+    ) -> "LegacyMUCType | None": ...
+
+    @overload
+    async def by_legacy_id(
+        self, legacy_id: LegacyGroupIdType, create: Literal[True]
+    ) -> "LegacyMUCType": ...
+
+    async def by_legacy_id(
+        self, legacy_id: LegacyGroupIdType, create: bool = False
+    ) -> LegacyMUCType | None:
         async with self.lock(("legacy_id", legacy_id)):
             local = await self.legacy_id_to_jid_local_part(legacy_id)
             jid = JID(f"{local}@{self.xmpp.boundjid}")
             if self.get_lock(("bare", jid.bare)):
                 self.session.log.debug("Already updating %s via by_jid()", jid)
-                return await self.by_jid(jid)
+                if create:
+                    return await self.by_jid(jid)
+                else:
+                    return self.by_jid_only_if_exists(jid)
 
             with self.xmpp.store.session() as orm:
                 stored = (

slidge/group/room.py

@@ -7,7 +7,16 @@ from asyncio import Lock
 from contextlib import asynccontextmanager
 from copy import copy
 from datetime import datetime, timedelta, timezone
-from typing import TYPE_CHECKING, AsyncIterator, Generic, Optional, Type, Union
+from typing import (
+    TYPE_CHECKING,
+    AsyncIterator,
+    Generic,
+    Literal,
+    Optional,
+    Type,
+    Union,
+    overload,
+)
 from uuid import uuid4
 
 import sqlalchemy as sa
@@ -325,16 +334,15 @@ class LegacyMUC(
             self.stored.history_filled = True
             self.commit(merge=True)
 
-    @property
-    def DISCO_NAME(self) -> str:  # type:ignore
-        return self.name or "unnamed-room"
+    def _get_disco_name(self) -> str | None:
+        return self.name
 
     @property
-    def name(self) -> str:
-        return self.stored.name or "unnamed-room"
+    def name(self) -> str | None:
+        return self.stored.name
 
     @name.setter
-    def name(self, n: str) -> None:
+    def name(self, n: str | None) -> None:
         if self.name == n:
             return
         self.stored.name = n
@@ -673,7 +681,7 @@ class LegacyMUC(
                 since=since,
             )
         self.__get_subject_setter_participant().set_room_subject(
-            self.subject if self.HAS_SUBJECT else (self.description or self.name),
+            self.subject if self.HAS_SUBJECT else (self.description or self.name or ""),
             user_full_jid,
             self.subject_date,
         )
@@ -764,9 +772,24 @@ class LegacyMUC(
         """
         return self._participant_cls(self, Participant(), is_system=True)
 
+    @overload
     async def get_participant_by_contact(
         self, c: "LegacyContact"
-    ) -> "LegacyParticipantType":
+    ) -> "LegacyParticipantType": ...
+
+    @overload
+    async def get_participant_by_contact(
+        self, c: "LegacyContact", create: Literal[False]
+    ) -> "LegacyParticipantType | None": ...
+
+    @overload
+    async def get_participant_by_contact(
+        self, c: "LegacyContact", create: Literal[True]
+    ) -> "LegacyParticipantType": ...
+
+    async def get_participant_by_contact(
+        self, c: "LegacyContact", create: bool = True
+    ) -> "LegacyParticipantType | None":
         """
         Get a non-anonymous participant.
 
@@ -774,6 +797,7 @@ class LegacyMUC(
         that the Contact jid is associated to this participant
 
         :param c: The :class:`.LegacyContact` instance corresponding to this contact
+        :param create: Creates the participant if it does not exist.
         :return:
         """
         await self.session.contacts.ready
@@ -785,7 +809,10 @@ class LegacyMUC(
                 .filter_by(contact=c.stored, room=self.stored)
                 .one_or_none()
             )
-            if stored is not None:
+            if stored is None:
+                if not create:
+                    return None
+            else:
                 return self.participant_from_store(stored=stored, contact=c)
 
         nickname = c.name or unescape_node(c.jid.node)

slidge/util/types.py

@@ -72,6 +72,7 @@ MucRole = Literal["visitor", "participant", "moderator", "none"]
 ClientType = Literal[
     "bot", "console", "game", "handheld", "pc", "phone", "sms", "tablet", "web"
 ]
+AttachmentDisposition = Literal["attachment", "inline"]
 
 
 @dataclass
@@ -115,6 +116,7 @@ class LegacyAttachment:
     legacy_file_id: Optional[Union[str, int]] = None
     url: Optional[str] = None
     caption: Optional[str] = None
+    disposition: Optional[AttachmentDisposition] = None
     """
     A caption for this specific image. For a global caption for a list of attachments,
     use the ``body`` parameter of :meth:`.AttachmentMixin.send_files`

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

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

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

@@ -39,11 +39,11 @@ slidge/core/dispatcher/muc/misc.py,sha256=FYo5FdmzksEuUCfCLLOOm8_8plXtZFQP8IzvzV
 slidge/core/dispatcher/muc/owner.py,sha256=dDAxpRaA8H_NJQNIyBNixck2oG4GHZeEQqPhKd7MmDQ,3359
 slidge/core/dispatcher/muc/ping.py,sha256=EgKKS9AvMnW-vINGcoGbtk6NdbN9A7zVaGfT5T7F6YE,1699
 slidge/core/mixins/__init__.py,sha256=Zea39CCwjJU5XfHwcYPEZ9Sin8z1BZxoV68G2RwC3nE,386
-slidge/core/mixins/attachment.py,sha256=f_8SZGyEAK00fzpwUWyIocPzdkSl5awPihR6_GCgdDo,21766
+slidge/core/mixins/attachment.py,sha256=6c1gZNydVZHgHB-_PjBLbT_9ntBSNG0AWqlv9Cgcku8,21906
 slidge/core/mixins/avatar.py,sha256=0E0mQxdTUcJQrYXlBkYqkNl4bYuga4cIC1s4XA2rED8,5559
-slidge/core/mixins/base.py,sha256=MOd-pas38_52VawQVlxWtBtmTKC6My9G0ZaCeQxOJbs,748
+slidge/core/mixins/base.py,sha256=iGu1yPFgivouhXx0ckgbO7HbpFHOnbJnEWEUvwSg8KU,755
 slidge/core/mixins/db.py,sha256=a6idm-FgHWfDK-MJZWy5AkkBlyY8JmwOB8xAFmm0E9g,1934
-slidge/core/mixins/disco.py,sha256=jk3Z1B6zTuisHv8VKNRJodIo0ee5btYHh2ZrlflPj_Q,3670
+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
@@ -53,16 +53,16 @@ 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=8z5bbaEINfU1Qx12iyHu4zRD9s3PwC6oUOz-PyBoqYg,12841
-slidge/db/store.py,sha256=shgBqGutbAeMD6T3sqH7Qo4IKs9TWwjwfH5-NDpj-kY,19399
+slidge/db/store.py,sha256=ZksmZlFaTia7eWy_trALc_iTEkk2x7CIlEQeYkHW21g,19408
 slidge/db/alembic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=UWrUjZMWlDmwKFRuNEqxZSx4cvXFib4AP_l388ApJa8,7086
+slidge/group/bookmarks.py,sha256=qOaopMQNoGUB05Kq4aYRmoE-DOtXmSAAGwfCs1hcWB4,7648
 slidge/group/participant.py,sha256=eMwUgbEtxGjWMmIqUfS8uSKlaStitZ3D68M_RixQeso,17676
-slidge/group/room.py,sha256=_KP0jIh9f9k0yDRWCe7BsZBQesfm1lwbHpN9WYRKuzc,48391
+slidge/group/room.py,sha256=E3uiroLmqwM52Lw6zT4wUQmVjmxx6wkeF3f87bIt3VU,49026
 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=_E6er2BtQlpyzTUmp4u8C9KhBYzbLrmTwSVgxGObKHU,13988
-slidge/util/types.py,sha256=xJ84ZvaUOU_VVJSjEMysgNSl05k0_O9YKbyW-JUrsMI,5635
+slidge/util/types.py,sha256=nilphTeJU3yb0MSqb86tZeWXis495oDvHSDDBs0hn_4,5747
 slidge/util/util.py,sha256=4hihLCl4SsB5S14TT3bP8tDPP_Zg9rYbSfLdLB9-G_Q,9332
-slidge-0.3.0b2.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.3.0b2.dist-info/METADATA,sha256=_O_tp1b_KiJA94aoQQG0e0Nbg37mt-P7BFJY6Gn0xcg,5056
-slidge-0.3.0b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-slidge-0.3.0b2.dist-info/entry_points.txt,sha256=py3_x834fFJ2TEzPd18Wt2DnysdAfuVqJ5zzBrXbAZs,44
-slidge-0.3.0b2.dist-info/top_level.txt,sha256=2LRjDYHaGZ5ieCMF8xy58JIiabRMzX-MGMbCZwfE17c,7
-slidge-0.3.0b2.dist-info/RECORD,,
+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,,