From a599ff721232b6ac0ec1a24135b388a52ad80f18 Mon Sep 17 00:00:00 2001 From: dpedu Date: Sat, 5 Sep 2015 20:55:57 -0700 Subject: [PATCH] Add checks to prevent bot saying "None", fix error building youtube message --- pyircbot/modules/LinkTitler.py | 7 +++++-- pyircbot/modules/Youtube.py | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pyircbot/modules/LinkTitler.py b/pyircbot/modules/LinkTitler.py index 691e72f..8a48ca9 100755 --- a/pyircbot/modules/LinkTitler.py +++ b/pyircbot/modules/LinkTitler.py @@ -36,7 +36,9 @@ class LinkTitler(ModuleBase): done = [] for item in matches: if not item in done: - self.bot.act_PRIVMSG(args[0], self.get_video_description(item)) + vidinfo = self.get_video_description(item) + if vidinfo: + self.bot.act_PRIVMSG(args[0], vidinfo) done.append(item) return @@ -122,7 +124,8 @@ class LinkTitler(ModuleBase): out += '%dh ' % int(duration["hours"]) if duration["minutes"]!=None: out += '%dm ' % int(duration["minutes"]) - out += "%ds\x02" % int(duration["seconds"]) + if duration["seconds"]!=None: + out += "%ds\x02" % int(duration["seconds"]) totalvotes = float(video["statistics"]["dislikeCount"])+float(video["statistics"]["likeCount"]) rating = float(video["statistics"]["likeCount"]) / totalvotes diff --git a/pyircbot/modules/Youtube.py b/pyircbot/modules/Youtube.py index 7f88797..c7574c2 100755 --- a/pyircbot/modules/Youtube.py +++ b/pyircbot/modules/Youtube.py @@ -47,7 +47,9 @@ class Youtube(ModuleBase): self.bot.act_PRIVMSG(args[0], "YouTube: No results found.") else: vid_id = j['data']['items'][0]['id'] - self.bot.act_PRIVMSG(args[0], "http://youtu.be/%s :: %s" % (vid_id, self.get_video_description(vid_id))) + vidinfo = self.get_video_description(vid_id) + if vidinfo: + self.bot.act_PRIVMSG(args[0], "http://youtu.be/%s :: %s" % (vid_id, vidinfo)) def get_video_description(self, vid_id): apidata = get('https://www.googleapis.com/youtube/v3/videos?part=snippet,contentDetails,statistics&id=%s&key=%s' % (vid_id, self.config["api_key"])).json()