change house femboy award

remotes/1693045480750635534/spooky-22
Aevann1 2022-09-06 06:16:41 +02:00
parent 4ca6cda0e5
commit d0cfd8a8c1
8 changed files with 45 additions and 32 deletions

View File

@ -6060,6 +6060,7 @@ g {
.fa-star-of-david:before{content:"\f69a"}
.fa-kiss-wink-heart:before{content:"\f598"}
.fa-hat-cowboy:before{content:"\f8c0"}
.fa-cloud-rainbow:before{content:"\f73e"}
.pronouns {
font-size: 9px;
@ -6183,11 +6184,11 @@ g {
}
.rainbow-text {
background-image: linear-gradient(to left, violet, indigo, blue, green, yellow, orange, red);
color: transparent;
background-clip: text;
-webkit-background-clip: text;
font-weight: 700;
background-image: repeating-linear-gradient(to left, violet, rgb(178, 94, 238), lightblue, green, yellow, orange, #ff7f7f 50%) !important;
color: transparent !important;
background-clip: text !important;
-webkit-background-clip: text !important;
font-weight: 700 !important;
}
.btn-rainbow {

View File

@ -139,6 +139,7 @@ class User(Base):
earlylife = Column(Integer)
owoify = Column(Integer)
marsify = Column(Integer, default=0)
rainbow = Column(Integer)
badges = relationship("Badge", order_by="Badge.created_utc", back_populates="user")
subscriptions = relationship("Subscription", back_populates="user")

View File

@ -440,6 +440,14 @@ AWARDS = {
"color": "text-gray",
"price": 200
},
"marsify": {
"kind": "marsify",
"title": "Marsify",
"description": "Marsifies the recipient's comments for 6 hours.",
"icon": "fas fa-cat",
"color": "text-white",
"price": 400
},
"shit": {
"kind": "shit",
"title": "Shit",
@ -724,12 +732,12 @@ if SITE_NAME != 'rDrama':
"color": "text-purple",
"price": 400
},
"marsify": {
"kind": "marsify",
"title": "Marsify",
"description": "Marsifies the recipient's comments for 6 hours.",
"icon": "fas fa-cat",
"color": "text-white",
"rainbow": {
"kind": "rainbow",
"title": "Rainbow",
"description": "Makes the recipient's comments and posts in rainbow text for 24 hours.",
"icon": "fas fa-cloud-rainbow",
"color": "text-pink",
"price": 400
},
}
@ -783,10 +791,10 @@ HOUSE_AWARDS = {
},
"Femboy": {
"kind": "Femboy",
"title": "Marsify",
"description": "Marsifies the recipient's comments for 6 hours.",
"icon": "fas fa-cat",
"color": "text-white",
"title": "Rainbow",
"description": "Makes the recipient's comments and posts in rainbow text for 24 hours.",
"icon": "fas fa-cloud-rainbow",
"color": "text-pink",
"price": 400
},
"Vampire": {

View File

@ -167,7 +167,7 @@ def award_thing(v, thing_type, id):
if kind == "benefactor" and author.id == v.id:
return {"error": "You can't use this award on yourself."}, 400
if (kind.startswith('Femboy') or kind == 'marsify') and author.marsify == 1:
if kind == 'marsify' and author.marsify == 1:
return {"error": "User is already permenantly marsified!"}, 403
if v.id != author.id:
@ -344,6 +344,16 @@ def award_thing(v, thing_type, id):
elif kind == "checkmark":
author.verified = "Verified"
badge_grant(user=author, badge_id=150)
elif kind == 'marsify':
if author.marsify: author.marsify += 21600
else: author.marsify = int(time.time()) + 21600
if thing_type == 'comment' and not author.deflector:
body = thing.body
if author.owoify: body = owoify(body)
body = marsify(body)
thing.body_html = sanitize(body, limit_pings=5, marsified=True)
g.db.add(thing)
elif "Vampire" in kind and kind == v.house:
if author.bite: author.bite += 86400
else: author.bite = int(time.time()) + 86400
@ -362,16 +372,9 @@ def award_thing(v, thing_type, id):
if author.marsify: body = marsify(body)
thing.body_html = sanitize(body, limit_pings=5, marsified=True)
g.db.add(thing)
elif ("Femboy" in kind and kind == v.house) or kind == 'marsify':
if author.marsify: author.marsify += 21600
else: author.marsify = int(time.time()) + 21600
if thing_type == 'comment' and not author.deflector:
body = thing.body
if author.owoify: body = owoify(body)
body = marsify(body)
thing.body_html = sanitize(body, limit_pings=5, marsified=True)
g.db.add(thing)
elif ("Femboy" in kind and kind == v.house):
if author.rainbow: author.rainbow += 86400
else: author.rainbow = int(time.time()) + 86400
if author.received_award_count: author.received_award_count += 1
else: author.received_award_count = 1

View File

@ -255,7 +255,7 @@
</style>
{% endif %}
<div id="comment-text-{{c.id}}" class="comment-text mb-0 {% if c.author.agendaposter and not (c.parent_submission and c.post.sub == 'chudrama') %}agendaposter{% endif %}">
<div id="comment-text-{{c.id}}" class="comment-text mb-0 {% if c.author.agendaposter and not (c.parent_submission and c.post.sub == 'chudrama') %}agendaposter{% endif %} {% if c.author.rainbow %}rainbow-text{% endif %}">
{{c.realbody(v) | safe}}
</div>
{% if c.parent_submission %}

View File

@ -709,14 +709,14 @@
</div>
{% endif %}
{% if p.realurl(v) and not v_forbid_deleted %}
<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %}"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %}"><a {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener noreferrer" href="{{p.realurl(v)}}">
{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{CC}}</span>{% endif %}
{% if p.category %}{{help.submission_category_tag(p.category.name, p.category.color_text, p.category.color_bg)}}{% endif %}
{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
{{p.realtitle(v) | safe}}
</a></h1>
{% else %}
<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %}">
<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %}">
{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{CC}}</span>{% endif %}
{% if p.category %}{{help.submission_category_tag(p.category.name, p.category.color_text, p.category.color_bg)}}{% endif %}
{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}

View File

@ -194,7 +194,7 @@
</div>
<h5 class="card-title post-title text-left w-lg-95 mb-0 pb-0 pb-md-1">
<a id="{{p.id}}-title" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}" class="{% if p.sub %}sub{% endif %} stretched-link {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %}">
<a id="{{p.id}}-title" {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}" class="{% if p.sub %}sub{% endif %} stretched-link {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %}">
{% if p.club %}<span class="patron font-weight-bolder mr-1" style="background-color:red; font-size:12px; line-height:2;">{{CC}}</span>{% endif %}
{% if p.category %}{{help.submission_category_tag(p.category.name, p.category.color_text, p.category.color_bg)}}{% endif %}
{% if p.flair %}<span class="patron font-weight-bolder mr-1" style="background-color:var(--primary); font-size:12px; line-height:2;">{{p.flair | safe}}</span>{% endif %}
@ -318,7 +318,7 @@
{% if (not p.club or v and (v.paid_dues or v.id == p.author_id)) and not v_forbid_deleted %}
{% if p.realbody(v, True) %}
<div class="d-none card rounded border {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %} post-preview" id="post-text-{{p.id}}">
<div class="d-none card rounded border {% if p.author.agendaposter and p.sub != 'chudrama' %}agendaposter{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} post-preview" id="post-text-{{p.id}}">
{{p.realbody(v, True) | safe}}
</div>
{% endif %}

View File

@ -1,6 +1,6 @@
{%-
set CACHE_VER = {
'css/main.css': 4004,
'css/main.css': 4005,
'css/catalog.css': 4000,
'css/4chan.css': 4000,
'css/classic.css': 4000,