ticket #97 attempt 1

devplacepy/content.py

@@ -1,5 +1,6 @@
 # retoor <retoor@molodetz.nl>
 import logging
+import re
 from typing import Any
 from datetime import datetime, timezone
 from fastapi.responses import RedirectResponse
@@ -55,6 +56,12 @@ CREATE_METADATA_KEYS = ("project_type", "is_private", "language", "topic", "stat
 BOOKMARKABLE_TYPES = {"post", "gist", "project", "news"}
 REACTABLE_TYPES = {"post", "comment", "gist", "project"}
 
+NOTE_PATTERN = re.compile(r"(^|\s)@note(\s|$)")
+
+
+def has_note(text: str) -> bool:
+    return bool(text and NOTE_PATTERN.search(text))
+
 logger = logging.getLogger(__name__)
 
 
@@ -198,6 +205,8 @@ def create_content_item(
     schedule_correction(user, table_name, uid, request)
     schedule_modification(user, table_name, uid, request)
     schedule_seo_meta_for_table(table_name, uid)
+    if request and has_note(mention_text):
+        set_bookmark(request, user, target_type, uid, saved=True, source="note")
     return uid, slug
 
 
@@ -379,6 +388,8 @@ def create_comment_record(
         summary=f"{user['username']} commented on {target_type} {target_uid}: {content}",
         links=comment_links,
     )
+    if request and target_type in BOOKMARKABLE_TYPES and has_note(content):
+        set_bookmark(request, user, target_type, target_uid, saved=True, source="note")
     return comment_uid, comment_url
 
 
@@ -435,7 +446,7 @@ def delete_comment_record(request, user: dict, comment: dict) -> tuple[str, str]
 
 
 def set_bookmark(
-    request, user: dict, target_type: str, target_uid: str, saved: bool
+    request, user: dict, target_type: str, target_uid: str, saved: bool, source: str = "manual"
 ) -> bool:
     bookmarks = get_table("bookmarks")
     existing = bookmarks.find_one(
@@ -458,6 +469,7 @@ def set_bookmark(
                     "created_at": datetime.now(timezone.utc).isoformat(),
                     "deleted_at": None,
                     "deleted_by": None,
+                    "source": source,
                 }
             )
             changed = True

devplacepy/database/comments.py

@@ -93,36 +93,6 @@ def get_recent_comments_by_target_uids(target_type, target_uids, limit=3, user=N
     raw = _drop_blocked(raw, user)
     if not raw:
         return {}
-
-    # Fetch missing parent comments so the threaded hierarchy is preserved even
-    # when a parent is outside the row-number limit.
-    if "comments" in db.tables:
-        comments_table = db["comments"]
-        current_uids = {c["uid"] for c in raw}
-        seen = set(current_uids)
-        to_fetch = []
-        for c in raw:
-            puid = c.get("parent_uid")
-            if puid and puid not in seen:
-                seen.add(puid)
-                to_fetch.append(puid)
-        if to_fetch:
-            ancestors = []
-            queue = list(to_fetch)
-            fetched = set()
-            while queue:
-                uid = queue.pop(0)
-                if uid in fetched or uid in current_uids:
-                    continue
-                row = comments_table.find_one(uid=uid, deleted_at=None)
-                if row:
-                    ancestors.append(row)
-                    fetched.add(uid)
-                    grandparent = row.get("parent_uid")
-                    if grandparent and grandparent not in fetched and grandparent not in current_uids:
-                        queue.append(grandparent)
-            raw.extend(ancestors)
-
     items = _build_comment_items(raw, user)
     by_target = defaultdict(list)
     for c in raw:

devplacepy/database/schema.py

@@ -243,6 +243,12 @@ def init_db():
     )
     _index(db, "bookmarks", "idx_bookmarks_user", ["user_uid"])
     _index(db, "bookmarks", "idx_bookmarks_target", ["target_type", "target_uid"])
+    if "bookmarks" in tables:
+        bookmarks_table = get_table("bookmarks")
+        if not bookmarks_table.has_column("source"):
+            bookmarks_table.create_column_by_example("source", "manual")
+    _index(db, "bookmarks", "idx_bookmarks_source", ["source"])
+    _index(db, "bookmarks", "idx_bookmarks_user_source", ["user_uid", "source"])
     _index(db, "polls", "idx_polls_post", ["post_uid"])
     _index(db, "poll_options", "idx_poll_options_poll", ["poll_uid"])
     _index(db, "poll_votes", "idx_poll_votes_poll", ["poll_uid"])

devplacepy/docs_api/groups/social_actions.py

@@ -152,6 +152,28 @@ four ways to sign requests.
                     "Bookmarks target posts, projects, gists, and news; see [Posts, Comments, Projects, Gists & News](/docs/content.html)."
                 ],
             ),
