ticket #95 attempt 2

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/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/static/css/base.css

@@ -513,6 +513,24 @@ img {
     display: inline-block;
 }
 
+.post-action-btn.is-loading,
+.comment-vote-btn.is-loading,
+.comment-action-btn.is-loading,
+.comment-form-submit.is-loading,
+.vote-star.is-loading,
+.poll-option.is-loading {
+    pointer-events: none;
+}
+
+.post-action-btn.is-loading .btn-spinner,
+.comment-vote-btn.is-loading .btn-spinner,
+.comment-action-btn.is-loading .btn-spinner,
+.comment-form-submit.is-loading .btn-spinner,
+.vote-star.is-loading .btn-spinner,
+.poll-option.is-loading .btn-spinner {
+    display: inline-block;
+}
+
 .badge {
     display: inline-flex;
     align-items: center;

devplacepy/static/js/BookmarkManager.js

@@ -22,6 +22,6 @@ export class BookmarkManager extends OptimisticAction {
             if (label) {
                 label.textContent = result.saved ? "Saved" : "Save";
             }
-        });
+        }, button);
     }
 }

devplacepy/static/js/CommentManager.js

@@ -23,7 +23,10 @@ export class CommentManager {
         const wrapper = form.closest(".comment");
         if (!wrapper) return;
         const button = form.querySelector("button[type='submit']");
-        if (button) button.disabled = true;
+        if (button) {
+            button.disabled = true;
+            button.classList.add("is-loading");
+        }
 
         const anchor = wrapper.previousElementSibling
             && wrapper.previousElementSibling.classList.contains("comment")
@@ -38,7 +41,10 @@ export class CommentManager {
             wrapper.remove();
             window.scrollTo({ top: Math.max(anchorTop, 0) });
         } catch (err) {
-            if (button) button.disabled = false;
+            if (button) {
+                button.disabled = false;
+                button.classList.remove("is-loading");
+            }
         }
     }
 
@@ -118,7 +124,10 @@ export class CommentManager {
 
     async submitEdit(form, text) {
         const save = form.querySelector("button[type='submit']");
-        if (save) save.disabled = true;
+        if (save) {
+            save.disabled = true;
+            save.classList.add("is-loading");
+        }
         const content = form.querySelector("textarea").value;
         try {
             const result = await Http.send(form.action, { content });
@@ -132,7 +141,10 @@ export class CommentManager {
             form.remove();
             text.style.display = "";
         } catch (err) {
-            if (save) save.disabled = false;
+            if (save) {
+                save.disabled = false;
+                save.classList.remove("is-loading");
+            }
         }
     }
 
@@ -205,7 +217,10 @@ export class CommentManager {
         }
         form.addEventListener("submit", () => {
             const btn = form.querySelector("button[type='submit']");
-            if (btn) btn.disabled = true;
+            if (btn) {
+                btn.disabled = true;
+                btn.classList.add("is-loading");
+            }
         });
     }
 }

devplacepy/static/js/OptimisticAction.js

