fdfd

files/classes/clients.py

@@ -1,6 +1,6 @@
 from flask import *
 from sqlalchemy import *
-from sqlalchemy.orm import relationship, lazyload
+from sqlalchemy.orm import relationship
 from .submission import Submission
 from .comment import Comment
 from files.__main__ import Base

files/classes/comment.py

@@ -5,7 +5,7 @@ from urllib.parse import urlencode, urlparse, parse_qs
 
 from flask import *
 from sqlalchemy import *
-from sqlalchemy.orm import relationship, deferred, lazyload
+from sqlalchemy.orm import relationship
 
 from files.__main__ import Base
 from files.classes.votes import CommentVote

files/classes/submission.py

@@ -6,7 +6,7 @@ from urllib.parse import urlparse
 
 from flask import render_template
 from sqlalchemy import *
-from sqlalchemy.orm import relationship, deferred, lazyload
+from sqlalchemy.orm import relationship
 
 from files.__main__ import Base
 from files.helpers.const import AUTOPOLLER_ACCOUNT, censor_slurs, TROLLTITLES

files/classes/user.py

@@ -1,4 +1,4 @@
-from sqlalchemy.orm import deferred, aliased
+from sqlalchemy.orm import deferred
 from secrets import token_hex
 import pyotp
 from files.helpers.discord import remove_user
@@ -371,12 +371,12 @@ class User(Base):
 
 		data = g.db.query(
 			User,
-			aliased(Alt, alias=subq)
+			Alt
 		).join(
 			subq,
 			or_(
-				subq.c.user1 == User.id,
+				Alt.c.user1 == User.id,
-				subq.c.user2 == User.id
+				Alt.c.user2 == User.id
 			)
 		).filter(
 			User.id != self.id

files/helpers/filters.py

@@ -2,7 +2,6 @@ from bs4 import BeautifulSoup
 from flask import *
 from urllib.parse import urlparse
 from files.classes import BannedDomain
-from sqlalchemy.orm import lazyload
 
 def filter_comment_html(html_text):
 

files/routes/admin.py

@@ -1,5 +1,4 @@
 import time
-from sqlalchemy.orm import lazyload
 import imagehash
 from os import remove
 from PIL import Image as IMAGE

files/routes/comments.py

@@ -209,10 +209,7 @@ def api_comment(v):
 		now = int(time.time())
 		cutoff = now - 60 * 60 * 24
 
-		similar_comments = g.db.query(Comment
+		similar_comments = g.db.query(Comment).filter(
-										).options(
-			lazyload('*')
-		).filter(
 			Comment.author_id == v.id,
 			Comment.body.op(
 				'<->')(body) < app.config["COMMENT_SPAM_SIMILAR_THRESHOLD"],
@@ -636,8 +633,6 @@ def edit_comment(cid, v):
 			cutoff = now - 60 * 60 * 24
 
 			similar_comments = g.db.query(Comment
-											).options(
-				lazyload('*')
 			).filter(
 				Comment.author_id == v.id,
 				Comment.body.op(

files/routes/login.py

@@ -304,8 +304,7 @@ def sign_up_post(v):
 	ref_id = int(request.values.get("referred_by", 0))
 
 	if ref_id:
-		ref_user = g.db.query(User).options(
+		ref_user = g.db.query(User).filter_by(id=ref_id).first()
-			lazyload('*')).filter_by(id=ref_id).first()
 
 		if ref_user:
 			badge_types = g.db.query(BadgeDef).filter(BadgeDef.qualification_expr.isnot(None)).all()

files/routes/posts.py

@@ -610,18 +610,14 @@ def submit_post(v):
 	cutoff = now - 60 * 60 * 24
 
 
-	similar_posts = g.db.query(Submission).options(
+	similar_posts = g.db.query(Submission).filter(
-		lazyload('*')
-		).filter(
 					Submission.author_id == v.id,
 					Submission.title.op('<->')(title) < app.config["SPAM_SIMILARITY_THRESHOLD"],
 					Submission.created_utc > cutoff
 	).all()
 
 	if url:
-		similar_urls = g.db.query(Submission).options(
+		similar_urls = g.db.query(Submission).filter(
-			lazyload('*')
-		).filter(
 					Submission.author_id == v.id,
 					Submission.url.op('<->')(url) < app.config["SPAM_URL_SIMILARITY_THRESHOLD"],
 					Submission.created_utc > cutoff

files/routes/settings.py

@@ -914,9 +914,7 @@ def settings_name_change(v):
 
 	name=new_name.replace('_','\_')
 
-	x= g.db.query(User).options(
+	x= g.db.query(User).filter(
-		lazyload('*')
-		).filter(
 		or_(
 			User.username.ilike(name),
 			User.original_username.ilike(name)