From 95decd9a560d5b1a4c9d398e26c1435b5e87f3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lera=20Elvo=C3=A9?= <yagich@poto.cafe>
Date: Thu, 20 Nov 2025 03:49:44 +0300
Subject: [PATCH] add user bookmarks view

---
 app/routes/users.py                | 15 ++++++++++++-
 app/templates/common/macros.html   |  8 ++++++-
 app/templates/common/topnav.html   |  4 ++++
 app/templates/users/bookmarks.html | 35 ++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 app/templates/users/bookmarks.html

diff --git a/app/routes/users.py b/app/routes/users.py
index 8ed04af..1e1803e 100644
--- a/app/routes/users.py
+++ b/app/routes/users.py
@@ -4,7 +4,7 @@ from flask import (
 from functools import wraps
 from ..db import db
 from ..lib.babycode import babycode_to_html, BABYCODE_VERSION
-from ..models import Users, Sessions, Subscriptions, Avatars, PasswordResetLinks, InviteKeys
+from ..models import Users, Sessions, Subscriptions, Avatars, PasswordResetLinks, InviteKeys, BookmarkCollections
 from ..constants import InfoboxKind, PermissionLevel
 from ..auth import digest, verify
 from wand.image import Image
@@ -260,6 +260,8 @@ def sign_up_post():
         "permission": PermissionLevel.GUEST.value,
     })
 
+    BookmarkCollections.create_default(new_user.id)
+
     if current_app.config['DISABLE_SIGNUP']:
         invite_key = InviteKeys.find({'key': key})
         new_user.update({
@@ -688,3 +690,14 @@ def revoke_invite_link(username):
     invite.delete()
 
     return redirect(url_for('.invite_links', username=target_user.username))
+
+
+@bp.get('/<username>/bookmarks')
+@login_required
+def bookmarks(username):
+    target_user = Users.find({'username': username})
+    if not target_user or target_user.username != get_active_user().username:
+        return redirect(url_for('.bookmarks', username=get_active_user().username))
+
+    collections = target_user.get_bookmark_collections()
+    return render_template('users/bookmarks.html', collections=collections)
diff --git a/app/templates/common/macros.html b/app/templates/common/macros.html
index f3bbda6..67e68c4 100644
--- a/app/templates/common/macros.html
+++ b/app/templates/common/macros.html
@@ -91,7 +91,7 @@
 </form>
 {% endmacro %}
 
-{% macro full_post(post, render_sig = True, is_latest = False, editing = False, active_user = None, no_reply = false, Reactions = none) %}
+{% macro full_post(post, render_sig = True, is_latest = False, editing = False, active_user = None, no_reply = false, Reactions = none, show_thread_title = false) %}
 {% set postclass = "post" %}
 {% if editing %}
   {% set postclass = postclass + " editing" %}
@@ -112,6 +112,11 @@
 
   <div class="post-content-container" {{ "id=latest-post" if is_latest else "" }}>
     <div class="post-info">
+      <span>
+      {% if show_thread_title %}
+        <a href="{{ url_for('threads.thread', slug=post.thread_slug) }}">Thread: {{ post.thread_title }}</a>
+        &bullet;
+      {% endif %}
       <a href="{{ post_permalink }}" title="Permalink"><i>
         {% if (post['edited_at'] | int) > (post['created_at'] | int) %}
           Edited on {{ timestamp(post['edited_at']) }}
@@ -119,6 +124,7 @@
           Posted on {{ timestamp(post['edited_at']) }}
         {% endif %}
       </i></a>
+      </span>
       <span>
         {% set show_edit = false %}
         {% if active_user %}
diff --git a/app/templates/common/topnav.html b/app/templates/common/topnav.html
index 2a85d08..7f91051 100644
--- a/app/templates/common/topnav.html
+++ b/app/templates/common/topnav.html
@@ -20,6 +20,10 @@
         &bullet;
         <a href="{{ url_for('users.invite_links', username=user.username )}}">Invite to {{ config.SITE_NAME }}</a>
       {% endif %}
+      {% if not user.is_guest() %}
+      &bullet;
+      <a href="{{ url_for('users.bookmarks', username=user.username) }}">Bookmarks</a>
+      {% endif %}
       {% if user.is_mod() %}
         &bullet;
         <a href="{{ url_for("mod.user_list") }}">User list</a>
diff --git a/app/templates/users/bookmarks.html b/app/templates/users/bookmarks.html
new file mode 100644
index 0000000..20d5918
--- /dev/null
+++ b/app/templates/users/bookmarks.html
@@ -0,0 +1,35 @@
+{% from "common/macros.html" import accordion, full_post %}
+{% extends "base.html" %}
+{% block title %}bookmarks{% endblock %}
+{% block content %}
+<div class="darkbg inbox-container">
+  {% for collection in collections %}
+    {% call(section) accordion(disabled=collection.is_empty()) %}
+      {% if section == 'header' %}
+        <h1 class="thread-title">{{ collection.name }}</h1>{{" (no bookmarks)" if collection.is_empty() else ""}}
+      {% else %}
+        {% call(inner_section) accordion(disabled=not collection.has_threads()) %}
+          {% if inner_section == 'header' %}
+          Threads{{" (no bookmarks)" if not collection.has_threads() else ""}}
+          {% else %}
+            <ul>
+            {% for thread in collection.get_threads()|sort(attribute='created_at', reverse=true) %}
+              <li><a href="{{ url_for('threads.thread', slug=thread.slug) }}">{{ thread.title }}</a></li>
+            {% endfor %}
+            </ul>
+          {% endif %}
+        {% endcall %}
+        {% call(inner_section) accordion(disabled=not collection.has_posts()) %}
+          {% if inner_section == 'header' %}
+          Posts{{" (no bookmarks)" if not collection.has_posts() else ""}}
+          {% else %}
+            {% for post in collection.get_posts()|sort(attribute='created_at', reverse=true) %}
+              {{ full_post(post.get_full_post_view(), no_reply=false, render_sig=false, show_thread_title=true) }}
+            {% endfor %}
+          {% endif %}
+        {% endcall %}
+      {% endif %}
+    {% endcall %}
+  {% endfor %}
+</div>
+{% endblock %}