Revert "Revert "remove all joinedload bullshit I added""

This reverts commit 4057711c83.

files/helpers/get.py

@@ -1,6 +1,5 @@
 from files.classes import *
 from flask import g
-from sqlalchemy.orm import joinedload, undefer
 
 def get_id(username, v=None, graceful=False):
 	
@@ -41,16 +40,6 @@ def get_user(username, v=None, graceful=False, rendered=False):
 			)
 		)
 
-	if rendered:
-		user = user.options(
-			undefer('reserved'),
-			undefer('profilecss'),
-			undefer('bio'),
-			undefer('friends_html'),
-			undefer('enemies_html'),
-			joinedload(User.badges)
-		)
-
 	user = user.one_or_none()
 
 	if not user:
@@ -160,17 +149,6 @@ def get_post(i, v=None, graceful=False, rendered=False, entered=False):
 			isouter=True
 		)
 
-		if rendered:
-			post = post.options(
-				joinedload(Submission.flags),
-				joinedload(Submission.awards),
-				joinedload(Submission.author),
-				joinedload(Submission.options).joinedload(SubmissionOption.votes)
-			)
-
-		if v and entered:
-			post = post.options(joinedload(Submission.comments))
-
 		post=post.one_or_none()
 		
 		if not post:
@@ -221,10 +199,6 @@ def get_posts(pids, v=None):
 			blocked, 
 			blocked.c.user_id == Submission.author_id, 
 			isouter=True
-		).options(joinedload(Submission.flags),
-			joinedload(Submission.awards),
-			joinedload(Submission.author),
-			joinedload(Submission.options).joinedload(SubmissionOption.votes)
 		).all()
 
 		output = [p[0] for p in query]
@@ -306,11 +280,6 @@ def get_comments(cids, v=None, load_parent=False):
 			blocked,
 			blocked.c.user_id == Comment.author_id,
 			isouter=True
-		).options(
-			joinedload(Comment.post),
-			joinedload(Comment.flags),
-			joinedload(Comment.awards),
-			joinedload(Comment.options).joinedload(CommentOption.votes)
 		).all()
 
 		output = []

files/routes/polls.py

@@ -47,9 +47,7 @@ def option_votes(option_id, v):
 
 	if not option: abort(404)
 
-	ups = g.db.query(SubmissionOptionVote).filter_by(option_id=option_id).options(
-		joinedload(SubmissionOptionVote.user)
-	).all()
+	ups = g.db.query(SubmissionOptionVote).filter_by(option_id=option_id).all()
 
 	return render_template("poll_votes.html",
 						   v=v,
@@ -99,9 +97,7 @@ def option_votes_comment(option_id, v):
 
 	if not option: abort(404)
 
-	ups = g.db.query(CommentOptionVote).filter_by(option_id=option_id).options(
-		joinedload(CommentOptionVote.user)
-	).all()
+	ups = g.db.query(CommentOptionVote).filter_by(option_id=option_id).all()
 
 	return render_template("poll_votes.html",
 						   v=v,