diff --git a/files/classes/user.py b/files/classes/user.py index 96162fda1..9874a1631 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -214,7 +214,7 @@ class User(Base): @property @lazy def paid_dues(self): - return self.admin_level or self.club_allowed or self.patron > 1 or (self.patron == 1 and self.truecoins > dues/10) 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.patron > 1 or (self.patron == 1 and self.truecoins > dues/10) or (self.club_allowed != False and self.truecoins > dues)) @lazy def any_block_exists(self, other): diff --git a/files/templates/admin/badge_grant.html b/files/templates/admin/badge_grant.html index 90e2bab88..76e1e75e4 100644 --- a/files/templates/admin/badge_grant.html +++ b/files/templates/admin/badge_grant.html @@ -60,7 +60,7 @@ - + {{badge.name}} {{badge.description}} diff --git a/files/templates/admin/badge_remove.html b/files/templates/admin/badge_remove.html index d94803bd3..99b84a3d3 100644 --- a/files/templates/admin/badge_remove.html +++ b/files/templates/admin/badge_remove.html @@ -60,7 +60,7 @@ - + {{badge.name}} {{badge.description}} diff --git a/files/templates/badges.html b/files/templates/badges.html index d4de554df..0c541f79d 100644 --- a/files/templates/badges.html +++ b/files/templates/badges.html @@ -23,7 +23,7 @@ {{loop.index}} {{badge.name}} - {{badge.name}} + {{badge.name}} {{badge.description}} {% endfor %} diff --git a/files/templates/comments.html b/files/templates/comments.html index 4d0abddd5..454cbc6cc 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -119,7 +119,7 @@ {% endif %} {% if standalone and level==1 %} -
+
{% if c.post and c.post.over_18 %}+18{% endif %} {% if c.post %} diff --git a/files/templates/patrons.html b/files/templates/patrons.html index bfa49917b..32cfe3cee 100644 --- a/files/templates/patrons.html +++ b/files/templates/patrons.html @@ -14,7 +14,7 @@ {{loop.index}} {{u.username}} - 2{{u.patron}} + 2{{u.patron}} {% endfor %} diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html index b112295ff..97613d5aa 100644 --- a/files/templates/sidebar_Drama.html +++ b/files/templates/sidebar_Drama.html @@ -4,7 +4,7 @@ {% set image=sub.sidebar_url %} {% else %} {% set path = "assets/images/" + SITE_NAME + "/sidebar" %} - {% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?a=33' %} + {% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?a=34' %} {% endif %} sidebar image diff --git a/ubuntu_setup b/ubuntu_setup index 4a8add038..8b6ed9920 100644 --- a/ubuntu_setup +++ b/ubuntu_setup @@ -12,4 +12,4 @@ sudo pip3 install -r requirements.txt mkdir /songs mkdir /images . imei.sh -sudo -E gunicorn files.__main__:app -k gevent -w 2 --reload -b 0.0.0.0:80:80 --max-requests 1000 --max-requests-jitter 500 \ No newline at end of file +sudo -E gunicorn files.__main__:app -k gevent -w 1 --reload -b 0.0.0.0:80:80 --max-requests 1000 --max-requests-jitter 500 \ No newline at end of file