ticket #87 attempt 1

devplacepy/database/notifications.py

@@ -18,7 +18,6 @@ NOTIFICATION_TYPES = [
     {"key": "reminder", "label": "Reminders", "description": "A reminder or scheduled task you asked Devii to run fires"},
     {"key": "harvest_stolen", "label": "Farm raids", "description": "Someone steals a ready build from your Code Farm"},
     {"key": "award", "label": "Awards", "description": "Someone gives you an award on your profile"},
-    {"key": "admin_alert", "label": "Admin alerts", "description": "System alerts requiring admin attention"},
 ]
 
 

devplacepy/routers/devii.py

@@ -23,7 +23,6 @@ from devplacepy.utils import (
     require_user,
 )
 from devplacepy.services.audit import record as audit
-from devplacepy.services.devii.quota import notify_admins_quota_blocked
 
 logger = logging.getLogger("devii.router")
 
@@ -280,7 +279,6 @@ async def devii_ws(websocket: WebSocket):
                         summary=f"AI request by {username or owner_id} blocked - 24h quota reached",
                         metadata={"limit_usd": limit, "owner_kind": owner_kind},
                     )
-                    notify_admins_quota_blocked(owner_kind, owner_id, username)
                     await websocket.send_json(
                         {
                             "type": "error",

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/services/devii/quota.py

@@ -1,26 +0,0 @@
-# retoor <retoor@molodetz.nl>
-
-import logging
-
-from devplacepy.database import get_table
-from devplacepy.utils.notifications import create_notification
-
-logger = logging.getLogger("devii.quota")
-
-ADMIN_ALERT_TYPE = "admin_alert"
-
-
-def notify_admins_quota_blocked(owner_kind: str, owner_id: str, username: str) -> None:
-    if owner_kind != "user":
-        return
-    admins = get_table("users").find(role="Admin")
-    for admin in admins:
-        if admin["uid"] == owner_id:
-            continue
-        create_notification(
-            admin["uid"],
-            ADMIN_ALERT_TYPE,
-            f"User {username} blocked - 24h AI quota reached",
-            owner_id,
-            "/admin/users",
-        )

devplacepy/services/telegram/bridge.py

@@ -10,7 +10,6 @@ from typing import Any
 
 from devplacepy.database import get_table
 from devplacepy.services.audit import record as audit
-from devplacepy.services.devii.quota import notify_admins_quota_blocked
 from devplacepy.services.manager import service_manager
 from devplacepy.utils import is_admin, is_primary_admin
 
@@ -401,7 +400,6 @@ class TelegramBridge:
                 summary=f"Telegram AI request by {user.get('username', owner_id)} blocked - 24h quota reached",
                 metadata={"limit_usd": limit},
             )
-            notify_admins_quota_blocked("user", owner_id, user.get("username", ""))
             await self._service.send(
                 chat_id, "Your daily AI quota is reached (100%). Please try again later."
             )

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