From 0db5cc0ada055aa324e06bca4ad1f2c5ebeba58d Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Thu, 16 Sep 2021 11:56:50 +0200
Subject: [PATCH] fd

---
 docker-compose.yml    | 1 -
 env                   | 1 -
 files/routes/posts.py | 4 ++++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ea896d455..a40d5e901 100644
--- a/docker-compose.yml
+++ b/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
diff --git a/env b/env
index 01dc38ef7..32955fe56 100644
--- a/env
+++ b/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"
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 8f8469e3e..b3e7fa703 100644
--- a/files/routes/posts.py
+++ b/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)