From 31d6db46fd34e6b71725d7d5da0197c6f332ad38 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 20 Dec 2021 17:17:43 +0200
Subject: [PATCH] sfddsf

---
 files/routes/settings.py                 | 4 ++--
 files/routes/static.py                   | 6 +++---
 files/templates/CHRISTMAS/header-tw.html | 4 ++--
 files/templates/CHRISTMAS/header.html    | 2 +-
 files/templates/header.html              | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/files/routes/settings.py b/files/routes/settings.py
index 55623c89b..bf1af3f97 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -50,9 +50,9 @@ def sex(v):
 			email=f"{email}@gmail.com"
 		emails.append(email.lower())
 
-	users = g.db.query(User).filter(User.patron > 0, User.patron < 5, User.email != None).all()
+	users = g.db.query(User).filter(User.patron > 0, User.patron < 5).all()
 	for u in users:
-		if u.email.lower() not in emails: print(u.username)
+		if not u.email or u.email.lower() not in emails: print(u.username)
 
 	return "sex"
 
diff --git a/files/routes/static.py b/files/routes/static.py
index b352c0c1b..d8263f205 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -180,12 +180,12 @@ def admins(v):
 @auth_desired
 def log(v):
 
-	page = int(request.args.get("page",1))
-	admin = request.args.get("admin")
+	page = int(request.values.get("page",1))
+	admin = request.values.get("admin")
 	if admin: admin_id = get_id(admin)
 	else: admin_id = 0
 
-	kind = request.args.get("kind")
+	kind = request.values.get("kind")
 
 	if v and v.admin_level > 1: types = ACTIONTYPES
 	else: types = ACTIONTYPES2
diff --git a/files/templates/CHRISTMAS/header-tw.html b/files/templates/CHRISTMAS/header-tw.html
index f96dc6196..b21e8b713 100644
--- a/files/templates/CHRISTMAS/header-tw.html
+++ b/files/templates/CHRISTMAS/header-tw.html
@@ -41,7 +41,7 @@
         </div>
         <div class="relative hidden sm:flex flex-shrink-0 items-center sm:ml-6">
           <form action="/search/posts/" method="get" class="relative mb-0">
-            <input placeholder="Search" class="w-full text-gray-500 focus:text-black rounded border border-gray-800 bg-black/20 focus:bg-white hover:bg-black/30 shadow-inner w-full px-2 py-1.5 pr-7" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
+            <input placeholder="Search" class="w-full text-gray-500 focus:text-black rounded border border-gray-800 bg-black/20 focus:bg-white hover:bg-black/30 shadow-inner w-full px-2 py-1.5 pr-7" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
             <i class="fas fa-search text-gray-600 absolute top-3 right-2"></i>
           </form>
         </div>
@@ -139,7 +139,7 @@
     <div class="offcanvas-body">
       <!-- Search box -->
       <form action="/search/posts/" method="get" class="relative mb-4">
-        <input placeholder="Search" class="block w-full rounded shadow-inner py-2 pl-2 pr-7 bg-white border border-gray-300 hover:border-gray-400 focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
+        <input placeholder="Search" class="block w-full rounded shadow-inner py-2 pl-2 pr-7 bg-white border border-gray-300 hover:border-gray-400 focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
         <i class="fas fa-search text-gray-400 absolute top-3 right-3"></i>
       </form>
       {% if v %}
diff --git a/files/templates/CHRISTMAS/header.html b/files/templates/CHRISTMAS/header.html
index da61aaed3..230b9ef1e 100644
--- a/files/templates/CHRISTMAS/header.html
+++ b/files/templates/CHRISTMAS/header.html
@@ -18,7 +18,7 @@
 			</div>
 			<div class="flex-grow-1 d-fl d-none d-md-block">
 				<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="/search/posts/" method="get">
-					<input class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
+					<input class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
 					<span class="input-group-append">
 						<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem;">
 							<i class="fa fa-search" aria-hidden="true"></i>
diff --git a/files/templates/header.html b/files/templates/header.html
index 6625c711a..ccd0653e0 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -18,7 +18,7 @@
 			</div>
 			<div class="flex-grow-1 d-fl d-none d-md-block">
 				<form class="form-inline search flex-nowrap mx-0 mx-lg-auto" action="/search/posts/" method="get">
-					<input class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.args.get('q', '')}}">
+					<input class="form-control w-100" type="search" placeholder="Search" aria-label="Search" name="q" value="{{request.values.get('q', '')}}">
 					<span class="input-group-append">
 						<span class="input-group-text border-0 bg-transparent" style="margin-left: -2.5rem;">
 							<i class="fa fa-search" aria-hidden="true"></i>