Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost

files/assets/js/comments+submission_listing.js

@@ -41,7 +41,7 @@ function popclick(e) {
 			badgesDOM.innerHTML = "";
 			for (const badge of author["badges"]) {
 				const badgeDOM = popClickBadgeTemplateDOM.cloneNode();
-				badgeDOM.src = badge + "?v=1021";
+				badgeDOM.src = badge + "?v=1025";
 
 				badgesDOM.append(badgeDOM);
 			}

files/helpers/const.py

@@ -1088,6 +1088,6 @@ forced_hats = {
 	"owoify": ("Cat Ears (wiggly)", "Nuzzles, pounces on you, UwU, you're so warm!.."),
 	"earlylife": ("The Merchant", "SHUT IT DOWN, the goys know!"),
 	"marsify": ("Marsified", "I can't pick my own Marseys, help!"),
-	"is_banned": ("Behind Bars", "This user is banned and needs to do better!"),
+	"is_suspended": ("Behind Bars", "This user is banned and needs to do better!"),
 	"agendaposter": ("Egg_irl", "This user is getting in touch with xir identity!")
 }

files/routes/users.py

@@ -237,6 +237,57 @@ def downvoting_comments(v, username, uid):
 	return render_template("voted_comments.html", next_exists=next_exists, listing=listing, page=page, v=v, standalone=True)
 
 
+@app.get("/@<username>/upvoted/posts")
+@auth_required
+def user_upvoted_posts(v, username):
+	u = get_user(username)
+	if u.is_private and (not v or (v.id != u.id and v.admin_level < 2 and not v.eye)): abort(403)
+	if not (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']): abort(403)
+
+	page = max(1, int(request.values.get("page", 1)))
+
+	listing = g.db.query(Submission).join(Vote).filter(
+			Submission.ghost == False,
+			Submission.is_banned == False,
+			Submission.deleted_utc == 0,
+			Submission.author_id != u.id,
+			Vote.user_id == u.id,
+			Vote.vote_type == 1
+		).order_by(Submission.created_utc.desc()).offset(25 * (page - 1)).limit(26).all()
+
+	listing = [p.id for p in listing]
+	next_exists = len(listing) > 25
+	listing = listing[:25]
+	listing = get_posts(listing, v=v)
+
+	return render_template("voted_posts.html", next_exists=next_exists, listing=listing, page=page, v=v)
+
+
+@app.get("/@<username>/upvoted/comments")
+@auth_required
+def user_upvoted_comments(v, username):
+	u = get_user(username)
+	if u.is_private and (not v or (v.id != u.id and v.admin_level < 2 and not v.eye)): abort(403)
+	if not (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']): abort(403)
+
+	page = max(1, int(request.values.get("page", 1)))
+
+	listing = g.db.query(Comment).join(CommentVote).filter(
+			Comment.ghost == False,
+			Comment.is_banned == False,
+			Comment.deleted_utc == 0,
+			Comment.author_id != u.id,
+			CommentVote.user_id == u.id,
+			CommentVote.vote_type == 1
+		).order_by(Comment.created_utc.desc()).offset(25 * (page - 1)).limit(26).all()
+
+	listing = [c.id for c in listing]
+	next_exists = len(listing) > 25
+	listing = listing[:25]
+	listing = get_comments(listing, v=v)
+
+	return render_template("voted_comments.html", next_exists=next_exists, listing=listing, page=page, v=v, standalone=True)
+
 
 @app.get("/poorcels")
 @auth_required

files/templates/comments.html

@@ -816,7 +816,7 @@
 		<script defer src="{{asset('js/comments_v.js')}}"></script>
 	{% endif %}
 
-	<script defer src="/assets/js/clipboard.js?v=4000"></script>
+	<script defer src="{{asset('js/clipboard.js')}}"></script>
 
 	{% if v and v.admin_level >= 2 %}
 		<script defer src="{{asset('js/comments_admin.js')}}"></script>
@@ -824,8 +824,8 @@
 
 	{% include "expanded_image_modal.html" %}
 
-	<script defer src="/assets/js/comments+submission_listing.js?h=7"></script>
-	<script defer src="/assets/js/comments.js?v=4000"></script>
+	<script defer src="{{asset('js/comments+submission_listing.js')}}"></script>
+	<script defer src="{{asset('js/comments.js')}}"></script>
 
 	<script>
 		{% if p and (not v or v.highlightcomments) %}

files/templates/log.html

@@ -160,6 +160,6 @@
 	</div>
 </div>
 
-<script defer src="/assets/js/clipboard.js?v=4000"></script>
+<script defer src="{{asset('js/clipboard.js')}}"></script>
 
 {% endblock %}

files/templates/notifications.html

@@ -111,7 +111,7 @@
 			</div>
 		</div>
 		
-		<script defer src="/assets/js/clipboard.js?v=4000"></script>		
+		<script defer src="{{asset('js/clipboard.js')}}"></script>
 	{% else %}
 		{% with comments=notifications %}
 			{% include "comments.html" %}

files/templates/settings.html

@@ -260,7 +260,7 @@
 
 {% block onload %}{% endblock %}
 
-<script defer src="/assets/js/clipboard.js?v=4000"></script>
+<script defer src="{{asset('js/clipboard.js')}}"></script>
 
 </body>
 

files/templates/submission.html

@@ -1100,7 +1100,7 @@
 	<script defer src="/assets/js/new_comments_count.js?v=4000"></script>
 {% endif %}
 
-<script defer src="/assets/js/clipboard.js?v=4000"></script>
+<script defer src="{{asset('js/clipboard.js')}}"></script>
 
 {% if not p.replies %}
 	{% include "comments.html" %}

files/templates/submission_listing.html

@@ -425,6 +425,6 @@
 {% endif %}
 {% include "expanded_image_modal.html" %}
 
-<script defer src="/assets/js/clipboard.js?v=4000"></script>
-<script defer src="/assets/js/comments+submission_listing.js?h=7"></script>
+<script defer src="{{asset('js/clipboard.js')}}"></script>
+<script defer src="{{asset('js/comments+submission_listing.js')}}"></script>
 <script defer src="{{asset('js/submission_listing.js')}}"></script>

files/templates/transfers.html

@@ -44,5 +44,5 @@
 	</div>
 </div>
 
-<script defer src="/assets/js/clipboard.js?v=4000"></script>
+<script defer src="{{asset('js/clipboard.js')}}"></script>
 {% endblock %}

files/templates/userpage.html

@@ -122,7 +122,7 @@
 				{% endif %}
 				
 				{% if v and (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']) -%}
-				<div class="font-weight-bolder mb-2" id="profile--simphate"><a class="mr-1" href="/@{{u.username}}/upvoters">Simps</a> | <a class="mx-1" href="/@{{u.username}}/downvoters">Haters</a> | <a class="mx-1" href="/@{{u.username}}/upvoting">Simps for</a> | <a class="ml-1" href="/@{{u.username}}/downvoting">Hates</a></div>
+				<div class="font-weight-bolder mb-2" id="profile--simphate"><a class="mr-1" href="/@{{u.username}}/upvoters">Simps</a> | <a class="mx-1" href="/@{{u.username}}/downvoters">Haters</a> | <a class="mx-1" href="/@{{u.username}}/upvoting">Simps For</a> | <a class="mx-1" href="/@{{u.username}}/downvoting">Hates</a> | <a class="ml-1" href="/@{{u.username}}/upvoted/posts">Upvoted</a></div>
 				{%- endif %}
 
 				<div class="font-weight-bolder">
@@ -457,7 +457,7 @@
 				{% endif %}
 
 				{% if v and (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']) -%}
-				<div class="font-weight-bolder mb-2" id="profile-mobile--simphate"><a class="mr-1" href="/@{{u.username}}/upvoters">Simps</a> | <a class="mx-1" href="/@{{u.username}}/downvoters">Haters</a> | <a class="mx-1" href="/@{{u.username}}/upvoting">Simps for</a> | <a class="ml-1" href="/@{{u.username}}/downvoting">Hates</a></div>
+				<div class="font-weight-bolder mb-2" id="profile-mobile--simphate"><a class="mr-1" href="/@{{u.username}}/upvoters">Simps</a> | <a class="mx-1" href="/@{{u.username}}/downvoters">Haters</a> | <a class="mx-1" href="/@{{u.username}}/upvoting">Simps For</a> | <a class="mx-1" href="/@{{u.username}}/downvoting">Hates</a> | <a class="ml-1" href="/@{{u.username}}/upvoted/posts">Upvoted</a></div>
 				{%- endif %}
 
 				<div class="font-weight-normal">

files/templates/util/assetcache.html

@@ -17,8 +17,11 @@ set CACHE_VER = {
 
 	'js/award_modal.js': 4001,
 	'js/bootstrap.js': 4006,
+	'js/clipboard.js': 4000,
+	'js/comments.js': 4000,
 	'js/comments_admin.js': 4000,
 	'js/comments_v.js': 4003,
+	'js/comments+submission_listing.js': 4010,
 	'js/submission_listing.js': 4000,
 	'js/emoji_modal.js': 4004,
 	'js/formatting.js': 4000,