skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into regex-censor

Browse source 
# Conflicts:
#	.gitignore
#	docker-compose.yml
#	files/classes/comment.py
#	files/classes/submission.py
#	files/helpers/const.py
#	requirements.txt
This commit is contained in:
Yo Mama 2021-10-16 21:29:36 +02:00
commit a509b084d9
1651 changed files with 44490 additions and 1859582 deletions
Download patch file Download diff file Expand all files Collapse all files

11
files/classes/comment.py
View file

@ -348,16 +348,13 @@ class Comment(Base):
@lazy
def collapse_for_user(self, v):
if self.over_18 and not (v and v.over_18) and not self.post.over_18:
return True
if self.over_18 and not (v and v.over_18) and not self.post.over_18: return True
if not v:
return False
if not v: return False
if any([x in self.body for x in v.filter_words]):
return True
if v.filter_words and any([x in self.body for x in v.filter_words]): return True
if self.is_banned: return True
if self.is_banned or (self.author and self.author.shadowbanned): return True
return False