diff --git a/exts/ae7q.py b/exts/ae7q.py index b11aeeb..8cf76c7 100644 --- a/exts/ae7q.py +++ b/exts/ae7q.py @@ -44,6 +44,14 @@ class AE7QCog(commands.Cog): base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" embed = cmn.embed_factory(ctx) + if not callsign.isalnum(): + embed = cmn.embed_factory(ctx) + embed.title = "AE7Q History for Callsign" + embed.colour = cmn.colours.bad + embed.description = "Not a valid callsign!" + await ctx.send(embed=embed) + return + async with self.session.get(base_url + callsign) as resp: if resp.status != 200: raise cmn.BotHTTPError(resp) @@ -110,6 +118,14 @@ class AE7QCog(commands.Cog): base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" embed = cmn.embed_factory(ctx) + if not callsign.isalnum(): + embed = cmn.embed_factory(ctx) + embed.title = "AE7Q Trustee History for Callsign" + embed.colour = cmn.colours.bad + embed.description = "Not a valid callsign!" + await ctx.send(embed=embed) + return + async with self.session.get(base_url + callsign) as resp: if resp.status != 200: raise cmn.BotHTTPError(resp) @@ -178,6 +194,14 @@ class AE7QCog(commands.Cog): base_url = "http://ae7q.com/query/data/CallHistory.php?CALL=" embed = cmn.embed_factory(ctx) + if not callsign.isalnum(): + embed = cmn.embed_factory(ctx) + embed.title = "AE7Q Application History for Callsign" + embed.colour = cmn.colours.bad + embed.description = "Not a valid callsign!" + await ctx.send(embed=embed) + return + async with self.session.get(base_url + callsign) as resp: if resp.status != 200: raise cmn.BotHTTPError(resp) @@ -250,6 +274,14 @@ class AE7QCog(commands.Cog): base_url = "http://ae7q.com/query/data/FrnHistory.php?FRN=" embed = cmn.embed_factory(ctx) + if not frn.isdecimal(): + embed = cmn.embed_factory(ctx) + embed.title = "AE7Q History for FRN" + embed.colour = cmn.colours.bad + embed.description = "Not a valid FRN!" + await ctx.send(embed=embed) + return + async with self.session.get(base_url + frn) as resp: if resp.status != 200: raise cmn.BotHTTPError(resp) @@ -313,6 +345,14 @@ class AE7QCog(commands.Cog): base_url = "http://ae7q.com/query/data/LicenseeIdHistory.php?ID=" embed = cmn.embed_factory(ctx) + if not licensee_id.isalnum(): + embed = cmn.embed_factory(ctx) + embed.title = "AE7Q History for Licensee" + embed.colour = cmn.colours.bad + embed.description = "Not a valid licensee ID!" + await ctx.send(embed=embed) + return + async with self.session.get(base_url + licensee_id) as resp: if resp.status != 200: raise cmn.BotHTTPError(resp) diff --git a/exts/qrz.py b/exts/qrz.py index 0e79e4b..169635e 100644 --- a/exts/qrz.py +++ b/exts/qrz.py @@ -31,6 +31,14 @@ class QRZCog(commands.Cog): """Looks up a callsign on [QRZ.com](https://www.qrz.com/). Add `--link` to only link the QRZ page.""" flags = [f.lower() for f in flags] + if not callsign.isalnum(): + embed = cmn.embed_factory(ctx) + embed.title = "QRZ Data for Callsign" + embed.colour = cmn.colours.bad + embed.description = "Not a valid callsign!" + await ctx.send(embed=embed) + return + if keys.qrz_user == "" or keys.qrz_pass == "" or "--link" in flags: await ctx.send(f"http://qrz.com/db/{callsign}") return