dfdf

files/__main__.py

@@ -15,7 +15,6 @@ from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm import sessionmaker, scoped_session, Query as _Query
 from sqlalchemy import *
 from sqlalchemy.pool import QueuePool
-import requests
 import redis
 import gevent
 
@@ -123,10 +122,6 @@ def retry(f):
 	def wrapper(self, *args, **kwargs):
 		try:
 			return f(self, *args, **kwargs)
-		except OperationalError as e:
-			#self.session.rollback()
-			#raise(DatabaseOverload)
-			print("sex")
 		except:
 			self.session.rollback()
 			return f(self, *args, **kwargs)

files/routes/admin.py

@@ -83,12 +83,7 @@ def flagged_comments(v):
 
 	page = max(1, int(request.args.get("page", 1)))
 
-	posts = g.db.query(Comment
+	posts = g.db.query(Comment).filter_by(is_approved=0, is_banned=False).join(Comment.flags).options(contains_eager(Comment.flags)).order_by(Comment.id.desc()).offset(25 * (page - 1)).limit(26).all()
-					   ).filter_by(
-		is_approved=0,
-		is_banned=False
-	).join(Comment.flags).options(contains_eager(Comment.flags)
-								  ).order_by(Comment.id.desc()).offset(25 * (page - 1)).limit(26).all()
 
 	listing = [p.id for p in posts]
 	next_exists = (len(listing) == 26)

files/routes/feeds.py

@@ -12,13 +12,15 @@ def feeds_user(sort='hot', t='all'):
 
 	page = int(request.args.get("page", 1))
 
-	posts, next_exists = frontlist(
+	ids, next_exists = frontlist(
 		sort=sort,
 		page=page,
 		t=t,
 		v=None,
 		)
 	
+	posts = get_posts(ids)
+
 	domain = environ.get(
 	"domain", environ.get(
 		"SERVER_NAME", None)).strip()

files/routes/login.py

@@ -56,6 +56,7 @@ def login_post():
 
 	username = request.form.get("username")
 
+	if not username: abort(400)
 	if "@" in username:
 		account = g.db.query(User).filter(
 			User.email.ilike(username)).first()

files/routes/posts.py

@@ -605,7 +605,8 @@ def submit_post(v):
 			else: embed = f"https://youtube.com/embed/{yt_id}"
 
 	elif "instagram.com" in domain:
-		embed = requests.get("https://graph.facebook.com/v9.0/instagram_oembed", params={"url":url,"access_token":environ.get("FACEBOOK_TOKEN","").strip(),"omitscript":'true'}, headers={"User-Agent": app.config["UserAgent"]}).json()["html"]
+		try: embed = requests.get("https://graph.facebook.com/v9.0/instagram_oembed", params={"url":url,"access_token":environ.get("FACEBOOK_TOKEN","").strip(),"omitscript":'true'}, headers={"User-Agent": app.config["UserAgent"]}).json()["html"]
+		except: embed = None
 
 	elif app.config['SERVER_NAME'] in domain and "/post/" in url:
 		id = url.split("/post/")[1]

requirements.txt

@@ -1,6 +1,6 @@
 beautifulsoup4
 bleach
-Flask
+Flask==2.0.0
 Flask-Caching
 Flask-Compress
 Flask-Limiter==1.1.0