sdfsdf

files/classes/submission.py

@@ -1,18 +1,19 @@
 from flask import render_template, g
 from sqlalchemy import *
-from sqlalchemy.orm import relationship, deferred
+from sqlalchemy.orm import relationship, deferred, lazyload
 import re, random
 from urllib.parse import urlparse
 from files.helpers.lazy import lazy
 from files.helpers.const import SLURS
 from files.__main__ import Base
-from .flags import *
+from .flags import Flag
+from .user import User
 from os import environ
 import time
 
 site = environ.get("DOMAIN").strip()
 site_name = environ.get("SITE_NAME").strip()
-
+shadowbanned = [x[0] for x in g.db.query(User.id).options(lazyload('*')).filter(User.shadowbanned != None).all()]
 
 class Submission(Base):
 
@@ -389,11 +390,12 @@ class Submission(Base):
 
 	@property
 	@lazy
-	def active_flags(self): return self.flags.count()
+	def active_flags(self): return self.ordered_flags.count()
 
 	@property
 	@lazy
-	def ordered_flags(self): return self.flags.order_by(Flag.id).all()
+	def ordered_flags(self):
+		return self.flags.filter(Flag.user_id.notin_(shadowbanned)).order_by(Flag.id).all()
 
 
 class SaveRelationship(Base):