carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

dfsdsf

master
Aevann1 2021-10-10 16:10:46 +02:00
parent 77d9309aa3
commit 728e4d1130
16 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/classes/user.py
View File

@ -266,7 +266,7 @@ class User(Base):
elif sort == "old": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
posts = posts.order_by(-1 * Submission.upvotes * (Submission.downvotes+1)) posts = posts.order_by(-1 * Submission.upvotes * min(Submission.downvotes, 1))
elif sort == "top": elif sort == "top":
posts = posts.order_by(Submission.downvotes - Submission.upvotes) posts = posts.order_by(Submission.downvotes - Submission.upvotes)
elif sort == "bottom": elif sort == "bottom":

2
files/helpers/sanitize.py
View File

@ -84,8 +84,6 @@ allowed_styles =['color', 'font-weight', 'transform', '-webkit-transform']
def sanitize(sanitized, noimages=False): def sanitize(sanitized, noimages=False):
sanitized = sanitized.replace("\ufeff", "").replace("m.youtube.com", "youtube.com") sanitized = sanitized.replace("\ufeff", "").replace("m.youtube.com", "youtube.com")
sanitized = re.sub("</blockquote>$", "</blockquote><pre></pre>", sanitized)
sanitized = re.sub("^<blockquote>", "<pre></pre><blockquote>", sanitized)
for i in re.finditer('https://i.imgur.com/(([^_]*?)\.(jpg|png|jpeg))', sanitized): for i in re.finditer('https://i.imgur.com/(([^_]*?)\.(jpg|png|jpeg))', sanitized):
sanitized = sanitized.replace(i.group(1), i.group(2) + "_d." + i.group(3) + "?maxwidth=9999") sanitized = sanitized.replace(i.group(1), i.group(2) + "_d." + i.group(3) + "?maxwidth=9999")

6
files/routes/front.py
View File

@ -199,7 +199,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='
elif sort == "old": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
posts = posts.order_by(-1 * Submission.upvotes * (Submission.downvotes+1)) posts = posts.order_by(-1 * Submission.upvotes * min(Submission.downvotes, 1))
elif sort == "top": elif sort == "top":
posts = posts.order_by(Submission.downvotes - Submission.upvotes) posts = posts.order_by(Submission.downvotes - Submission.upvotes)
elif sort == "bottom": elif sort == "bottom":
@ -291,7 +291,7 @@ def changeloglist(v=None, sort="new", page=1 ,t="all"):
elif sort == "old": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
posts = posts.order_by(-1 * Submission.upvotes * (Submission.downvotes+1)) posts = posts.order_by(-1 * Submission.upvotes * min(Submission.downvotes, 1))
elif sort == "top": elif sort == "top":
posts = posts.order_by(Submission.downvotes - Submission.upvotes) posts = posts.order_by(Submission.downvotes - Submission.upvotes)
elif sort == "bottom": elif sort == "bottom":
@ -361,7 +361,7 @@ def comment_idlist(page=1, v=None, nsfw=False, sort="new", t="all"):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
comments = comments.order_by(-1 * Comment.upvotes * (Comment.downvotes+1)) comments = comments.order_by(-1 * Comment.upvotes * min(Comment.downvotes, 1))
elif sort == "top": elif sort == "top":
comments = comments.order_by(Comment.downvotes - Comment.upvotes) comments = comments.order_by(Comment.downvotes - Comment.upvotes)
elif sort == "bottom": elif sort == "bottom":

4
files/routes/posts.py
View File

@ -143,7 +143,7 @@ def post_id(pid, anything=None, v=None):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
comments = comments.order_by(-1 * Comment.upvotes * (Comment.downvotes+1)) comments = comments.order_by(-1 * Comment.upvotes * min(Comment.downvotes, 1))
elif sort == "top": elif sort == "top":
comments = comments.order_by(Comment.downvotes - Comment.upvotes) comments = comments.order_by(Comment.downvotes - Comment.upvotes)
elif sort == "bottom": elif sort == "bottom":
@ -168,7 +168,7 @@ def post_id(pid, anything=None, v=None):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
comments = comments.order_by(-1 * Comment.upvotes * (Comment.downvotes+1)) comments = comments.order_by(-1 * Comment.upvotes * min(Comment.downvotes, 1))
elif sort == "top": elif sort == "top":
comments = comments.order_by(Comment.downvotes - Comment.upvotes) comments = comments.order_by(Comment.downvotes - Comment.upvotes)
elif sort == "bottom": elif sort == "bottom":

4
files/routes/search.py
View File

@ -132,7 +132,7 @@ def searchposts(v):
elif sort == "old": elif sort == "old":
posts = posts.order_by(Submission.created_utc.asc()) posts = posts.order_by(Submission.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
posts = posts.order_by(-1 * Submission.upvotes * (Submission.downvotes+1)) posts = posts.order_by(-1 * Submission.upvotes * min(Submission.downvotes, 1))
elif sort == "top": elif sort == "top":
posts = posts.order_by(Submission.downvotes - Submission.upvotes) posts = posts.order_by(Submission.downvotes - Submission.upvotes)
elif sort == "bottom": elif sort == "bottom":
@ -235,7 +235,7 @@ def searchcomments(v):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
comments = comments.order_by(-1 * Comment.upvotes * (Comment.downvotes+1)) comments = comments.order_by(-1 * Comment.upvotes * min(Comment.downvotes, 1))
elif sort == "top": elif sort == "top":
comments = comments.order_by(Comment.downvotes - Comment.upvotes) comments = comments.order_by(Comment.downvotes - Comment.upvotes)
elif sort == "bottom": elif sort == "bottom":

2
files/routes/users.py
View File

@ -572,7 +572,7 @@ def u_username_comments(username, v=None):
elif sort == "old": elif sort == "old":
comments = comments.order_by(Comment.created_utc.asc()) comments = comments.order_by(Comment.created_utc.asc())
elif sort == "controversial": elif sort == "controversial":
comments = comments.order_by(-1 * Comment.upvotes * (Comment.downvotes+1)) comments = comments.order_by(-1 * Comment.upvotes * min(Comment.downvotes, 1))
elif sort == "top": elif sort == "top":
comments = comments.order_by(Comment.downvotes - Comment.upvotes) comments = comments.order_by(Comment.downvotes - Comment.upvotes)
elif sort == "bottom": elif sort == "bottom":

6
files/templates/authforms.html
View File

@ -15,11 +15,11 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=67">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=66">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %} {% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=67">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
{% endif %} {% endif %}
</head> </head>

8
files/templates/default.html
View File

@ -250,12 +250,12 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67">
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=66"> <link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=67">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=66">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %} {% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=67">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
{% endif %} {% endif %}
{% endblock %} {% endblock %}

6
files/templates/log.html
View File

@ -17,11 +17,11 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=67">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=66">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %} {% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=67">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
{% endif %} {% endif %}
<div class="row justify-content-around"> <div class="row justify-content-around">

2
files/templates/login.html
View File

@ -15,7 +15,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
<link href="/assets/css/fa.css?v=52" rel="stylesheet"> <link href="/assets/css/fa.css?v=52" rel="stylesheet">
</head> </head>

2
files/templates/login_2fa.html
View File

@ -12,7 +12,7 @@
<title>2-Step Login - {{'SITE_NAME' | app_config}}</title> <title>2-Step Login - {{'SITE_NAME' | app_config}}</title>
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
</head> </head>

4
files/templates/settings.html
View File

@ -55,8 +55,8 @@
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=67">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=66">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %} {% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=67">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link href="/assets/css/fa.css?v=52" rel="stylesheet"> <link href="/assets/css/fa.css?v=52" rel="stylesheet">
</head> </head>

4
files/templates/settings2.html
View File

@ -40,10 +40,10 @@
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=67">
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
{% endif %} {% endif %}
<link href="/assets/css/fa.css?v=52" rel="stylesheet"> <link href="/assets/css/fa.css?v=52" rel="stylesheet">

2
files/templates/sign_up.html
View File

@ -36,7 +36,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
</head> </head>

2
files/templates/sign_up_failed_ref.html
View File

@ -31,7 +31,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
</head> </head>

8
files/templates/submit.html
View File

@ -25,12 +25,12 @@
{% block stylesheets %} {% block stylesheets %}
{% if v %} {% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style> <style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=67">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=66">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %} {% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=67">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %} {% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style> <style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=66"> <link rel="stylesheet" href="/assets/css/main.css?v=67">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=66"> <link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=67">
{% endif %} {% endif %}
{% endblock %} {% endblock %}