More error messages

qwertyquerty · Apr 30, 2018 · 4cdb83b · 4cdb83b
1 parent 3f16d33
commit 4cdb83b
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 26 deletions.
diff --git a/dist/pypresence-1.0.9.tar.gz b/dist/pypresence-1.0.9.tar.gz
diff --git a/pypresence.egg-info/PKG-INFO b/pypresence.egg-info/PKG-INFO
diff --git a/pypresence.egg-info/SOURCES.txt b/pypresence.egg-info/SOURCES.txt
diff --git a/pypresence.egg-info/dependency_links.txt b/pypresence.egg-info/dependency_links.txt
diff --git a/pypresence.egg-info/top_level.txt b/pypresence.egg-info/top_level.txt
diff --git a/pypresence/client.py b/pypresence/client.py
@@ -38,7 +38,10 @@ def read_output(self):
         except BrokenPipeError:
             raise InvalidID
         code, length = struct.unpack('<ii', data[:8])
-        return json.loads(data[8:].decode('utf-8'))
+        payload = json.loads(data[8:].decode('utf-8'))
+        if payload["evt"] == "ERROR":
+            raise ServerError(payload["data"]["message"])
+        return payload
 
 
     def send_data(self, op: int, payload: dict):

diff --git a/pypresence/exceptions.py b/pypresence/exceptions.py
@@ -1,7 +1,11 @@
 class InvalidID(Exception):
     def __init__(self):
         super().__init__('Client ID is Invalid')
-        
+
 class InvalidPipe(Exception):
     def __init__(self):
         super().__init__('Pipe Not Found - Is Discord Running?')
+
+class ServerError(Exception):
+    def __init__(self,message):
+        super().__init__(message.replace(']','').replace('[','').capitalize())
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 setup(name='pypresence',
       author='qwertyquerty',
       url='https://github.com/qwertyquerty/pypresence',
-      version='1.0.7',
+      version='1.0.9',
       packages=['pypresence'],
       license='MIT',
       description='Discord RPC client written in python',