Merge pull request matryer#1790 from elalemanyo/fix/github_notifications

001-notifications.30s.py: fix small bugs and add discussion
jimeh · Aug 23, 2022 · 82e185b · 82e185b
2 parents c379023 + bc0f340
commit 82e185b
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/Dev/GitHub/notifications.30s.py b/Dev/GitHub/notifications.30s.py
@@ -59,7 +59,7 @@ def make_github_request(url, method="GET", data=None, enterprise=False):
         request.get_method = lambda: method
         response = urlopen(request, data)
         return (
-            json.load(response) if response.headers.get("content-length", 0) > 0 else {}
+            json.load(response) if int(response.headers.get("content-length", 0)) > 0 else {}
         )
     except Exception:
         return None
@@ -129,7 +129,7 @@ def format_notification(notification):
     }
     if len(formatted["title"]) > 90:
         formatted["title"] = formatted["title"][:79] + "…"
-    formatted["title"] = formatted["title"].replace("|", "-")
+    formatted["title"] = formatted["title"].decode().replace("|", "-")
     latest_comment_url = notification.get("subject", {}).get("latest_comment_url", None)
     typejson = make_github_request(formatted["href"])
     if latest_comment_url:
@@ -185,6 +185,16 @@ def format_notification(notification):
             "image"
         ] += "JdJREFUKJGl0DsKwkAUBdDTRgvFHbgmNyLY+QWzKxM/kK2kSKc70MIIQ0ziqBceA/dxinn8mSkKVMGUmH+CBWaNboQjdn2wqt97Pa8kNd5+C0O86YNdSZC34RLjCJxhHZYLXDCIxKuwTHGOwBNcm2WKUw9OcMCybZl6XjHpQOs30cB5gKNQiDPPP0WjV/a4aVwxNsNfUGce7P8k4XgVPSYAAAAASUVORK5CYII="
         formatted["templateImage"] = formatted.pop("image")
+    elif type == "Discussion":
+        formatted[
+            "image"
+        ] += ""
+        formatted["templateImage"] = formatted.pop("image")
+    elif type == "CheckSuite":
+        formatted[
+            "image"
+        ] += ""
+        formatted["templateImage"] = formatted.pop("image")
     return formatted