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

farin

Browse source
This commit is contained in:
Aevann1 2022-02-24 11:24:22 +02:00
parent 0196ef421a
commit 1c7b081231
8 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

45
files/assets/js/comments_v.js
View file

@ -156,18 +156,17 @@ function post_reply(id){
xhr.open("post", "/reply"); xhr.open("post", "/reply");
xhr.setRequestHeader('xhr', 'xhr'); xhr.setRequestHeader('xhr', 'xhr');
xhr.onload=function(){ xhr.onload=function(){
if (xhr.status==200) { let data
try {data = JSON.parse(xhr.response)}
catch(e) {console.log(e)}
if (data && data["comment"]) {
commentForm=document.getElementById('comment-form-space-'+id); commentForm=document.getElementById('comment-form-space-'+id);
commentForm.innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '').replace('comment-collapse-desktop d-none d-md-block','d-none').replace('border-left: 2px solid','padding-left:0;border-left: 0px solid'); commentForm.innerHTML = data["comment"].replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '').replace('comment-collapse-desktop d-none d-md-block','d-none').replace('border-left: 2px solid','padding-left:0;border-left: 0px solid');
bs_trigger(); bs_trigger();
} }
else { else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later." if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
try{ else document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
let data = JSON.parse(xhr.response)
document.getElementById('toast-post-error-text').innerText = data["error"];
}
catch(e) {console.log(e)}
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
setTimeout(() => { setTimeout(() => {
@ -193,18 +192,17 @@ function comment_edit(id){
xhr.open("post", "/edit_comment/"+id); xhr.open("post", "/edit_comment/"+id);
xhr.setRequestHeader('xhr', 'xhr'); xhr.setRequestHeader('xhr', 'xhr');
xhr.onload=function(){ xhr.onload=function(){
if (xhr.status==200) { let data
try {data = JSON.parse(xhr.response)}
catch(e) {console.log(e)}
if (data && data["comment"]) {
commentForm=document.getElementById('comment-text-'+id); commentForm=document.getElementById('comment-text-'+id);
commentForm.innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '') commentForm.innerHTML = data["comment"].replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '')
document.getElementById('cancel-edit-'+id).click() document.getElementById('cancel-edit-'+id).click()
} }
else { else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later." if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
try{ else document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
let data = JSON.parse(xhr.response)
document.getElementById('toast-post-error-text').innerText = data["error"];
}
catch(e) {console.log(e)}
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
setTimeout(() => { setTimeout(() => {
@ -232,18 +230,17 @@ function post_comment(fullname){
xhr.open("post", "/comment"); xhr.open("post", "/comment");
xhr.setRequestHeader('xhr', 'xhr'); xhr.setRequestHeader('xhr', 'xhr');
xhr.onload=function(){ xhr.onload=function(){
if (xhr.status==200) { let data
try {data = JSON.parse(xhr.response)}
catch(e) {console.log(e)}
if (data && data["comment"]) {
commentForm=document.getElementById('comment-form-space-'+fullname); commentForm=document.getElementById('comment-form-space-'+fullname);
commentForm.innerHTML = xhr.response.replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, ''); commentForm.innerHTML = data["comment"].replace(/data-src/g, 'src').replace(/data-cfsrc/g, 'src').replace(/style="display:none;visibility:hidden;"/g, '');
bs_trigger(); bs_trigger();
} }
else { else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later." if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
try{ else document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
let data = JSON.parse(xhr.response)
document.getElementById('toast-post-error-text').innerText = data["error"];
}
catch(e) {console.log(e)}
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
setTimeout(() => { setTimeout(() => {

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

File diff suppressed because one or more lines are too long

1
files/helpers/sanitize.py
View file

@ -177,6 +177,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
tag["onclick"] = "expandDesktopImage(this.src);" tag["onclick"] = "expandDesktopImage(this.src);"
tag["data-bs-toggle"] = "modal" tag["data-bs-toggle"] = "modal"
tag["data-bs-target"] = "#expandImageModal" tag["data-bs-target"] = "#expandImageModal"
tag['referrerpolicy'] = "no-referrer"
for tag in soup.find_all("a"): for tag in soup.find_all("a"):
if tag.get("href"): if tag.get("href"):

8
files/routes/comments.py
View file

@ -223,7 +223,7 @@ def api_comment(v):
name = badge_def["name"] name = badge_def["name"]
existing = g.db.query(BadgeDef).filter_by(name=name).one_or_none() existing = g.db.query(BadgeDef).filter_by(name=name).one_or_none()
if existing: return {"error": "A badge with this name already exists!"} if existing: return {"error": "A badge with this name already exists!"}, 403
badge = BadgeDef(name=name, description=badge_def["description"]) badge = BadgeDef(name=name, description=badge_def["description"])
g.db.add(badge) g.db.add(badge)
@ -243,7 +243,7 @@ def api_comment(v):
else: abort(400) else: abort(400)
existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none() existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none()
if existing: return {"error": "A marsey with this name already exists!"} if existing: return {"error": "A marsey with this name already exists!"}, 403
marsey = Marsey(name=marsey["name"], author_id=author_id, tags=marsey["tags"], count=0) marsey = Marsey(name=marsey["name"], author_id=author_id, tags=marsey["tags"], count=0)
g.db.add(marsey) g.db.add(marsey)
@ -684,7 +684,7 @@ def api_comment(v):
g.db.commit() g.db.commit()
if request.headers.get("Authorization"): return c.json if request.headers.get("Authorization"): return c.json
return render_template("comments.html", v=v, comments=[c], ajax=True) return {"comment": c.body_html}
@ -897,7 +897,7 @@ def edit_comment(cid, v):
g.db.commit() g.db.commit()
return c.realbody(v) return {"comment": c.realbody(v)}
@app.post("/delete/comment/<cid>") @app.post("/delete/comment/<cid>")

2
files/routes/users.py
View file

@ -595,7 +595,7 @@ def messagereply(v):
g.db.add(notif) g.db.add(notif)
g.db.commit() g.db.commit()
return render_template("comments.html", v=v, comments=[new_comment], ajax=True) return {"comment": render_template("comments.html", v=v, comments=[new_comment], ajax=True)}
@app.get("/2faqr/<secret>") @app.get("/2faqr/<secret>")
@auth_required @auth_required

4
files/templates/comments.html
View file

@ -147,7 +147,7 @@
</div> </div>
{% endif %} {% endif %}
{% if c.sentto and c.level > 1 %} {% if c.parent_comment and c.parent_comment.sentto %}
{% set isreply = True %} {% set isreply = True %}
{% else %} {% else %}
{% set isreply = False %} {% set isreply = False %}
@ -871,7 +871,7 @@
{% if v %} {% if v %}
<script src="/static/assets/js/marked.js?a=242"></script> <script src="/static/assets/js/marked.js?a=242"></script>
<script src="/static/assets/js/comments_v.js?a=257"></script> <script src="/static/assets/js/comments_v.js?a=259"></script>
{% endif %} {% endif %}
<script src="/static/assets/js/clipboard.js?a=250"></script> <script src="/static/assets/js/clipboard.js?a=250"></script>

8
files/templates/formatting.html
View file

@ -54,7 +54,7 @@ You can use Markdown formatting:
<tr> <tr>
<td>Images</td> <td>Images</td>
<td>https://i.imgur.com/Lf6dfPO.jpg</td> <td>https://i.imgur.com/Lf6dfPO.jpg</td>
<td><img loading="lazy" alt="example image" src="https://i.imgur.com/Lf6dfPO.jpg"></td> <td><img loading="lazy" alt="example image" referrerpolicy="no-referrer" src="https://i.imgur.com/Lf6dfPO.jpg"></td>
</tr> </tr>
<tr> <tr>
<td>Youtube Videos</td> <td>Youtube Videos</td>
@ -64,7 +64,7 @@ You can use Markdown formatting:
<tr> <tr>
<td>Video Files</td> <td>Video Files</td>
<td>https://files.catbox.moe/v4om92.mp4</td> <td>https://files.catbox.moe/v4om92.mp4</td>
<td><video controls preload="none" class="embedvid"><source src="https://files.catbox.moe/v4om92.mp4" type="video/mp4"></video></td> <td><video controls preload="none" class="embedvid"><source referrerpolicy="no-referrer" src="https://files.catbox.moe/v4om92.mp4" type="video/mp4"></video></td>
</tr> </tr>
<tr> <tr>
<td>Emojis</td> <td>Emojis</td>
@ -465,10 +465,10 @@ line breaks
<tr> <tr>
<td>Images</td> <td>Images</td>
<td> <td>
&lt;img src="https://i.imgur.com/SwVuagI_d.webp" width="200"&gt; &lt;img referrerpolicy="no-referrer" src="https://i.imgur.com/SwVuagI_d.webp" width="200"&gt;
</td> </td>
<td> <td>
<img loading="lazy" alt="example image" src="https://i.imgur.com/SwVuagI_d.webp" width="200"> <img loading="lazy" alt="example image" referrerpolicy="no-referrer" src="https://i.imgur.com/SwVuagI_d.webp" width="200">
</td> </td>
</tr> </tr>
</tbody> </tbody>

2
files/templates/gif_modal.html
View file

@ -26,4 +26,4 @@
</div> </div>
</div> </div>
<script src="/static/assets/js/gif_modal.js?a=242"></script> <script src="/static/assets/js/gif_modal.js?a=243"></script>