From c2fd01ff4ec67f4ddb34d7bc7e6b27f92ae2dcf0 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sat, 11 Sep 2021 05:49:59 +0200 Subject: [PATCH] fd --- files/classes/user.py | 2 +- files/routes/admin.py | 11 ++++++++--- files/routes/login.py | 4 +--- files/routes/settings.py | 12 +----------- files/routes/users.py | 2 -- files/templates/comments.html | 4 ++-- files/templates/emoji_modal.html | 16 ++++++++-------- files/templates/header.html | 4 ++-- files/templates/message.html | 2 +- files/templates/norules.html | 2 +- files/templates/notifications.html | 2 +- files/templates/user_listing.html | 6 +++--- files/templates/userpage.html | 4 +--- seed-db.sql | 26 +++++++++++++++++++++++++- 14 files changed, 55 insertions(+), 42 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index d57d6a1b3..f0e52cd04 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -541,7 +541,7 @@ class User(Base, Stndrd, Age_times): def is_blocked(self): return self.__dict__.get('_is_blocked', 0) - def refresh_selfset_badges(self): + def refresh_referral_badges(self): # check self-setting badges badge_types = g.db.query(BadgeDef).filter(BadgeDef.qualification_expr.isnot(None)).all() diff --git a/files/routes/admin.py b/files/routes/admin.py index 66ba1807b..12d881bec 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -667,11 +667,16 @@ def agendaposter(user_id, v): note = note ) g.db.add(ma) - - user.refresh_selfset_badges() - g.db.flush() + if user.agendaposter: + if not user.has_badge(26): + badge = Badge(user_id=user.id, badge_id=26) + g.db.add(badge) + else: + badge = user.has_badge(26) + if badge: g.db.delete(badge) + if user.agendaposter: send_notification(NOTIFICATIONS_ACCOUNT, user, f"You have been marked by an admin as an agendaposter ({note}).") else: send_notification(NOTIFICATIONS_ACCOUNT, user, f"You have been unmarked by an admin as an agendaposter.") diff --git a/files/routes/login.py b/files/routes/login.py index 59b5e86f6..1b92b07ce 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -151,8 +151,6 @@ def login_post(): check_for_alts(account.id) - account.refresh_selfset_badges() - # check for previous page redir = request.form.get("redirect", "/").replace("/logged_out", "") @@ -336,7 +334,7 @@ def sign_up_post(v): ref_user = g.db.query(User).options( lazyload('*')).filter_by(id=ref_id).first() if ref_user: - ref_user.refresh_selfset_badges() + ref_user.refresh_referral_badges() g.db.add(ref_user) id_1 = g.db.query(User).filter_by(id=6).count() diff --git a/files/routes/settings.py b/files/routes/settings.py index 5465dc42f..a04d11cf4 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -842,14 +842,4 @@ def settings_title_change(v): v.customtitle = filter_title(new_name) g.db.add(v) - return redirect("/settings/profile") - - -@app.post("/settings/badges") -@auth_required -@validate_formkey -def settings_badge_recheck(v): - - v.refresh_selfset_badges() - - return {"message":"Badges Refreshed"} \ No newline at end of file + return redirect("/settings/profile") \ No newline at end of file diff --git a/files/routes/users.py b/files/routes/users.py index 36418b872..8351cedb7 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -365,8 +365,6 @@ def u_username(username, v=None): u = get_user(username, v=v) - #if v and v == u: v.refresh_selfset_badges() - # check for wrong cases if username != u.username: diff --git a/files/templates/comments.html b/files/templates/comments.html index 7af3dcfb4..b775711d9 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -446,9 +446,9 @@ {% if v and c.parent_submission and c.author_id==v.id %}
  • Edit
    • -
  • Delete
    • +
  • Delete
    • -
  • Undelete
    • +
  • Undelete
    • {% endif %} {% if v and c.post and (v.admin_level >= 1 or v.id == c.post.author_id) and c.level == 1 %} diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index b16000ea1..e919188ca 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -7,28 +7,28 @@
    diff --git a/files/templates/header.html b/files/templates/header.html index 882581002..450721bf0 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -130,7 +130,7 @@
    - Log out + Log out
    @@ -190,7 +190,7 @@
  • Contact us
  • - Log out + Log out
    • {% else %}
  • diff --git a/files/templates/message.html b/files/templates/message.html index 35779c2fa..c306e6e1d 100644 --- a/files/templates/message.html +++ b/files/templates/message.html @@ -20,7 +20,7 @@

    {{title}}

    {{message if message else error}}
    - Go to homepage + Go to homepage diff --git a/files/templates/norules.html b/files/templates/norules.html index d0d91e20c..4c8db1161 100644 --- a/files/templates/norules.html +++ b/files/templates/norules.html @@ -19,7 +19,7 @@

    You haven't set up your rules page yet

    Your rules will be publicly available here.
    - Set up rules + Set up rules diff --git a/files/templates/notifications.html b/files/templates/notifications.html index 517c075b3..4f7fe9802 100644 --- a/files/templates/notifications.html +++ b/files/templates/notifications.html @@ -60,7 +60,7 @@
    No unread messages
    When someone comments or replies, it will show up here.
    - View entire inbox + View entire inbox {% endif %} diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html index c64ee12bc..5df4b34d8 100644 --- a/files/templates/user_listing.html +++ b/files/templates/user_listing.html @@ -13,12 +13,12 @@ {% if v %} {% if v.id!=u.id and not u.is_private and not u.is_nofollow %} - + - + {% endif %} {% else %} - + {% endif %} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 3f675af38..3d71db6f3 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -247,7 +247,6 @@ {% elif v and v.id == u.id %} Edit profile Profile views - Refresh Badges {% endif %} {% if v and v.id != u.id and v.admin_level > 1 %}

    @@ -448,8 +447,7 @@ {% endfor %} {% if v and v.id == u.id %} - Edit profile - Refresh Badges + Edit profile {% endif %} {% if v and v.id != u.id %} Unfollow diff --git a/seed-db.sql b/seed-db.sql index ba9014cf9..4eda7aaa1 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -1,4 +1,28 @@ -INSERT INTO public.badge_defs VALUES (6, 'Beta User', 'Joined during open beta', 'beta.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (12, 'Gold Recruiter', 'Recruited 100 friends to join Drama', 'recruit-100.gif', 1, 'v.referral_count>=100 and v.referral_count <=999'); +INSERT INTO public.badge_defs VALUES (11, 'Silver Recruiter', 'Recruited 10 friends to join Drama', 'recruit-10.gif', 1, 'v.referral_count>=10 and v.referral_count <= 99'); +INSERT INTO public.badge_defs VALUES (10, 'Bronze Recruiter', 'Recruited 1 friend to join Drama', 'recruit-1.gif', 1, 'v.referral_count>=1 and v.referral_count<9'); +INSERT INTO public.badge_defs VALUES (58, 'Diamond Recruiter', 'Recruited 1000 friends to join Drama', 'recruit-1000.gif', 1, 'v.referral_count >= 1000'); +INSERT INTO public.badge_defs VALUES (25, 'Footpig', 'Contributed at least $100/month', 'patron-5.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (61, 'Lab Rat', 'Helped test features in development', 'labrat.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (63, 'Balls', 'I wrote carp on my balls as a sign of submission', 'carpballs.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (4, 'White Hat', 'Responsibly reported a security issue', 'whitehat.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (2, 'Verified Email', 'Verified Email', 'mail.gif', 1, NULL); +INSERT INTO public.badge_defs VALUES (6, 'Beta User', 'Joined during open beta', 'beta.gif', 4, NULL); +INSERT INTO public.badge_defs VALUES (15, 'Idea Maker', 'Had a good idea for Drama which was implemented by the developers', 'idea.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (3, 'Code Contributor', 'Contributed to Drama source code', 'git.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (1, 'Alpha User', 'Joined during open alpha', 'alpha.gif', 4, NULL); +INSERT INTO public.badge_defs VALUES (18, 'Artisan', 'Contributed to Drama artwork', 'art.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (27, 'Lolcow', 'Beautiful and valid milk provider', 'lolcow.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (21, 'Paypig', 'Contributed at least $5/month', 'patron-1.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (22, 'Renthog', 'Contributed at least $10/month', 'patron-2.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (23, 'Landchad', 'Contributed at least $20/month', 'patron-3.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (24, 'Terminally online turboautist', 'Contributed at least $50/month', 'patron-4.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (28, 'Rich Bich', 'Contributed $500', 'patron-8.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (7, 'Bug Finder', 'Found a bug', 'sitebreaker.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (60, 'Unironically Retarded', 'Demonstrated a wholesale inability to read the room', 'retarded.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (26, 'Agendaposter', 'Forced to use the agendaposter theme', 'agendaposter.gif', 1, NULL); +INSERT INTO public.badge_defs VALUES (17, 'Marsey Artisan', 'Contributed a Marsey emoji ✨', 'marseybadge-1.gif', 3, NULL); +INSERT INTO public.badge_defs VALUES (16, 'Marsey Master', 'Contributed 10 (or more!!!!) Marsey emojis ✨', 'marseybadge-2.gif', 3, NULL); INSERT INTO public.users ( id, username, passhash, created_utc, admin_level, over_18, is_activated, bio, bio_html, login_nonce, is_private,