vxc

files/helpers/wrappers.py

@@ -15,7 +15,6 @@ def get_logged_in_user():
 
 		v = client.user
 		v.client = client
-		return v
 	else:
 		lo_user = session.get("lo_user")
 		if not lo_user: return None
@@ -31,7 +30,82 @@ def get_logged_in_user():
 			if not submitted_key: abort(401)
 			elif not v.validate_formkey(submitted_key): abort(401)
 
-		return v
+	
+	if v.patron_utc and v.patron_utc < time.time():
+		v.patron = 0
+		v.patron_utc = 0
+		send_repeatable_notification(v.id, "Your paypig status has expired!")
+		g.db.add(v)
+		g.db.commit()
+
+	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():
+		v.agendaposter_expires_utc = 0
+		v.agendaposter = None
+		send_repeatable_notification(v.id, "Your chud theme has expired!")
+		g.db.add(v)
+		badge = v.has_badge(26)
+		if badge: g.db.delete(badge)
+		g.db.commit()
+
+	if v.flairchanged and v.flairchanged < time.time():
+		v.flairchanged = None
+		send_repeatable_notification(v.id, "Your flair lock has expired. You can now change your flair!")
+		g.db.add(v)
+		badge = v.has_badge(96)
+		if badge: g.db.delete(badge)
+		g.db.commit()
+
+	if v.marseyawarded and v.marseyawarded < time.time():
+		v.marseyawarded = None
+		send_repeatable_notification(v.id, "Your marsey award has expired!")
+		g.db.add(v)
+		badge = v.has_badge(98)
+		if badge: g.db.delete(badge)
+		g.db.commit()
+
+	if v.longpost and v.longpost < time.time():
+		v.longpost = None
+		send_repeatable_notification(v.id, "Your pizzashill award has expired!")
+		g.db.add(v)
+		badge = v.has_badge(97)
+		if badge: g.db.delete(badge)
+		g.db.commit()
+
+	if v.bird and v.bird < time.time():
+		v.bird = None
+		send_repeatable_notification(v.id, "Your bird site award has expired!")
+		g.db.add(v)
+		badge = v.has_badge(95)
+		if badge: g.db.delete(badge)
+		g.db.commit()
+
+	if v.progressivestack and v.progressivestack < time.time():
+		v.progressivestack = None
+		send_repeatable_notification(v.id, "Your progressive stack has expired!")
+		g.db.add(v)
+		badge = v.has_badge(94)
+		if badge: g.db.delete(badge)
+		g.db.commit()
+
+	if v.rehab and v.rehab < time.time():
+		v.rehab = None
+		send_repeatable_notification(v.id, "Your rehab has finished!")
+		g.db.add(v)
+		badge = v.has_badge(109)
+		if badge: g.db.delete(badge)
+		g.db.commit()
+
+	return v
 
 def check_ban_evade(v):
 	if v and not v.patron and v.admin_level == 0 and v.ban_evade and not v.unban_utc: