rDrama
/
rDrama
9
10
Fork 8
Code Issues Pull Requests Packages Releases Wiki Activity

fds

remotes/1693045480750635534/spooky-22
Aevann1 2021-10-20 01:43:11 +02:00
parent 8a7dfc0ec5
commit 9c7878d7c9
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/classes/comment.py
View File

@ -199,7 +199,7 @@ class Comment(Base):
@property @property
@lazy @lazy
def shortlink(self): def shortlink(self):
return f"https://{site}/comment/{self.id}" return f"http://{site}/comment/{self.id}"
@property @property
@lazy @lazy

10
files/classes/submission.py
View File

@ -170,7 +170,7 @@ class Submission(Base):
@property @property
@lazy @lazy
def shortlink(self): def shortlink(self):
return f"https://{site}/post/{self.id}" return f"http://{site}/post/{self.id}"
@property @property
@lazy @lazy
@ -233,11 +233,11 @@ class Submission(Base):
@property @property
@lazy @lazy
def thumb_url(self): def thumb_url(self):
if self.over_18: return f"https://{site}/assets/images/nsfw.gif" if self.over_18: return f"http://{site}/assets/images/nsfw.gif"
elif not self.url: return f"https://{site}/assets/images/{site_name}/default_thumb_text.gif" elif not self.url: return f"http://{site}/assets/images/{site_name}/default_thumb_text.gif"
elif self.thumburl: return self.thumburl elif self.thumburl: return self.thumburl
elif "youtu.be" in self.domain or "youtube.com" in self.domain: return f"https://{site}/assets/images/default_thumb_yt.gif" elif "youtu.be" in self.domain or "youtube.com" in self.domain: return f"http://{site}/assets/images/default_thumb_yt.gif"
else: return f"https://{site}/assets/images/default_thumb_link.gif" else: return f"http://{site}/assets/images/default_thumb_link.gif"
@property @property
@lazy @lazy

6
files/classes/user.py
View File

@ -431,14 +431,14 @@ class User(Base):
@lazy @lazy
def banner_url(self): def banner_url(self):
if self.bannerurl: return self.bannerurl if self.bannerurl: return self.bannerurl
else: return f"https://{site}/assets/images/{site_name}/preview.gif" else: return f"http://{site}/assets/images/{site_name}/preview.gif"
@property @property
@lazy @lazy
def profile_url(self): def profile_url(self):
if self.profileurl: return self.profileurl if self.profileurl: return self.profileurl
elif "rama" in site: return f"https://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.gif" elif "rama" in site: return f"http://{site}/assets/images/defaultpictures/{random.randint(1, 150)}.gif"
else: return f"https://{site}/assets/images/default-profile-pic.gif" else: return f"http://{site}/assets/images/default-profile-pic.gif"
@property @property
@lazy @lazy

8
files/helpers/sanitize.py
View File

@ -164,13 +164,13 @@ def sanitize(sanitized, noimages=False):
if emoji.startswith("!"): if emoji.startswith("!"):
emoji = emoji[1:] emoji = emoji[1:]
if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
new = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" class="bigemoji mirrored" src="https://{site}/assets/images/emojis/{emoji}.webp" >', new) new = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" class="bigemoji mirrored" src="http://{site}/assets/images/emojis/{emoji}.webp" >', new)
if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
else: session["favorite_emojis"][emoji] = 1 else: session["favorite_emojis"][emoji] = 1
elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" class="bigemoji" src="https://{site}/assets/images/emojis/{emoji}.webp" >', new) new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" class="bigemoji" src="http://{site}/assets/images/emojis/{emoji}.webp" >', new)
if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
else: session["favorite_emojis"][emoji] = 1 else: session["favorite_emojis"][emoji] = 1
@ -183,13 +183,13 @@ def sanitize(sanitized, noimages=False):
if emoji.startswith("!"): if emoji.startswith("!"):
emoji = emoji[1:] emoji = emoji[1:]
if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
sanitized = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" class="emoji mirrored" src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized) sanitized = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" class="emoji mirrored" src="http://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
else: session["favorite_emojis"][emoji] = 1 else: session["favorite_emojis"][emoji] = 1
elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
sanitized = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" class="emoji" src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized) sanitized = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" class="emoji" src="http://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1 if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
else: session["favorite_emojis"][emoji] = 1 else: session["favorite_emojis"][emoji] = 1

2
files/routes/comments.py
View File

@ -525,7 +525,7 @@ def api_comment(v):
'notification': { 'notification': {
'title': f'New reply by @{v.username}', 'title': f'New reply by @{v.username}',
'body': c.body, 'body': c.body,
'deep_link': f'https://{site}{c.permalink}?context=10#context', 'deep_link': f'http://{site}{c.permalink}?context=10#context',
}, },
}, },
}, },

2
files/routes/feeds.py
View File

@ -51,7 +51,7 @@ def feeds_user(sort='hot', t='all'):
with tag("name"): with tag("name"):
text(post.author.username) text(post.author.username)
with tag("uri"): with tag("uri"):
text(f'https://{site}/@{post.author.username}') text(f'http://{site}/@{post.author.username}')
doc.stag("link", href=full_link(post.permalink)) doc.stag("link", href=full_link(post.permalink))

14
files/routes/posts.py
View File

