ticket #90 attempt 1

devplacepy/routers/messages.py

@@ -19,6 +19,7 @@ from devplacepy.templating import clear_messages_cache
 from devplacepy.utils import (
     require_user,
     time_ago,
+    is_admin,
     _user_from_session,
     _user_from_api_key,
 )
@@ -152,6 +153,7 @@ 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/templates/_comment.html

@@ -1,4 +1,4 @@
-{% macro comment_cell(item, depth, parent_author=None) %}
+{% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
 <div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
@@ -26,6 +26,7 @@
         {% 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-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">&#x1F517;</span><span class="label"> Share</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>
             <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
@@ -39,21 +40,21 @@
 </div>
 {% endmacro %}
 
-{% macro render_comment(item, depth=0) %}
+{% macro render_comment(item, depth=0, parent_url=None) %}
 {% set max_depth = 2 %}
 {% set visual_depth = depth if depth < max_depth else max_depth %}
-{% call comment_cell(item, visual_depth) %}
+{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
     {% if item.children %}
     {% if depth < max_depth %}
     <div class="comment-replies">
         {% for child in item.children %}
-        {{ render_comment(child, depth + 1) }}
+        {{ render_comment(child, depth + 1, parent_url) }}
         {% endfor %}
     </div>
     {% else %}
     <div class="comment-replies comment-replies-flat">
         {% for child in item.children %}
-        {{ render_comment_flat(child, max_depth, item.author) }}
+        {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
         {% endfor %}
     </div>
     {% endif %}
@@ -61,9 +62,9 @@
 {% endcall %}
 {% endmacro %}
 
-{% macro render_comment_flat(item, depth, parent_author) %}
+{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
-{% call comment_cell(item, depth, parent_author) %}{% endcall %}
+{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
 {% for child in item.children %}
-{{ render_comment_flat(child, depth, item.author) }}
+{{ render_comment_flat(child, depth, item.author, parent_url) }}
 {% endfor %}
 {% endmacro %}

devplacepy/templates/_comment_section.html

@@ -3,8 +3,10 @@
 
     {% from "_comment.html" import render_comment with context %}
 
+    {% set parent_url = resolve_object_url(target_type, target_uid) %}
+
     {% for item in comments %}
-    {{ render_comment(item, 0) }}
+    {{ render_comment(item, 0, parent_url) }}
     {% else %}
     <p class="no-comments-msg">No comments yet. Start the discussion.</p>
     {% endfor %}

devplacepy/templating.py

@@ -9,6 +9,7 @@ from devplacepy.cache import TTLCache
 from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
 from devplacepy.constants import TOPICS, REACTION_EMOJI
 from devplacepy.database import get_int_setting, get_setting, get_table
+from devplacepy.database.content import resolve_object_url
 from devplacepy.avatar import avatar_url, avatar_seed
 from devplacepy.utils import format_date as _format_date
 from devplacepy.utils import time_ago as _time_ago
@@ -49,6 +50,7 @@ templates.env.globals["is_self"] = is_self
 templates.env.globals["guest_disabled"] = guest_disabled
 templates.env.globals["is_online"] = presence.is_online
 templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
+templates.env.globals["resolve_object_url"] = resolve_object_url
 
 from devplacepy.docs_devrant import devrant_endpoints
 

tests/api/messages/index.py

@@ -115,6 +115,7 @@ 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"):
@@ -179,56 +180,3 @@ 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']}"
-    )