diff --git a/files/assets/style/main.scss b/files/assets/style/main.scss index 223a921b1..32e67fb0b 100644 --- a/files/assets/style/main.scss +++ b/files/assets/style/main.scss @@ -4014,4 +4014,10 @@ img.emoji { * { -webkit-animation: None !important; animation: None !important; +} + +.patron { + padding: 5px 10px 10px 10px !important; + border-radius: 10px !important; + color: white !important; } \ No newline at end of file diff --git a/files/classes/user.py b/files/classes/user.py index c5e3cbdce..a77c18521 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -32,7 +32,6 @@ class User(Base, Stndrd, Age_times): profileurl = Column(String) bannerurl = Column(String) patron = Column(Integer, default=0) - animatedname = Column(Boolean, default=False) email = Column(String) css = deferred(Column(String)) profilecss = deferred(Column(String)) diff --git a/files/routes/admin.py b/files/routes/admin.py index 610109079..16fb5f045 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -182,7 +182,6 @@ def badge_grant_post(v): if badge_id in [21,22,23,24,28]: user.patron = int(str(badge_id)[-1]) - user.animatedname = True grant_awards = {} diff --git a/files/routes/settings.py b/files/routes/settings.py index d6385ad6b..16affdc65 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -50,14 +50,6 @@ def settings_profile_post(v): updated = True v.is_private = request.values.get("private", None) == 'true' - if request.values.get("animatedname", v.animatedname) != v.animatedname: - if v.animatedname == False: - users = g.db.query(User.id).options(lazyload('*')).order_by(User.coins.desc()).limit(25).all() - users = [x[0] for x in users] - if v.id not in users: return {"error": "You must be in the top 25 leaderboard or be a patron to apply an animated name!"}, 403 - updated = True - v.animatedname = request.values.get("animatedname", None) == 'true' - if request.values.get("nofollow", v.is_nofollow) != v.is_nofollow: updated = True v.is_nofollow = request.values.get("nofollow", None) == 'true' diff --git a/files/templates/badmins.html b/files/templates/badmins.html index 87e791c50..220ad75f7 100644 --- a/files/templates/badmins.html +++ b/files/templates/badmins.html @@ -15,7 +15,7 @@ {% for user in badmins %} - {{user.username}} + {{user.username}} {{user.coins}} {% endfor %} diff --git a/files/templates/banned.html b/files/templates/banned.html index 3ebac6bd6..139b6b351 100644 --- a/files/templates/banned.html +++ b/files/templates/banned.html @@ -13,9 +13,9 @@ {% for user in users %} {{users.index(user)+1}} - {{user.username}} + {{user.username}} {% if user.ban_reason %}{{user.ban_reason}}{% endif %} - {% if user.banned_by %}{{user.banned_by.username}}{% endif %} + {% if user.banned_by %}{{user.banned_by.username}}{% endif %} {% endfor %} diff --git a/files/templates/blocks.html b/files/templates/blocks.html index c0f04ba49..dd9bb30b6 100644 --- a/files/templates/blocks.html +++ b/files/templates/blocks.html @@ -14,8 +14,8 @@ {% for user in users %} - {{user.username}} - {{targets[loop.index-1].username}} + {{user.username}} + {{targets[loop.index-1].username}} {% endfor %} diff --git a/files/templates/comments.html b/files/templates/comments.html index 1e657eab5..6dc3eb641 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -126,7 +126,7 @@ {% if c.is_blocking %} {% endif %} {% if c.is_blocked %} {% endif %} - {{c.author.username}}{% if c.author.customtitle %}  {{c.author.customtitle | safe}}{% endif %} + {{c.author.username}}{% if c.author.customtitle %}  {{c.author.customtitle | safe}}{% endif %}  {{c.age_string}} {% if c.edited_utc %} diff --git a/files/templates/followers.html b/files/templates/followers.html index 8e068b02b..fc1d05555 100644 --- a/files/templates/followers.html +++ b/files/templates/followers.html @@ -13,7 +13,7 @@ {% for user in users %} {{users.index(user)+1}} - {{user.username}} + {{user.username}} {% endfor %} diff --git a/files/templates/header.html b/files/templates/header.html index 3a6913326..bcb1c2522 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -78,7 +78,7 @@
-
{{v.username}}
+
{{v.username}}
{{v.coins}} {{"COINS_NAME" | app_config}}
diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html index 91fbc3fa3..ca2cddc88 100644 --- a/files/templates/leaderboard.html +++ b/files/templates/leaderboard.html @@ -17,7 +17,7 @@ {% for user in users1 %} {{users1.index(user)+1}} - {{user.username}} + {{user.username}} {{user.coins}} {% endfor %} @@ -42,7 +42,7 @@ {% for user in users2 %} {{users2.index(user)+1}} - {{user.username}} + {{user.username}} {{user.stored_subscriber_count}} {% endfor %} @@ -67,7 +67,7 @@ {% for user in users3 %} {{users3.index(user)+1}} - {{user.username}} + {{user.username}} {{user.post_count}} {% endfor %} @@ -92,7 +92,7 @@ {% for user in users4 %} {{users4.index(user)+1}} - {{user.username}} + {{user.username}} {{user.comment_count}} {% endfor %} diff --git a/files/templates/patrons.html b/files/templates/patrons.html index 3aa67f04a..36aecaee8 100644 --- a/files/templates/patrons.html +++ b/files/templates/patrons.html @@ -13,7 +13,7 @@ {% for user in users %} {{users.index(user)+1}} - {{user.username}} + {{user.username}} diff --git a/files/templates/rentoids.html b/files/templates/rentoids.html index 3002bacf1..1f210620d 100644 --- a/files/templates/rentoids.html +++ b/files/templates/rentoids.html @@ -13,7 +13,7 @@ {% for user in users %} {{users.index(user)+1}} - {{user.username}} + {{user.username}} {% endfor %} diff --git a/files/templates/submission.html b/files/templates/submission.html index e81e5faab..3a18d8244 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -219,7 +219,7 @@ {% if p.over_18 %}+18{% endif %} {% if p.private %}unlisted{% endif %} {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} -    {{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %} +    {{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}  {{p.age_string}} ({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 24f5323be..1ab2d447c 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -101,7 +101,7 @@ {% if p.is_blocked %}{% endif %} {% if p.private %}unlisted{% endif %} {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} -  {{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %} +  {{p.author.username}}{% if p.author.customtitle %}  {{p.author.customtitle | safe}}{% endif %}  {{p.age_string}}   ({% if p.realurl(v) %}{{p.domain}}{% else %}text post{% endif %}) diff --git a/files/templates/viewers.html b/files/templates/viewers.html index 5e7ccbef9..c53b3272e 100644 --- a/files/templates/viewers.html +++ b/files/templates/viewers.html @@ -12,7 +12,7 @@ {% for view in viewers %} - {{view.viewer.username}} + {{view.viewer.username}} {{view.last_view_string}} {% endfor %} diff --git a/files/templates/votes.html b/files/templates/votes.html index 456aec3a7..057ebafff 100644 --- a/files/templates/votes.html +++ b/files/templates/votes.html @@ -28,7 +28,7 @@ User {% for vote in ups %} - {{vote.user.username}} + {{vote.user.username}} {% endfor %} @@ -37,7 +37,7 @@ User {% for vote in downs %} - {{vote.user.username}} + {{vote.user.username}} {% endfor %} diff --git a/schema.sql b/schema.sql index 0831e7ac9..8e788ef74 100644 --- a/schema.sql +++ b/schema.sql @@ -1039,7 +1039,6 @@ CREATE TABLE public.users ( agendaposter boolean, agendaposter_expires_utc integer DEFAULT 0, resized boolean, - animatedname boolean, suicide_utc integer, post_count integer, comment_count integer,