Merge pull request #136 from TotallyNotRobots/gonzobot+youtube-nsfw

Fix youtube.py nsfw tags

Author: linuxdaemon

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix matching exception in horoscope test
 - Fix youtube.py ISO time parse
 - Fix grammatical error in food sentence (beer)
+- Update youtube plugin to use proper contentRating API
 
 ## [1.3.0] 2020-03-17
 ### Added

plugins/youtube.py

@@ -5,7 +5,7 @@
 
 from cloudbot import hook
 from cloudbot.bot import bot
-from cloudbot.util import timeformat
+from cloudbot.util import colors, timeformat
 from cloudbot.util.formatting import pluralize_auto
 
 youtube_re = re.compile(r'(?:youtube.*?(?:v=|/v/)|youtu\.be/|yooouuutuuube.*?id=)([-_a-zA-Z0-9]+)', re.I)
@@ -75,8 +75,13 @@ def get_video_description(video_id):
     out += ' - \x02{}\x02 on \x02{}\x02'.format(uploader,
                                                 upload_time.strftime("%Y.%m.%d"))
 
-    if 'contentRating' in content_details:
-        out += ' - \x034NSFW\x02'
+    try:
+        yt_rating = content_details['contentRating']['ytRating']
+    except KeyError:
+        pass
+    else:
+        if yt_rating == "ytAgeRestricted":
+            out += colors.parse(' - $(red)NSFW$(reset)')
 
     return out
 

tests/plugin_tests/test_youtube.py

@@ -159,7 +159,7 @@ def test_success_nsfw(self, mock_requests, mock_api_keys):
         from plugins import youtube
 
         data = deepcopy(video_data)
-        data['items'][0]['contentDetails']['contentRating'] = "18+"
+        data['items'][0]['contentDetails']['contentRating'] = {"ytRating": "ytAgeRestricted"}
 
         mock_requests.add(
             'GET',
@@ -172,7 +172,7 @@ def test_success_nsfw(self, mock_requests, mock_api_keys):
             '\x02some title\x02 - length \x0217m 2s\x02 - '
             '4,633 likes, 31 dislikes (\x0299.3\x02%) - '
             '\x0268,905\x02 views - \x02a channel\x02 on \x022019.10.10\x02 - '
-            '\x034NSFW\x02'
+            '\x0304NSFW\x0f'
         )
 
         assert youtube.get_video_description('phL7P6gtZRM') == result