ticket #87 attempt 1

devplacepy/content.py

@@ -1,6 +1,5 @@
 # retoor <retoor@molodetz.nl>
 import logging
-import re
 from typing import Any
 from datetime import datetime, timezone
 from fastapi.responses import RedirectResponse
@@ -56,12 +55,6 @@ 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__)
 
 
@@ -205,8 +198,6 @@ 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
 
 
@@ -388,8 +379,6 @@ 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
 
 
@@ -446,7 +435,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, source: str = "manual"
+    request, user: dict, target_type: str, target_uid: str, saved: bool
 ) -> bool:
     bookmarks = get_table("bookmarks")
     existing = bookmarks.find_one(
@@ -469,7 +458,6 @@ def set_bookmark(
                     "created_at": datetime.now(timezone.utc).isoformat(),
                     "deleted_at": None,
                     "deleted_by": None,
-                    "source": source,
                 }
             )
             changed = True

devplacepy/database/schema.py

@@ -243,12 +243,6 @@ 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,28 +152,6 @@ 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,13 +31,10 @@ LABEL_BY_TYPE: dict[str, str] = {
 
 
 @router.get("/saved", response_class=HTMLResponse)
-async def saved_page(request: Request, before: str = None, source: str = None):
+async def saved_page(request: Request, before: str = None):
     user = require_user(request)
     bookmarks = get_table("bookmarks")
-    filters: dict = {"user_uid": user["uid"]}
+    rows, next_cursor = paginate(bookmarks, before=before, 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:
@@ -88,7 +85,6 @@ async def saved_page(request: Request, before: str = None, source: 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, source="manual")
+    set_bookmark(request, user, "post", post["uid"], saved)
     return dr_ok()
 
 

devplacepy/routers/messages.py

@@ -19,7 +19,6 @@ from devplacepy.templating import clear_messages_cache
 from devplacepy.utils import (
     require_user,
     time_ago,
-    is_admin,
     _user_from_session,
     _user_from_api_key,
 )
@@ -153,7 +152,6 @@ async def messages_page(request: Request, with_uid: str = None, search: str = ""
     other_last_seen = None
     if with_uid:
         messages, other_user = get_conversation_messages(user["uid"], with_uid)
-        mark_conversation_read(user["uid"], with_uid)
         mark_notifications_read_by_target(
             user["uid"], f"/messages?with_uid={with_uid}"
         )

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

@@ -65,13 +65,6 @@ 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,40 +2,10 @@
 {% 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">
@@ -44,13 +14,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, or add <code>@note</code> to your post or comment to auto-save it.</div>
+        <div class="empty-state">Nothing saved yet. Use the Save button on posts, gists, projects and news.</div>
         {% endfor %}
     </div>
 
     {% if next_cursor %}
     <div class="load-more-wrap">
-        <a href="/bookmarks/saved?before={{ next_cursor }}{% if current_source %}&source={{ current_source }}{% endif %}" class="btn btn-secondary">Load more</a>
+        <a href="/bookmarks/saved?before={{ next_cursor }}" class="btn btn-secondary">Load more</a>
     </div>
     {% endif %}
 </div>

tests/api/bookmarks/saved.py

@@ -76,50 +76,3 @@ 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/api/messages/index.py

@@ -115,7 +115,6 @@ def _seed_news_audit_log():
     )
     refresh_snapshot()
     return uid
-from devplacepy.database import get_table
 JSON_content_negotiation = {"Accept": "application/json"}
 _counter_content_negotiation = [0]
 def _session_content_negotiation(password="secret123"):
@@ -180,3 +179,56 @@ def test_messages_conversation_list_avatar_has_presence_dot(app_server):
     assert "conversation-item" in html
     assert "presence-dot" in html
     assert f'data-presence-uid="{other_uid}"' in html
+
+
+def test_notification_open_does_not_mark_messages_read(app_server, seeded_db):
+    """Regression: opening a DM notification must NOT mark the conversation read.
+    The GET /messages?with_uid=... handler should NOT call mark_conversation_read;
+    only the WebSocket markRead mechanism should do that.
+    """
+    sender, sender_name = _member()
+    receiver, receiver_name = _member()
+
+    refresh_snapshot()
+    sender_user = _db_user(sender_name)
+    receiver_user = _db_user(receiver_name)
+
+    send_resp = sender.post(
+        f"{BASE_URL}/messages/send",
+        data={"receiver_uid": receiver_user["uid"], "content": "DM that must stay unread"},
+        allow_redirects=True,
+    )
+    assert send_resp.status_code == 200, send_resp.text[:300]
+
+    refresh_snapshot()
+    msg = get_table("messages").find_one(
+        sender_uid=sender_user["uid"], receiver_uid=receiver_user["uid"]
+    )
+    assert msg is not None, "message should exist"
+    assert msg["read"] == 0, f"expected read=0 after send, got {msg['read']}"
+
+    n_uid = generate_uid()
+    get_table("notifications").insert({
+        "uid": n_uid,
+        "user_uid": receiver_user["uid"],
+        "type": "message",
+        "message": "sent you a message",
+        "related_uid": sender_user["uid"],
+        "target_url": f"/messages?with_uid={sender_user['uid']}",
+        "read": False,
+        "created_at": datetime.now(timezone.utc).isoformat(),
+    })
+
+    receiver.get(f"{BASE_URL}/notifications/open/{n_uid}", allow_redirects=True)
+
+    refresh_snapshot()
+    n = get_table("notifications").find_one(uid=n_uid)
+    assert n is not None, "notification should exist"
+    assert n["read"] in (1, True, "1"), "notification should be marked read"
+
+    refresh_snapshot()
+    msg_after = get_table("messages").find_one(uid=msg["uid"])
+    assert msg_after is not None, "message should still exist"
+    assert msg_after["read"] == 0, (
+        f"expected read=0 after notification open, got {msg_after['read']}"
+    )