CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-07 11:48:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Audio] Better URL checking, strip enclosing tags

Browse Source
This commit is contained in:
Twentysix 2017-01-24 19:34:56 +01:00
parent 08a26f5ff1
commit 143d41f2f2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cogs/audio.py
View File

@ -6,6 +6,7 @@ from random import shuffle, choice
from cogs.utils.dataIO import dataIO from cogs.utils.dataIO import dataIO
from cogs.utils import checks from cogs.utils import checks
from cogs.utils.chat_formatting import pagify from cogs.utils.chat_formatting import pagify
from urllib.parse import urlparse
from __main__ import send_cmd_help, settings from __main__ import send_cmd_help, settings
from json import JSONDecodeError from json import JSONDecodeError
import re import re
@ -725,6 +726,12 @@ class Audio:
return True return True
return False return False
def _match_any_url(self, url):
url = urlparse(url)
if url.scheme and url.netloc and url.path:
return True
return False
# TODO: _next_songs_in_queue # TODO: _next_songs_in_queue
async def _parse_playlist(self, url): async def _parse_playlist(self, url):
@ -1345,7 +1352,9 @@ class Audio:
await self.bot.say("I'm already downloading a file!") await self.bot.say("I'm already downloading a file!")
return return
if "." in url: url = url.strip("<>")
if self._match_any_url(url):
if not self._valid_playable_url(url): if not self._valid_playable_url(url):
await self.bot.say("That's not a valid URL.") await self.bot.say("That's not a valid URL.")
return return
@ -1609,7 +1618,9 @@ class Audio:
" queue to modify. This should never" " queue to modify. This should never"
" happen.") " happen.")
if "." in url: url = url.strip("<>")
if self._match_any_url(url):
if not self._valid_playable_url(url): if not self._valid_playable_url(url):
await self.bot.say("That's not a valid URL.") await self.bot.say("That's not a valid URL.")
return return