Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c6b87b77bb |
@@ -258,13 +258,13 @@ class NotificationDefaultForm(BaseModel):
|
||||
class AiCorrectionForm(BaseModel):
|
||||
enabled: bool = False
|
||||
sync: bool = False
|
||||
prompt: str = Field(default=DEFAULT_CORRECTION_PROMPT, max_length=20000)
|
||||
prompt: str = Field(default=DEFAULT_CORRECTION_PROMPT)
|
||||
|
||||
|
||||
class AiModifierForm(BaseModel):
|
||||
enabled: bool = False
|
||||
sync: bool = False
|
||||
prompt: str = Field(default=DEFAULT_MODIFIER_PROMPT, max_length=20000)
|
||||
prompt: str = Field(default=DEFAULT_MODIFIER_PROMPT)
|
||||
|
||||
|
||||
class InteractionsForm(BaseModel):
|
||||
|
||||
@@ -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}"
|
||||
)
|
||||
|
||||
@@ -61,7 +61,7 @@ AI_CORRECTION_ACTIONS: tuple[Action, ...] = (
|
||||
),
|
||||
arg(
|
||||
"prompt",
|
||||
"The correction instruction (max 20000 chars). Omit to keep the current one.",
|
||||
"The correction instruction. Omit to keep the current one.",
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -64,7 +64,7 @@ AI_MODIFIER_ACTIONS: tuple[Action, ...] = (
|
||||
),
|
||||
arg(
|
||||
"prompt",
|
||||
"The modifier instruction (max 20000 chars). Omit to keep the current one.",
|
||||
"The modifier instruction. Omit to keep the current one.",
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -70,7 +70,7 @@ class AiCorrectionController:
|
||||
if prompt_raw is None:
|
||||
prompt = user.get("ai_correction_prompt") or DEFAULT_CORRECTION_PROMPT
|
||||
else:
|
||||
prompt = str(prompt_raw).strip()[:20000] or DEFAULT_CORRECTION_PROMPT
|
||||
prompt = str(prompt_raw).strip() or DEFAULT_CORRECTION_PROMPT
|
||||
get_table("users").update(
|
||||
{
|
||||
"uid": self._owner_id,
|
||||
|
||||
@@ -70,7 +70,7 @@ class AiModifierController:
|
||||
if prompt_raw is None:
|
||||
prompt = user.get("ai_modifier_prompt") or DEFAULT_MODIFIER_PROMPT
|
||||
else:
|
||||
prompt = str(prompt_raw).strip()[:20000] or DEFAULT_MODIFIER_PROMPT
|
||||
prompt = str(prompt_raw).strip() or DEFAULT_MODIFIER_PROMPT
|
||||
get_table("users").update(
|
||||
{
|
||||
"uid": self._owner_id,
|
||||
|
||||
@@ -226,7 +226,7 @@
|
||||
<option value="sync" {% if ai_correction_sync %}selected{% endif %}>Synchronously (wait while saving)</option>
|
||||
</select>
|
||||
</div>
|
||||
<textarea data-ai-correction-prompt class="input-sm ai-correction-prompt" maxlength="20000" rows="3" aria-label="AI content correction prompt">{{ ai_correction_prompt }}</textarea>
|
||||
<textarea data-ai-correction-prompt class="input-sm ai-correction-prompt" rows="3" aria-label="AI content correction prompt">{{ ai_correction_prompt }}</textarea>
|
||||
<div class="customization-row">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-ai-correction-save>Save</button>
|
||||
<span class="ai-correction-status" data-ai-correction-status role="status" aria-live="polite"></span>
|
||||
@@ -251,7 +251,7 @@
|
||||
<option value="sync" {% if ai_modifier_sync %}selected{% endif %}>Synchronously (wait while saving)</option>
|
||||
</select>
|
||||
</div>
|
||||
<textarea data-ai-modifier-prompt class="input-sm ai-correction-prompt" maxlength="20000" rows="3" aria-label="AI modifier prompt">{{ ai_modifier_prompt }}</textarea>
|
||||
<textarea data-ai-modifier-prompt class="input-sm ai-correction-prompt" rows="3" aria-label="AI modifier prompt">{{ ai_modifier_prompt }}</textarea>
|
||||
<div class="customization-row">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-ai-modifier-save>Save</button>
|
||||
<span class="ai-correction-status" data-ai-modifier-status role="status" aria-live="polite"></span>
|
||||
|
||||
@@ -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']}"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user