web failsafe

Author: Simon Berger

gisi/cogs/web.py

@@ -1,6 +1,8 @@
 import logging
 from io import BytesIO
 
+from aiohttp import ClientConnectorError
+from aiohttp.http_exceptions import InvalidURLError
 from discord import File
 from discord.ext.commands import command
 
@@ -16,18 +18,25 @@ def __init__(self, bot):
     @command()
     async def show(self, ctx, url: UrlConverter):
         async with ctx.typing():
-            async with self.bot.webdriver as driver:
-                await ctx.message.edit(content=f"heading to {url}...")
-                await driver.get(url)
-                await ctx.message.edit(content=f"taking screenshot...")
-                im = await driver.get_screenshot()
-                title = driver.title
-            imdata = BytesIO()
-            im.save(imdata, "png")
-            imdata.seek(0)
-            file = File(imdata, f"{title}.png")
-            await ctx.send(f"{title} (<{url}>):", file=file)
-            await ctx.message.delete()
+            await ctx.message.edit(content=f"checking {url}...")
+            try:
+                async with self.bot.aiosession.head(url, allow_redirects=True) as resp:
+                    resp.raise_for_status()
+            except (InvalidURLError, ClientConnectorError):
+                await ctx.message.edit(content=f"<{url}> **isn't a valid url**")
+                return
+
+        async with self.bot.webdriver as driver:
+            await ctx.message.edit(content=f"heading to {url}...")
+            await driver.get(url)
+            await ctx.message.edit(content=f"taking screenshot...")
+            im = await driver.get_screenshot()
+            title = driver.title
+        imdata = BytesIO()
+        im.save(imdata, "png")
+        imdata.seek(0)
+        file = File(imdata, f"{title}.png")
+        await ctx.message.edit(content=f"{title} (<{url}>):", file=file)
 
 
 def setup(bot):

scripts/run.bat

@@ -2,6 +2,6 @@ cd ..
 call venv\scripts\activate
 :run
 echo STARTING
-run.py
+python run.py
 goto run
 pause