fdsfds

files/assets/CHRISTMAS/js/default.js

@@ -104,9 +104,10 @@ function post_toast2(url, button1, button2) {
 	xhr.withCredentials=true;
 
 	xhr.onload = function() {
-		if (xhr.status >= 200 && xhr.status < 300) {
+		data=JSON.parse(xhr.response);
+		if (xhr.status >= 200 && xhr.status < 300 && !data["error"]) {
 			try {
-				document.getElementById('toast-post-success-text').innerText = JSON.parse(xhr.response)["message"];
+				document.getElementById('toast-post-success-text').innerText = data["message"];
 			} catch(e) {
 				document.getElementById('toast-post-success-text').innerText = "Action successful!";
 			}

files/assets/CHRISTMAS/js/post_toast2.js

@@ -15,9 +15,10 @@ function post_toast2(url, button1, button2) {
 	xhr.withCredentials=true;
 
 	xhr.onload = function() {
-		if (xhr.status >= 200 && xhr.status < 300) {
+		data=JSON.parse(xhr.response);
+		if (xhr.status >= 200 && xhr.status < 300 && !data["error"]) {
 			try {
-				document.getElementById('toast-post-success-text').innerText = JSON.parse(xhr.response)["message"];
+				document.getElementById('toast-post-success-text').innerText = data["message"];
 			} catch(e) {
 				document.getElementById('toast-post-success-text').innerText = "Action successful!";
 			}
@@ -29,8 +30,6 @@ function post_toast2(url, button1, button2) {
 			window.location.href = JSON.parse(xhr.response)["redirect"]
 		} else {
 			try {
-				data=JSON.parse(xhr.response);
-
 				var myToast = new bootstrap.Toast(document.getElementById('toast-post-error'));
 				myToast.show();
 				document.getElementById('toast-post-error-text').innerText = data["error"];

files/assets/js/post_toast2.js

@@ -16,7 +16,7 @@ function post_toast2(url, button1, button2) {
 
 	xhr.onload = function() {
 		data = JSON.parse(xhr.response)
-		if (xhr.status >= 200 && xhr.status < 300 && !data["error"] ) {
+		if (xhr.status >= 200 && xhr.status < 300 && !data["error"]) {
 			try {
 				document.getElementById('toast-post-success-text').innerText = data["message"];
 			} catch(e) {}

files/routes/admin.py

@@ -967,15 +967,15 @@ def api_distinguish_post(post_id, v):
 @validate_formkey
 def api_sticky_post(post_id, v):
 
-	pins = g.db.query(Submission.id).filter(Submission.stickied != None, Submission.is_banned == False).count()
-	if pins > 2: return {"error": "Can't exceed 3 pinned posts limit!"}, 403
-
 	post = g.db.query(Submission).filter_by(id=post_id).first()
 	if post:
 		if post.stickied:
 			if post.stickied.startswith("t:"): abort(403)
 			else: post.stickied = None
-		else: post.stickied = v.username
+		else:
+			pins = g.db.query(Submission.id).filter(Submission.stickied != None, Submission.is_banned == False).count()
+			if pins > 2: return {"error": "Can't exceed 3 pinned posts limit!"}, 403
+			post.stickied = v.username
 		g.db.add(post)
 
 		ma=ModAction(

files/templates/CHRISTMAS/changelog.html

@@ -104,6 +104,6 @@
 </nav>
 {% endif %}
 
-<script src="/assets/CHRISTMAS/js/post_toast2.js?v=200"></script>
+<script src="/assets/CHRISTMAS/js/post_toast2.js?v=201"></script>
 
 {% endblock %}

files/templates/CHRISTMAS/default.html

@@ -346,7 +346,7 @@
 
 {% if v %}
 	<script>function formkey() {return '{{v.formkey}}';}</script>
-	<script src="/assets/CHRISTMAS/js/default.js?v=200"></script>
+	<script src="/assets/CHRISTMAS/js/default.js?v=201"></script>
 {% endif %}
 
 </body>

files/templates/CHRISTMAS/settings.html

@@ -215,7 +215,7 @@
 
 	{% if v %}
 		<script>function formkey() {return '{{v.formkey}}';}</script>
-		<script src="/assets/CHRISTMAS/js/default.js?v=200"></script>
+		<script src="/assets/CHRISTMAS/js/default.js?v=201"></script>
 	{% endif %}
 </body>
 </html>

files/templates/admin/image_posts.html

@@ -53,7 +53,4 @@
 		{% endif %}
 	</ul>
 </nav>
-{% endblock %}
-
-{% block SongsTax %}
 {% endblock %}

files/templates/admin/reported_posts.html

@@ -80,7 +80,4 @@
 		{% endif %}
 	</ul>
 </nav>
-{% endblock %}
-
-{% block SongsTax %}
 {% endblock %}

files/templates/userpage.html

@@ -683,6 +683,18 @@
 
 </div>
 
+{% if u.song %}
+<div id="uid" class="d-none">{{u.id}}</div>
+{% endif %}
+
+{% if v %}
+<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
+<script src="/assets/js/userpage_v.js?v=190"></script>
+<div id="username" class="d-none">{{u.username}}</div>
+{% endif %}
+
+<script src="/assets/js/userpage.js?v=190"></script>
+
 {% endblock %}
 
 {% block pagenav %}
@@ -720,16 +732,5 @@
 
 {% endblock %}
 
-{% block SongsTax %}
+{% block GIFpicker %}
-	{% if u.song %}
-		<div id="uid" class="d-none">{{u.id}}</div>
-	{% endif %}
-
-	{% if v %}
-		<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
-		<script src="/assets/js/userpage_v.js?v=190"></script>
-		<div id="username" class="d-none">{{u.username}}</div>
-	{% endif %}
-
-	<script src="/assets/js/userpage.js?v=190"></script>
 {% endblock %}

files/templates/userpage_comments.html

@@ -103,4 +103,16 @@
 	{% endif %}
 </div>
 </div>
+
+{% if u.song %}
+<div id="uid" class="d-none">{{u.id}}</div>
+{% endif %}
+
+{% if v %}
+<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
+<script src="/assets/js/userpage_v.js?v=190"></script>
+<div id="username" class="d-none">{{u.username}}</div>
+{% endif %}
+
+<script src="/assets/js/userpage.js?v=190"></script>
 {% endblock %}

files/templates/userpage_private.html

@@ -30,6 +30,18 @@
 		</div>
 	</div>
 </div>
+
+{% if u.song %}
+<div id="uid" class="d-none">{{u.id}}</div>
+{% endif %}
+
+{% if v %}
+<div id='tax' class="d-none">{% if v.patron or u.patron %}0{% else %}0.03{% endif %}</div>
+<script src="/assets/js/userpage_v.js?v=190"></script>
+<div id="username" class="d-none">{{u.username}}</div>
+{% endif %}
+
+<script src="/assets/js/userpage.js?v=190"></script>
 {% endblock %}
 
 {% block pagenav %}