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"},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ from fastapi import FastAPI, Request
|
|||||||
from fastapi.responses import HTMLResponse, RedirectResponse
|
from fastapi.responses import HTMLResponse, RedirectResponse
|
||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
from fastapi.exceptions import RequestValidationError
|
from fastapi.exceptions import RequestValidationError
|
||||||
|
from starlette.middleware.gzip import GZipMiddleware
|
||||||
from devplacepy.config import (
|
from devplacepy.config import (
|
||||||
STATIC_DIR,
|
STATIC_DIR,
|
||||||
STATIC_VERSION,
|
STATIC_VERSION,
|
||||||
@@ -609,6 +610,10 @@ async def response_timing(request: Request, call_next):
|
|||||||
response.headers["X-Response-Time"] = f"{(time.perf_counter() - start) * 1000:.1f}ms"
|
response.headers["X-Response-Time"] = f"{(time.perf_counter() - start) * 1000:.1f}ms"
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
|
app.add_middleware(GZipMiddleware, minimum_size=512, compresslevel=5)
|
||||||
|
|
||||||
|
|
||||||
_home_cache = TTLCache(ttl=int(os.environ.get("DEVPLACE_HOME_CACHE_TTL", "60")), max_size=4)
|
_home_cache = TTLCache(ttl=int(os.environ.get("DEVPLACE_HOME_CACHE_TTL", "60")), max_size=4)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ How a request flows through middleware to a router, how the database layer is bu
|
|||||||
|
|
||||||
## Middleware
|
## Middleware
|
||||||
|
|
||||||
Six HTTP middlewares run as a stack around every request, listed outermost first. `response_timing` is the outermost and `refresh_db_snapshot` the innermost. Compression is handled by nginx in production; the Python application does not compress responses itself.
|
Seven HTTP middlewares run as a stack around every request, listed outermost first. `response_timing` is the outermost, `refresh_db_snapshot` the innermost, and a `GZipMiddleware` (responses over 512 bytes) wraps the whole stack on top:
|
||||||
|
|
||||||
| Middleware (outermost first) | Responsibility |
|
| Middleware (outermost first) | Responsibility |
|
||||||
|------------|----------------|
|
|------------|----------------|
|
||||||
|
|||||||
+1
-2
@@ -4,8 +4,7 @@ version = "1.0.0"
|
|||||||
description = "DevPlace - The Developer Social Network"
|
description = "DevPlace - The Developer Social Network"
|
||||||
requires-python = ">=3.12"
|
requires-python = ">=3.12"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"fastapi>=0.110.0",
|
"fastapi",
|
||||||
"starlette>=0.37.0",
|
|
||||||
"uvicorn[standard]",
|
"uvicorn[standard]",
|
||||||
"jinja2",
|
"jinja2",
|
||||||
"python-multipart",
|
"python-multipart",
|
||||||
|
|||||||
@@ -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