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

fdsdfs

master
Aevann1 2021-10-10 06:28:48 +02:00
parent 9dbcbc9cd5
commit 12a7181707
22 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/classes/user.py
View File

@ -535,6 +535,7 @@ class User(Base):
return [x[0] for x in posts.offset(25 * (page - 1)).limit(26).all()]
@lazy
def saved_comment_idlist(self):
saved = [x[0] for x in g.db.query(SaveRelationship.comment_id).options(lazyload('*')).filter(SaveRelationship.user_id == self.id).all()]

6
files/templates/authforms.html
View File

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

2
files/templates/award_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/award_modal.js?v=51"></script>
<script src="/assets/js/award_modal.js?v=52"></script>
<div class="modal fade" id="awardModal" tabindex="-1" role="dialog" aria-labelledby="awardModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered" role="document">

2
files/templates/changelog.html
View File

@ -3,7 +3,7 @@
{% block pagetitle %}Changelog{% endblock %}
{% block desktopBanner %}
<script src="/assets/js/changelog.js?v=51"></script>
<script src="/assets/js/changelog.js?v=52"></script>
<div class="row" style="overflow: visible;padding-top:5px;">
<div class="col">

4
files/templates/comments.html
View File

@ -33,14 +33,14 @@
{% if v %}
{% include "award_modal.html" %}
<script src="/assets/js/comments_v.js?v=51"></script>
<script src="/assets/js/comments_v.js?v=52"></script>
{% endif %}
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
{% if v and v.admin_level == 6 %}
<script src="/assets/js/comments_admin.js?v=51"></script>
<script src="/assets/js/comments_admin.js?v=52"></script>
{% endif %}
<script>

10
files/templates/default.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<script src="/assets/js/lozad.js?v=51"></script>
<script src="/assets/js/lozad.js?v=52"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
@ -69,7 +69,7 @@
{% if v %}
<script>function formkey() {return '{{v.formkey}}';}</script>
<script src="/assets/js/default.js?v=51"></script>
<script src="/assets/js/default.js?v=52"></script>
{% endif %}
@ -251,11 +251,11 @@
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63">
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=62">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=62">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=63">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=63">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=62">
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=63">
{% endif %}
{% endblock %}

2
files/templates/emoji_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/emoji_modal.js?v=51"></script>
<script src="/assets/js/emoji_modal.js?v=52"></script>
<style>
a.emojitab {

2
files/templates/gif_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/gif_modal.js?v=51"></script>
<script src="/assets/js/gif_modal.js?v=52"></script>
<div class="modal fade" id="gifModal" tabindex="-1" role="dialog" aria-labelledby="gifModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable modal-dialog-centered p-5" role="document">

2
files/templates/header.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/header.js?v=51"></script>
<script src="/assets/js/header.js?v=52"></script>
<nav class="shadow shadow-md fixed-top">
{% if "rama" in request.host %}

6
files/templates/log.html
View File

@ -17,11 +17,11 @@
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=62">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=62">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=63">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=63">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=62">
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=63">
{% endif %}
<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">
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=62">
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=63">
<link href="/assets/css/fa.css?v=52" rel="stylesheet">
</head>

2
files/templates/login_2fa.html
View File

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

2
files/templates/mobile_navigation_bar.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/mobile_navigation_bar.js?v=51"></script>
<script src="/assets/js/mobile_navigation_bar.js?v=52"></script>
<style>
.btn-dead:hover, .active.btn-dead:hover, .active.btn-dead {

2
files/templates/report_post_modal.html
View File

@ -1,4 +1,4 @@
<script src="/assets/js/report_post_modal.js?v=51"></script>
<script src="/assets/js/report_post_modal.js?v=52"></script>
<div class="modal fade" id="reportPostModal" tabindex="-1" role="dialog" aria-labelledby="reportPostModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">

4
files/templates/settings.html
View File

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

4
files/templates/settings2.html
View File

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

4
files/templates/sign_up.html
View File

@ -4,7 +4,7 @@
<head>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="/assets/js/signup.js?v=51"></script>
<script src="/assets/js/signup.js?v=52"></script>
{% if hcaptcha %}
<script src="https://hcaptcha.com/1/api.js"></script>
@ -36,7 +36,7 @@
<link href="https://fonts.googleapis.com/css?family=Open+Sans:400,600&display=swap" rel="stylesheet">
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=62">
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=63">
</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">
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=62">
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=63">
</head>

8
files/templates/submission.html
View File

@ -14,7 +14,7 @@
{% block title %}
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
<script src="/assets/js/new_comments_count.js?v=51"></script>
<script src="/assets/js/new_comments_count.js?v=52"></script>
{% if v and v.id == p.author_id %}
<script>
@ -53,7 +53,7 @@
</script>
{% if v %}
<script src="/assets/js/comments_v.js?v=51"></script>
<script src="/assets/js/comments_v.js?v=52"></script>
{% include "award_modal.html" %}
{% include "emoji_modal.html" %}
{% include "gif_modal.html" %}
@ -65,7 +65,7 @@
{% endif %}
{% if p.award_count("shit") %}
<script src="/assets/js/bug-min.js?v=51"></script>
<script src="/assets/js/bug-min.js?v=52"></script>
{% set minbugs = 10*p.award_count("shit") if p.award_count("shit") < 3 else 20 %}
{% set maxbugs = 20*p.award_count("shit") if p.award_count("shit") < 3 else 40 %}
<script>
@ -81,7 +81,7 @@
{% if p.award_count("fireflies") %}
<script src="/assets/js/fireflies.js?v=51"></script>
<script src="/assets/js/fireflies.js?v=52"></script>
{% set minbugs = 10*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 20 %}
{% set maxbugs = 20*p.award_count("fireflies") if p.award_count("fireflies") < 3 else 40 %}
<script>

2
files/templates/submission_listing.html
View File

@ -4,7 +4,7 @@
<script src="https://cdn.jsdelivr.net/npm/clipboard@2.0.8/dist/clipboard.min.js"></script>
<script src="/assets/js/new_comments_count.js?v=51"></script>
<script src="/assets/js/new_comments_count.js?v=52"></script>
<script>
function expandText(id) {

8
files/templates/submit.html
View File

@ -4,7 +4,7 @@
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/marked/marked.min.js"></script>
<script src="/assets/js/submit.js?v=51"></script>
<script src="/assets/js/submit.js?v=52"></script>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@ -25,12 +25,12 @@
{% block stylesheets %}
{% if v %}
<style>:root{--primary:#{{v.themecolor}}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=62">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=62">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
<link rel="stylesheet" href="/assets/css/main.css?v=63"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=63">
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=63">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
{% else %}
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
<link rel="stylesheet" href="/assets/css/main.css?v=63">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=62">
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=63">
{% endif %}
{% endblock %}

2
files/templates/userpage.html
View File

@ -15,7 +15,7 @@
}
</style>
<script src="/assets/js/userpage.js?v=51"></script>
<script src="/assets/js/userpage.js?v=52"></script>
<title>{{u.username}}'s profile - {{'SITE_NAME' | app_config}}</title>
{% if u.is_private %}
<meta name="robots" content="noindex">