trappy

files/routes/posts.py

@@ -394,7 +394,7 @@ def viewmore(v, pid, sort, offset):
 	else: offset += 1
 	comments = comments2
 
-	return render_template("comments.html", v=v, comments=comments, ids=list(ids), render_replies=True, pid=pid, sort=sort, offset=offset, ajax=True)
+	return render_template("comments.html", v=v, comments=comments, p=post, ids=list(ids), render_replies=True, pid=pid, sort=sort, offset=offset, ajax=True)
 
 
 @app.get("/morecomments/<cid>")
@@ -443,7 +443,8 @@ def morecomments(v, cid):
 		c = g.db.query(Comment).filter_by(id=cid).one_or_none()
 		comments = c.replies
 
-	return render_template("comments.html", v=v, comments=comments, render_replies=True, ajax=True)
+	p = comments[0].post
+	return render_template("comments.html", v=v, comments=comments, p=p, render_replies=True, ajax=True)
 
 @app.post("/edit_post/<pid>")
 @limiter.limit("1/second;30/minute;200/hour;1000/day")

files/templates/comments.html

@@ -537,7 +537,7 @@
 
 {% if c.post %}
 	{% set sub = c.post.sub %}
-	{% if sub and v.mods(sub) %}
+	{% if sub and v.mods(sub) and not c.author.mods(sub) %}
 		<button id="exile-{{c.id}}" class="d-none {% if not c.author.exiled_from(sub) %}d-md-block{% endif %} dropdown-item list-inline-item text-danger" onclick="post_toast2(this,'/exile/comment/{{c.id}}','exile-{{c.id}}','unexile-{{c.id}}')"><i class="fas fa-campfire text-danger fa-fw"></i>Exile user</button>
 		<button id="unexile-{{c.id}}" class="d-none {% if c.author.exiled_from(sub) %}d-md-block{% endif %} dropdown-item list-inline-item text-success" onclick="post_toast2(this,'/unexile/comment/{{c.id}}','exile-{{c.id}}','unexile-{{c.id}}')"><i class="fas fa-campfire text-success fa-fw"></i>Unexile user</button>
 	{% endif %}
@@ -713,7 +713,7 @@
 
 						{% if c.post %}
 							{% set sub = c.post.sub %}
-							{% if sub and v.mods(sub) %}
+							{% if sub and v.mods(sub) and not c.author.mods(sub) %}
 								<a data-bs-dismiss="modal" id="exile2-{{c.id}}" class="{% if c.author.exiled_from(sub) %}d-none{% endif %} list-group-item text-danger" onclick="post_toast2(this,'/exile/comment/{{c.id}}','exile2-{{c.id}}','unexile2-{{c.id}}')"><i class="fas fa-campfire text-danger mr-2"></i>Exile user</a>
 								<a data-bs-dismiss="modal" id="unexile2-{{c.id}}" class="{% if not c.author.exiled_from(sub) %}d-none{% endif %} list-group-item text-success" onclick="post_toast2(this,'/unexile/comment/{{c.id}}','exile2-{{c.id}}','unexile2-{{c.id}}')"><i class="fas fa-campfire text-success mr-2"></i>Unexile user</a>
 							{% endif %}
@@ -887,10 +887,25 @@
 
 	<script src="/static/assets/js/comments+submission_listing.js?v=253"></script>
 	<script src="/static/assets/js/comments.js?v=252"></script>
+{% endif %}
 
+{% if offset %}
+	{% if p %}
+		{% set pid = p.id %}
+	{% endif %}
+	<br>
+	<div id="viewmore-{{offset}}"><button id="viewbtn" class="btn btn-primary" onclick="viewmore({{pid}},'{{sort}}',{{offset}},{{ids}})">VIEW MORE COMMENTS</a></div>
+{% endif %}
+
+{% if p %}
 	<script>
 		{% if p and (not v or v.highlightcomments) %}
