forked from rDrama/rDrama
master
parent
ea09088fe0
commit
99b25b29be
|
@ -209,7 +209,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
|
||||||
'is_banned': bool(self.is_banned),
|
'is_banned': bool(self.is_banned),
|
||||||
'deleted_utc': self.deleted_utc,
|
'deleted_utc': self.deleted_utc,
|
||||||
'is_nsfw': self.over_18,
|
'is_nsfw': self.over_18,
|
||||||
'is_offensive': self.is_offensive,
|
|
||||||
'permalink': self.permalink,
|
'permalink': self.permalink,
|
||||||
'post_id': self.post.base36id,
|
'post_id': self.post.base36id,
|
||||||
'score': self.score_fuzzed,
|
'score': self.score_fuzzed,
|
||||||
|
@ -350,9 +349,6 @@ class Comment(Base, Age_times, Scores, Stndrd, Fuzzing):
|
||||||
|
|
||||||
if not v:
|
if not v:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_offensive and v.hide_offensive:
|
|
||||||
return True
|
|
||||||
|
|
||||||
if self.is_bot and v.hide_bot:
|
if self.is_bot and v.hide_bot:
|
||||||
return True
|
return True
|
||||||
|
|
|
@ -72,7 +72,6 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
|
||||||
score_hot = Column(Float, default=0)
|
score_hot = Column(Float, default=0)
|
||||||
score_top = Column(Float, default=1)
|
score_top = Column(Float, default=1)
|
||||||
score_activity = Column(Float, default=0)
|
score_activity = Column(Float, default=0)
|
||||||
is_offensive = Column(Boolean, default=False)
|
|
||||||
author = relationship(
|
author = relationship(
|
||||||
"User",
|
"User",
|
||||||
lazy="joined",
|
lazy="joined",
|
||||||
|
@ -288,7 +287,6 @@ class Submission(Base, Stndrd, Age_times, Scores, Fuzzing):
|
||||||
'upvotes': self.upvotes_fuzzed,
|
'upvotes': self.upvotes_fuzzed,
|
||||||
'downvotes': self.downvotes_fuzzed,
|
'downvotes': self.downvotes_fuzzed,
|
||||||
#'award_count': self.award_count,
|
#'award_count': self.award_count,
|
||||||
'is_offensive': self.is_offensive,
|
|
||||||
'meta_title': self.meta_title,
|
'meta_title': self.meta_title,
|
||||||
'meta_description': self.meta_description,
|
'meta_description': self.meta_description,
|
||||||
'voted': self.voted
|
'voted': self.voted
|
||||||
|
|
Loading…
Reference in New Issue