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/CommentManager.js

@@ -8,11 +8,6 @@ export class CommentManager {
         this.initCommentReply();
         this.initCommentEdit();
         this.initCommentDelete();
-        document.addEventListener("paste", (event) => {
-            const textarea = event.target.closest("form textarea[name='body'], form textarea[name='content']");
-            if (!textarea) return;
-            this._onPaste(event, textarea);
-        });
     }
 
     initCommentDelete() {
@@ -213,41 +208,4 @@ export class CommentManager {
             if (btn) btn.disabled = true;
         });
     }
-
-    _onPaste(event, textarea) {
-        const items = event.clipboardData?.items;
-        if (!items) return;
-        for (const item of items) {
-            if (item.kind === "file" && item.type.startsWith("image/")) {
-                event.preventDefault();
-                const file = item.getAsFile();
-                const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
-                this._uploadImage(namedFile, textarea);
-                break;
-            }
-        }
-    }
-
-    async _uploadImage(file, textarea) {
-        const formData = new FormData();
-        formData.append("file", file, file.name);
-        try {
-            const response = await fetch("/uploads/upload", {
-                method: "POST",
-                headers: {
-                    "Accept": "application/json",
-                    "X-Requested-With": "fetch",
-                },
-                body: formData,
-            });
-            if (!response.ok) {
-                const data = await response.json().catch(() => ({}));
-                throw new Error(data.error || `Upload failed (${response.status})`);
-            }
-            const result = await response.json();
-            window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
-        } catch (err) {
-            Http.notifyError(err.message);
-        }
-    }
 }

devplacepy/static/js/IssueReporter.js

@@ -12,48 +12,6 @@ export class IssueReporter {
             event.preventDefault();
             this.submit(form);
         });
-        document.addEventListener("paste", (event) => {
-            const textarea = event.target.closest("form[data-issue-create] [name='description']");
-            if (!textarea) return;
-            this._onPaste(event, textarea);
-        });
-    }
-
-    _onPaste(event, textarea) {
-        const items = event.clipboardData?.items;
-        if (!items) return;
-        for (const item of items) {
-            if (item.kind === "file" && item.type.startsWith("image/")) {
-                event.preventDefault();
-                const file = item.getAsFile();
-                const namedFile = new File([file], file.name || "clipboard.png", { type: file.type });
-                this._uploadImage(namedFile, textarea);
-                break;
-            }
-        }
-    }
-
-    async _uploadImage(file, textarea) {
-        const formData = new FormData();
-        formData.append("file", file, file.name);
-        try {
-            const response = await fetch("/uploads/upload", {
-                method: "POST",
-                headers: {
-                    "Accept": "application/json",
-                    "X-Requested-With": "fetch",
-                },
-                body: formData,
-            });
-            if (!response.ok) {
-                const data = await response.json().catch(() => ({}));
-                throw new Error(data.error || `Upload failed (${response.status})`);
-            }
-            const result = await response.json();
-            window.TextInput.insertAtCursor(textarea, `![](${result.url})`);
-        } catch (err) {
-            Http.notifyError(err.message);
-        }
     }
 
     async submit(form) {

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

tests/api/uploads/upload.py

@@ -240,17 +240,3 @@ def test_delete_own_allowed_other_user_forbidden(app_server):
     bob = _session_uploads()
     assert bob.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 403
     assert alice.delete(f"{BASE_URL}/uploads/delete/{uid}").status_code == 200
-
-
-def test_paste_image_upload_returns_url(app_server):
-    s = _session_uploads()
-    r = s.post(
-        f"{BASE_URL}/uploads/upload",
-        files={"file": ("clipboard.png", _png_bytes_uploads(), "image/png")},
-    )
-    assert r.status_code == 201, r.text
-    data = r.json()
-    assert "url" in data
-    assert data["url"].startswith("/static/uploads/attachments/")
-    assert data["uid"]
-    assert data["is_image"] is True

venv/bin/python

@@ -1 +0,0 @@
-python3

venv/bin/python3

@@ -1 +0,0 @@
-/usr/bin/python3

venv/bin/python3.11

@@ -1 +0,0 @@
-python3

venv/lib64

@@ -1 +0,0 @@
-lib

venv/pyvenv.cfg

@@ -1,5 +0,0 @@
-home = /usr/bin
-include-system-site-packages = false
-version = 3.11.2
-executable = /usr/bin/python3.11
-command = /usr/bin/python3 -m venv /workspace/repo/venv