From ea89da55b3ee2b1c7356a98c1e1d149e441c9696 Mon Sep 17 00:00:00 2001 From: 0xd3d0c3d <0xd3d0c3d@protonmail.com> Date: Tue, 26 Jul 2022 23:42:44 -0500 Subject: [PATCH] revisions --- plugins/boombox_plugin.py | 3 --- plugins/youtube_plugin.py | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/plugins/boombox_plugin.py b/plugins/boombox_plugin.py index 8e863a6..8902ca2 100644 --- a/plugins/boombox_plugin.py +++ b/plugins/boombox_plugin.py @@ -10,7 +10,6 @@ from typing import Type import random import string import os -import ipdb ######################################################################################################### THE ASCII LOGO TO BE USED MOTD=""" _________ _________ _________ ___ ___ _________ _________ ____ ____ @@ -140,13 +139,11 @@ class Plugin: try: base=bbs_data[nl[i][0]] except: - ipdb.set_trace() pass title=base['title'].lower() token=base['token'] url=base['url'] site=base['site'] - # bbs_data=self.bot.db.getlist("bbs_data") hits=base['hits'] lot_nicks=[(k,v) for k, v in zip(range(len(base['nicks'].values())),base['nicks'].values())] buf_nicks=[] diff --git a/plugins/youtube_plugin.py b/plugins/youtube_plugin.py index a4bd382..ecc2351 100644 --- a/plugins/youtube_plugin.py +++ b/plugins/youtube_plugin.py @@ -74,8 +74,13 @@ class Plugin: except: topics = [] ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 1 of 2 ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 1 of 2 ######## - url="https://youtu.be/{}".format(video_id) - self.bot.bbs.enter(mask.nick,url,title) + MUSIC_FOUND=False + for topic in topics: + if topic.lower().find('music'): + MUSIC_FOUND=True + if MUSIC_FOUND: + url = "https://youtu.be/{}".format(video_id) + self.bot.bbs.enter(mask.nick,url,title) ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 1 of 2 ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 1 of 2 ######## duration = isodate.parse_duration(video_info.get("contentDetails").get("duration")) msg = "\x02\x0302{nick:}\x0F\x02\x0304 ▶▶ \x02\x0303\x1D\x1F{title:}\x0F".format(nick=mask.nick, title=title) @@ -135,8 +140,13 @@ class Plugin: topics = [] duration = isodate.parse_duration(video_info.get("contentDetails").get("duration")) ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 2 of 2 ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 2 of 2 ######## - url = "https://youtu.be/{}".format(video_id) - self.bot.bbs.enter(mask.nick,url,title) + MUSIC_FOUND=False + for topic in topics: + if topic.lower().find('music'): + MUSIC_FOUND=True + if MUSIC_FOUND: + url = "https://youtu.be/{}".format(video_id) + self.bot.bbs.enter(mask.nick,url,title) ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 2 of 2 ######## YOUTUBE <-> BOOMBOX_PLUGIN HOOK: 2 of 2 ######## _nick = "" try: