From 70813c686a717aaa2bfa2f566cf7fae149ae7b5e Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sat, 29 Jan 2022 03:20:02 +0200
Subject: [PATCH] dfs

---
 files/classes/user.py | 7 -------
 files/routes/admin.py | 7 ++++---
 files/routes/front.py | 8 ++++++++
 files/routes/users.py | 9 ++++++---
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/files/classes/user.py b/files/classes/user.py
index 61e3c7edf..a90160d60 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -529,13 +529,6 @@ class User(Base):
 
 	@property
 	def is_suspended(self):
-		if self.unban_utc and self.unban_utc < time.time():
-			self.is_banned = 0
-			self.unban_utc = 0
-			self.ban_evade = 0
-			g.db.add(self)
-			g.db.commit()
-			return False
 		return (self.is_banned and (self.unban_utc == 0 or self.unban_utc > time.time()))
 
 
diff --git a/files/routes/admin.py b/files/routes/admin.py
index aa10d6731..7cef81402 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -118,12 +118,14 @@ def revert_actions(v, username):
 		user.is_banned = 0
 		user.unban_utc = 0
 		user.ban_evade = 0
+		send_repeatable_notification(user.id, "Your account has been unbanned!")
 		g.db.add(user)
 		for u in user.alts:
 			u.shadowbanned = None
 			u.is_banned = 0
 			u.unban_utc = 0
 			u.ban_evade = 0
+			send_repeatable_notification(u.id, "Your account has been unbanned!")
 			g.db.add(u)
 
 	g.db.commit()
@@ -935,6 +937,7 @@ def unban_user(user_id, v):
 	user.unban_utc = 0
 	user.ban_evade = 0
 	user.ban_reason = None
+	send_repeatable_notification(user.id, "Your account has been unbanned!")
 	g.db.add(user)
 
 	for x in user.alts:
@@ -942,11 +945,9 @@ def unban_user(user_id, v):
 		x.unban_utc = 0
 		x.ban_evade = 0
 		x.ban_reason = None
+		send_repeatable_notification(x.id, "Your account has been unbanned!")
 		g.db.add(x)
 
-	send_repeatable_notification(user.id,
-					  "Your account has been reinstated. Please carefully review and abide by the [rules](/sidebar) to ensure that you don't get suspended again.")
-
 	ma=ModAction(
 		kind="unban_user",
 		user_id=v.id,
diff --git a/files/routes/front.py b/files/routes/front.py
index 6f7980945..32415b274 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -168,6 +168,14 @@ def front_all(v):
 	posts = get_posts(ids, v=v)
 
 	if v:
+		if v.unban_utc and v.unban_utc < time.time():
+			v.is_banned = 0
+			v.unban_utc = 0
+			v.ban_evade = 0
+			send_repeatable_notification(v.id, "You have been unbanned!")
+			g.db.add(v)
+			g.db.commit()
+
 		if v.hidevotedon: posts = [x for x in posts if not hasattr(x, 'voted') or not x.voted]
 
 		if v.agendaposter_expires_utc and v.agendaposter_expires_utc < time.time():
diff --git a/files/routes/users.py b/files/routes/users.py
index 2df466457..986649e77 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -1013,8 +1013,12 @@ def fp(v, fp):
 	if v.username != fp:
 		v.fp = fp
 		users = g.db.query(User).filter(User.fp == fp, User.id != v.id).all()
+		if users: print(f'{v.username}: fp {v.fp}')
 		if v.email and v.is_activated:
-			users += g.db.query(User).filter(User.email == v.email, User.is_activated, User.id != v.id).all()
+			alts = g.db.query(User).filter(User.email == v.email, User.is_activated, User.id != v.id).all()
+			if alts:
+				print(f'{v.username}: email {v.email}')
+				users += alts
 		for u in users:
 			li = [v.id, u.id]
 			existing = g.db.query(Alt).filter(Alt.user1.in_(li), Alt.user2.in_(li)).first()
@@ -1022,8 +1026,7 @@ def fp(v, fp):
 			new_alt = Alt(user1=v.id, user2=u.id)
 			g.db.add(new_alt)
 			g.db.flush()
-			if v.email == u.email: print('\n\n' + v.username + ' + ' + u.username + v.email + '\n\n')
-			if v.fp == u.fp: print('\n\n' + v.username + ' + ' + u.username + v.fp + '\n\n')
+			print('\n\n' + v.username + ' + ' + u.username + '\n\n')
 		g.db.add(v)
 		g.db.commit()
 	return '', 204
\ No newline at end of file