ticket #87 attempt 1

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/static/js/ModalManager.js

@@ -29,7 +29,6 @@ export class ModalManager {
                 const modal = document.getElementById(modalId);
                 if (modal) {
                     modal.classList.add("visible");
-                    window.history.pushState({__overlay: true}, "");
                 }
             });
         });
@@ -38,13 +37,11 @@ export class ModalManager {
             modal.addEventListener("click", (e) => {
                 if (e.target === modal) {
                     modal.classList.remove("visible");
-                    window.history.back();
                 }
             });
             modal.querySelectorAll(".modal-close").forEach((closeBtn) => {
                 closeBtn.addEventListener("click", () => {
                     modal.classList.remove("visible");
-                    window.history.back();
                 });
             });
             this.enhanceModal(modal);
@@ -53,14 +50,6 @@ export class ModalManager {
         document.addEventListener("keydown", (e) => {
             if (e.key !== "Escape") return;
             const open = [...document.querySelectorAll(".modal-overlay.visible")].pop();
-            if (open) {
-                open.classList.remove("visible");
-                window.history.back();
-            }
-        });
-
-        window.addEventListener("popstate", () => {
-            const open = document.querySelector(".modal-overlay.visible");
             if (open) open.classList.remove("visible");
         });
     }

devplacepy/static/js/components/AppContextMenu.js

@@ -51,11 +51,6 @@ export class AppContextMenu extends Component {
         document.addEventListener("keydown", (e) => {
             if (e.key === "Escape") this.close();
         });
-        window.addEventListener("popstate", () => {
-            if (this.menu.classList.contains("visible")) {
-                this.menu.classList.remove("visible");
-            }
-        });
     }
 
     render(items) {
@@ -98,7 +93,6 @@ export class AppContextMenu extends Component {
         if (!items || !items.length) return;
         this.render(items);
         this.menu.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         const rect = this.menu.getBoundingClientRect();
         const vv = window.visualViewport;
         const safeW = vv ? vv.width : window.innerWidth;
@@ -117,7 +111,6 @@ export class AppContextMenu extends Component {
 
     close() {
         this.menu.classList.remove("visible");
-        window.history.back();
     }
 
     suppressNextClick() {

devplacepy/static/js/components/AppDialog.js

@@ -64,11 +64,6 @@ export class AppDialog extends Component {
                 this.dismiss();
             }
         });
-        window.addEventListener("popstate", () => {
-            if (this.overlay.classList.contains("visible")) {
-                this.overlay.classList.remove("visible");
-            }
-        });
         overlay.addEventListener("keydown", (e) => {
             if (e.key !== "Tab") return;
             const items = [
@@ -112,7 +107,6 @@ export class AppDialog extends Component {
 
         this.lastFocus = document.activeElement;
         this.overlay.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         const focusTarget = mode === "prompt" ? this.input : this.confirmBtn;
         setTimeout(() => {
             focusTarget.focus();
@@ -133,7 +127,6 @@ export class AppDialog extends Component {
 
     close(value) {
         this.overlay.classList.remove("visible");
-        window.history.back();
         if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
         const resolve = this.resolver;
         this.resolver = null;

devplacepy/static/js/components/AppLightbox.js

@@ -54,7 +54,6 @@ export class AppLightbox extends Component {
                 this.close();
             }
         });
-        window.addEventListener("popstate", () => this._onPopstate());
         this.overlay.addEventListener("keydown", (e) => {
             if (e.key === "Tab" && this.overlay.classList.contains("visible")) {
                 e.preventDefault();
@@ -78,23 +77,15 @@ export class AppLightbox extends Component {
         this.bodyOverflow = document.body.style.overflow;
         document.body.style.overflow = "hidden";
         this.overlay.classList.add("visible");
-        window.history.pushState({__overlay: true}, "");
         setTimeout(() => this.closeBtn.focus(), 20);
     }
 
     close() {
         this.overlay.classList.remove("visible");
-        window.history.back();
         this.image.src = "";
         document.body.style.overflow = this.bodyOverflow;
         if (this.lastFocus && this.lastFocus.focus) this.lastFocus.focus();
     }
-
-    _onPopstate() {
-        if (this.overlay.classList.contains("visible")) {
-            this.overlay.classList.remove("visible");
-        }
-    }
 }
 
 customElements.define("dp-lightbox", AppLightbox);

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']}"
+    )