@ -63,7 +63,7 @@ def publish(pid, v):
for follow in v.followers: for follow in v.followers:
user = get_account(follow.user_id) user = get_account(follow.user_id)
send_notification(AUTOJANNY_ACCOUNT, user, f"@{v.username} has made a new post: [{post.title}](https://{site}{post.permalink})") send_notification(AUTOJANNY_ACCOUNT, user, f"@{v.username} has made a new post: [{post.title}](http://{site}{post.permalink})")
g.db.commit() g.db.commit()
@ -297,7 +297,7 @@ def edit_post(pid, v):
user = g.db.query(User).options(lazyload('*')).filter_by(username=username).first() user = g.db.query(User).options(lazyload('*')).filter_by(username=username).first()
if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user) if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user)
message = f"@{v.username} has mentioned you: https://{site}{p.permalink}" message = f"@{v.username} has mentioned you: http://{site}{p.permalink}"
for x in notify_users: for x in notify_users:
existing = g.db.query(Comment).options(lazyload('*')).filter(Comment.author_id == NOTIFICATIONS_ACCOUNT, Comment.body == message, Comment.notifiedto == x.id).first() existing = g.db.query(Comment).options(lazyload('*')).filter(Comment.author_id == NOTIFICATIONS_ACCOUNT, Comment.body == message, Comment.notifiedto == x.id).first()
if not existing: send_notification(NOTIFICATIONS_ACCOUNT, x, message) if not existing: send_notification(NOTIFICATIONS_ACCOUNT, x, message)
@ -349,10 +349,10 @@ def filter_title(title):
if emoji.startswith("!"): if emoji.startswith("!"):
emoji = emoji[1:] emoji = emoji[1:]
if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
title = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp" class="mirrored">', title) title = re.sub(f'(?<!"):!{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{emoji}:" title=":!{emoji}:" delay="0" height=30 src="http://{site}/assets/images/emojis/{emoji}.webp" class="mirrored">', title)
elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'): elif path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
title = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp">', title) title = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=30 src="http://{site}/assets/images/emojis/{emoji}.webp">', title)
if len(title) > 1500: abort(400) if len(title) > 1500: abort(400)
else: return title else: return title
@ -752,12 +752,12 @@ def submit_post(v):
user = g.db.query(User).options(lazyload('*')).filter_by(username=username).first() user = g.db.query(User).options(lazyload('*')).filter_by(username=username).first()
if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user) if user and not v.any_block_exists(user) and user.id != v.id: notify_users.add(user)
for x in notify_users: send_notification(NOTIFICATIONS_ACCOUNT, x, f"@{v.username} has mentioned you: https://{site}{new_post.permalink}") for x in notify_users: send_notification(NOTIFICATIONS_ACCOUNT, x, f"@{v.username} has mentioned you: http://{site}{new_post.permalink}")
if not new_post.private: if not new_post.private:
for follow in v.followers: for follow in v.followers:
user = get_account(follow.user_id) user = get_account(follow.user_id)
send_notification(AUTOJANNY_ACCOUNT, user, f"@{v.username} has made a new post: [{title}](https://{site}{new_post.permalink})") send_notification(AUTOJANNY_ACCOUNT, user, f"@{v.username} has made a new post: [{title}](http://{site}{new_post.permalink})")
g.db.add(new_post) g.db.add(new_post)
g.db.flush() g.db.flush()
@ -879,7 +879,7 @@ def submit_post(v):
cache.delete_memoized(frontlist) cache.delete_memoized(frontlist)
cache.delete_memoized(User.userpagelisting) cache.delete_memoized(User.userpagelisting)
if "[changelog]" in new_post.title or "(changelog)" in new_post.title: if "[changelog]" in new_post.title or "(changelog)" in new_post.title:
send_message(f"https://{site}{new_post.permalink}") send_message(f"http://{site}{new_post.permalink}")
cache.delete_memoized(changeloglist) cache.delete_memoized(changeloglist)
g.db.commit() g.db.commit()

4
files/routes/reporting.py
View File

@ -21,7 +21,7 @@ def api_flag_post(pid, v):
for i in re.finditer(':(.{1,30}?):', reason): for i in re.finditer(':(.{1,30}?):', reason):
if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'): if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">') reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="http://{site}/assets/images/emojis/{i.group(1)}.webp">')
flag = Flag(post_id=post.id, flag = Flag(post_id=post.id,
user_id=v.id, user_id=v.id,
@ -53,7 +53,7 @@ def api_flag_comment(cid, v):
for i in re.finditer(':(.{1,30}?):', reason): for i in re.finditer(':(.{1,30}?):', reason):
if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'): if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">') reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="http://{site}/assets/images/emojis/{i.group(1)}.webp">')
flag = CommentFlag(comment_id=comment.id, flag = CommentFlag(comment_id=comment.id,
user_id=v.id, user_id=v.id,

2
files/routes/static.py
View File

@ -228,7 +228,7 @@ def contact(v):
@limiter.limit("1/second") @limiter.limit("1/second")
@auth_required @auth_required
def submit_contact(v): def submit_contact(v):
message = f'This message has been sent automatically to all admins via https://{site}/contact, user email is "{v.email}"\n\nMessage:\n\n' + request.values.get("message", "") message = f'This message has been sent automatically to all admins via http://{site}/contact, user email is "{v.email}"\n\nMessage:\n\n' + request.values.get("message", "")
send_admin(v.id, message) send_admin(v.id, message)
g.db.commit() g.db.commit()
return render_template("contact.html", v=v, msg="Your message has been sent.") return render_template("contact.html", v=v, msg="Your message has been sent.")

2
files/routes/users.py
View File

@ -271,7 +271,7 @@ def message2(v, username):
'notification': { 'notification': {
'title': f'New message from @{v.username}', 'title': f'New message from @{v.username}',
'body': message, 'body': message,
'deep_link': f'https://{site}/notifications', 'deep_link': f'http://{site}/notifications',
}, },
}, },
}, },