diff --git a/main.py b/main.py index f614c89..290f100 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,7 @@ import ffmpeg from dotenv import load_dotenv from downloader import download from compressionMessages import getCompressionMessage +from validator import extractUrl, isSupportedUrl load_dotenv() @@ -58,10 +59,29 @@ async def on_message(message): if message.content.startswith('$hello'): await message.channel.send('Hello!') + # Extract and validate the request + extractResponse = extractUrl(message.content) + url = extractResponse["url"] + messages = extractResponse['messages'] + if(messages.startswith("Error")): + await message.channel.send('TikBot encountered an error determing a URL. Consider berating my human if this was not expected.\nMessage: ' + messages) + return + + print("Got URL: " + url + " For User: " + str(message.author)) + if('๐Ÿค–' not in message.content): + # Validate unless we've been reqeuested not to + validateResponse = isSupportedUrl(url) + messages = validateResponse['messages'] + if(messages.startswith("Error")): + await message.channel.send('TikBot encountered an error validating the URL. Consider berating my human if this was not expected.\nMessage: ' + messages) + return + if(validateResponse['supported'] == 'false'): + # Unsupported URL, return silently without doing anything + return if message.content.startswith('https'): await message.channel.send('TikBot downloading video now!') - downloadResponse = download(message.content) + downloadResponse = download(url) fileName = downloadResponse['fileName'] duration = downloadResponse['duration'] messages = downloadResponse['messages'] diff --git a/tests.py b/tests.py new file mode 100644 index 0000000..a09ad6e --- /dev/null +++ b/tests.py @@ -0,0 +1,17 @@ +import unittest +from validator import extractUrl, isSupportedUrl + +class TestUrlParser(unittest.TestCase): + + def test_supportedUrl(self): + url = "https://vm.tiktok.com/ZSJrgyXdt/" + supportedResponse = isSupportedUrl(url) + self.assertEqual(supportedResponse["supported"], 'true') + + def test_unsupportedUrl(self): + url = "https://www.twitch.tv/robcdee/clip/AgileLivelyCucumberPartyTime" + supportedResponse = isSupportedUrl(url) + self.assertEqual(supportedResponse["supported"], 'false') + +if __name__ == '__main__': + unittest.main() \ No newline at end of file diff --git a/validator.py b/validator.py new file mode 100644 index 0000000..5425599 --- /dev/null +++ b/validator.py @@ -0,0 +1,31 @@ +import re + +def extractUrl(inputString): + response = {'url': '', 'messages': ''} + + # Grubers regex pattern https://gist.github.com/gruber/8891611 + pattern = r"""(?i)\b((?:https?:(?:/{1,3}|[a-z0-9%])|[a-z0-9.\-]+[.](?:com|net|org|edu|gov|mil|aero|asia|biz|cat|coop|info|int|jobs|mobi|museum|name|post|pro|tel|travel|xxx|ac|ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|ax|az|ba|bb|bd|be|bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cd|cf|cg|ch|ci|ck|cl|cm|cn|co|cr|cs|cu|cv|cx|cy|cz|dd|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|eu|fi|fj|fk|fm|fo|fr|ga|gb|gd|ge|gf|gg|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|hk|hm|hn|hr|ht|hu|id|ie|il|im|in|io|iq|ir|is|it|je|jm|jo|jp|ke|kg|kh|ki|km|kn|kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|me|mg|mh|mk|ml|mm|mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|ps|pt|pw|py|qa|re|ro|rs|ru|rw|sa|sb|sc|sd|se|sg|sh|si|sj|Ja|sk|sl|sm|sn|so|sr|ss|st|su|sv|sx|sy|sz|tc|td|tf|tg|th|tj|tk|tl|tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|ws|ye|yt|yu|za|zm|zw)/)(?:[^\s()<>{}\[\]]+|\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\))+(?:\([^\s()]*?\([^\s()]+\)[^\s()]*?\)|\([^\s]+?\)|[^\s`!()\[\]{};:'".,<>?ยซยปโ€œโ€โ€˜โ€™])|(?:(?