forked from rDrama/rDrama
Merge branch 'master' into mistletoe
commit
3704d24845
|
@ -481,7 +481,7 @@ class User(Base):
|
||||||
def json(self):
|
def json(self):
|
||||||
data = self.json_core
|
data = self.json_core
|
||||||
|
|
||||||
data["badges"] = [x.json_core for x in self.badges]
|
data["badges"] = [x.json for x in self.badges]
|
||||||
data['coins'] = self.coins
|
data['coins'] = self.coins
|
||||||
data['post_count'] = self.post_count
|
data['post_count'] = self.post_count
|
||||||
data['comment_count'] = self.comment_count
|
data['comment_count'] = self.comment_count
|
||||||
|
|
|
@ -127,6 +127,8 @@ if SITE == 'rdrama.net':
|
||||||
LLM_ID = 253
|
LLM_ID = 253
|
||||||
DAD_ID = 2513
|
DAD_ID = 2513
|
||||||
MOM_ID = 4588
|
MOM_ID = 4588
|
||||||
|
DONGER_ID = 541
|
||||||
|
FARTBINN_ID = 2256
|
||||||
BUG_THREAD = 18459
|
BUG_THREAD = 18459
|
||||||
EMOJI_THREAD = 22479
|
EMOJI_THREAD = 22479
|
||||||
elif SITE == "pcmemes.net":
|
elif SITE == "pcmemes.net":
|
||||||
|
@ -150,6 +152,8 @@ elif SITE == "pcmemes.net":
|
||||||
LLM_ID = 0
|
LLM_ID = 0
|
||||||
DAD_ID = 0
|
DAD_ID = 0
|
||||||
MOM_ID = 0
|
MOM_ID = 0
|
||||||
|
DONGER_ID = 0
|
||||||
|
FARTBINN_ID = 0
|
||||||
BUG_THREAD = 4103
|
BUG_THREAD = 4103
|
||||||
EMOJI_THREAD = 0
|
EMOJI_THREAD = 0
|
||||||
else:
|
else:
|
||||||
|
@ -173,6 +177,8 @@ else:
|
||||||
LLM_ID = 0
|
LLM_ID = 0
|
||||||
DAD_ID = 0
|
DAD_ID = 0
|
||||||
MOM_ID = 0
|
MOM_ID = 0
|
||||||
|
DONGER_ID = 0
|
||||||
|
FARTBINN_ID = 0
|
||||||
BUG_THREAD = 0
|
BUG_THREAD = 0
|
||||||
EMOJI_THREAD = 0
|
EMOJI_THREAD = 0
|
||||||
|
|
||||||
|
@ -890,4 +896,6 @@ NOTIFIED_USERS = {
|
||||||
'landlordmessiah': LLM_ID,
|
'landlordmessiah': LLM_ID,
|
||||||
' llm ': LLM_ID,
|
' llm ': LLM_ID,
|
||||||
'landlet': LLM_ID,
|
'landlet': LLM_ID,
|
||||||
|
'dong': DONGER_ID,
|
||||||
|
'dong': FARTBINN_ID
|
||||||
}
|
}
|
||||||
|
|
|
@ -212,7 +212,7 @@ def log_item(id, v):
|
||||||
|
|
||||||
@app.get("/assets/favicon.ico")
|
@app.get("/assets/favicon.ico")
|
||||||
def favicon():
|
def favicon():
|
||||||
return send_file(f"./assets/images/{site_name}/icon.webp")
|
return send_file(f"./assets/images/{site_name}/icon.webp?v=5")
|
||||||
|
|
||||||
@app.get("/api")
|
@app.get("/api")
|
||||||
@auth_desired
|
@auth_desired
|
||||||
|
|
|
@ -14,11 +14,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=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
|
@ -521,16 +521,4 @@ line breaks
|
||||||
|
|
||||||
{% include "expanded_image_modal.html" %}
|
{% include "expanded_image_modal.html" %}
|
||||||
|
|
||||||
<style>
|
|
||||||
@media (max-width: 767.98px) {
|
|
||||||
table {
|
|
||||||
display: inline-block;
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pre {
|
|
||||||
color: var(--white) !important;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
|
@ -8,7 +8,7 @@
|
||||||
<div class="container-fluid" style="padding:0;">
|
<div class="container-fluid" style="padding:0;">
|
||||||
<div class="flex-grow-1">
|
<div class="flex-grow-1">
|
||||||
<a href="/" class="navbar-brand mr-auto">
|
<a href="/" class="navbar-brand mr-auto">
|
||||||
<img loading="lazy" height="30" src="/assets/images/{{'SITE_NAME' | app_config}}/headericon.webp?v=4">
|
<img loading="lazy" height="30" src="/assets/images/{{'SITE_NAME' | app_config}}/headericon.webp?v=5">
|
||||||
{% if "gigachadlife" in request.host %}
|
{% if "gigachadlife" in request.host %}
|
||||||
<span style="font-weight: bold; font-size: 1.2rem;">GigaChadLife</span>
|
<span style="font-weight: bold; font-size: 1.2rem;">GigaChadLife</span>
|
||||||
{% elif 'pcm' not in request.host %}
|
{% elif 'pcm' not in request.host %}
|
||||||
|
|
|
@ -6,11 +6,11 @@
|
||||||
{% block content %}
|
{% block content %}
|
||||||
{% 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=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=125">{% 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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<div class="row justify-content-around">
|
<div class="row justify-content-around">
|
||||||
|
|
|
@ -13,7 +13,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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<meta name="description" content="">
|
<meta name="description" content="">
|
||||||
<meta name="author" content="">
|
<meta name="author" content="">
|
||||||
<meta name="thumbnail" content="/assets/images/{{'SITE_NAME' | app_config}}/preview.webp?v=3">
|
<meta name="thumbnail" content="/assets/images/{{'SITE_NAME' | app_config}}/preview.webp?v=3">
|
||||||
<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=4">
|
<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.webp?v=5">
|
||||||
|
|
||||||
<meta property="og:type" content="article" >
|
<meta property="og:type" content="article" >
|
||||||
<meta property="og:title" content="{{'SITE_NAME' | app_config}}" >
|
<meta property="og:title" content="{{'SITE_NAME' | app_config}}" >
|
||||||
|
@ -38,10 +38,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=152"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=125">
|
||||||
{% 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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<link href="/assets/css/fa.css?v=55" rel="stylesheet">
|
<link href="/assets/css/fa.css?v=55" rel="stylesheet">
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</title>
|
<title>{% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %}</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=152"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
<link rel="stylesheet" href="/assets/css/main.css?v=154"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=125">
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue