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-04 18:36:59 -06:00
commit 2a25b9ea2c
30 changed files with 251 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,3 @@
window.addEventListener("load",function(event) {
var prevScrollpos = window.pageYOffset;
window.onscroll = function () {
var currentScrollPos = window.pageYOffset;
@ -43,4 +42,3 @@ window.addEventListener("load",function(event) {
}
prevScrollpos = currentScrollPos;
}
})

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

@ -1,4 +1,3 @@
window.addEventListener("load",function(event) {
function eventasdf(value){
var content_id = value.getAttributeNode("data-content-id").value;
value.addEventListener("click", function(){jhkj(content_id)});
@ -34,4 +33,3 @@ window.addEventListener("load",function(event) {
usernames.forEach(eventasdf);
document.addEventListener("click", function(e){dfgh(e)});
});

5
files/classes/comment.py
View file

@ -335,8 +335,11 @@ class Comment(Base):
maxupvotes = min(ti, 31)
rand = randint(0, maxupvotes)
if self.upvotes < rand:
self.upvotes += randint(0, 3)
amount = randint(0, 3)
self.upvotes += amount
g.db.add(self)
self.author.coins += amount
g.db.add(self.author)
g.db.commit()
return body

5
files/classes/submission.py
View file

@ -335,8 +335,11 @@ class Submission(Base):
maxupvotes = min(ti, 27)
rand = random.randint(0, maxupvotes)
if self.upvotes < rand:
self.upvotes += random.randint(0, 3)
amount = random.randint(0, 3)
self.upvotes += amount
g.db.add(self)
self.author.coins += amount
g.db.add(self.author)
g.db.commit()
return body

35
files/helpers/const.py
View file

@ -143,6 +143,7 @@ if SITE == 'rdrama.net':
CARP_ID = 995
JOAN_ID = 28
AEVANN_ID = 1
KLEN_ID = 2050
LAWLZ_ID = 3833
LLM_ID = 253
DAD_ID = 2513
@ -164,6 +165,7 @@ elif SITE == "pcmemes.net":
CARP_ID = 0
JOAN_ID = 0
AEVANN_ID = 1
KLEN_ID = 0
LAWLZ_ID = 0
LLM_ID = 0
DAD_ID = 0
@ -185,6 +187,7 @@ else:
CARP_ID = 0
JOAN_ID = 0
AEVANN_ID = 0
KLEN_ID = 0
LAWLZ_ID = 0
LLM_ID = 0
DAD_ID = 0
@ -416,6 +419,38 @@ BADGES = {
}
AWARDS = {
"snow": {
"kind": "snow",
"title": "Snow",
"description": "???",
"icon": "fas fa-snowflake",
"color": "text-gray",
"price": 300
},
"candycane": {
"kind": "candycane",
"title": "Candy Cane",
"description": "???",
"icon": "fas fa-candy-cane",
"color": "text-gray",
"price": 500
},
"mistletoe": {
"kind": "mistletoe",
"title": "Mistletoe",
"description": "???",
"icon": "fas fa-mistletoe",
"color": "text-gray",
"price": 600
},
"mariah": {
"kind": "mariah",
"title": "Mariah",
"description": "???",
"icon": "fas fa-music",
"color": "text-gray",
"price": 800
},
"haunt": {
"kind": "haunt",
"title": "Haunt",

10
files/helpers/sanitize.py
View file

@ -130,14 +130,16 @@ def sanitize(sanitized, noimages=False):
if site not in tag["src"] and not tag["src"].startswith('/'): tag["rel"] = "nofollow noopener noreferrer"
tag["class"] = "in-comment-image"
tag["loading"] = "lazy"
tag["data-src"] = tag["src"]
tag["src"] = "/assets/images/loading.webp"
# tag["data-src"] = tag["src"]
# tag["src"] = "/assets/images/loading.webp"
link = soup.new_tag("a")
link["href"] = tag["data-src"]
# link["href"] = tag["data-src"]
link["href"] = tag["src"]
if site not in link["href"] and not link["href"].startswith('/'): link["rel"] = "nofollow noopener noreferrer"
link["target"] = "_blank"
link["onclick"] = f"expandDesktopImage('{tag['data-src']}');"
# link["onclick"] = f"expandDesktopImage('{tag['data-src']}');"
link["onclick"] = f"expandDesktopImage('{tag['src']}');"
link["data-bs-toggle"] = "modal"
link["data-bs-target"] = "#expandImageModal"

4
files/routes/awards.py
View file

@ -515,6 +515,8 @@ def buy(v, award):
@auth_required
def award_post(pid, v):
if v.shadowbanned: return render_template('errors/500.html', v=v), 500
if v.is_banned and not v.unban_utc: return {"error": "forbidden."}, 403
kind = request.values.get("kind", "").strip()
@ -670,6 +672,8 @@ def award_post(pid, v):
@auth_required
def award_comment(cid, v):
if v.shadowbanned: return render_template('errors/500.html', v=v), 500
if v.is_suspended and v.unban_utc == 0: return {"error": "forbidden"}, 403
kind = request.values.get("kind", "").strip()

2
files/routes/discord.py
View file

@ -19,7 +19,7 @@ def join_discord(v):
if v.is_suspended != 0 and v.admin_level == 0: return "Banned users cannot join the discord server!"
if SITE_NAME == 'Drama' and v.admin_level == 0 and v.patron == 0 and v.truecoins < 150: return f"You must earn 150 {COINS_NAME} before entering the Discord server. You earn {COINS_NAME} by making posts/comments and getting upvoted."
if SITE_NAME == 'Drama' and v.admin_level == 0 and v.patron == 0 and v.truecoins < 150: return f"You must receive 150 upvotes/downvotes from other users before being able to join the Discord server."
if v.shadowbanned or v.agendaposter: return ""

11
files/routes/settings.py
View file

@ -338,6 +338,17 @@ def settings_profile_post(v):
if len(bio_html) > 10000: abort(400)
if v.id == KLEN_ID:
notify_users = NOTIFY_USERS(friends_html, v.id)
soup = BeautifulSoup(friends_html, features="html.parser")
for mention in soup.find_all("a", href=re.compile("^/@(\w+)")):
username = mention["href"].split("@")[1]
user = g.db.query(User).filter_by(username=username).first()
if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user.id)
for x in notify_users:
message = f"@{v.username} has added you to their friends list!"
send_notification(x, message)
v.bio = bio[:1500]
v.bio_html=bio_html
g.db.add(v)

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

@ -12,7 +12,6 @@
{% block fixedMobileBarJS %}
<script>
window.addEventListener("load",function(event) {
var prevScrollpos = window.pageYOffset;
window.onscroll = function () {
var currentScrollPos = window.pageYOffset;
@ -32,7 +31,6 @@
}
prevScrollpos = currentScrollPos;
}
});
</script>
{% endblock %}

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

@ -40,7 +40,6 @@
{% block fixedMobileBarJS %}
<script>
window.addEventListener("load",function(event) {
var prevScrollpos = window.pageYOffset;
window.onscroll = function () {
var currentScrollPos = window.pageYOffset;
@ -60,7 +59,6 @@
}
prevScrollpos = currentScrollPos;
}
});
</script>
{% endblock %}

2
files/templates/changelog.html
View file

@ -105,6 +105,6 @@
</nav>
{% endif %}
<script defer src="/assets/js/changelog.js?v=54"></script>
<script src="/assets/js/changelog.js?v=54"></script>
{% endblock %}

4
files/templates/embeds/twitter.html
View file

@ -1,8 +1,6 @@
{{p.embed_url | safe}}
<script defer src="/assets/js/twitter.js" charset="utf-8">
<script src="/assets/js/twitter.js" charset="utf-8">
</script>
<script>
window.addEventListener("load",function(event) {
document.getElementById('twitter-widget-0').setAttribute('sandbox','')
};
</script>

4
files/templates/embeds/twitterlight.html
View file

@ -1,8 +1,6 @@
{{p.embed_url | safe}}
<script defer src="https://platform.twitter.com/widgets.js" charset="utf-8">
<script src="https://platform.twitter.com/widgets.js" charset="utf-8">
</script>
<script>
window.addEventListener("load",function(event) {
document.getElementById('twitter-widget-0').setAttribute('sandbox','')
});
</script>

2
files/templates/emoji_modal.html
View file

@ -84,7 +84,7 @@
</div>
</div>
<script defer src="/assets/js/emoji_modal.js?v=128"></script>
<script src="/assets/js/emoji_modal.js?v=128"></script>
<style>
a.emojitab {

2
files/templates/followers.html
View file

@ -1,13 +1,11 @@
{% extends "default.html" %}
{% block content %}
<script>
window.addEventListener("load",function(event) {
function removeFollower(event, username) {
post_toast('/remove_follow/' + username);
let table = document.getElementById("followers-table");
table.removeChild(event.target.parentElement.parentElement);
}
});
</script>
<pre>

2
files/templates/following.html
View file

@ -1,13 +1,11 @@
{% extends "default.html" %}
{% block content %}
<script>
window.addEventListener("load",function(event) {
function removeFollower(event, username) {
post_toast('/unfollow/' + username);
let table = document.getElementById("followers-table");
table.removeChild(event.target.parentElement.parentElement);
}
});
</script>
<pre>

2
files/templates/gif_modal.html
View file

@ -26,4 +26,4 @@
</div>
</div>
<script defer src="/assets/js/gif_modal.js?v=54"></script>
<script src="/assets/js/gif_modal.js?v=54"></script>

2
files/templates/header.html
View file

@ -218,7 +218,7 @@
function formkey() {return '{{v.formkey}}';}
</script>
{% endif %}
<script defer src="/assets/js/header.js?v=54"></script>
<script src="/assets/js/header.js?v=54"></script>
<style>
.notif-count {

4
files/templates/log.html
View file

@ -122,16 +122,14 @@
</div>
</div>
<script defer src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
<script>
window.addEventListener("load",function(event) {
var clipboard = new ClipboardJS('.copy-link');
clipboard.on('success', function(e) {
var myToast = new bootstrap.Toast(document.getElementById('toast-success'));
myToast.show();
});
});
</script>
{% endblock %}

2
files/templates/login.html
View file

@ -114,7 +114,7 @@
</div>
</div>
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
</body>

2
files/templates/settings2.html
View file

@ -168,7 +168,7 @@
{% block scripts %}
{% endblock %}
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script>
function formkey() {return '{{v.formkey}}';}

2
files/templates/settings_blocks.html
View file

@ -6,7 +6,6 @@
<script>
window.addEventListener("load",function(event) {
block_user=function() {
var exileForm = document.getElementById("exile-form");
@ -40,7 +39,6 @@
xhr.send(f)
}
}
});
</script>
<div class="row">

3
files/templates/settings_css.html
View file

@ -38,15 +38,12 @@
</div>
{% if v.agendaposter %}
<script>
window.addEventListener("load",function(event) {
const flip = (e) => {
e.preventDefault();
document.getElementsByTagName("body")[0].setAttribute("style", "-moz-transform: scale(-1, -1);-o-transform: scale(-1, -1);-webkit-transform: scale(-1, -1);transform: scale(-1, -1);");
};
document.getElementById("submit-btn").onclick = flip;
});
</script>
{% endif %}
</div>

6
files/templates/sign_up.html
View file

@ -146,12 +146,12 @@
</div>
</div>
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script defer src="/assets/js/signup.js?v=63"></script>
<script src="/assets/js/signup.js?v=63"></script>
{% if hcaptcha %}
<script defer src="https://hcaptcha.com/1/api.js"></script>
<script src="https://hcaptcha.com/1/api.js"></script>
{% endif %}
</body>

2
files/templates/sign_up_failed_ref.html
View file

@ -96,7 +96,7 @@
</div>
</div>
<script defer src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
</body>

2
files/templates/userpage_blocked.html
View file

@ -4,7 +4,6 @@
{% block fixedMobileBarJS %}
<script>
window.addEventListener("load",function(event) {
var prevScrollpos = window.pageYOffset;
window.onscroll = function () {
var currentScrollPos = window.pageYOffset;
@ -24,7 +23,6 @@
}
prevScrollpos = currentScrollPos;
}
});
</script>
{% endblock %}

2
files/templates/userpage_blocking.html
View file

@ -4,7 +4,6 @@
{% block fixedMobileBarJS %}
<script>
window.addEventListener("load",function(event) {
var prevScrollpos = window.pageYOffset;
window.onscroll = function () {
var currentScrollPos = window.pageYOffset;
@ -24,7 +23,6 @@
}
prevScrollpos = currentScrollPos;
}
});
</script>
{% endblock %}

2
files/templates/userpage_private.html
View file

@ -33,5 +33,5 @@
{% endblock %}
{% block pagenav %}
<script defer src="/assets/js/userpage.js?v=72"></script>
<script src="/assets/js/userpage.js?v=72"></script>
{% endblock %}

2
files/templates/userpage_reserved.html
View file

@ -4,7 +4,6 @@
{% block fixedMobileBarJS %}
<script>
window.addEventListener("load",function(event) {
var prevScrollpos = window.pageYOffset;
window.onscroll = function () {
var currentScrollPos = window.pageYOffset;
@ -24,7 +23,6 @@
}
prevScrollpos = currentScrollPos;
}
});
</script>
{% endblock %}