From fcb7c94659cca085d044430ca3fef218eb71317b Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 18 Oct 2021 21:02:04 +0200
Subject: [PATCH] fds

---
 files/classes/user.py  | 4 ++--
 files/routes/awards.py | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/files/classes/user.py b/files/classes/user.py
index 6655d33116..0f3bd59a5f 100755
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -485,7 +485,7 @@ class User(Base):
 
 		return data
 
-	def ban(self, admin=None, reason=None, days=0, discord=True):
+	def ban(self, admin=None, reason=None, days=0):
 
 		if days > 0:
 			ban_time = int(time.time()) + (days * 86400)
@@ -493,7 +493,7 @@ class User(Base):
 		else:
 			self.bannerurl = None
 			self.profileurl = None
-			if self.discord_id and discord: remove_user(self)
+			if self.discord_id: remove_user(self)
 
 		self.is_banned = admin.id if admin else AUTOJANNY_ACCOUNT
 		if reason: self.ban_reason = reason
diff --git a/files/routes/awards.py b/files/routes/awards.py
index a3ecc1ea6e..00cffa4f16 100755
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -181,7 +181,7 @@ def banaward_trigger(post=None, comment=None):
 	link = f"[this post]({post.permalink})" if post else f"[this comment]({comment.permalink})"
 
 	if not author.is_suspended:
-		author.ban(reason="one-day ban award used", days=1)
+		author.ban(reason=f"one-day ban award used by @{v.username}", days=1)
 
 		send_notification(NOTIFICATIONS_ACCOUNT, author, f"Your account has been suspended for a day for {link}. It sucked and you should feel bad.")
 	elif author.unban_utc > 0:
@@ -194,9 +194,12 @@ def banaward_trigger(post=None, comment=None):
 def grass_trigger(post=None, comment=None):
 
 	author = post.author if post else comment.author
-	link = f"[this post]({post.permalink})" if post else f"[this comment]({comment.permalink})"
 
-	author.ban(reason="grass award used", discord=False)
+	author.is_banned = AUTOJANNY_ACCOUNT
+	author.ban_reason = f"grass award used by @{v.username}"
+	g.db.add(self)
+
+	link = f"[this post]({post.permalink})" if post else f"[this comment]({comment.permalink})"
 	send_notification(NOTIFICATIONS_ACCOUNT, author, f"Your account has been suspended permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass to get unbanned!")
 
 ACTIONS = {