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/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/services/xmlrpc/__init__.py

@@ -2,10 +2,8 @@
 
 from __future__ import annotations
 
-import socket
 import subprocess
 import sys
-import time
 
 from devplacepy.config import XMLRPC_BIND, XMLRPC_PORT
 from devplacepy.services.base import BaseService
@@ -27,48 +25,20 @@ class XmlrpcService(BaseService):
     def __init__(self) -> None:
         super().__init__("xmlrpc", interval_seconds=XMLRPC_INTERVAL_SECONDS)
         self._process: subprocess.Popen | None = None
-        self._last_stderr: str | None = None
 
     def _alive(self) -> bool:
         return self._process is not None and self._process.poll() is None
 
     def _spawn(self) -> None:
-        self._last_stderr = None
         self._process = subprocess.Popen(
             [sys.executable, "-m", SERVER_MODULE],
             stdout=subprocess.DEVNULL,
-            stderr=subprocess.PIPE,
+            stderr=subprocess.DEVNULL,
         )
         self.log(
-            f"Forking XML-RPC server spawning (pid {self._process.pid}) on "
+            f"Forking XML-RPC server started (pid {self._process.pid}) on "
             f"{XMLRPC_BIND}:{XMLRPC_PORT}"
         )
-        time.sleep(0.5)
-        if self._process.poll() is not None:
-            stderr_data = self._process.communicate()[1]
-            if stderr_data:
-                self._last_stderr = stderr_data.decode("utf-8", errors="replace")
-            self.log(
-                f"Forking XML-RPC server died after spawn (pid {self._process.pid}, "
-                f"exit code {self._process.returncode})"
-            )
-            if self._last_stderr:
-                for line in self._last_stderr.strip().split("\n"):
-                    self.log(f"  stderr: {line}")
-            return
-        try:
-            sock = socket.create_connection((XMLRPC_BIND, XMLRPC_PORT), timeout=1)
-            sock.close()
-        except (OSError, socket.timeout):
-            self.log(
-                f"Forking XML-RPC server not yet ready (pid {self._process.pid}) "
-                f"on {XMLRPC_BIND}:{XMLRPC_PORT}"
-            )
-        else:
-            self.log(
-                f"Forking XML-RPC server started (pid {self._process.pid}) on "
-                f"{XMLRPC_BIND}:{XMLRPC_PORT}"
-            )
 
     def _terminate(self) -> None:
         if not self._alive():
@@ -95,13 +65,6 @@ class XmlrpcService(BaseService):
             self.log(f"XML-RPC server healthy (pid {self._process.pid})")
             return
         self.log("XML-RPC server not running, starting it")
-        if self._process is not None:
-            self.log(
-                f"Previous process exited with code {self._process.returncode}"
-            )
-            if self._last_stderr:
-                for line in self._last_stderr.strip().split("\n"):
-                    self.log(f"  last stderr: {line}")
         self._spawn()
 
     def collect_metrics(self) -> dict:

devplacepy/services/xmlrpc/server.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-import sys
 from socketserver import ForkingMixIn
 from xmlrpc.server import SimpleXMLRPCDispatcher, SimpleXMLRPCRequestHandler, SimpleXMLRPCServer
 
@@ -117,9 +116,6 @@ def main() -> None:
         server.serve_forever()
     except KeyboardInterrupt:
         logger.info("XML-RPC server interrupted")
-    except Exception:
-        logging.exception("XML-RPC server crashed with unhandled exception")
-        sys.exit(1)
     finally:
         server.server_close()
 

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