wnox 0.7.0__tar.gz → 0.8.0__tar.gz

{wnox-0.7.0 → wnox-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wnox
-Version: 0.7.0
+Version: 0.8.0
 Summary: QE nexus client.
 Home-page: https://github.com/arminkardan/pywnox
 Author: Ethan (Armin) Cardan

{wnox-0.7.0 → wnox-0.8.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "wnox"
-version = "0.7.0"
+version = "0.8.0"
 authors = [{ name = "Ethan (Armin) Cardan", email = "armin.fire@gmail.com" }]
 description = "QE nexus client."
 readme = "README.md"

{wnox-0.7.0 → wnox-0.8.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="wnox",
-    version="0.7.0",
+    version="0.8.0",
     packages=find_packages(),
     install_requires=[],
     author="Ethan (Armin) Cardan",

{wnox-0.7.0 → wnox-0.8.0}/wnox/__init__.py

@@ -62,7 +62,7 @@ class WSX(ClientXMPP, EventEmitter):
         print("[bridge] connected.")
         self.send_presence(ptype="presence")
         await self.get_roster()
-        await self.emit("connect",{})
+        await self.emit("__connect",{})
         self.connected = True
         
 
@@ -71,7 +71,7 @@ class WSX(ClientXMPP, EventEmitter):
 
     async def on_disconnect(self, event):
         """Handle disconnection and attempt reconnection."""
-        await self.emit("disconnect",{})
+        await self.emit("__disconnect",{})
         self.connected = False
         asyncio.create_task(self.reconnect())
 
@@ -95,17 +95,27 @@ class WSX(ClientXMPP, EventEmitter):
             delayed = "urn:xmpp:delay" in str(stanza)
 
             if body and not delayed:
-                user_uid = from_jid.split('@')[0]
+               
                     
                 if body.startswith("{"):
                     try:
                         json_data = json.loads(body)
+                        if "__connect" in json_data:
+                            return
+                        if "__disconnect" in  json_data:
+                            return
+                        if "__message" in  json_data:
+                            return
+                        
                         if "api" in json_data:
+                            user_uid = from_jid.split('@')[0]
                             data = {key: val for key, val in json_data.items() if key != "api"}
                             data = {key: val for key, val in data.items() if key != "mid"}
                             data["from"] = from_jid
-                            
-                            if True or len(user_uid) == 24 and ObjectId.is_valid(user_uid):
+                            data["app"] = None
+                            if len(user_uid) == 24 and ObjectId.is_valid(user_uid):
+                                data["uid"] = user_uid
+                                data["app"] = None
                                 result = await self.emit(json_data["api"], data)
                                 if result == None:
                                     result = {}
@@ -113,6 +123,14 @@ class WSX(ClientXMPP, EventEmitter):
                                     mto=from_jid,
                                     mbody=json.dumps({**result, "mid": json_data.get("mid")})
                                 )
+                            elif "conference.qepal.com" in from_jid:
+                                pass
+                            elif "-" in user_uid:
+                                app = user_uid.split('-')[0]
+                                user_uid = user_uid.split('-')[1]
+                                data["app"] = app
+                                data["uid"] = user_uid
+                                
                         else:
                             if "mid" in json_data:
                                 data = {key: val for key, val in json_data.items() if key != "mid"}
@@ -120,12 +138,12 @@ class WSX(ClientXMPP, EventEmitter):
                                 if json_data.get("mid") in eventsx:
                                     eventsx.get(json_data.get("mid")).set()
                             else:
-                                await self.emit("message", {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro})
+                                await self.emit("__message", {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro})
                    
                     except json.JSONDecodeError:
                         pass
                 else:
-                    await self.emit("message", {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro})
+                    await self.emit("__message", {"from": from_jid, "body": body, "itsme": itsme, "itsbro": itsbro})
 
 
 

{wnox-0.7.0 → wnox-0.8.0}/wnox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: wnox
-Version: 0.7.0
+Version: 0.8.0
 Summary: QE nexus client.
 Home-page: https://github.com/arminkardan/pywnox
 Author: Ethan (Armin) Cardan