From 22ca768ad1717629788b5c41385f021e4dbf7c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lera=20Elvo=C3=A9?= Date: Wed, 3 Jun 2026 16:35:59 +0300 Subject: [PATCH] finish invites i think --- app/routes/users.py | 7 +++++-- app/templates/common/topnav.html | 3 +++ app/templates/users/bookmarks.html | 6 +++--- app/templates/users/user_page.html | 9 +++++---- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/routes/users.py b/app/routes/users.py index a964e50..53c6b37 100644 --- a/app/routes/users.py +++ b/app/routes/users.py @@ -220,11 +220,12 @@ def sign_up_post(): 'username': username_pair[0], 'password_hash': password_hash, 'permission': PermissionLevel.GUEST.value, - 'created_at': int(time.time()), + 'created_at': time_now(), } if invite: user_data['invited_by'] = invite.created_by user_data['permission'] = PermissionLevel.USER.value + user_data['confirmed_on'] = time_now() invite.delete() user = Users.create(user_data) @@ -251,7 +252,9 @@ def user_page(username): target_user = Users.find({'username': username}) if not target_user: abort(404) - return render_template('users/user_page.html', target_user=target_user) + if current_app.config['DISABLE_SIGNUP'] and target_user.invited_by: + invited_by = Users.find({'id': target_user.invited_by}) + return render_template('users/user_page.html', target_user=target_user, invited_by=invited_by) @bp.get('//posts/') def posts(username): diff --git a/app/templates/common/topnav.html b/app/templates/common/topnav.html index 0fd8962..5ff0b97 100644 --- a/app/templates/common/topnav.html +++ b/app/templates/common/topnav.html @@ -9,6 +9,9 @@
  • Settings
  • Inbox{{' (%s)' % uc if uc else ''}}
  • Bookmarks
  • + {%- if user.can_invite() -%} + Invite + {%- endif %} {% if user.is_mod() -%}
  • Moderation
  • {%- endif %} diff --git a/app/templates/users/bookmarks.html b/app/templates/users/bookmarks.html index de4e5ad..a604cc2 100644 --- a/app/templates/users/bookmarks.html +++ b/app/templates/users/bookmarks.html @@ -32,9 +32,9 @@ {%- for bt in collection.get_threads() -%} {%- set thread = bt.get_thread() -%} - {{thread.title}} - {{bt.note}} - {{bookmark_button('thread', id=thread.id, text='Manage')}} + {{thread.title}} + {{bt.note}} + {{bookmark_button('thread', id=thread.id, text='Manage')}} {%- endfor -%} diff --git a/app/templates/users/user_page.html b/app/templates/users/user_page.html index fd984e1..3a9a413 100644 --- a/app/templates/users/user_page.html +++ b/app/templates/users/user_page.html @@ -50,11 +50,12 @@ Mention: @{{target_user.username}} Status: {{target_user.status}} Rank: {{target_user.permission | permission_string}} - {%- set time = target_user.created_at -%} - {%- if target_user.approved_at -%} - {%- set time = target_user.approved_at -%} + {%- if target_user.confirmed_on -%} + Joined: {{timestamp(target_user.confirmed_on)}} + {%- endif -%} + {%- if invited_by -%} + Invited by: {{invited_by.get_readable_name()}} {%- endif -%} - Joined: {{timestamp(target_user.created_at)}} {%- if not target_user.is_guest() -%} Posts: {{stats.post_count}} Threads started: {{stats.thread_count}}