From 871ad7c6c8e82282f59819e3a81587718793174b Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 25 Feb 2022 15:26:56 +0200
Subject: [PATCH] fdfd

---
 files/classes/user.py                   | 2 +-
 files/templates/admin/badge_grant.html  | 2 +-
 files/templates/admin/badge_remove.html | 2 +-
 files/templates/badges.html             | 2 +-
 files/templates/comments.html           | 2 +-
 files/templates/patrons.html            | 2 +-
 files/templates/sidebar_Drama.html      | 2 +-
 ubuntu_setup                            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

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 @@
 			<label class="custom-control-label" for="{{badge.id}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="/static/assets/images/badges/{{badge.id}}.webp?a=1012" width=64.16 height=70></label></td>
+	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="/static/assets/images/badges/{{badge.id}}.webp?a=1013" width=64.16 height=70></label></td>
 	<td>{{badge.name}}</td>
 	<td>{{badge.description}}</td>
 </tr>
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 @@
 			<label class="custom-control-label" for="{{badge.id}}"></label>
 		</div>		
 	</td>
-	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="/static/assets/images/badges/{{badge.id}}.webp?a=1012" width=64.16 height=70></label></td>
+	<td><label for="badge-{{badge.id}}"><img alt="{{badge.name}}" loading="lazy" src="/static/assets/images/badges/{{badge.id}}.webp?a=1013" width=64.16 height=70></label></td>
 	<td>{{badge.name}}</td>
 	<td>{{badge.description}}</td>
 </tr>
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 @@
 	<tr>
 		<td>{{loop.index}}</td>
 		<td>{{badge.name}}</td>
-		<td><img alt="{{badge.name}}" loading="lazy" src="/static/assets/images/badges/{{badge.id}}.webp?a=1012" width=45.83 height=50>
+		<td><img alt="{{badge.name}}" loading="lazy" src="/static/assets/images/badges/{{badge.id}}.webp?a=1013" width=45.83 height=50>
 		<td>{{badge.description}}</td>
 	</tr>
 {% 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 %}
-<div class="post-info mt-5 mb-1 mr-2">
+<div class="post-info mb-1 mr-2 {% if request.path == '/notifications' %}mt-5{% else %}mt-3{% endif %}">
 	{% if c.post and c.post.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span>{% endif %}
 	<span class="align-top">
 	{% 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 @@
 		<td>{{loop.index}}</td>
 		<td><a style="color:#{{u.namecolor}}" href="/@{{u.username}}"><img loading="lazy" src="{{u.profile_url}}" class="pp20"><span {% if u.patron %}class="patron" style="background-color:#{{u.namecolor}}"{% endif %}>{{u.username}}</span></a></td>
 
-		<td><img alt="2{{u.patron}}" loading="lazy" width=29.33 height=32 src="/static/assets/images/badges/2{{u.patron}}.webp?a=1012"></td>
+		<td><img alt="2{{u.patron}}" loading="lazy" width=29.33 height=32 src="/static/assets/images/badges/2{{u.patron}}.webp?a=1013"></td>
 	</tr>
 {% endfor %}
 </table>
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 %}
 
 	<img class="mb-4" alt="sidebar image" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{image}}')" loading="lazy" src="{{image}}" width=100%>
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