skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdsfds

Browse source
This commit is contained in:
Aevann1 2021-12-17 09:06:25 +02:00
parent 6d9727d0b8
commit 1f32f3a35d
12 changed files with 51 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
files/assets/CHRISTMAS/js/default.js
View file

@ -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!";
}

7
files/assets/CHRISTMAS/js/post_toast2.js
View file

@ -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"];

2
files/assets/js/post_toast2.js
View file

@ -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) {}

8
files/routes/admin.py
View file

@ -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(

2
files/templates/CHRISTMAS/changelog.html
View file

@ -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 %}

2
files/templates/CHRISTMAS/default.html
View file

@ -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>

2
files/templates/CHRISTMAS/settings.html
View file

@ -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>

3
files/templates/admin/image_posts.html
View file

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

3
files/templates/admin/reported_posts.html
View file

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

25
files/templates/userpage.html
View file

@ -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 %}
{% 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>
{% block GIFpicker %}
{% endblock %}

12
files/templates/userpage_comments.html
View file

@ -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 %}

12
files/templates/userpage_private.html
View file

@ -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 %}