Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

files/classes/user.py

@@ -840,11 +840,14 @@ class User(Base):
 				g.db.add(self)
 				g.db.commit()
 				return
-			if u.is_suspended_permanently:
-				self.shadowbanned = u.banned_by.username
-				g.db.add(self)
-				g.db.commit()
-				return
+			## Disabled pending better solution: permabans haven't propagated for
+			## most of Summer 2022. We've gotten somewhat used to this. Think we only
+			## want them to propagate on account creation? Or at least needs discussion.
+			# if u.is_suspended_permanently:
+			# 	self.shadowbanned = u.banned_by.username
+			# 	g.db.add(self)
+			# 	g.db.commit()
+			# 	return
 
 	@property
 	@lazy

files/helpers/cron.py

@@ -32,8 +32,7 @@ def cron(every_5m, every_1h, every_1d, every_1mo):
 		spin_roulette_wheel()
 		offsitementions.offsite_mentions_task()
 		if SITE_NAME == 'PCM':
-			cache.delete_memoized(route_static.live_cached)
-			route_static.live_cached()
+			route_static.live_cached(force=True)
 
 	if every_1h:
 		awards.award_timers_bots_task()

files/routes/static.py

@@ -443,8 +443,10 @@ if SITE == 'pcmemes.net':
 	live_thumb_regex = re.compile('\{"thumbnail":\{"thumbnails":\[\{"url":"(.*?)"', flags=re.A)
 	offline_regex = re.compile('","title":"(.*?)".*?"width":48,"height":48\},\{"url":"(.*?)"', flags=re.A)
 
-	@cache.memoize(timeout=86400)
-	def live_cached():
+	@cache.memoize(timeout=86400,
+		forced_update=(lambda force=False: force),
+		args_to_ignore=["force"])
+	def live_cached(force=False):
 		live = []
 		offline = []
 		db = db_session()