slidge 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

slidge/core/gateway/base.py

@@ -521,7 +521,7 @@ class BaseGateway(
             self.send_message(
                 mto=jid,
                 mbody=f"{iq.get_from()} has registered",
-                mtype="headline",
+                mtype="chat",
                 mfrom=self.boundjid.bare,
             )
         session.send_gateway_message(self.WELCOME_MESSAGE)

slidge/core/gateway/session_dispatcher.py

@@ -448,6 +448,15 @@ class SessionDispatcher:
                 entity.react(legacy_id, emojis, xmpp_id=xmpp_id, carbon=True)
 
     async def on_presence(self, p: Presence):
+        if p.get_plugin("muc_join", check=True):
+            # handled in on_groupchat_join
+            # without this early return, since we switch from and to in this
+            # presence stanza, on_groupchat_join ends up trying to instantiate
+            # a MUC with the user's JID, which in turn leads to slidge sending
+            # a (error) presence from=the user's JID, which terminates the
+            # XML stream.
+            return
+
         session = await self.__get_session(p)
 
         pto = p.get_to()
@@ -473,6 +482,12 @@ class SessionDispatcher:
         if muc is None or p.get_from().resource not in muc.user_resources:
             return
 
+        if pto.resource == muc.user_nick:
+            # Ignore presence stanzas with the valid nick.
+            # even if joined to the group, we might receive those from clients,
+            # when setting a status message, or going away, etc.
+            return
+
         # We can't use XMPPError here because from must be room@slidge/VALID-USER-NICK
 
         error_from = JID(muc.jid)

slidge/group/participant.py

@@ -108,7 +108,7 @@ class LegacyParticipant(
         msg = self._make_message()
         msg["muc"]["affiliation"] = self._affiliation
         msg["type"] = "normal"
-        if not self.muc.is_anonymous:
+        if not self.muc.is_anonymous and not self.is_system:
             if self.contact:
                 msg["muc"]["jid"] = self.contact.jid
             else:
@@ -143,6 +143,7 @@ class LegacyParticipant(
 
         if self.is_system:
             self.jid = j
+            self._nickname_no_illegal = ""
             return
 
         nickname = unescaped_nickname
@@ -213,7 +214,6 @@ class LegacyParticipant(
 
         kwargs["status_codes"] = set()
         p = self._make_presence(ptype="available", last_seen=last_seen, **kwargs)
-        self.__add_nick_element(p)
         self._send(p)
 
         if old:
@@ -235,7 +235,7 @@ class LegacyParticipant(
         codes = status_codes or set()
         if self.is_user:
             codes.add(110)
-        if not self.muc.is_anonymous:
+        if not self.muc.is_anonymous and not self.is_system:
             if self.is_user:
                 if user_full_jid:
                     p["muc"]["jid"] = user_full_jid
@@ -301,6 +301,7 @@ class LegacyParticipant(
         **send_kwargs,
     ) -> MessageOrPresenceTypeVar:
         stanza["occupant-id"]["id"] = self.__occupant_id
+        self.__add_nick_element(stanza)
         if isinstance(stanza, Presence):
             if stanza["type"] == "unavailable" and not self.__presence_sent:
                 return stanza  # type:ignore
@@ -344,11 +345,11 @@ class LegacyParticipant(
                 )
         return item
 
-    def __add_nick_element(self, p: Presence):
+    def __add_nick_element(self, stanza: Union[Presence, Message]):
         if (nick := self._nickname_no_illegal) != self.jid.resource:
             n = self.xmpp.plugin["xep_0172"].stanza.UserNick()
             n["nick"] = nick
-            p.append(n)
+            stanza.append(n)
 
     def _get_last_presence(self) -> Optional[CachedPresence]:
         own = super()._get_last_presence()
@@ -400,7 +401,6 @@ class LegacyParticipant(
         )
         if presence_id:
             p["id"] = presence_id
-        self.__add_nick_element(p)
         self._send(p, full_jid)
 
     def leave(self):

{slidge-0.1.1.dist-info → slidge-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: slidge
-Version: 0.1.1
+Version: 0.1.3
 Summary: XMPP bridging framework
 Home-page: https://sr.ht/~nicoco/slidge/
 License: AGPL-3.0-or-later
@@ -20,9 +20,11 @@ Requires-Dist: pickle-secure (>=0.99.9,<0.100.0)
 Requires-Dist: python-magic (>=0.4.27,<0.5.0)
 Requires-Dist: qrcode (>=7.4.1,<8.0.0)
 Requires-Dist: slixmpp (>=1.8.5,<2.0.0)
+Project-URL: Documentation, https://slidge.im/
+Project-URL: Repository, https://git.sr.ht/~nicoco/slidge/
 Description-Content-Type: text/markdown
 
-![Slidge logo](./dev/assets/slidge-color-small.png)
+![Slidge logo](https://git.sr.ht/~nicoco/slidge/blob/master/dev/assets/slidge-color-small.png)
 
 [Home](https://sr.ht/~nicoco/slidge) |
 [Docs](https://slidge.im/core) |
@@ -66,8 +68,7 @@ bundle.
 Status
 ------
 
-Slidge is **beta**-grade software for 1:1 chats.
-Group chat support is **experimental**.
+Slidge is **beta**-grade software. It support groups and 1:1 chats.
 
 Try slidge and give us some
 feedback, through the [MUC](xmpp:slidge@conference.nicoco.fr?join), the

{slidge-0.1.1.dist-info → slidge-0.1.3.dist-info}/RECORD

@@ -15,7 +15,7 @@ slidge/core/__init__.py,sha256=RG7Jj5JCJERjhqJ31lOLYV-7bH_oblClQD1KF9LsTXo,68
 slidge/core/cache.py,sha256=Tkw8Bsor8zTN5wPIsBzxfnEk8GaOXMIauO4iBXxgv3M,5443
 slidge/core/config.py,sha256=upZsWObT14foXc5HaXlOcZPLhGL2KSeK0K-QwPDHL3I,7392
 slidge/core/gateway/__init__.py,sha256=rZckY2gAE-mon77_DSsAW1XtWqhBAETE2d4FqZ8pJXk,58
-slidge/core/gateway/base.py,sha256=Ji4cY99m3DJPNTW00oSaOGRY6SZwkQUJRFmSiUlVkjM,34649
+slidge/core/gateway/base.py,sha256=SOjoEV6MME2gGDS7oZgA3RdWBlqdrZeQs5Usf80ijcY,34645
 slidge/core/gateway/caps.py,sha256=Qosd3cZ356mGzzQkdP6Y8OZ5c0l7H3Lr2wptoFrD1qU,1919
 slidge/core/gateway/delivery_receipt.py,sha256=AT_9gvZrtWpSRsDJcYjE8CmF7TW-YBbUPdqNW5zWAdo,1352
 slidge/core/gateway/disco.py,sha256=_ylFGQAzBvKSe1iB85uhBnRUXExExDrEaFa5MEM3E7Y,2230
@@ -25,7 +25,7 @@ slidge/core/gateway/ping.py,sha256=YUmreEyEw89l0M65D_AylL5oW4xj4lvJvhwucyiKofw,1
 slidge/core/gateway/presence.py,sha256=Ow2tWRx-tBL9mGeYRrHLboxD2CdJ32w9yor1kHZEL4U,2732
 slidge/core/gateway/registration.py,sha256=KmxDFV3N01gCs_58Re9QIxJukYP7S3_i6IbukZxzEIs,1619
 slidge/core/gateway/search.py,sha256=ZZPnZlTYFedsQAY-80ZX2el_oej6X7HfIwydYdTxl-o,3518
-slidge/core/gateway/session_dispatcher.py,sha256=ZPaHK-CS4c49U-PEzPlEpwtTMi6h65rLIaikuH-7UPo,28927
+slidge/core/gateway/session_dispatcher.py,sha256=UoBygDrgKIwIb-0TcrPzxxg_AuFhkexGGgvWZWroLts,29641
 slidge/core/gateway/vcard_temp.py,sha256=uCSefV1D0Xx7Ex40t4uS0KHF7cbnq-xixAQQBxTtme8,4639
 slidge/core/mixins/__init__.py,sha256=iAVi4gzekXIR2xDS8ic1gSguvBbfVSScWArM4t87L-U,368
 slidge/core/mixins/attachment.py,sha256=yu7AzrRUCvKM_4AXYO1a83I4o_Sc8h3zteNRYOP2LgU,17808
@@ -42,7 +42,7 @@ slidge/core/session.py,sha256=xKyFxmi_tbp0WJNB7uJX_AENA2u1Pc0EzGr54ajmzfA,26134
 slidge/group/__init__.py,sha256=yFt7cHqeaKIMN6f9ZyhhspOcJJvBtLedGv-iICG7lto,258
 slidge/group/archive.py,sha256=5lnhUZ27RoVsYgcs-KiYiOLHZtB7VfRozLiTf0ZGNjM,3426
 slidge/group/bookmarks.py,sha256=2uX7EiMlJJhYOnTXS1oJOchF5u_hFQAlp8VT2mcPqi0,5944
-slidge/group/participant.py,sha256=5_pfkI-Q9xnf2Oe5RvafetwcFWuiZsfkyyY0GuQ-pgI,14862
+slidge/group/participant.py,sha256=hZNxh8QXaYb4AjVqUYQmHPwWnec1RdyQVDP1sZE85Jk,14947
 slidge/group/room.py,sha256=I6cysvz8rfL6mZZ2AloYufJeG4FlDkEmESLH5oG8b-0,38972
 slidge/migration.py,sha256=PPSjYMFsc9WGWWiSHWqUskpV_L9OJcrlecRf-Z0Vw_E,334
 slidge/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -89,8 +89,8 @@ slidge/util/sql.py,sha256=xjSldsDwgpZc20cmk6UfS4nhdc7Hbuml7kjH6IZgT0I,16517
 slidge/util/test.py,sha256=8cTrL-traDv2jfvfTDNgqewsBJH19ePQ1bf7qzp1RHQ,10688
 slidge/util/types.py,sha256=djIOI4kBBKl_2w8gm7QLtE3NDOCA832rD_GU7A3N6U4,4689
 slidge/util/util.py,sha256=t8t1nPybcitpmuSlYsOwZ8gDjfiEwTjaa4D7vtzrvQ8,8587
-slidge-0.1.1.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-slidge-0.1.1.dist-info/METADATA,sha256=vUVtZmFEef3K9rLBWYpihvADbrOkvKVrIohkpeIwd2Y,4608
-slidge-0.1.1.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-slidge-0.1.1.dist-info/entry_points.txt,sha256=SNl72KSocF5plsu_67xyH6wVWfGTXQbzkQgXbLtzDrQ,47
-slidge-0.1.1.dist-info/RECORD,,
+slidge-0.1.3.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+slidge-0.1.3.dist-info/METADATA,sha256=yCKNkKIY6QS_HY0XKsRFaIQ68hpDGeh1lRPFKgLOgrk,4736
+slidge-0.1.3.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+slidge-0.1.3.dist-info/entry_points.txt,sha256=SNl72KSocF5plsu_67xyH6wVWfGTXQbzkQgXbLtzDrQ,47
+slidge-0.1.3.dist-info/RECORD,,