slidge 0.1.1__tar.gz → 0.1.3__tar.gz

{slidge-0.1.1 → slidge-0.1.3}/PKG-INFO

@@ -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 → slidge-0.1.3}/README.md

@@ -1,4 +1,4 @@
-![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) |
@@ -42,8 +42,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 → slidge-0.1.3}/pyproject.toml

@@ -1,11 +1,13 @@
 [tool.poetry]
 name = "slidge"
-version = "0.1.1"
+version = "0.1.3"
 description = "XMPP bridging framework"
 authors = ["Nicolas Cedilnik <nicoco@nicoco.fr>"]
 readme = "README.md"
 license = "AGPL-3.0-or-later"
 homepage = "https://sr.ht/~nicoco/slidge/"
+repository = "https://git.sr.ht/~nicoco/slidge/"
+documentation = "https://slidge.im/"
 include = ["slidge/util/schema.sql"]
 
 [tool.poetry.dependencies]

{slidge-0.1.1 → slidge-0.1.3}/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-0.1.1 → slidge-0.1.3}/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-0.1.1 → slidge-0.1.3}/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):