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

Merge branch 'master' into mistletoe

Browse source
This commit is contained in:
kek7198 2021-12-11 00:34:36 -06:00
commit 4c1a5141ee
6 changed files with 2 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
files/assets/images/emojis/marseyliondance.webp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 150 KiB

Before After
Before After

31
files/assets/js/comments+submission_listing.js
View file

@ -32,37 +32,6 @@ function popovertrigger() {
popovertrigger()
function eventasdf(value){
var content_id = value.getAttributeNode("data-content-id").value;
value.addEventListener("click", function(){jhkj(content_id)});
}
function checkIfBussy(){
if (document.getElementById("bussy") != null){
document.body.removeChild(document.getElementById("bussy"));
}
}
function dfgh(e){
active = document.activeElement;
if (active.getAttributeNode("class") == null || active.getAttributeNode("class").nodeValue != "user-name text-decoration-none"){
checkIfBussy();
}
}
function jhkj(value){
checkIfBussy();
var popover_shit = document.getElementsByClassName("popover")[0];
var uiop = document.createElement("DIV");
uiop.innerHTML = popover_shit.outerHTML;
uiop.id = "bussy";
document.body.appendChild(uiop);
document.body.removeChild(popover_shit);
}
var usernames = document.querySelectorAll("a.user-name");
usernames.forEach(eventasdf);

3
files/assets/js/emoji_modal.js
View file

File diff suppressed because one or more lines are too long

6
files/routes/admin.py
View file

File diff suppressed because one or more lines are too long

3
files/routes/front.py
View file

@ -255,8 +255,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='
elif sort == "comments":
posts = posts.order_by(Submission.comment_count.desc())
if v:
size = v.frontsize
if v: size = v.frontsize or 0
else: size = 25
posts = posts.offset(size * (page - 1)).limit(size+1).all()

2
files/routes/settings.py
View file

@ -848,8 +848,6 @@ def settings_profilecss(v):
@validate_formkey
def settings_block_user(v):
if v and v.admin_level: return {"error": "Admins can't block users."}, 403
user = get_user(request.values.get("username"), graceful=True)
if not user: return {"error": "That user doesn't exist."}, 404