dffd

drama/classes/comment.py

@@ -346,9 +346,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
 		if not v:
 			return False
 			
-		if self.is_bot and v.hide_bot:
-			return True
-
 		if any([x in self.body for x in v.filter_words]):
 			return True
 		

drama/routes/comments.py

@@ -143,8 +143,6 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None):
 				blocking.c.id,
 				blocked.c.id,
 				aliased(ModAction, alias=exile)
-			).select_from(Comment).options(
-				joinedload(Comment.author).joinedload(User.title)
 			).filter(
 				Comment.parent_comment_id.in_(current_ids)
 			).join(
@@ -194,8 +192,6 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None):
 			comms = g.db.query(
 				Comment,
 				aliased(ModAction, alias=exile)
-			).options(
-				joinedload(Comment.author).joinedload(User.title)
 			).filter(
 				Comment.parent_comment_id.in_(current_ids)
 			).join(

drama/routes/settings.py

@@ -51,11 +51,6 @@ def settings_profile_post(v):
 		updated = True
 		v.hide_offensive = request.values.get("hide_offensive", None) == 'true'
 		
-	if request.values.get("hide_bot",
-						  v.hide_bot) != v.hide_bot:
-		updated = True
-		v.hide_bot = request.values.get("hide_bot", None) == 'true'
-
 	if request.values.get("private", v.is_private) != v.is_private:
 		updated = True
 		v.is_private = request.values.get("private", None) == 'true'