From 51a52e2b0e54031cce5876f54d1d48c268b5441c Mon Sep 17 00:00:00 2001 From: jesopo Date: Wed, 26 Sep 2018 18:27:17 +0100 Subject: Switch to using @Utils.hook and docstrings for event hooks --- modules/youtube.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/youtube.py') diff --git a/modules/youtube.py b/modules/youtube.py index 1cd0f675..10766c9c 100644 --- a/modules/youtube.py +++ b/modules/youtube.py @@ -20,11 +20,6 @@ class Module(object): def __init__(self, bot, events, exports): self.bot = bot self.events = events - events.on("received.command").on("yt", "youtube").hook(self.yt, - help="Find a video on youtube", usage="[query]") - events.on("received.message.channel").hook(self.channel_message) - - events.on("get.searchyoutube").hook(self.search_video) exports.add("channelset", {"setting": "auto-youtube", "help": "Disable/Enable automatically getting info from " @@ -65,6 +60,7 @@ class Module(object): video_title, video_duration, video_uploader, "{:,}".format( int(video_views)), video_opinions, URL_YOUTUBESHORT % video_id) + @Utils.hook("get.searchyoutube") def search_video(self, event): search = event["query"] video_id = "" @@ -80,8 +76,11 @@ class Module(object): video_id = search_page["items"][0]["id"]["videoId"] return "https://youtu.be/%s" % video_id - + @Utils.hook("received.command.yt|youtube", usage="[query]") def yt(self, event): + """ + Find a video on youtube + """ video_id = None search = None if event["args"]: @@ -111,6 +110,7 @@ class Module(object): else: event["stderr"].write("No search phrase provided") + @Utils.hook("received.message.channel") def channel_message(self, event): match = re.search(REGEX_YOUTUBE, event["message"]) if match and event["channel"].get_setting("auto-youtube", False): -- cgit v1.3.1-10-gc9f91