Merge branch 'master' into mistletoe

files/assets/js/comments+submission_listing.js

@@ -32,37 +32,6 @@ function popovertrigger() {
 
 popovertrigger()
 
-function eventasdf(value){
-	var content_id = value.getAttributeNode("data-content-id").value;
-	value.addEventListener("click", function(){jhkj(content_id)});
-}
-
-function checkIfBussy(){
-	if (document.getElementById("bussy") != null){
-		document.body.removeChild(document.getElementById("bussy"));
-	}
-}
-
-function dfgh(e){
-	active = document.activeElement;
-	if (active.getAttributeNode("class") == null || active.getAttributeNode("class").nodeValue != "user-name text-decoration-none"){
-		checkIfBussy();
-	}
-}
-
-function jhkj(value){
-	checkIfBussy();
-	var popover_shit = document.getElementsByClassName("popover")[0];
-	var uiop = document.createElement("DIV");
-
-	uiop.innerHTML = popover_shit.outerHTML;
-	uiop.id = "bussy";
-
-	document.body.appendChild(uiop);
-	document.body.removeChild(popover_shit);
-}
-
-
 var usernames = document.querySelectorAll("a.user-name");
 usernames.forEach(eventasdf);
 

files/routes/front.py

@@ -255,8 +255,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='
 	elif sort == "comments":
 		posts = posts.order_by(Submission.comment_count.desc())
 
-	if v:
+	if v: size = v.frontsize or 0
-		size = v.frontsize
 	else: size = 25
 
 	posts = posts.offset(size * (page - 1)).limit(size+1).all()

files/routes/settings.py

@@ -848,8 +848,6 @@ def settings_profilecss(v):
 @validate_formkey
 def settings_block_user(v):
 
-	if v and v.admin_level: return {"error": "Admins can't block users."}, 403
-
 	user = get_user(request.values.get("username"), graceful=True)
 
 	if not user: return {"error": "That user doesn't exist."}, 404