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

files/helpers/media.py

@@ -29,11 +29,6 @@ def process_files():
 	return body
 
 
-def process_other(file):
-	req = requests.post("https://pomf2.lain.la/upload.php", files={'files[]': file}, timeout=20).json()
-	return req['files'][0]['url']
-
-
 def process_audio(file):
 	name = f'/audio/{time.time()}'.replace('.','')
 

files/routes/front.py

@@ -118,7 +118,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
 	if sort == 'hot':
 		ti = int(time.time()) + 3600
 		if SITE_NAME == 'rDrama':
-			posts = posts.order_by(-1000000*(Submission.realupvotes + 1 + Submission.comment_count/5 + func.least(10, (func.length(Submission.body_html)-func.length(func.replace(Submission.body_html,'<a href="https://','')))/5))/(func.power(((ti - Submission.created_utc)/1000), 1.23)), Submission.created_utc.desc())
+			posts = posts.order_by(-1000000*(Submission.realupvotes + 1 + Submission.comment_count/5)/(func.power(((ti - Submission.created_utc)/1000), 1.23)), Submission.created_utc.desc())
 		else:
 			posts = posts.order_by(-1000000*(Submission.upvotes - Submission.downvotes + 1)/(func.power(((ti - Submission.created_utc)/1000), 1.23)), Submission.created_utc.desc())
 	elif sort == "bump":

notice.txt

@@ -0,0 +1 @@
+Sorry, we're moving to a new host right now, ETA 10 minutes or so