forked from rDrama/rDrama
fddf
parent
5040f719fc
commit
e09ea194bf
|
|
@ -81,6 +81,7 @@ class User(Base):
|
|||
nitter = Column(Boolean)
|
||||
mute = Column(Boolean)
|
||||
unmutable = Column(Boolean)
|
||||
eye = Column(Boolean)
|
||||
frontsize = Column(Integer, default=25)
|
||||
controversial = Column(Boolean, default=False)
|
||||
bio = deferred(Column(String))
|
||||
|
|
|
|||
|
|
@ -314,6 +314,14 @@ AWARDS = {
|
|||
"color": "text-orange",
|
||||
"price": 1000
|
||||
},
|
||||
"eye": {
|
||||
"kind": "eye",
|
||||
"title": "All-Seeing Eye",
|
||||
"description": "Gives the recipient the ability to view private profiles.",
|
||||
"icon": "fas fa-eye",
|
||||
"color": "text-silver",
|
||||
"price": 10000
|
||||
},
|
||||
}
|
||||
|
||||
AWARDS2 = {
|
||||
|
|
@ -405,6 +413,14 @@ AWARDS2 = {
|
|||
"color": "text-success",
|
||||
"price": 10000
|
||||
},
|
||||
"eye": {
|
||||
"kind": "eye",
|
||||
"title": "All-Seeing Eye",
|
||||
"description": "Gives the recipient the ability to view private profiles.",
|
||||
"icon": "fas fa-eye",
|
||||
"color": "text-silver",
|
||||
"price": 10000
|
||||
},
|
||||
"pause": {
|
||||
"kind": "pause",
|
||||
"title": "Pause",
|
||||
|
|
|
|||
|
|
@ -55,7 +55,8 @@ def shop(v):
|
|||
"icon": "fas fa-poop",
|
||||
"color": "text-black-50",
|
||||
"owned": 0,
|
||||
"price": 500
|
||||
"price": 500,
|
||||
"MB": True
|
||||
},
|
||||
"fireflies": {
|
||||
"kind": "fireflies",
|
||||
|
|
@ -64,7 +65,8 @@ def shop(v):
|
|||
"icon": "fas fa-sparkles",
|
||||
"color": "text-warning",
|
||||
"owned": 0,
|
||||
"price": 500
|
||||
"price": 500,
|
||||
"MB": True
|
||||
},
|
||||
"train": {
|
||||
"kind": "train",
|
||||
|
|
@ -73,7 +75,8 @@ def shop(v):
|
|||
"icon": "fas fa-train",
|
||||
"color": "text-pink",
|
||||
"owned": 0,
|
||||
"price": 500
|
||||
"price": 500,
|
||||
"MB": True
|
||||
},
|
||||
"pin": {
|
||||
"kind": "pin",
|
||||
|
|
@ -82,7 +85,8 @@ def shop(v):
|
|||
"icon": "fas fa-thumbtack fa-rotate--45",
|
||||
"color": "text-warning",
|
||||
"owned": 0,
|
||||
"price": 750
|
||||
"price": 750,
|
||||
"MB": True
|
||||
},
|
||||
"unpin": {
|
||||
"kind": "unpin",
|
||||
|
|
@ -91,7 +95,8 @@ def shop(v):
|
|||
"icon": "fas fa-thumbtack fa-rotate--45",
|
||||
"color": "text-black",
|
||||
"owned": 0,
|
||||
"price": 1000
|
||||
"price": 1000,
|
||||
"MB": True
|
||||
},
|
||||
"flairlock": {
|
||||
"kind": "flairlock",
|
||||
|
|
@ -100,7 +105,8 @@ def shop(v):
|
|||
"icon": "fas fa-lock",
|
||||
"color": "text-black",
|
||||
"owned": 0,
|
||||
"price": 1250
|
||||
"price": 1250,
|
||||
"MB": True
|
||||
},
|
||||
"agendaposter": {
|
||||
"kind": "agendaposter",
|
||||
|
|
@ -109,7 +115,8 @@ def shop(v):
|
|||
"icon": "fas fa-snooze",
|
||||
"color": "text-purple",
|
||||
"owned": 0,
|
||||
"price": 2500
|
||||
"price": 2500,
|
||||
"MB": True
|
||||
},
|
||||
"marsey": {
|
||||
"kind": "marsey",
|
||||
|
|
@ -118,7 +125,8 @@ def shop(v):
|
|||
"icon": "fas fa-cat",
|
||||
"color": "text-orange",
|
||||
"owned": 0,
|
||||
"price": 3000
|
||||
"price": 3000,
|
||||
"MB": True
|
||||
},
|
||||
"ban": {
|
||||
"kind": "ban",
|
||||
|
|
@ -127,7 +135,8 @@ def shop(v):
|
|||
"icon": "fas fa-gavel",
|
||||
"color": "text-danger",
|
||||
"owned": 0,
|
||||
"price": 3000
|
||||
"price": 3000,
|
||||
"MB": True
|
||||
},
|
||||
"unban": {
|
||||
"kind": "unban",
|
||||
|
|
@ -136,7 +145,8 @@ def shop(v):
|
|||
"icon": "fas fa-gavel",
|
||||
"color": "text-success",
|
||||
"owned": 0,
|
||||
"price": 3500
|
||||
"price": 3500,
|
||||
"MB": True
|
||||
},
|
||||
"grass": {
|
||||
"kind": "grass",
|
||||
|
|
@ -145,7 +155,18 @@ def shop(v):
|
|||
"icon": "fas fa-seedling",
|
||||
"color": "text-success",
|
||||
"owned": 0,
|
||||
"price": 10000
|
||||
"price": 10000,
|
||||
"MB": True
|
||||
},
|
||||
"eye": {
|
||||
"kind": "eye",
|
||||
"title": "All-Seeing Eye",
|
||||
"description": "Gives the recipient the ability to view private profiles.",
|
||||
"icon": "fas fa-eye",
|
||||
"color": "text-silver",
|
||||
"owned": 0,
|
||||
"price": 10000,
|
||||
"MB": True
|
||||
},
|
||||
"pause": {
|
||||
"kind": "pause",
|
||||
|
|
@ -154,7 +175,8 @@ def shop(v):
|
|||
"icon": "fas fa-volume-mute",
|
||||
"color": "text-danger",
|
||||
"owned": 0,
|
||||
"price": 20000
|
||||
"price": 20000,
|
||||
"MB": True
|
||||
},
|
||||
"unpausable": {
|
||||
"kind": "unpausable",
|
||||
|
|
@ -163,7 +185,8 @@ def shop(v):
|
|||
"icon": "fas fa-volume",
|
||||
"color": "text-success",
|
||||
"owned": 0,
|
||||
"price": 40000
|
||||
"price": 40000,
|
||||
"MB": True
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -279,6 +302,14 @@ def buy(v, award):
|
|||
"color": "text-success",
|
||||
"price": 10000
|
||||
},
|
||||
"eye": {
|
||||
"kind": "eye",
|
||||
"title": "All-Seeing Eye",
|
||||
"description": "Gives the recipient the ability to view private profiles.",
|
||||
"icon": "fas fa-eye",
|
||||
"color": "text-silver",
|
||||
"price": 10000
|
||||
},
|
||||
"pause": {
|
||||
"kind": "pause",
|
||||
"title": "Pause",
|
||||
|
|
@ -468,6 +499,11 @@ def award_post(pid, v):
|
|||
send_notification(995, f"@{v.username} bought {kind} award!")
|
||||
new_badge = Badge(badge_id=67, user_id=author.id)
|
||||
g.db.add(new_badge)
|
||||
elif kind == "eye":
|
||||
author.eye = True
|
||||
send_notification(995, f"@{v.username} bought {kind} award!")
|
||||
new_badge = Badge(badge_id=83, user_id=author.id)
|
||||
g.db.add(new_badge)
|
||||
elif kind == "marsey":
|
||||
author.marseyawarded = time.time() + 86400
|
||||
|
||||
|
|
@ -755,6 +791,15 @@ def items(v):
|
|||
"owned": 0,
|
||||
"price": 10000
|
||||
},
|
||||
"eye": {
|
||||
"kind": "eye",
|
||||
"title": "All-Seeing Eye",
|
||||
"description": "Gives the recipient the ability to view private profiles.",
|
||||
"icon": "fas fa-eye",
|
||||
"color": "text-silver",
|
||||
"owned": 0,
|
||||
"price": 10000
|
||||
},
|
||||
"pause": {
|
||||
"kind": "pause",
|
||||
"title": "Pause",
|
||||
|
|
|
|||
|
|
@ -512,7 +512,7 @@ def u_username(username, v=None):
|
|||
g.db.commit()
|
||||
|
||||
|
||||
if u.is_private and (not v or (v.id != u.id and v.admin_level < 3)):
|
||||
if u.is_private and (not v or (v.id != u.id and v.admin_level < 2 and not v.eye)):
|
||||
|
||||
if v and u.id == LLM_ID:
|
||||
if int(time.time()) - v.rent_utc > 600:
|
||||
|
|
@ -523,12 +523,12 @@ def u_username(username, v=None):
|
|||
else: return render_template("userpage_private.html", time=int(time.time()), u=u, v=v)
|
||||
|
||||
|
||||
if hasattr(u, 'is_blocking') and u.is_blocking and (not v or v.admin_level < 3):
|
||||
if hasattr(u, 'is_blocking') and u.is_blocking and (not v or v.admin_level < 2):
|
||||
if request.headers.get("Authorization"): return {"error": f"You are blocking @{u.username}."}
|
||||
else: return render_template("userpage_blocking.html", u=u, v=v)
|
||||
|
||||
|
||||
if hasattr(u, 'is_blocked') and u.is_blocked and (not v or v.admin_level < 3):
|
||||
if hasattr(u, 'is_blocked') and u.is_blocked and (not v or v.admin_level < 2):
|
||||
if request.headers.get("Authorization"): return {"error": "This person is blocking you."}
|
||||
else: return render_template("userpage_blocked.html", u=u, v=v)
|
||||
|
||||
|
|
@ -605,7 +605,7 @@ def u_username_comments(username, v=None):
|
|||
v=v)
|
||||
|
||||
|
||||
if u.is_private and (not v or (v.id != u.id and v.admin_level < 3)):
|
||||
if u.is_private and (not v or (v.id != u.id and v.admin_level < 2 and not v.eye)):
|
||||
if v and u.id == LLM_ID:
|
||||
if int(time.time()) - v.rent_utc > 600:
|
||||
if request.headers.get("Authorization"): return {"error": "That userpage is private"}
|
||||
|
|
@ -614,13 +614,13 @@ def u_username_comments(username, v=None):
|
|||
if request.headers.get("Authorization"): return {"error": "That userpage is private"}
|
||||
else: return render_template("userpage_private.html", time=int(time.time()), u=u, v=v)
|
||||
|
||||
if hasattr(u, 'is_blocking') and u.is_blocking and (not v or v.admin_level < 3):
|
||||
if hasattr(u, 'is_blocking') and u.is_blocking and (not v or v.admin_level < 2):
|
||||
if request.headers.get("Authorization"): return {"error": f"You are blocking @{u.username}."}
|
||||
else: return render_template("userpage_blocking.html",
|
||||
u=u,
|
||||
v=v)
|
||||
|
||||
if hasattr(u, 'is_blocked') and u.is_blocked and (not v or v.admin_level < 3):
|
||||
if hasattr(u, 'is_blocked') and u.is_blocked and (not v or v.admin_level < 2):
|
||||
if request.headers.get("Authorization"): return {"error": "This person is blocking you."}
|
||||
else: return render_template("userpage_blocked.html",
|
||||
u=u,
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=115"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=115">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=115">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=116">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=116">{% 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=115"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
{% endif %}
|
||||
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -23,11 +23,6 @@
|
|||
<div class="text-muted">{{award.owned}} owned</div>
|
||||
</a>
|
||||
{% endfor %}
|
||||
<a class="card disabled d-md-none" style="border:none">
|
||||
<i class="fas fa-volume-mute" style="opacity:0"></i>
|
||||
<div class="pt-2" style="font-weight: bold; font-size: 14px; color:#E1E1E1"> </div>
|
||||
<div class="text-muted"> </div>
|
||||
</a>
|
||||
</div>
|
||||
<label id="notelabel" for="note" class="pt-4">Note (optional):</label>
|
||||
<input id="kind" name="kind" value="" hidden>
|
||||
|
|
|
|||
|
|
@ -254,12 +254,12 @@
|
|||
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=115">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=115">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116">
|
||||
<link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=116">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=116">{% 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=115"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@
|
|||
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=115"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=115">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=115">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=116">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=116">{% 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=115"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
{% endif %}
|
||||
|
||||
<div class="row justify-content-around">
|
||||
|
|
|
|||
|
|
@ -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=115"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -55,8 +55,8 @@
|
|||
|
||||
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=115"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=115">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=115">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=116">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=116">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
|
||||
<link href="/assets/css/fa.css?v=52" rel="stylesheet">
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@
|
|||
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=115"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=116">
|
||||
{% else %}
|
||||
<style>:root{--primary:#{{'DEFAULT_COLOR' | app_config}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=115"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
{% endif %}
|
||||
|
||||
<link href="/assets/css/fa.css?v=52" rel="stylesheet">
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
{% set kind = a['kind'] %}
|
||||
<td style="font-weight: bold">
|
||||
<a class="d-flex btn btn-success {% if v.coins < a['price'] %}disabled{% endif %}" href="javascript:void(0)" onclick="post_toast('/buy/{{kind}}')"><span class="m-auto">Buy</span></a>
|
||||
{% if v.procoins and kind not in ["grass","pause","unpausable"] %}<a class="d-flex marseybux btn btn-success {% if v.procoins < a['price'] %}disabled{% endif %}" href="javascript:void(0)" onclick="post_toast('/buy/{{kind}}?mb=true')"><span class="m-auto">Buy with Marseybux</span></a>{% endif %}
|
||||
{% if v.procoins and a['MB'] %}<a class="d-flex marseybux btn btn-success {% if v.procoins < a['price'] %}disabled{% endif %}" href="javascript:void(0)" onclick="post_toast('/buy/{{kind}}?mb=true')"><span class="m-auto">Buy with Marseybux</span></a>{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -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=115"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -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=115"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,12 +31,12 @@
|
|||
{% block stylesheets %}
|
||||
{% if v %}
|
||||
<style>:root{--primary:#{{v.themecolor}}}</style>
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=115"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=115">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=115">{% elif v.css %}<link rel="stylesheet" href="/@{{v.username}}/css">{% endif %}
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116"><link rel="stylesheet" href="/assets/css/{{v.theme}}.css?v=116">
|
||||
{% if v.agendaposter %}<link rel="stylesheet" href="/assets/css/agendaposter.css?v=116">{% 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=115">
|
||||
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=115">
|
||||
<link rel="stylesheet" href="/assets/css/main.css?v=116">
|
||||
<link rel="stylesheet" href="/assets/css/{{'DEFAULT_THEME' | app_config}}.css?v=116">
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue