forked from MarseyWorld/MarseyWorld
conflict resolution 2
parent
a30edea43d
commit
523eb1c03d
|
@ -1146,7 +1146,7 @@ def u_username_comments(username, v=None):
|
||||||
Comment.is_banned == False,
|
Comment.is_banned == False,
|
||||||
Comment.ghost == False,
|
Comment.ghost == False,
|
||||||
comment_post_author.shadowbanned == None,
|
comment_post_author.shadowbanned == None,
|
||||||
Comment.deleted_utc == 0,
|
Comment.deleted_utc == 0
|
||||||
)
|
)
|
||||||
|
|
||||||
comments = apply_time_filter(t, comments, Comment)
|
comments = apply_time_filter(t, comments, Comment)
|
||||||
|
|
Loading…
Reference in New Issue