forked from retoor/devplacepy
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
35fb386be1 |
File diff suppressed because one or more lines are too long
@@ -360,6 +360,37 @@ def create_comment_record(
|
|||||||
comment_url,
|
comment_url,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if target_type == "post":
|
||||||
|
posts_table = get_table("posts")
|
||||||
|
post_record = posts_table.find_one(uid=target_uid)
|
||||||
|
if not post_record:
|
||||||
|
post_record = posts_table.find_one(slug=target_uid)
|
||||||
|
|
||||||
|
commenter_uids = set()
|
||||||
|
for c in get_table("comments").find(
|
||||||
|
target_type="post", target_uid=target_uid, deleted_at=None
|
||||||
|
):
|
||||||
|
commenter_uids.add(c["user_uid"])
|
||||||
|
|
||||||
|
commenter_uids.discard(user["uid"])
|
||||||
|
if post_record:
|
||||||
|
commenter_uids.discard(post_record["user_uid"])
|
||||||
|
if parent_uid:
|
||||||
|
parent_comment = get_table("comments").find_one(
|
||||||
|
uid=parent_uid, deleted_at=None
|
||||||
|
)
|
||||||
|
if parent_comment and parent_comment["user_uid"] != user["uid"]:
|
||||||
|
commenter_uids.discard(parent_comment["user_uid"])
|
||||||
|
|
||||||
|
for commenter_uid in commenter_uids:
|
||||||
|
create_notification(
|
||||||
|
commenter_uid,
|
||||||
|
"thread_comment",
|
||||||
|
f"{user['username']} also commented on a post you commented on",
|
||||||
|
user["uid"],
|
||||||
|
comment_url,
|
||||||
|
)
|
||||||
|
|
||||||
create_mention_notifications(content, user["uid"], comment_url)
|
create_mention_notifications(content, user["uid"], comment_url)
|
||||||
schedule_correction(user, "comments", comment_uid, request)
|
schedule_correction(user, "comments", comment_uid, request)
|
||||||
schedule_modification(user, "comments", comment_uid, request)
|
schedule_modification(user, "comments", comment_uid, request)
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ NOTIFICATION_TYPES = [
|
|||||||
{"key": "harvest_stolen", "label": "Farm raids", "description": "Someone steals a ready build from your Code Farm"},
|
{"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": "award", "label": "Awards", "description": "Someone gives you an award on your profile"},
|
||||||
{"key": "system", "label": "System alerts", "description": "Platform infrastructure alerts (e.g. the AI gateway going down)"},
|
{"key": "system", "label": "System alerts", "description": "Platform infrastructure alerts (e.g. the AI gateway going down)"},
|
||||||
|
{"key": "thread_comment", "label": "Thread comments", "description": "Someone else comments on a post you commented on"},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ from devplacepy.utils import (
|
|||||||
track_action,
|
track_action,
|
||||||
build_achievements,
|
build_achievements,
|
||||||
)
|
)
|
||||||
from devplacepy.utils.rewards import LEVEL_XP
|
|
||||||
from devplacepy.responses import respond, action_result, wants_json
|
from devplacepy.responses import respond, action_result, wants_json
|
||||||
from devplacepy.schemas import ProfileOut
|
from devplacepy.schemas import ProfileOut
|
||||||
from devplacepy.avatar import avatar_url, avatar_seed
|
from devplacepy.avatar import avatar_url, avatar_seed
|
||||||
@@ -381,10 +380,6 @@ async def profile_page(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
xp = profile_user.get("xp") or 0
|
|
||||||
xp_progress_pct = xp % LEVEL_XP
|
|
||||||
xp_next_level = ((xp // LEVEL_XP) + 1) * LEVEL_XP
|
|
||||||
|
|
||||||
return respond(
|
return respond(
|
||||||
request,
|
request,
|
||||||
"profile.html",
|
"profile.html",
|
||||||
@@ -444,8 +439,6 @@ async def profile_page(
|
|||||||
"awards_pagination": awards_pagination,
|
"awards_pagination": awards_pagination,
|
||||||
"awards_count": awards_count,
|
"awards_count": awards_count,
|
||||||
"prominent_award": prominent_award,
|
"prominent_award": prominent_award,
|
||||||
"xp_progress_pct": xp_progress_pct,
|
|
||||||
"xp_next_level": xp_next_level,
|
|
||||||
"can_give_award": can_give,
|
"can_give_award": can_give,
|
||||||
},
|
},
|
||||||
model=ProfileOut,
|
model=ProfileOut,
|
||||||
|
|||||||
@@ -80,8 +80,6 @@ class ProfileOut(_Out):
|
|||||||
awards_count: int = 0
|
awards_count: int = 0
|
||||||
prominent_award: Optional[AwardOut] = None
|
prominent_award: Optional[AwardOut] = None
|
||||||
can_give_award: bool = False
|
can_give_award: bool = False
|
||||||
xp_progress_pct: Optional[int] = None
|
|
||||||
xp_next_level: Optional[int] = None
|
|
||||||
|
|
||||||
|
|
||||||
class TelegramPairOut(_Out):
|
class TelegramPairOut(_Out):
|
||||||
|
|||||||
@@ -267,37 +267,6 @@ def test_activity_comment_card_renders_overlay_link(app_server):
|
|||||||
assert f'class="card-link" href="/posts/{post_slug}#comment-{comment_uid}"' in r.text
|
assert f'class="card-link" href="/posts/{post_slug}#comment-{comment_uid}"' in r.text
|
||||||
|
|
||||||
|
|
||||||
def test_profile_json_contains_xp_progress(app_server):
|
|
||||||
from devplacepy.database import get_table, refresh_snapshot
|
|
||||||
import time
|
|
||||||
|
|
||||||
name = f"xp{int(time.time() * 1000)}"
|
|
||||||
session = requests.Session()
|
|
||||||
session.post(
|
|
||||||
f"{BASE_URL}/auth/signup",
|
|
||||||
data={
|
|
||||||
"username": name,
|
|
||||||
"email": f"{name}@t.dev",
|
|
||||||
"password": "secret123",
|
|
||||||
"confirm_password": "secret123",
|
|
||||||
},
|
|
||||||
allow_redirects=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
user = get_table("users").find_one(username=name)
|
|
||||||
assert user is not None
|
|
||||||
get_table("users").update({"uid": user["uid"], "xp": 250}, ["uid"])
|
|
||||||
refresh_snapshot()
|
|
||||||
|
|
||||||
r = session.get(
|
|
||||||
f"{BASE_URL}/profile/{name}", headers={"Accept": "application/json"}
|
|
||||||
)
|
|
||||||
assert r.status_code == 200, f"status {r.status_code}: {r.text[:200]}"
|
|
||||||
body = r.json()
|
|
||||||
assert body["xp_progress_pct"] == 50
|
|
||||||
assert body["xp_next_level"] == 300
|
|
||||||
|
|
||||||
|
|
||||||
def test_profile_json_exposes_online_presence(app_server):
|
def test_profile_json_exposes_online_presence(app_server):
|
||||||
import time
|
import time
|
||||||
|
|
||||||
|
|||||||
@@ -384,6 +384,66 @@ def test_comment_notification_on_post(app_server, browser, seeded_db):
|
|||||||
ctx_b.close()
|
ctx_b.close()
|
||||||
|
|
||||||
|
|
||||||
|
def test_thread_comment_notification(app_server, browser, seeded_db):
|
||||||
|
from tests.conftest import login_user
|
||||||
|
|
||||||
|
ctx_a = browser.new_context(viewport={"width": 1400, "height": 900})
|
||||||
|
ctx_b = browser.new_context(viewport={"width": 1400, "height": 900})
|
||||||
|
pa = ctx_a.new_page()
|
||||||
|
pb = ctx_b.new_page()
|
||||||
|
pa.set_default_timeout(15000)
|
||||||
|
pb.set_default_timeout(15000)
|
||||||
|
|
||||||
|
login_user(pa, seeded_db["alice"])
|
||||||
|
login_user(pb, seeded_db["bob"])
|
||||||
|
|
||||||
|
pa.goto(f"{BASE_URL}/feed", wait_until="domcontentloaded")
|
||||||
|
pa.locator(".feed-fab").first.wait_for(state="visible", timeout=10000)
|
||||||
|
pa.locator(".feed-fab").first.click()
|
||||||
|
pa.fill("#post-content", "Post for thread comment notification test")
|
||||||
|
pa.locator("#create-post-modal button.btn-primary:has-text('Post')").click()
|
||||||
|
pa.wait_for_url("**/posts/*", timeout=10000, wait_until="domcontentloaded")
|
||||||
|
post_url = pa.url
|
||||||
|
|
||||||
|
pb.goto(post_url, wait_until="domcontentloaded")
|
||||||
|
pb.wait_for_timeout(1000)
|
||||||
|
comment_textarea = pb.locator("form.comment-form textarea[name='content']").first
|
||||||
|
comment_textarea.wait_for(state="visible", timeout=10000)
|
||||||
|
comment_textarea.fill("Bob's top-level comment")
|
||||||
|
pb.locator("button.comment-form-submit").first.click()
|
||||||
|
pb.wait_for_timeout(1500)
|
||||||
|
|
||||||
|
pb_body = pb.locator("body").text_content()
|
||||||
|
assert "Internal Server Error" not in pb_body, f"Bob got 500: {pb_body[:300]}"
|
||||||
|
|
||||||
|
pa.goto(post_url, wait_until="domcontentloaded")
|
||||||
|
pa.wait_for_timeout(1000)
|
||||||
|
comment_textarea = pa.locator("form.comment-form textarea[name='content']").first
|
||||||
|
comment_textarea.wait_for(state="visible", timeout=10000)
|
||||||
|
comment_textarea.fill("Alice also comments on her own post")
|
||||||
|
pa.locator("button.comment-form-submit").first.click()
|
||||||
|
pa.wait_for_timeout(1500)
|
||||||
|
|
||||||
|
pa_body = pa.locator("body").text_content()
|
||||||
|
assert "Internal Server Error" not in pa_body, f"Alice got 500: {pa_body[:300]}"
|
||||||
|
|
||||||
|
pb.goto(f"{BASE_URL}/notifications", wait_until="domcontentloaded")
|
||||||
|
pb.wait_for_timeout(2000)
|
||||||
|
body = pb.locator("body").text_content()
|
||||||
|
assert "Internal Server Error" not in body, (
|
||||||
|
f"Got 500 error on notifications: {body[:500]}"
|
||||||
|
)
|
||||||
|
assert "alice_test" in body, (
|
||||||
|
f"Expected 'alice_test' in notifications, got: {body[:500]}"
|
||||||
|
)
|
||||||
|
assert "also commented" in body, (
|
||||||
|
f"Expected 'also commented' in notifications, got: {body[:500]}"
|
||||||
|
)
|
||||||
|
|
||||||
|
ctx_a.close()
|
||||||
|
ctx_b.close()
|
||||||
|
|
||||||
|
|
||||||
def test_follow_notification(app_server, browser, seeded_db):
|
def test_follow_notification(app_server, browser, seeded_db):
|
||||||
from tests.conftest import login_user
|
from tests.conftest import login_user
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user