diff --git a/files/routes/admin.py b/files/routes/admin.py index cf5637151..b4c7386aa 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -1042,26 +1042,25 @@ def agendaposter(id, v): reason = reason_regex_post.sub(r'\1', reason) reason = reason_regex_comment.sub(r'\1', reason) - duration = "permanently" if days: if user.agendaposter: user.agendaposter += days * 86400 else: user.agendaposter = int(time.time()) + (days * 86400) + days_txt = str(days) if days_txt.endswith('.0'): days_txt = days_txt[:-2] duration = f"for {days_txt} day" if days != 1: duration += "s" - if reason: text = f"@{v.username} (a site admin) has chudded you for **{days_txt}** days for the following reason:\n\n> {reason}" - else: text = f"@{v.username} (a site admin) has chudded you for **{days_txt}** days." else: user.agendaposter = 1 - if reason: text = f"@{v.username} (a site admin) has chudded you permanently for the following reason:\n\n> {reason}" - else: text = f"@{v.username} (a site admin) has chudded you permanently." + duration = "permanently" user.agendaposter_phrase = "trans lives matter" - text += f"\n\n> {user.agendaposter_phrase}" + text = f"@{v.username} (a site admin) has chudded you **{duration}**" + if reason: text += f"for the following reason:\n\n> {reason}" + text += f"\n\n**You now have to say this phrase in all posts and comments you make {duration}:**\n\n> {user.agendaposter_phrase}" user.chudded_by = v.id g.db.add(user) diff --git a/files/routes/awards.py b/files/routes/awards.py index e3603d1f2..3f59c6aac 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -221,6 +221,8 @@ def award_thing(v, thing_type, id): msg += "!" if note: note = '\n\n> '.join(note.splitlines()) + if kind == "agendaposter": + msg += f"\n\n**You now have to say this phrase in all posts and comments you make for 24 hours:**" msg += f"\n\n> {note}" send_repeatable_notification(author.id, msg)