Refactor code to use keyword arguments in generate_code_snippet funct…

…ion and add validators module

cogs/getcode.py

@@ -46,7 +46,7 @@ async def get_code(self, interaction: discord.Interaction, language:app_commands
 
         await interaction.response.defer()
 
-        code, lang = generate_code_snippet(language.value, url, alias, max_clicks, password)
+        code, lang = generate_code_snippet(language=language.value, long_url=url, alias=alias, max_clicks=max_clicks, password=password)
 
         soft_errors = []
 

constants.py

@@ -13,6 +13,7 @@
 import random
 import datetime
 import random
+import validators
 
 load_dotenv()
 

requirements.txt

@@ -4,4 +4,5 @@ discord.py
 python-dotenv
 requests
 py_spoo_url
-flask
+flask
+validators

utils_code.py

@@ -1,6 +1,7 @@
 import json
 from typing import Literal
 import re
+import validators
 
 available_languages = [
     "Python-Requests",
@@ -472,7 +473,7 @@ async def main():
             "kotlin",
         )
 
-    elif language == "Node.js-Request":
+    elif language == "Node.js-Requests":
         form_params = f"url: '{long_url}'"
 
         if alias is not None:
@@ -755,18 +756,21 @@ def validate_password(password):
     return True
 
 
-def validate_url(url):
-    pattern = re.compile(
-        r"^(https?:\/\/)?(www\.)?[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,6}(\:[0-9]{1,5})?(\/.*)?$"
-    )
+# def validate_url(url):
+#     pattern = re.compile(
+#         r"^(https?:\/\/)?(www\.)?[a-zA-Z0-9]+([\-\.]{1}[a-zA-Z0-9]+)*\.[a-zA-Z]{2,6}(\:[0-9]{1,5})?(\/.*)?$"
+#     )
 
-    if "spoo.me" in url:
-        return False
+#     if "spoo.me" in url:
+#         return False
 
-    if re.fullmatch(pattern, url):
-        return True
-    else:
-        return False
+#     if re.fullmatch(pattern, url):
+#         return True
+#     else:
+#         return False
+
+def validate_url(url):
+    return validators.url(url, skip_ipv4_addr=True, skip_ipv6_addr=True) and not "spoo.me" in url
 
 
 def validate_string(string):