Merge pull request #464 from TotallyNotRobots/fix-yt-likes

chore: Handle missing dislike data due to YouTube API changes

Author: linuxdaemon

plugins/youtube.py

@@ -3,6 +3,7 @@
 
 import isodate
 import requests
+from requests import Response
 
 from cloudbot import hook
 from cloudbot.bot import bot
@@ -23,7 +24,9 @@
 
 
 class APIError(Exception):
-    def __init__(self, message: str, response: Optional[str] = None) -> None:
+    def __init__(
+        self, message: str, response: Optional[Union[str, Response]] = None
+    ) -> None:
         super().__init__(message)
         self.message = message
         self.response = response
@@ -35,8 +38,8 @@ def __init__(self) -> None:
 
 
 class NoResultsError(APIError):
-    def __init__(self) -> None:
-        super().__init__("No results")
+    def __init__(self, response: Response) -> None:
+        super().__init__("No results", response)
 
 
 def raise_api_errors(response: requests.Response) -> None:
@@ -115,7 +118,7 @@ def get_video_description(video_id: str) -> str:
 
     data = json["items"]
     if not data:
-        raise NoResultsError()
+        raise NoResultsError(request)
 
     item = data[0]
     snippet = item["snippet"]
@@ -131,20 +134,21 @@ def get_video_description(video_id: str) -> str:
     out += " - length \x02{}\x02".format(
         timeformat.format_time(int(length.total_seconds()), simple=True)
     )
-    try:
-        total_votes = float(statistics["likeCount"]) + float(
-            statistics["dislikeCount"]
-        )
-    except (LookupError, ValueError):
-        total_votes = 0
 
-    if total_votes != 0:
-        # format
-        likes = pluralize_suffix(int(statistics["likeCount"]), "like")
-        dislikes = pluralize_suffix(int(statistics["dislikeCount"]), "dislike")
+    like_data = statistics.get("likeCount")
+    dislike_data = statistics.get("dislikeCount")
 
-        percent = 100 * float(statistics["likeCount"]) / total_votes
-        out += " - {}, {} (\x02{:.1f}\x02%)".format(likes, dislikes, percent)
+    if like_data:
+        # format
+        likes = int(like_data)
+        out += " - {}".format(pluralize_suffix(likes, "like"))
+        if dislike_data:
+            dislikes = int(dislike_data)
+            total_votes = likes + dislikes
+            percent = 100 * likes / total_votes
+            out += ", {} (\x02{:.1f}\x02%)".format(
+                pluralize_suffix(dislikes, "dislike"), percent
+            )
 
     if "viewCount" in statistics:
         views = int(statistics["viewCount"])
@@ -178,7 +182,7 @@ def get_video_id(text: str) -> str:
     json = request.json()
 
     if not json.get("items"):
-        raise NoResultsError()
+        raise NoResultsError(request)
 
     video_id = json["items"][0]["id"]["videoId"]  # type: str
     return video_id

tests/plugin_tests/test_youtube.py

@@ -131,6 +131,25 @@ def test_success_no_likes(self, mock_requests, mock_api_keys):
 
         assert youtube.get_video_description("phL7P6gtZRM") == result
 
+    def test_success_no_dislikes(self, mock_requests, mock_api_keys):
+        data = deepcopy(video_data)
+        del data["items"][0]["statistics"]["dislikeCount"]
+
+        mock_requests.add(
+            "GET",
+            self.api_url.format(id="phL7P6gtZRM", key="APIKEY"),
+            match_querystring=True,
+            json=data,
+        )
+
+        result = (
+            "\x02some title\x02 - length \x0217m 2s\x02 - 4,633 likes - "
+            "\x0268,905\x02 views - \x02a channel\x02 on "
+            "\x022019.10.10\x02"
+        )
+
+        assert youtube.get_video_description("phL7P6gtZRM") == result
+
     def test_success_nsfw(self, mock_requests, mock_api_keys):
         data = deepcopy(video_data)
         data["items"][0]["contentDetails"]["contentRating"] = {