-			comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
+			{% if ajax %}
+				comments = JSON.parse(localStorage.getItem("old-comment-counts")) || {}
+			{% else %}
+				comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
+			{% endif %}
+
 			lastCount = comments['{{p.id}}']
 			if (lastCount)
 			{
@@ -906,12 +921,4 @@
 	</script>
 {% endif %}
 
-{% if offset %}
-	{% if p %}
-		{% set pid = p.id %}
-	{% endif %}
-	<br>
-	<div id="viewmore-{{offset}}"><button id="viewbtn" class="btn btn-primary" onclick="viewmore({{pid}},'{{sort}}',{{offset}},{{ids}})">VIEW MORE COMMENTS</a></div>
-{% endif %}
-
 </body>

files/templates/emoji_modal.html

@@ -94,4 +94,4 @@
 	</div>
 </div>
 
-<script src="/static/assets/js/emoji_modal.js?v=255"></script>
+<script src="/static/assets/js/emoji_modal.js?v=256"></script>

files/templates/post_actions.html

@@ -78,8 +78,8 @@
             {% endif %}
 
 
-            {% if p.sub and v.mods(p.sub) %}
+            {% if p.sub and v.mods(p.sub) and not p.author.mods(sub) %}
-                <a class="dropdown-item list-inline-item text-danger" role="button" onclick="post_toast(this,'/kick/{{p.id}}')"><i class="fas fa-sign-out text-danger"></i>Kick</a>
+                <a class="dropdown-item list-inline-item text-danger" role="button" onclick="post_toast(this,'/kick/{{p.id}}')"><i class="fas fa-sign-out text-danger"></i>Remove</a>
 
                 <a id="exile-{{p.id}}" class="{% if p.author.exiled_from(p.sub) %}d-none{% endif %} dropdown-item list-inline-item text-danger" role="button" onclick="post_toast2(this,'/exile/post/{{p.id}}','exile-{{p.id}}','unexile-{{p.id}}')"><i class="fas fa-campfire text-danger"></i>Exile user</a>
                 <a id="unexile-{{p.id}}" class="{% if not p.author.exiled_from(p.sub) %}d-none{% endif %} dropdown-item list-inline-item text-success" role="button" onclick="post_toast2(this,'/unexile/post/{{p.id}}','exile-{{p.id}}','unexile-{{p.id}}')"><i class="fas fa-campfire text-success"></i>Unexile user</a>

files/templates/post_actions_mobile.html

@@ -50,8 +50,8 @@
     {% endif %}
 {% endif %}
 
-{% if p.sub and v.mods(p.sub) %}
+{% if p.sub and v.mods(p.sub) and not p.author.mods(sub) %}
-    <button data-bs-dismiss="modal" class="nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast(this,'/kick/{{p.id}}')"><i class="fas fa-sign-out text-danger text-center mr-3"></i>Kick</button>
+    <button data-bs-dismiss="modal" class="nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast(this,'/kick/{{p.id}}')"><i class="fas fa-sign-out text-danger text-center mr-3"></i>Remove</button>
 
     <button data-bs-dismiss="modal" id="exile2" class="{% if p.author.exiled_from(p.sub) %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-danger" onclick="post_toast2(this,'/exile/post/{{p.id}}','exile2','unexile2')"><i class="fas fa-campfire mr-3 text-danger"></i>Exile user</button>
     <button data-bs-dismiss="modal" id="unexile2" class="{% if not p.author.exiled_from(p.sub) %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-success" onclick="post_toast2(this,'/unexile/post/{{p.id}}','exile2','unexile2')"><i class="fas fa-campfire mr-3 text-success"></i>Unexile user</button>

files/templates/submission.html

@@ -1045,6 +1045,8 @@
 		{% endif %}
 
 		{% if "?context" not in request.full_path %}
+			localStorage.setItem("old-comment-counts", localStorage.getItem("comment-counts"))
+
 			const comments = JSON.parse(localStorage.getItem("comment-counts")) || {}
 			const newTotal = {{p.comment_count}} || ((comments['{{p.id}}'] || {c: 0}).c + 1)
 			comments['{{p.id}}'] = {c: newTotal, t: Date.now()}