fd

docker-compose.yml

@@ -10,7 +10,6 @@ services:
       - PYTHONPATH="/service"
       - REDIS_URL=redis://redis
       - DATABASE_URL=postgresql://postgres@postgres:5432/postgres
-      - DATABASE_CONNECTION_POOL_URL=postgresql://postgres@postgres:5432/postgres
       - MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=}
       - DOMAIN=localhost
       - SITE_NAME=Drama

env

@@ -1,7 +1,6 @@
 export PYTHONPATH="/service"
 export REDIS_URL="redis://redis"
 export DATABASE_URL="postgresql://postgres@postgres:5432/postgres"
-export DATABASE_CONNECTION_POOL_URL="postgresql://postgres@postgres:5432/postgres"
 export MASTER_KEY="-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA="
 export DOMAIN="localhost"
 export SITE_NAME="Drama"

files/routes/posts.py

@@ -112,6 +112,10 @@ def post_id(pid, anything=None, v=None):
 			blocked.c.id,
 		)
 
+		shadowbanned = g.db.query(User.id).filter(User.shadowbanned == False).subquery()
+
+		comments = comments.filter(Comment.author_id.notin_(shadowbanned))
+		
 		if not (v and v.shadowbanned) and not (v and v.admin_level == 6):
 			comments = comments.join(Comment.author).filter(User.shadowbanned == False)