diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index 91735d1fc..9fb4f309b 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -4462,8 +4462,9 @@ blockquote p {
padding-top: 0.7rem;
}
.unread {
- padding: 10px !important;
+ padding: 10px 10px 0 10px!important;
border: 2px solid var(--primary) !important;
+ margin-bottom: 1rem;
}
@media (min-width: 576px) {
.modal-dialog {
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 0ee88bae6..9558700c8 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -800,11 +800,11 @@ def edit_comment(cid, v):
body_html = sanitize(body, edit=True)
- if v.marseyawarded and marseyaward_body_regex.search(body_html):
- return {"error":"You can only type marseys!"}, 403
-
if len(body_html) > 20000: abort(400)
+ if v.marseyawarded and marseyaward_body_regex.search(body_html):
+ return {"error":"You can only type marseys!"}, 403
+
c.body = body[:10000]
c.body_html = body_html
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 79812b5a6..ba364dfb1 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -261,6 +261,10 @@ def post_id(pid, anything=None, v=None, sub=None):
@limiter.limit("1/second;30/minute;200/hour;1000/day")
@auth_desired
def viewmore(v, pid, sort, offset):
+ pid = int(pid)
+ post = get_post(pid, v=v)
+ if post.club and not (v and (v.paid_dues or v.id == post.author_id)): abort(403)
+
offset = int(offset)
try: ids = set(int(x) for x in request.values.get("ids").split(','))
except: abort(400)
@@ -341,7 +345,6 @@ def viewmore(v, pid, sort, offset):
comments2 = []
count = 0
- post = get_post(pid, v=v)
if post.created_utc > 1638672040:
for comment in comments:
comments2.append(comment)
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index b83658215..bf4c40853 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -15,7 +15,7 @@
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 61b62084b..62c0ae8df 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -14,7 +14,7 @@
Chat
-
+
{% if v.css %}
diff --git a/files/templates/default.html b/files/templates/default.html
index 1cc9fd6c4..0396a34b5 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -7,7 +7,7 @@
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
diff --git a/files/templates/log.html b/files/templates/log.html
index d75ee136a..c37084925 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -6,7 +6,7 @@
{% block content %}
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html
index d53708e08..c3fd88ccd 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -18,7 +18,7 @@
{% endblock %}
-
+
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 8ffb170f1..731018a13 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -14,7 +14,7 @@
2-Step Login - {{SITE_NAME}}
-
+
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 34910e89e..e1e6b560b 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -39,10 +39,10 @@
{% if v %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 1a528abf2..6cdc3a1ba 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -31,7 +31,7 @@
{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}
-
+
diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html
index e3217f6c0..e3bf1d995 100644
--- a/files/templates/sign_up_failed_ref.html
+++ b/files/templates/sign_up_failed_ref.html
@@ -32,7 +32,7 @@
{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}
-
+
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 1f1352023..b5a58c797 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -26,7 +26,7 @@
{% block stylesheets %}
{% if v %}
-
+
{% if v.agendaposter %}
-
+
{% endif %}
{% endblock %}