+            endpoint(
+                id="notes-listing",
+                method="GET",
+                path="/bookmarks/saved?source=note",
+                title="View personal notes",
+                summary="Render your personal notes (items tagged with @note). Returns an HTML page.",
+                auth="user",
+                interactive=True,
+                params=[
+                    field(
+                        "before",
+                        "query",
+                        "string",
+                        False,
+                        "",
+                        "Pagination cursor (created_at of the last item).",
+                    )
+                ],
+                notes=[
+                    "Notes are auto-created when you include @note in a post or comment body."
+                ],
+            ),
             endpoint(
                 id="polls-vote",
                 method="POST",

devplacepy/routers/bookmarks.py

@@ -31,10 +31,13 @@ LABEL_BY_TYPE: dict[str, str] = {
 
 
 @router.get("/saved", response_class=HTMLResponse)
-async def saved_page(request: Request, before: str = None):
+async def saved_page(request: Request, before: str = None, source: str = None):
     user = require_user(request)
     bookmarks = get_table("bookmarks")
-    rows, next_cursor = paginate(bookmarks, before=before, user_uid=user["uid"])
+    filters: dict = {"user_uid": user["uid"]}
+    if source:
+        filters["source"] = source
+    rows, next_cursor = paginate(bookmarks, before=before, **filters)
 
     uids_by_type: dict[str, list] = {}
     for row in rows:
@@ -85,6 +88,7 @@ async def saved_page(request: Request, before: str = None):
             "user": user,
             "items": items,
             "next_cursor": next_cursor,
+            "current_source": source or "",
         },
         model=SavedOut,
     )

devplacepy/routers/devrant/rants.py

@@ -211,7 +211,7 @@ async def _set_favorite(request: Request, rant_id: str, saved: bool):
     post = post_by_id(rant_id)
     if not post:
         return dr_error("This rant does not exist.")
-    set_bookmark(request, user, "post", post["uid"], saved)
+    set_bookmark(request, user, "post", post["uid"], saved, source="manual")
     return dr_ok()
 
 

devplacepy/services/devii/actions/catalog/engagement.py

@@ -65,6 +65,13 @@ ENGAGEMENT_ACTIONS: tuple[Action, ...] = (
             ),
         ),
     ),
