diff --git a/files/classes/user.py b/files/classes/user.py index 33344730c..c05a582e2 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -58,7 +58,7 @@ class User(Base): profile_background = Column(String) flair = deferred(Column(String)) flair_html = Column(String) - titlecolor = Column(String, default=DEFAULT_COLOR) + flaircolor = Column(String, default=DEFAULT_COLOR) theme = Column(String, default=DEFAULT_THEME) themecolor = Column(String, default=DEFAULT_COLOR) song = Column(String) diff --git a/files/routes/settings.py b/files/routes/settings.py index 97f92c6b8..34ac238cf 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -426,14 +426,14 @@ def namecolor(v): def themecolor(v): return set_color(v, "themecolor") -@app.post("/settings/titlecolor") +@app.post("/settings/flaircolor") @limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400) @limiter.limit(DEFAULT_RATELIMIT, deduct_when=lambda response: response.status_code < 400, key_func=get_ID) @auth_required -def titlecolor(v): - return set_color(v, "titlecolor") +def flaircolor(v): + return set_color(v, "flaircolor") @app.post("/settings/verifiedcolor") @limiter.limit('1/second', scope=rpath) diff --git a/files/templates/comments.html b/files/templates/comments.html index fc4be51e8..95077cf97 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -176,10 +176,10 @@ {{c.author_name}} {% if FEATURES['PRONOUNS'] %} - {{c.author.pronouns_display}} + {{c.author.pronouns_display}} {% endif %} {% if c.author.flair_html %} - {{c.author.flair_html | safe}} + {{c.author.flair_html | safe}} {% endif %} {% endif %} diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html index e60ba0fe6..d9443d49d 100644 --- a/files/templates/settings/personal.html +++ b/files/templates/settings/personal.html @@ -209,7 +209,7 @@ {{common.line_text_section('flair', '/settings/change_flair', 'flair', 'Flair', v.flair, 'Limit of 100 characters', 'Enter a flair here', 'Change Flair', true, 0, 100, '.*', v.flairchanged)}} - {{common.color_section('flaircolor', '/settings/titlecolor', 'titlecolor', 'Flair Color', v.titlecolor)}} + {{common.color_section('flaircolor', '/settings/flaircolor', 'flaircolor', 'Flair Color', v.flaircolor)}} {% if FEATURES['USERS_PROFILE_SONG'] -%}
{{u.pronouns_display}}
+{{u.pronouns_display}}
{% endif %} {% if u.flair_html and can_see(v, u) %} -{{u.flair_html | safe}}
+{{u.flair_html | safe}}
{% endif %}{{u.pronouns_display}}
+{{u.pronouns_display}}
{% endif %} {% if u.flair_html and can_see(v, u) %} -{{u.flair_html | safe}}
+{{u.flair_html | safe}}
{% endif %}