Misogynist => Queen
Chuck Sneed
parent
457f8b2b11
commit
34f3a8677e
|
|
@ -6670,7 +6670,7 @@ g {
|
|||
font-weight: 700 !important;
|
||||
}
|
||||
|
||||
.misogynist:not(a) {
|
||||
.queen:not(a) {
|
||||
color: hotpink !important;
|
||||
font-weight: 700 !important;
|
||||
text-transform: lowercase !important;
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ class User(Base):
|
|||
coins_spent_on_hats = Column(Integer, default=0)
|
||||
lootboxes_bought = Column(Integer, default=0)
|
||||
agendaposter = Column(Integer, default=0)
|
||||
misogynist = Column(Integer, default=0)
|
||||
queen = Column(Integer, default=0)
|
||||
agendaposter_phrase = Column(String)
|
||||
is_activated = Column(Boolean, default=False)
|
||||
shadowbanned = Column(Integer, ForeignKey("users.id"))
|
||||
|
|
@ -817,7 +817,7 @@ class User(Base):
|
|||
return f"{SITE_FULL}/e/chudsey.webp"
|
||||
if self.rainbow:
|
||||
return f"{SITE_FULL}/e/marseysalutepride.webp"
|
||||
if self.misogynist:
|
||||
if self.queen:
|
||||
number_of_girl_pfps = 8
|
||||
pic_num = (self.id % number_of_girl_pfps) + 1
|
||||
return f"{SITE_FULL}/i/pfps/girls/{pic_num}.webp"
|
||||
|
|
|
|||
|
|
@ -531,9 +531,9 @@ AWARDS = {
|
|||
"ghost": False,
|
||||
"enabled": True,
|
||||
},
|
||||
"misogynist": {
|
||||
"kind": "misogynist",
|
||||
"title": "Misogynist",
|
||||
"queen": {
|
||||
"kind": "queen",
|
||||
"title": "Queen",
|
||||
"description": "Gets the recipient in touch with their feminine side for 24 hours.",
|
||||
"icon": "fas fa-phone",
|
||||
"color": "text-purple",
|
||||
|
|
|
|||
|
|
@ -1155,7 +1155,7 @@ forced_hats = {
|
|||
"earlylife": ("The Merchant", "SHUT IT DOWN, the goys know!"),
|
||||
"marsify": ("Marsified", "I can't pick my own Marseys, help!"),
|
||||
"is_suspended": ("Behind Bars", "This user is banned and needs to do better!"),
|
||||
"misogynist": ("Emoji Crown (hearts and shooting stars)", "This user is getting in touch with her feminine side 🥰"),
|
||||
"queen": ("Emoji Crown (hearts and shooting stars)", "This user is getting in touch with her feminine side 🥰"),
|
||||
"agendaposter": (("Egg_irl", "This user is getting in touch with xir identity!"),
|
||||
("Trans Flag", "Just in case you forgot, trans lives matter."),
|
||||
("Trans Flag II", "Your egg is cracked; wear it with pride!"),
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ def _award_timers_task():
|
|||
_process_timer(User.earlylife, [169], "The earlylife award you received has expired!")
|
||||
_process_timer(User.marsify, [170], "The marsify award you received has expired!")
|
||||
_process_timer(User.rainbow, [171], "The rainbow award you received has expired!")
|
||||
_process_timer(User.misogynist, [999], "The misogynist award you received has expired!", {
|
||||
_process_timer(User.queen, [999], "The queen award you received has expired!", {
|
||||
User.username: User.prelock_username,
|
||||
User.prelock_username: None,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -686,7 +686,7 @@ def torture_ap(string, username):
|
|||
string = torture_regex3.sub(rf"\1@{username}'s\3", string)
|
||||
return string
|
||||
|
||||
def torture_misogynist(string, key):
|
||||
def torture_queen(string, key):
|
||||
if not string: return string
|
||||
string = string.lower()
|
||||
string = sentence_ending_regex.sub(", and", string)
|
||||
|
|
@ -716,7 +716,7 @@ def torture_object(obj, torture_method):
|
|||
|
||||
def complies_with_chud(obj):
|
||||
#check for cases where u should leave
|
||||
if not (obj.author.agendaposter or obj.author.misogynist): return True
|
||||
if not (obj.author.agendaposter or obj.author.queen): return True
|
||||
if obj.author.marseyawarded: return True
|
||||
if isinstance(obj, Post):
|
||||
if obj.id in ADMIGGER_THREADS: return True
|
||||
|
|
@ -755,6 +755,6 @@ def complies_with_chud(obj):
|
|||
return True
|
||||
|
||||
return False
|
||||
elif obj.author.misogynist:
|
||||
torture_object(obj, torture_misogynist)
|
||||
elif obj.author.queen:
|
||||
torture_object(obj, torture_queen)
|
||||
return True
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ def award_thing(v, thing_type, id):
|
|||
cache.delete_memoized(frontlist)
|
||||
else: thing.stickied_utc = t
|
||||
g.db.add(thing)
|
||||
elif kind == "misogynist":
|
||||
elif kind == "queen":
|
||||
if author.agendaposter:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Chud award!")
|
||||
|
||||
|
|
@ -328,7 +328,7 @@ def award_thing(v, thing_type, id):
|
|||
if author.owoify:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: OwOify award!")
|
||||
|
||||
if not author.misogynist:
|
||||
if not author.queen:
|
||||
|
||||
adjective = GIRL_NAME_ADJECTIVE[author.id%20].capitalize()
|
||||
noun = GIRL_NAME_NOUN[(int(author.id/20))%20].capitalize()
|
||||
|
|
@ -352,8 +352,8 @@ def award_thing(v, thing_type, id):
|
|||
author.prelock_username = author.username
|
||||
author.username = new_name
|
||||
|
||||
if author.misogynist and time.time() < author.misogynist: author.misogynist += 86400
|
||||
else: author.misogynist = int(time.time()) + 86400
|
||||
if author.queen and time.time() < author.queen: author.queen += 86400
|
||||
else: author.queen = int(time.time()) + 86400
|
||||
|
||||
badge_grant(user=author, badge_id=999)
|
||||
|
||||
|
|
@ -362,8 +362,8 @@ def award_thing(v, thing_type, id):
|
|||
or thing_type == 'comment' and thing.post and thing.post.sub == 'chudrama':
|
||||
abort(403, "You can't give the chud award in /h/chudrama")
|
||||
|
||||
if author.misogynist:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Misogynist award!")
|
||||
if author.queen:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Queen award!")
|
||||
|
||||
if author.marseyawarded:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Marsey award!")
|
||||
|
|
@ -403,8 +403,8 @@ def award_thing(v, thing_type, id):
|
|||
badge_grant(user=author, badge_id=96)
|
||||
elif kind == "namelock":
|
||||
|
||||
if author.misogynist:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Misogynist award!")
|
||||
if author.queen:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Queen award!")
|
||||
|
||||
new_name = note.strip().lstrip('@')
|
||||
if not new_name and author.namechanged:
|
||||
|
|
@ -429,8 +429,8 @@ def award_thing(v, thing_type, id):
|
|||
elif kind == "marsey":
|
||||
if author.agendaposter:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Chud award!")
|
||||
if author.misogynist:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Misogynist award!")
|
||||
if author.queen:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Queen award!")
|
||||
|
||||
if author.marseyawarded: author.marseyawarded += 86400
|
||||
else: author.marseyawarded = int(time.time()) + 86400
|
||||
|
|
@ -487,8 +487,8 @@ def award_thing(v, thing_type, id):
|
|||
elif kind == 'marsify':
|
||||
if author.agendaposter:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Chud award!")
|
||||
if author.misogynist:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Misogynist award!")
|
||||
if author.queen:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Queen award!")
|
||||
|
||||
if not author.marsify or author.marsify != 1:
|
||||
if author.marsify: author.marsify += 86400
|
||||
|
|
@ -519,8 +519,8 @@ def award_thing(v, thing_type, id):
|
|||
elif ("Furry" in kind and kind == v.house) or kind == 'owoify':
|
||||
if author.agendaposter:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Chud award!")
|
||||
if author.misogynist:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Misogynist award!")
|
||||
if author.queen:
|
||||
abort(409, f"{safe_username} is under the effect of a conflicting award: Queen award!")
|
||||
|
||||
if author.owoify: author.owoify += 21600
|
||||
else: author.owoify = int(time.time()) + 21600
|
||||
|
|
|
|||
|
|
@ -721,7 +721,7 @@ def settings_advanced_get(v:User):
|
|||
@limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
|
||||
@is_not_permabanned
|
||||
def settings_name_change(v):
|
||||
if v.namechanged or v.misogynist: abort(403)
|
||||
if v.namechanged or v.queen: abort(403)
|
||||
|
||||
if v.shadowbanned: abort(500)
|
||||
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@
|
|||
{% endif %}
|
||||
|
||||
{% set realbody = c.realbody(v) %}
|
||||
<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') %}text-uppercase agendaposter-img agendaposter-{{c.id_last_num}}{% endif %} {% if c.author.rainbow %}rainbow-text{% endif %} {%if c.author.misogynist%}misogynist{%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') %}text-uppercase agendaposter-img agendaposter-{{c.id_last_num}}{% endif %} {% if c.author.rainbow %}rainbow-text{% endif %} {%if c.author.queen%}queen{%endif%}">
|
||||
{{realbody | safe}}
|
||||
</div>
|
||||
{% if c.parent_submission or c.wall_user_id %}
|
||||
|
|
|
|||
|
|
@ -81,13 +81,13 @@
|
|||
|
||||
{% 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' %}text-uppercase{% endif %}">
|
||||
<a {% if p.author.rainbow %}class="rainbow-text"{% endif %} {%if p.author.misogynist%}misogynist{%endif%} {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener" href="{{p.realurl(v)}}">
|
||||
<a {% if p.author.rainbow %}class="rainbow-text"{% endif %} {%if p.author.queen%}queen{%endif%} {% if not v or v.newtabexternal %}target="_blank"{% endif %} rel="nofollow noopener" href="{{p.realurl(v)}}">
|
||||
{% 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' %}text-uppercase{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} {%if p.author.misogynist%}misogynist{%endif%}">
|
||||
<h1 id="post-title" class="card-title post-title text-left mb-md-3 {% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} {%if p.author.queen%}queen{%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}}
|
||||
</h1>
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
{% endif %}
|
||||
|
||||
|
||||
<div id="post-text" class="{% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} {%if p.author.misogynist%}misogynist{%endif%}">
|
||||
<div id="post-text" class="{% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} {%if p.author.queen%}queen{%endif%}">
|
||||
{% if p.is_image %}
|
||||
<div class="row no-gutters mb-4">
|
||||
<div class="col">
|
||||
|
|
|
|||
|
|
@ -208,7 +208,7 @@
|
|||
|
||||
{% if not v_forbid_deleted %}
|
||||
{% if p.realbody(v, listing=True) %}
|
||||
<div class="d-none card rounded border {% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} {%if p.author.misogynist%}misogynist{%endif%} post-preview" id="post-text-{{p.id}}">
|
||||
<div class="d-none card rounded border {% if p.author.agendaposter and p.sub != 'chudrama' %}text-uppercase agendaposter-img agendaposter-{{p.id_last_num}}{% endif %} {% if p.author.rainbow %}rainbow-text{% endif %} {%if p.author.queen%}queen{%endif%} post-preview" id="post-text-{{p.id}}">
|
||||
{{p.realbody(v, listing=True) | safe}}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -163,10 +163,10 @@
|
|||
<p>Your original username will always stay reserved for you: <code>{{v.original_username}}</code></p>
|
||||
<form action="/settings/name_change" method="post">
|
||||
<input hidden name="formkey" value="{{v|formkey}}">
|
||||
<input id="name-body" autocomplete="off" type="text" name="name" class="form-control" value="{{v.username}}" {% if v.namechanged or v.misogynist %}disabled{% endif %}>
|
||||
<input id="name-body" autocomplete="off" type="text" name="name" class="form-control" value="{{v.username}}" {% if v.namechanged or v.queen %}disabled{% endif %}>
|
||||
<small>3-25 characters, including letters, numbers, _ , and -</small>
|
||||
<div class="d-flex mt-2">
|
||||
<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Change Display Name" {% if v.namechanged or v.misogynist%}disabled{% endif %}>
|
||||
<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Change Display Name" {% if v.namechanged or v.queen%}disabled{% endif %}>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -271,8 +271,8 @@
|
|||
<script defer src="{{'js/flairchanged.js' | asset}}"></script>
|
||||
{% endif %}
|
||||
|
||||
{% if v.namechanged or v.misogynist%}
|
||||
<input hidden id="namechanged" value="{{v.namechanged if v.namechanged else v.misogynist}}">
|
||||
{% if v.namechanged or v.queen%}
|
||||
<input hidden id="namechanged" value="{{v.namechanged if v.namechanged else v.queen}}">
|
||||
<script defer src="{{'js/namechanged.js' | asset}}"></script>
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
alter table users add column misogynist integer;
|
||||
alter table users add column queen integer;
|
||||
|
|
@ -250,7 +250,7 @@ CREATE TABLE public.users (
|
|||
agendaposter_phrase character varying(35),
|
||||
prelock_username character varying(30),
|
||||
namechanged integer,
|
||||
misogynist integer
|
||||
queen integer
|
||||
);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ INSERT INTO public.badge_defs VALUES (282, 'Rehab Counselor', 'Awarded for parti
|
|||
INSERT INTO public.badge_defs VALUES (283, 'Summer Fun', 'Awarded for contributing to the Marsey''s Summer Fun event', 1685121838);
|
||||
INSERT INTO public.badge_defs VALUES (284, 'In Memoriam Theodroa', 'When God calls one of His most blessed angels home, the heavens rejoice while we are left behind to weep with the rain.', 1686502188);
|
||||
INSERT INTO public.badge_defs VALUES (285, 'Queen', 'This user SLAYS 💅👠💄', 1687282987);
|
||||
INSERT INTO public.badge_defs VALUES (999, 'Misogynist', 'This incel is metamorphosizing', 1686502188);
|
||||
INSERT INTO public.badge_defs VALUES (999, 'Queen', 'This incel is metamorphosizing', 1686502188);
|
||||
|
||||
-- Name: badge_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
|
||||
--
|
||||
|
|
|
|||
Loading…
Reference in New Issue