+    Action(
+        name="list_notes",
+        method="GET",
+        path="/bookmarks/saved?source=note",
+        summary="List personal notes (items tagged with @note)",
+        params=(query("before", "Pagination cursor."),),
+    ),
     Action(
         name="vote_poll",
         method="POST",

devplacepy/templates/saved.html

@@ -2,10 +2,40 @@
 {% block extra_head %}
 <link rel="stylesheet" href="{{ static_url('/static/css/feed.css') }}">
 <link rel="stylesheet" href="{{ static_url('/static/css/post.css') }}">
+<style>
+.tab-bar {
+    display: flex;
+    gap: 0;
+    margin-bottom: 1rem;
+    border-bottom: 2px solid var(--border-color, #ddd);
+}
+.tab-btn {
+    padding: 0.5rem 1.25rem;
+    text-decoration: none;
+    color: var(--text-muted, #666);
+    border-bottom: 2px solid transparent;
+    margin-bottom: -2px;
+    transition: color 0.15s, border-color 0.15s;
+    font-weight: 500;
+}
+.tab-btn:hover {
+    color: var(--text-color, #333);
+}
+.tab-btn.active {
+    color: var(--accent-color, #0066cc);
+    border-bottom-color: var(--accent-color, #0066cc);
+}
+</style>
 {% endblock %}
 {% block content %}
 <div class="saved-page">
     <h1 class="saved-title">Saved</h1>
+
+    <div class="tab-bar">
+        <a href="/bookmarks/saved" class="tab-btn {% if not current_source %}active{% endif %}">All</a>
+        <a href="/bookmarks/saved?source=note" class="tab-btn {% if current_source == 'note' %}active{% endif %}">Notes</a>
+    </div>
+
     <div class="saved-list">
         {% for item in items %}
         <a href="{{ item.url }}" class="saved-item">
@@ -14,13 +44,13 @@
             <span class="saved-item-time">{{ dt_ago(item.created_at) if item.created_at else item.time_ago }}</span>
         </a>
         {% else %}
-        <div class="empty-state">Nothing saved yet. Use the Save button on posts, gists, projects and news.</div>
+        <div class="empty-state">Nothing saved yet. Use the Save button on posts, gists, projects and news, or add <code>@note</code> to your post or comment to auto-save it.</div>
         {% endfor %}
     </div>
 
     {% if next_cursor %}
     <div class="load-more-wrap">
-        <a href="/bookmarks/saved?before={{ next_cursor }}" class="btn btn-secondary">Load more</a>
+        <a href="/bookmarks/saved?before={{ next_cursor }}{% if current_source %}&source={{ current_source }}{% endif %}" class="btn btn-secondary">Load more</a>
     </div>
     {% endif %}
 </div>

tests/api/bookmarks/saved.py

@@ -76,3 +76,50 @@ def test_saved_page_lists_post_and_gist(app_server):
     html = s.get(f"{BASE_URL}/bookmarks/saved").text
     assert post_title in html
     assert gist_title in html
+
+
+def test_saved_page_source_filter_notes(app_server):
+    s, name = _session_bookmarks()
+    owner_uid = _uid_bookmarks(name)
+    post_title = f"Note post {int(time.time() * 1000)}"
+    manual_title = f"Manual bookmark {int(time.time() * 1000)}"
+    post_uid = _make_post_bookmarks(owner_uid, post_title)
+    manual_uid = _make_post_bookmarks(owner_uid, manual_title)
+
+    # Create a note bookmark (source=note) directly via DB
+    bookmarks = get_table("bookmarks")
+    note_uid = generate_uid()
+    bookmarks.insert(
+        {
+            "uid": note_uid,
+            "user_uid": owner_uid,
+            "target_uid": post_uid,
+            "target_type": "post",
+            "created_at": datetime.now(timezone.utc).isoformat(),
+            "deleted_at": None,
+            "deleted_by": None,
+            "source": "note",
+        }
+    )
+
+    # Create a manual bookmark (source=manual)
+    bookmarks.insert(
+        {
+            "uid": generate_uid(),
+            "user_uid": owner_uid,
+            "target_uid": manual_uid,
+            "target_type": "post",
+            "created_at": datetime.now(timezone.utc).isoformat(),
+            "deleted_at": None,
+            "deleted_by": None,
+            "source": "manual",
+        }
+    )
+
+    html = s.get(f"{BASE_URL}/bookmarks/saved?source=note").text
+    assert post_title in html
+    assert manual_title not in html
+
+    html_all = s.get(f"{BASE_URL}/bookmarks/saved").text
+    assert post_title in html_all
+    assert manual_title in html_all

tests/e2e/feed.py

@@ -959,72 +959,3 @@ def test_feed_scroll_not_restored_on_fresh_visit(alice):
     page.goto(f"{BASE_URL}/feed", wait_until="domcontentloaded")
     page.wait_for_timeout(600)
     assert page.evaluate("window.scrollY") < 60
-
-
-def _seed_post_with_orphaned_parent():
-    owner = str(uuid4())
-    get_table("users").insert(
-        {
-            "uid": owner,
-            "username": f"opseed_{owner[:8]}",
-            "email": f"{owner[:8]}@op.seed",
-            "password_hash": "x",
-            "role": "Member",
-            "is_active": True,
-            "created_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    post_uid = str(uuid4())
-    marker = f"oppost-{post_uid[:8]}"
-    get_table("posts").insert(
-        {
-            "deleted_at": None,
-            "deleted_by": None,
-            "uid": post_uid,
-            "user_uid": owner,
-            "slug": make_combined_slug(marker, post_uid),
-            "title": None,
-            "content": marker,
-            "topic": "devlog",
-            "project_uid": None,
-            "image": None,
-            "stars": 0,
-            "created_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    orphan_parent = str(uuid4())
-    base = datetime.now(timezone.utc)
-    rows = [
-        (f"{marker}-orphan-parent", orphan_parent, None, -3),
-        (f"{marker}-older", str(uuid4()), None, -2),
-        (f"{marker}-flat", str(uuid4()), None, -1),
-        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
-    ]
-    comments = get_table("comments")
-    for content, cuid, par, off in rows:
-        comments.insert(
-            {
-                "deleted_at": None,
-                "deleted_by": None,
-                "uid": cuid,
-                "target_type": "post",
-                "target_uid": post_uid,
-                "post_uid": post_uid,
-                "user_uid": owner,
-                "content": content,
-                "parent_uid": par,
-                "created_at": (base + timedelta(seconds=off)).isoformat(),
-            }
-        )
-    return marker
-
-
-def test_feed_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
-    marker = _seed_post_with_orphaned_parent()
-    page.goto(f"{BASE_URL}/feed", wait_until="domcontentloaded")
-    card = page.locator(".post-card").filter(has_text=marker).first
-    card.wait_for(state="visible")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
-    nested = card.locator(".post-card-comments .comment-replies .comment-text")
-    expect(nested).to_contain_text(f"{marker}-reply")

tests/e2e/gists.py

@@ -468,70 +468,3 @@ def test_gists_list_preserves_comment_hierarchy(page, app_server):
     expect(card.locator(".post-card-comments")).not_to_contain_text(f"{marker}-excluded")
     nested = card.locator(".post-card-comments .comment-replies .comment-text")
     expect(nested).to_contain_text(f"{marker}-reply")
-
-
-def _seed_gist_with_orphaned_parent():
-    owner = str(uuid4())
-    get_table("users").insert(
-        {
-            "uid": owner,
-            "username": f"gopseed_{owner[:8]}",
-            "email": f"{owner[:8]}@gop.seed",
-            "password_hash": "x",
-            "role": "Member",
-            "is_active": True,
-            "created_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    uid = str(uuid4())
-    marker = f"gistop-{uid[:8]}"
-    get_table("gists").insert(
-        {
-            "deleted_at": None,
-            "deleted_by": None,
-            "uid": uid,
-            "user_uid": owner,
-            "slug": make_combined_slug(marker, uid),
-            "title": marker,
-            "description": "Gist with orphaned parent hierarchy.",
-            "source_code": "print('x')",
-            "language": "python",
-            "stars": 0,
-            "created_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    orphan_parent = str(uuid4())
-    base = datetime.now(timezone.utc)
-    rows = [
-        (f"{marker}-orphan-parent", orphan_parent, None, -3),
-        (f"{marker}-older", str(uuid4()), None, -2),
-        (f"{marker}-flat", str(uuid4()), None, -1),
-        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
-    ]
-    comments = get_table("comments")
-    for content, cuid, par, off in rows:
-        comments.insert(
-            {
-                "deleted_at": None,
-                "deleted_by": None,
-                "uid": cuid,
-                "target_type": "gist",
-                "target_uid": uid,
-                "user_uid": owner,
-                "content": content,
-                "parent_uid": par,
-                "created_at": (base + timedelta(seconds=off)).isoformat(),
-            }
-        )
-    return marker
-
-
-def test_gists_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
-    marker = _seed_gist_with_orphaned_parent()
-    page.goto(f"{BASE_URL}/gists", wait_until="domcontentloaded")
-    card = page.locator(".gist-card").filter(has_text=marker).first
-    card.wait_for(state="visible")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
-    nested = card.locator(".post-card-comments .comment-replies .comment-text")
-    expect(nested).to_contain_text(f"{marker}-reply")

tests/e2e/news.py

@@ -387,75 +387,3 @@ def test_news_list_preserves_comment_hierarchy(page, app_server):
     expect(card.locator(".post-card-comments")).not_to_contain_text(f"{marker}-excluded")
     nested = card.locator(".post-card-comments .comment-replies .comment-text")
     expect(nested).to_contain_text(f"{marker}-reply")
-
-
-def _seed_news_with_orphaned_parent():
-    owner = str(uuid4())
-    get_table("users").insert(
-        {
-            "uid": owner,
-            "username": f"nopseed_{owner[:8]}",
-            "email": f"{owner[:8]}@nop.seed",
-            "password_hash": "x",
-            "role": "Member",
-            "is_active": True,
-            "created_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    uid = str(uuid4())
-    marker = f"newsop-{uid[:8]}"
-    get_table("news").insert(
-        {
-            "deleted_at": None,
-            "deleted_by": None,
-            "uid": uid,
-            "slug": make_combined_slug(marker, uid),
-            "title": marker,
-            "description": "News with orphaned parent hierarchy.",
-            "content": "Body.",
-            "url": "https://example.com/nop",
-            "source_name": "NOPSource",
-            "external_id": f"nop_{uid[:8]}",
-            "status": "published",
-            "show_on_landing": 0,
-            "grade": 10,
-            "synced_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    orphan_parent = str(uuid4())
-    base = datetime.now(timezone.utc)
-    rows = [
-        (f"{marker}-orphan-parent", orphan_parent, None, -3),
-        (f"{marker}-older", str(uuid4()), None, -2),
-        (f"{marker}-flat", str(uuid4()), None, -1),
-        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
-    ]
-    comments = get_table("comments")
-    for content, cuid, par, off in rows:
-        comments.insert(
-            {
-                "deleted_at": None,
-                "deleted_by": None,
-                "uid": cuid,
-                "target_type": "news",
-                "target_uid": uid,
-                "user_uid": owner,
-                "content": content,
-                "parent_uid": par,
-                "created_at": (base + timedelta(seconds=off)).isoformat(),
-            }
-        )
-    return marker
-
-
-def test_news_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
-    from playwright.sync_api import expect
-
-    marker = _seed_news_with_orphaned_parent()
-    page.goto(f"{BASE_URL}/news", wait_until="domcontentloaded")
-    card = page.locator(".news-card").filter(has_text=marker).first
-    card.wait_for(state="visible")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
-    nested = card.locator(".post-card-comments .comment-replies .comment-text")
-    expect(nested).to_contain_text(f"{marker}-reply")

tests/e2e/projects/index.py

@@ -1015,71 +1015,3 @@ def test_containers_menu_hidden_for_non_owner_admin_on_member_private_project(pa
     page.goto(f"{BASE_URL}/projects/{slug}", wait_until="domcontentloaded")
     page.locator(".project-actions-more").click()
     expect(page.locator(".context-menu-item:has-text('Containers')")).to_have_count(0)
-
-
-def _seed_project_with_orphaned_parent():
-    owner = str(uuid4())
-    get_table("users").insert(
-        {
-            "uid": owner,
-            "username": f"popseed_{owner[:8]}",
-            "email": f"{owner[:8]}@pop.seed",
-            "password_hash": "x",
-            "role": "Member",
-            "is_active": True,
-            "created_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    uid = str(uuid4())
-    marker = f"projop-{uid[:8]}"
-    get_table("projects").insert(
-        {
-            "deleted_at": None,
-            "deleted_by": None,
-            "uid": uid,
-            "user_uid": owner,
-            "slug": make_combined_slug(marker, uid),
-            "title": marker,
-            "description": "Project with orphaned parent hierarchy.",
-            "project_type": "software",
-            "platforms": "Linux",
-            "status": "Released",
-            "stars": 0,
-            "created_at": datetime.now(timezone.utc).isoformat(),
-        }
-    )
-    orphan_parent = str(uuid4())
-    base = datetime.now(timezone.utc)
-    rows = [
-        (f"{marker}-orphan-parent", orphan_parent, None, -3),
-        (f"{marker}-older", str(uuid4()), None, -2),
-        (f"{marker}-flat", str(uuid4()), None, -1),
-        (f"{marker}-reply", str(uuid4()), orphan_parent, 0),
-    ]
-    comments = get_table("comments")
-    for content, cuid, par, off in rows:
-        comments.insert(
-            {
-                "deleted_at": None,
-                "deleted_by": None,
-                "uid": cuid,
-                "target_type": "project",
-                "target_uid": uid,
-                "user_uid": owner,
-                "content": content,
-                "parent_uid": par,
-                "created_at": (base + timedelta(seconds=off)).isoformat(),
-            }
-        )
-    return marker
-
-
-def test_projects_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
-    marker = _seed_project_with_orphaned_parent()
-    page.goto(f"{BASE_URL}/projects", wait_until="domcontentloaded")
-    card = page.locator(".project-card").filter(has_text=marker).first
-    card.wait_for(state="visible")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
-    expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
-    nested = card.locator(".post-card-comments .comment-replies .comment-text")
-    expect(nested).to_contain_text(f"{marker}-reply")