diff --git a/files/classes/user.py b/files/classes/user.py index c5b9c05eb..eea6e0790 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -220,7 +220,7 @@ class User(Base): @property @lazy def paid_dues(self): - return not self.shadowbanned and not (self.is_banned and not self.unban_utc) and (self.admin_level or self.club_allowed or self.patron or (self.club_allowed != False and self.truecoins > dues)) + return not self.shadowbanned and not (self.is_banned and not self.unban_utc) and (self.admin_level or self.club_allowed or (self.club_allowed != False and self.truecoins > dues)) @lazy def any_block_exists(self, other): diff --git a/files/routes/front.py b/files/routes/front.py index 0f009259e..ed84e6c0e 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -42,6 +42,7 @@ def notifications(v): messages = request.values.get('messages') modmail = request.values.get('modmail') posts = request.values.get('posts') + reddit = request.values.get('reddit') if modmail and v.admin_level > 1: comments = g.db.query(Comment).filter(Comment.sentto==2).order_by(Comment.id.desc()).offset(25*(page-1)).limit(26).all() next_exists = (len(comments) > 25) @@ -68,12 +69,30 @@ def notifications(v): g.db.commit() next_exists = (len(notifications) > len(listing)) + elif reddit: + notifications = v.notifications.join(Notification.comment).filter(Comment.body_html.like('

New rdrama mention: 50) diff --git a/files/templates/notifications.html b/files/templates/notifications.html index 2f95861b1..f925c3f8d 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -37,6 +37,13 @@ {% endif %} + {% if v.admin_level %} +

  • + + Reddit + +
    • + {% endif %}