@@ -4,7 +4,11 @@ import { Http } from "./Http.js";
 import { Toast } from "./Toast.js";
 
 export class OptimisticAction {
-    async submit(url, params, errorTarget, render) {
+    async submit(url, params, errorTarget, render, button = null) {
+        if (button) {
+            button.disabled = true;
+            button.classList.add("is-loading");
+        }
         try {
             const result = await Http.sendForm(url, params, { silent: true });
             if (render) render(result);
@@ -13,10 +17,19 @@ export class OptimisticAction {
             console.error("optimistic action failed", error);
             if (errorTarget) Toast.flash(errorTarget, "Error", 1500);
             return null;
+        } finally {
+            if (button) {
+                button.disabled = false;
+                button.classList.remove("is-loading");
+            }
         }
     }
 
-    async submitOptimistic(url, params, errorTarget, apply, revert, reconcile) {
+    async submitOptimistic(url, params, errorTarget, apply, revert, reconcile, button = null) {
+        if (button) {
+            button.disabled = true;
+            button.classList.add("is-loading");
+        }
         apply();
         try {
             const result = await Http.sendForm(url, params, { silent: true });
@@ -27,6 +40,11 @@ export class OptimisticAction {
             revert();
             if (errorTarget) Toast.flash(errorTarget, "Error", 1500);
             return null;
+        } finally {
+            if (button) {
+                button.disabled = false;
+                button.classList.remove("is-loading");
+            }
         }
     }
 }

devplacepy/static/js/PollManager.js

@@ -42,7 +42,7 @@ export class PollManager extends OptimisticAction {
         }
         const pollUid = poll.dataset.pollUid;
         const optionUid = option.dataset.optionUid;
-        await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, null, (result) => this.render(poll, result));
+        await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, null, (result) => this.render(poll, result), option);
     }
 
     render(poll, result) {

devplacepy/static/js/ReactionBar.js

@@ -75,7 +75,7 @@ export class ReactionBar extends OptimisticAction {
         const type = bar.dataset.reactionType;
         const uid = bar.dataset.reactionUid;
         const emoji = trigger.dataset.reactionEmoji;
-        await this.submit(`/reactions/${type}/${uid}`, { emoji }, null, (result) => this.render(bar, result));
+        await this.submit(`/reactions/${type}/${uid}`, { emoji }, null, (result) => this.render(bar, result), trigger);
         this.closeAllPalettes();
     }
 

devplacepy/static/js/VoteManager.js

@@ -34,6 +34,7 @@ export class VoteManager extends OptimisticAction {
             () => this.render(action, { net: predictedNet, value: newValue }),
             () => this.render(action, { net: prevNet, value: prevValue }),
             (result) => this.render(action, result),
+            button,
         );
     }
 

devplacepy/templates/_bookmark_button.html

@@ -1,3 +1,3 @@
 <button type="button" class="post-action-btn bookmark-btn{% if _bookmarked %} bookmarked{% endif %}" data-bookmark-type="{{ _type }}" data-bookmark-uid="{{ _uid }}" title="Save" aria-label="Save" aria-pressed="{% if _bookmarked %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>
-    <span class="bookmark-icon">&#x1F516;</span> <span class="bookmark-label">{% if _bookmarked %}Saved{% else %}Save{% endif %}</span>
+    <span class="btn-spinner" aria-hidden="true"></span><span class="bookmark-icon">&#x1F516;</span> <span class="bookmark-label">{% if _bookmarked %}Saved{% else %}Save{% endif %}</span>
 </button>

devplacepy/templates/_comment.html

@@ -3,12 +3,12 @@
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
             <input type="hidden" name="value" value="1">
-            <button type="submit" class="comment-vote-btn vote-up{% if item.my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if item.my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>+</button>
+            <button type="submit" class="comment-vote-btn vote-up{% if item.my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if item.my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>+</button>
         </form>
         <span class="comment-vote-count" data-vote-count="{{ item.comment['uid'] }}">{{ item.votes.up - item.votes.down }}</span>
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
             <input type="hidden" name="value" value="-1">
-            <button type="submit" class="comment-vote-btn vote-down{% if item.my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if item.my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>-</button>
+            <button type="submit" class="comment-vote-btn vote-down{% if item.my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if item.my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>-</button>
         </form>
     </div>
 
@@ -25,11 +25,11 @@
         {% include "_attachment_display.html" %}
         {% endif %}
         <div class="comment-actions">
-            <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
+            <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span><span class="icon">💬</span><span class="label"> Reply</span></button>
             {% if owns(item.comment, user) %}
-            <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
+            <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">✏️</span><span class="label"> Edit</span></button>
             <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
-                <button type="submit" class="comment-action-btn" data-confirm="Delete this comment?"><span class="icon">🗑️</span><span class="label"> Delete</span></button>
+                <button type="submit" class="comment-action-btn" data-confirm="Delete this comment?"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">🗑️</span><span class="label"> Delete</span></button>
             </form>
             {% endif %}
             {% set _type = "comment" %}{% set _uid = item.comment['uid'] %}{% set _reactions = item.reactions %}{% include "_reaction_bar.html" %}

devplacepy/templates/_comment_form.html

@@ -9,7 +9,7 @@
             max-size="{{ max_upload_size_mb() }}"
             max-files="{{ max_attachments_per_resource() }}"
             allowed-types="{{ allowed_file_types() }}"></dp-upload>
-        <button type="submit" class="comment-form-submit"><span class="icon">&#x1F4E4;</span><span class="label"> Post</span></button>
+        <button type="submit" class="comment-form-submit"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">&#x1F4E4;</span><span class="label"> Post</span></button>
     </div>
 </form>
 {% else %}

devplacepy/templates/_poll.html

@@ -4,6 +4,7 @@
     <div class="poll-options" role="group" aria-label="Poll options">
         {% for opt in _poll.options %}
         <button type="button" class="poll-option{% if _poll.my_choice == opt.uid %} chosen{% endif %}" data-option-uid="{{ opt.uid }}" aria-pressed="{% if _poll.my_choice == opt.uid %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>
+            <span class="btn-spinner" aria-hidden="true"></span>
             <span class="poll-option-bar" style="--poll-pct: {{ opt.pct }}%;"></span>
             <span class="poll-option-label">{{ render_title(opt.label) }}</span>
             <span class="poll-option-meta">

devplacepy/templates/_post_votes.html

@@ -1,11 +1,11 @@
 <div class="post-votes" role="group" aria-label="Post votes">
     <form method="POST" action="/votes/post/{{ _uid }}" class="inline-form">
         <input type="hidden" name="value" value="-1">
-        <button type="submit" class="post-action-btn vote-down{% if _my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if _my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>−</button>
+        <button type="submit" class="post-action-btn vote-down{% if _my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if _my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>−</button>
     </form>
     <span class="post-vote-count" data-vote-count="{{ _uid }}">{{ _count }}</span>
     <form method="POST" action="/votes/post/{{ _uid }}" class="inline-form">
         <input type="hidden" name="value" value="1">
-        <button type="submit" class="post-action-btn vote-up{% if _my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>+</button>
+        <button type="submit" class="post-action-btn vote-up{% if _my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>+</button>
     </form>
 </div>

devplacepy/templates/_star_vote.html

@@ -1,4 +1,4 @@
 <form method="POST" action="/votes/{{ _type }}/{{ _uid }}" class="inline-form"{% if _stop %} data-stop-propagation{% endif %}>
     <input type="hidden" name="value" value="1">
-    <button type="submit" class="{{ _btn_class }} vote-star{% if _my_vote == 1 %} voted{% endif %}" aria-label="Star" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="vote-count-value" data-vote-count="{{ _uid }}">{{ _count }}</span></button>
+    <button type="submit" class="{{ _btn_class }} vote-star{% if _my_vote == 1 %} voted{% endif %}" aria-label="Star" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span><span class="vote-count-value" data-vote-count="{{ _uid }}">{{ _count }}</span></button>
 </form>

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