Restructure do_matrix_request to simplify it

aleksis/apps/matrix/util/matrix.py

@@ -28,18 +28,19 @@ def do_matrix_request(method: str, url: str, body: Optional[dict] = None) -> Dic
     """Do a HTTP request to the Matrix Client Server API."""
     while True:
         res = requests.request(method=method, url=build_url(url), headers=get_headers(), json=body)
-        if res.status_code != requests.codes.ok:
-            try:
-                data = res.json()
-            except JSONDecodeError:
-                raise MatrixException(res.text)
-
-            # If rate limit exceeded, wait and retry
-            if data.get("errcode", "") == "M_LIMIT_EXCEEDED":
-                time.sleep(data["retry_after_ms"] / 1000)
-            else:
-                raise MatrixException(data)
-        else:
+
+        try:
+            data = res.json()
+        except JSONDecodeError:
+            raise MatrixException(res.text) from JSONDecodeError
+
+        if res.status_code == requests.codes.ok:
             break
 
-    return res.json()
+        # If rate limit exceeded, wait and retry
+        if data.get("errcode", "") == "M_LIMIT_EXCEEDED":
+            time.sleep(data["retry_after_ms"] / 1000)
+        else:
+            raise MatrixException(data)
+
+    return data