From f2780d1f447bd6eadfa360bcedffc0cbb4f908bc Mon Sep 17 00:00:00 2001
From: nex <me@nexy7574.co.uk>
Date: Thu, 23 Feb 2023 11:08:57 +0000
Subject: [PATCH] Add web-verification

---
 utils/_email.py |  3 ++-
 utils/client.py |  2 +-
 utils/views.py  |  2 +-
 web/server.py   | 11 ++++++-----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/utils/_email.py b/utils/_email.py
index 4d10b25..7d0b135 100644
--- a/utils/_email.py
+++ b/utils/_email.py
@@ -31,7 +31,8 @@ async def send_verification_code(user: discord.User, student_number: str, **kwar
         f"Go back to the #verify channel, and click 'I have a verification code!', and put {code} in the modal"
         f" that pops up\n\n"
         f"If you have any issues getting in, feel free to reply to this email, or DM eek#7574.\n"
-        f"~Nex"
+        f"~Nex\n\n\n"
+        f"(P.S you can now go to http://droplet.nexy7574.co.uk/jimmy/verify/{code} instead)"
     )
     msg = EmailMessage()
     msg["From"] = msg["bcc"] = "B593764@my.leedscitycollege.ac.uk"
diff --git a/utils/client.py b/utils/client.py
index e229793..ab9e392 100644
--- a/utils/client.py
+++ b/utils/client.py
@@ -24,7 +24,7 @@ class Bot(commands.Bot):
         from .db import JimmyBans, registry
         from .console import console
         super().__init__(
-            command_prefix=self.get_prefix,
+            command_prefix=commands.when_mentioned_or("h!", "r!"),
             debug_guilds=guilds,
             allowed_mentions=discord.AllowedMentions.none(),
             intents=intents,
diff --git a/utils/views.py b/utils/views.py
index 7ed321b..91fd5f6 100644
--- a/utils/views.py
+++ b/utils/views.py
@@ -130,7 +130,7 @@ class VerifyView(View):
                     return await interaction.followup.send(f"\N{cross mark} Failed to send email - {e}. Try again?")
                 console.log(f"Sending verification email to {interaction.user} ({interaction.user.id}/{st})...")
                 name = self.children[1].value
-                __code = await VerifyCode.objects.create(code=_code, bind=interaction.id, student_id=st, name=name)
+                __code = await VerifyCode.objects.create(code=_code, bind=interaction.user.id, student_id=st, name=name)
                 console.log(
                     f"[green]Sent verification email to {interaction.user} ({interaction.user.id}/{st}): " f"{_code!r}"
                 )
diff --git a/web/server.py b/web/server.py
index 674dc51..8eec280 100644
--- a/web/server.py
+++ b/web/server.py
@@ -164,7 +164,7 @@ async def verify(code: str):
             status_code=404,
             detail="Code not found."
         )
-    
+
     # Now we need to fetch the student from the database
     student = await get_or_none(Student, user_id=verify_code.bind)
     if student:
@@ -195,8 +195,9 @@ async def verify(code: str):
     # And delete the code
     await verify_code.delete()
 
-    console.log(f"[green]{verify_code.bind} verified ({verify_code.bing}/{verify_code.student_id})")
+    console.log(f"[green]{verify_code.bind} verified ({verify_code.bind}/{verify_code.student_id})")
 
-    return {
-        "message": "Successfully verified."
-    }
+    return RedirectResponse(
+        "https://ptb.discord.com/channels/994710566612500550/1018915342317277215/",
+        status_code=308
+    )