Added "exception" op support.

Bump to v2.3
zRitsu · Mar 21, 2023 · 6a782e6 · 6a782e6
1 parent cadecbf
commit 6a782e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/main_window.py b/main_window.py
@@ -15,8 +15,8 @@
 class RPCGui:
 
     def __init__(self, client: RpcClient):
-        self.appname = "Discord RPC (Music Bot)"
         self.client = client
+        self.appname = f"Discord RPC (Music Bot) v{self.client.version}"
         self.config = self.client.config
         self.ready = False
 
@@ -235,7 +235,7 @@ def window_loop(self):
 
             elif event == "btn_paste_token":
 
-                token = self.window.TKroot.clipboard_get()
+                token = self.window.TKroot.clipboard_get().replace("\n","").replace(" ", "")
 
                 if len(token) != 50:
                     sg.popup_ok(f"O token colado não possui 50 caracteres:\n"

diff --git a/rpc_client.py b/rpc_client.py
@@ -119,6 +119,7 @@ def fix_characters(text: str, limit=30):
 class RpcClient:
 
     def __init__(self):
+        self.version = 2.3
         self.last_data = {}
         self.tasks = []
         self.main_task = None
@@ -575,7 +576,7 @@ async def handle_socket(self, uri):
                                 "op": "rpc_update",
                                 "user_ids": list(user_clients),
                                 "token": self.config["token"].replace(" ", ""),
-                                "version": 2.1
+                                "version": self.version
                             }
                         )
                     )
@@ -622,6 +623,13 @@ async def handle_socket(self, uri):
                             except KeyError:
                                 continue
 
+                            if data['op'] == "exception":
+                                self.gui.update_log(f"op: {data['op']} | {user} {user_ws} | "
+                                                    f"bot: {(bot_name + ' ') if bot_name else ''}[{bot_id}] | "
+                                                    f"\nerror: {data.get('message')}",
+                                                    log_type="error")
+                                continue
+
                             self.gui.update_log(f"op: {data['op']} | {user} {user_ws} | "
                                                 f"bot: {(bot_name + ' ') if bot_name else ''}[{bot_id}]",
                                                 log_type="info")