fix bug when both queen and namelock expire at the same time
parent
bc419a52da
commit
f22a362f37
|
@ -186,7 +186,6 @@ def _process_timer(attr, badge_ids, text, extra_attrs={}):
|
||||||
if isinstance(val, InstrumentedAttribute):
|
if isinstance(val, InstrumentedAttribute):
|
||||||
val = str(val).split('.')[1]
|
val = str(val).split('.')[1]
|
||||||
val = getattr(user, val)
|
val = getattr(user, val)
|
||||||
print(f'k: {k}, val: {val}', flush=True)
|
|
||||||
setattr(user, k, val)
|
setattr(user, k, val)
|
||||||
|
|
||||||
#remove corresponding badges
|
#remove corresponding badges
|
||||||
|
@ -215,10 +214,7 @@ def _award_timers_task():
|
||||||
_process_timer(User.earlylife, [169], "The earlylife award you received has expired!")
|
_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.marsify, [170], "The marsify award you received has expired!")
|
||||||
_process_timer(User.rainbow, [171], "The rainbow award you received has expired!")
|
_process_timer(User.rainbow, [171], "The rainbow award you received has expired!")
|
||||||
_process_timer(User.queen, [285], "The queen award you received has expired!", {
|
_process_timer(User.queen, [285], "The queen award you received has expired!")
|
||||||
User.username: User.prelock_username,
|
|
||||||
User.prelock_username: None,
|
|
||||||
})
|
|
||||||
_process_timer(User.spider, [179], "The spider award you received has expired!")
|
_process_timer(User.spider, [179], "The spider award you received has expired!")
|
||||||
_process_timer(User.namechanged, [281], "The namelock award you received has expired. You're now back to your old username!", {
|
_process_timer(User.namechanged, [281], "The namelock award you received has expired. You're now back to your old username!", {
|
||||||
User.username: User.prelock_username,
|
User.username: User.prelock_username,
|
||||||
|
|
|
@ -346,6 +346,8 @@ def award_thing(v, thing_type, id):
|
||||||
if author.queen and time.time() < author.queen: author.queen += 86400
|
if author.queen and time.time() < author.queen: author.queen += 86400
|
||||||
else: author.queen = int(time.time()) + 86400
|
else: author.queen = int(time.time()) + 86400
|
||||||
|
|
||||||
|
author.namechanged = author.queen
|
||||||
|
|
||||||
badge_grant(user=author, badge_id=285)
|
badge_grant(user=author, badge_id=285)
|
||||||
|
|
||||||
elif kind == "chud":
|
elif kind == "chud":
|
||||||
|
|
|
@ -737,7 +737,7 @@ def settings_advanced_get(v:User):
|
||||||
@limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
|
@limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID)
|
||||||
@is_not_permabanned
|
@is_not_permabanned
|
||||||
def settings_name_change(v):
|
def settings_name_change(v):
|
||||||
if v.namechanged or v.queen: abort(403)
|
if v.namechanged: abort(403)
|
||||||
|
|
||||||
if v.shadowbanned: abort(500)
|
if v.shadowbanned: abort(500)
|
||||||
|
|
||||||
|
|
|
@ -163,10 +163,10 @@
|
||||||
<p>Your original username will always stay reserved for you: <code>{{v.original_username}}</code></p>
|
<p>Your original username will always stay reserved for you: <code>{{v.original_username}}</code></p>
|
||||||
<form action="/settings/name_change" method="post">
|
<form action="/settings/name_change" method="post">
|
||||||
<input hidden name="formkey" value="{{v|formkey}}">
|
<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.queen %}disabled{% endif %}>
|
<input id="name-body" autocomplete="off" type="text" name="name" class="form-control" value="{{v.username}}" {% if v.namechanged %}disabled{% endif %}>
|
||||||
<small>3-25 characters, including letters, numbers, _ , and -</small>
|
<small>3-25 characters, including letters, numbers, _ , and -</small>
|
||||||
<div class="d-flex mt-2">
|
<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.queen%}disabled{% endif %}>
|
<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Change Display Name" {% if v.namechanged %}disabled{% endif %}>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -272,8 +272,8 @@
|
||||||
<script defer src="{{'js/flairchanged.js' | asset}}"></script>
|
<script defer src="{{'js/flairchanged.js' | asset}}"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if v.namechanged or v.queen%}
|
{% if v.namechanged %}
|
||||||
<input hidden id="namechanged" value="{{v.namechanged if v.namechanged else v.queen}}">
|
<input hidden id="namechanged" value="{{v.namechanged}}">
|
||||||
<script defer src="{{'js/namechanged.js' | asset}}"></script>
|
<script defer src="{{'js/namechanged.js' | asset}}"></script>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue