Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

only show youtu.be url when one was not provided

Browse source 
closes #171
This commit is contained in:
jesopo 2019-10-08 11:39:14 +01:00
parent 68aa89f16f
commit 513f8a1ddd
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/youtube.py
View file

@ -61,9 +61,11 @@ class Module(ModuleManager.BaseModule):
) if match.group(2) else "00:" ) if match.group(2) else "00:"
video_duration += "%s" % match.group(3)[:-1].zfill(2 video_duration += "%s" % match.group(3)[:-1].zfill(2
) if match.group(3) else "00" ) if match.group(3) else "00"
return "%s (%s) uploaded by %s, %s views%s %s" % ( url = URL_YOUTUBESHORT % video_id
return "%s (%s) uploaded by %s, %s views%s" % (
video_title, video_duration, video_uploader, "{:,}".format( video_title, video_duration, video_uploader, "{:,}".format(
int(video_views)), video_opinions, URL_YOUTUBESHORT % video_id) int(video_views)), video_opinions), url
return None
def get_playlist_page(self, playlist_id, part): def get_playlist_page(self, playlist_id, part):
return utils.http.request(URL_YOUTUBEPLAYLIST, get_params={ return utils.http.request(URL_YOUTUBEPLAYLIST, get_params={
@ -128,6 +130,8 @@ class Module(ModuleManager.BaseModule):
url = event["target"].buffer.find(REGEX_YOUTUBE) url = event["target"].buffer.find(REGEX_YOUTUBE)
url = utils.http.url_sanitise(url.match) if url else None url = utils.http.url_sanitise(url.match) if url else None
from_url = not url == None
if not url: if not url:
safe_setting = event["target"].get_setting("youtube-safesearch", True) safe_setting = event["target"].get_setting("youtube-safesearch", True)
safe = "moderate" if safe_setting else "none" safe = "moderate" if safe_setting else "none"
@ -147,6 +151,9 @@ class Module(ModuleManager.BaseModule):
if url: if url:
out = self._from_url(url) out = self._from_url(url)
if not out == None: if not out == None:
out, short_url = out
if not from_url:
out = "%s %s" % (out, short_url)
event["stdout"].write(out) event["stdout"].write(out)
else: else:
raise utils.EventsResultsError() raise utils.EventsResultsError()
@ -162,5 +169,6 @@ class Module(ModuleManager.BaseModule):
url = utils.http.url_sanitise(event["match"].group(0)) url = utils.http.url_sanitise(event["match"].group(0))
out = self._from_url(url) out = self._from_url(url)
if not out == None: if not out == None:
out, short_url = out
event.eat() event.eat()
event["stdout"].write(out) event["stdout"].write(out)