Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3e12f9b27f |
File diff suppressed because one or more lines are too long
@@ -93,36 +93,6 @@ def get_recent_comments_by_target_uids(target_type, target_uids, limit=3, user=N
|
||||
raw = _drop_blocked(raw, user)
|
||||
if not raw:
|
||||
return {}
|
||||
|
||||
# Fetch missing parent comments so the threaded hierarchy is preserved even
|
||||
# when a parent is outside the row-number limit.
|
||||
if "comments" in db.tables:
|
||||
comments_table = db["comments"]
|
||||
current_uids = {c["uid"] for c in raw}
|
||||
seen = set(current_uids)
|
||||
to_fetch = []
|
||||
for c in raw:
|
||||
puid = c.get("parent_uid")
|
||||
if puid and puid not in seen:
|
||||
seen.add(puid)
|
||||
to_fetch.append(puid)
|
||||
if to_fetch:
|
||||
ancestors = []
|
||||
queue = list(to_fetch)
|
||||
fetched = set()
|
||||
while queue:
|
||||
uid = queue.pop(0)
|
||||
if uid in fetched or uid in current_uids:
|
||||
continue
|
||||
row = comments_table.find_one(uid=uid, deleted_at=None)
|
||||
if row:
|
||||
ancestors.append(row)
|
||||
fetched.add(uid)
|
||||
grandparent = row.get("parent_uid")
|
||||
if grandparent and grandparent not in fetched and grandparent not in current_uids:
|
||||
queue.append(grandparent)
|
||||
raw.extend(ancestors)
|
||||
|
||||
items = _build_comment_items(raw, user)
|
||||
by_target = defaultdict(list)
|
||||
for c in raw:
|
||||
|
||||
@@ -8,6 +8,11 @@ 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() {
|
||||
@@ -208,4 +213,41 @@ 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, ``);
|
||||
} catch (err) {
|
||||
Http.notifyError(err.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,48 @@ 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, ``);
|
||||
} catch (err) {
|
||||
Http.notifyError(err.message);
|
||||
}
|
||||
}
|
||||
|
||||
async submit(form) {
|
||||
|
||||
@@ -240,3 +240,17 @@ 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
|
||||
|
||||
@@ -959,72 +959,3 @@ def test_feed_scroll_not_restored_on_fresh_visit(alice):
|
||||
page.goto(f"{BASE_URL}/feed", wait_until="domcontentloaded")
|
||||
page.wait_for_timeout(600)
|
||||
assert page.evaluate("window.scrollY") < 60
|
||||
|
||||
|
||||
def _seed_post_with_orphaned_parent():
|
||||
owner = str(uuid4())
|
||||
get_table("users").insert(
|
||||
{
|
||||
"uid": owner,
|
||||
"username": f"opseed_{owner[:8]}",
|
||||
"email": f"{owner[:8]}@op.seed",
|
||||
"password_hash": "x",
|
||||
"role": "Member",
|
||||
"is_active": True,
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
post_uid = str(uuid4())
|
||||
marker = f"oppost-{post_uid[:8]}"
|
||||
get_table("posts").insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": post_uid,
|
||||
"user_uid": owner,
|
||||
"slug": make_combined_slug(marker, post_uid),
|
||||
"title": None,
|
||||
"content": marker,
|
||||
"topic": "devlog",
|
||||
"project_uid": None,
|
||||
"image": None,
|
||||
"stars": 0,
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
orphan_parent = str(uuid4())
|
||||
base = datetime.now(timezone.utc)
|
||||
rows = [
|
||||
(f"{marker}-orphan-parent", orphan_parent, None, -3),
|
||||
(f"{marker}-older", str(uuid4()), None, -2),
|
||||
(f"{marker}-flat", str(uuid4()), None, -1),
|
||||
(f"{marker}-reply", str(uuid4()), orphan_parent, 0),
|
||||
]
|
||||
comments = get_table("comments")
|
||||
for content, cuid, par, off in rows:
|
||||
comments.insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": cuid,
|
||||
"target_type": "post",
|
||||
"target_uid": post_uid,
|
||||
"post_uid": post_uid,
|
||||
"user_uid": owner,
|
||||
"content": content,
|
||||
"parent_uid": par,
|
||||
"created_at": (base + timedelta(seconds=off)).isoformat(),
|
||||
}
|
||||
)
|
||||
return marker
|
||||
|
||||
|
||||
def test_feed_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
|
||||
marker = _seed_post_with_orphaned_parent()
|
||||
page.goto(f"{BASE_URL}/feed", wait_until="domcontentloaded")
|
||||
card = page.locator(".post-card").filter(has_text=marker).first
|
||||
card.wait_for(state="visible")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
|
||||
nested = card.locator(".post-card-comments .comment-replies .comment-text")
|
||||
expect(nested).to_contain_text(f"{marker}-reply")
|
||||
|
||||
@@ -468,70 +468,3 @@ def test_gists_list_preserves_comment_hierarchy(page, app_server):
|
||||
expect(card.locator(".post-card-comments")).not_to_contain_text(f"{marker}-excluded")
|
||||
nested = card.locator(".post-card-comments .comment-replies .comment-text")
|
||||
expect(nested).to_contain_text(f"{marker}-reply")
|
||||
|
||||
|
||||
def _seed_gist_with_orphaned_parent():
|
||||
owner = str(uuid4())
|
||||
get_table("users").insert(
|
||||
{
|
||||
"uid": owner,
|
||||
"username": f"gopseed_{owner[:8]}",
|
||||
"email": f"{owner[:8]}@gop.seed",
|
||||
"password_hash": "x",
|
||||
"role": "Member",
|
||||
"is_active": True,
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
uid = str(uuid4())
|
||||
marker = f"gistop-{uid[:8]}"
|
||||
get_table("gists").insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": uid,
|
||||
"user_uid": owner,
|
||||
"slug": make_combined_slug(marker, uid),
|
||||
"title": marker,
|
||||
"description": "Gist with orphaned parent hierarchy.",
|
||||
"source_code": "print('x')",
|
||||
"language": "python",
|
||||
"stars": 0,
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
orphan_parent = str(uuid4())
|
||||
base = datetime.now(timezone.utc)
|
||||
rows = [
|
||||
(f"{marker}-orphan-parent", orphan_parent, None, -3),
|
||||
(f"{marker}-older", str(uuid4()), None, -2),
|
||||
(f"{marker}-flat", str(uuid4()), None, -1),
|
||||
(f"{marker}-reply", str(uuid4()), orphan_parent, 0),
|
||||
]
|
||||
comments = get_table("comments")
|
||||
for content, cuid, par, off in rows:
|
||||
comments.insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": cuid,
|
||||
"target_type": "gist",
|
||||
"target_uid": uid,
|
||||
"user_uid": owner,
|
||||
"content": content,
|
||||
"parent_uid": par,
|
||||
"created_at": (base + timedelta(seconds=off)).isoformat(),
|
||||
}
|
||||
)
|
||||
return marker
|
||||
|
||||
|
||||
def test_gists_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
|
||||
marker = _seed_gist_with_orphaned_parent()
|
||||
page.goto(f"{BASE_URL}/gists", wait_until="domcontentloaded")
|
||||
card = page.locator(".gist-card").filter(has_text=marker).first
|
||||
card.wait_for(state="visible")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
|
||||
nested = card.locator(".post-card-comments .comment-replies .comment-text")
|
||||
expect(nested).to_contain_text(f"{marker}-reply")
|
||||
|
||||
@@ -387,75 +387,3 @@ def test_news_list_preserves_comment_hierarchy(page, app_server):
|
||||
expect(card.locator(".post-card-comments")).not_to_contain_text(f"{marker}-excluded")
|
||||
nested = card.locator(".post-card-comments .comment-replies .comment-text")
|
||||
expect(nested).to_contain_text(f"{marker}-reply")
|
||||
|
||||
|
||||
def _seed_news_with_orphaned_parent():
|
||||
owner = str(uuid4())
|
||||
get_table("users").insert(
|
||||
{
|
||||
"uid": owner,
|
||||
"username": f"nopseed_{owner[:8]}",
|
||||
"email": f"{owner[:8]}@nop.seed",
|
||||
"password_hash": "x",
|
||||
"role": "Member",
|
||||
"is_active": True,
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
uid = str(uuid4())
|
||||
marker = f"newsop-{uid[:8]}"
|
||||
get_table("news").insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": uid,
|
||||
"slug": make_combined_slug(marker, uid),
|
||||
"title": marker,
|
||||
"description": "News with orphaned parent hierarchy.",
|
||||
"content": "Body.",
|
||||
"url": "https://example.com/nop",
|
||||
"source_name": "NOPSource",
|
||||
"external_id": f"nop_{uid[:8]}",
|
||||
"status": "published",
|
||||
"show_on_landing": 0,
|
||||
"grade": 10,
|
||||
"synced_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
orphan_parent = str(uuid4())
|
||||
base = datetime.now(timezone.utc)
|
||||
rows = [
|
||||
(f"{marker}-orphan-parent", orphan_parent, None, -3),
|
||||
(f"{marker}-older", str(uuid4()), None, -2),
|
||||
(f"{marker}-flat", str(uuid4()), None, -1),
|
||||
(f"{marker}-reply", str(uuid4()), orphan_parent, 0),
|
||||
]
|
||||
comments = get_table("comments")
|
||||
for content, cuid, par, off in rows:
|
||||
comments.insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": cuid,
|
||||
"target_type": "news",
|
||||
"target_uid": uid,
|
||||
"user_uid": owner,
|
||||
"content": content,
|
||||
"parent_uid": par,
|
||||
"created_at": (base + timedelta(seconds=off)).isoformat(),
|
||||
}
|
||||
)
|
||||
return marker
|
||||
|
||||
|
||||
def test_news_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
|
||||
from playwright.sync_api import expect
|
||||
|
||||
marker = _seed_news_with_orphaned_parent()
|
||||
page.goto(f"{BASE_URL}/news", wait_until="domcontentloaded")
|
||||
card = page.locator(".news-card").filter(has_text=marker).first
|
||||
card.wait_for(state="visible")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
|
||||
nested = card.locator(".post-card-comments .comment-replies .comment-text")
|
||||
expect(nested).to_contain_text(f"{marker}-reply")
|
||||
|
||||
@@ -1015,71 +1015,3 @@ def test_containers_menu_hidden_for_non_owner_admin_on_member_private_project(pa
|
||||
page.goto(f"{BASE_URL}/projects/{slug}", wait_until="domcontentloaded")
|
||||
page.locator(".project-actions-more").click()
|
||||
expect(page.locator(".context-menu-item:has-text('Containers')")).to_have_count(0)
|
||||
|
||||
|
||||
def _seed_project_with_orphaned_parent():
|
||||
owner = str(uuid4())
|
||||
get_table("users").insert(
|
||||
{
|
||||
"uid": owner,
|
||||
"username": f"popseed_{owner[:8]}",
|
||||
"email": f"{owner[:8]}@pop.seed",
|
||||
"password_hash": "x",
|
||||
"role": "Member",
|
||||
"is_active": True,
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
uid = str(uuid4())
|
||||
marker = f"projop-{uid[:8]}"
|
||||
get_table("projects").insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": uid,
|
||||
"user_uid": owner,
|
||||
"slug": make_combined_slug(marker, uid),
|
||||
"title": marker,
|
||||
"description": "Project with orphaned parent hierarchy.",
|
||||
"project_type": "software",
|
||||
"platforms": "Linux",
|
||||
"status": "Released",
|
||||
"stars": 0,
|
||||
"created_at": datetime.now(timezone.utc).isoformat(),
|
||||
}
|
||||
)
|
||||
orphan_parent = str(uuid4())
|
||||
base = datetime.now(timezone.utc)
|
||||
rows = [
|
||||
(f"{marker}-orphan-parent", orphan_parent, None, -3),
|
||||
(f"{marker}-older", str(uuid4()), None, -2),
|
||||
(f"{marker}-flat", str(uuid4()), None, -1),
|
||||
(f"{marker}-reply", str(uuid4()), orphan_parent, 0),
|
||||
]
|
||||
comments = get_table("comments")
|
||||
for content, cuid, par, off in rows:
|
||||
comments.insert(
|
||||
{
|
||||
"deleted_at": None,
|
||||
"deleted_by": None,
|
||||
"uid": cuid,
|
||||
"target_type": "project",
|
||||
"target_uid": uid,
|
||||
"user_uid": owner,
|
||||
"content": content,
|
||||
"parent_uid": par,
|
||||
"created_at": (base + timedelta(seconds=off)).isoformat(),
|
||||
}
|
||||
)
|
||||
return marker
|
||||
|
||||
|
||||
def test_projects_list_preserves_comment_hierarchy_with_orphaned_parent(page, app_server):
|
||||
marker = _seed_project_with_orphaned_parent()
|
||||
page.goto(f"{BASE_URL}/projects", wait_until="domcontentloaded")
|
||||
card = page.locator(".project-card").filter(has_text=marker).first
|
||||
card.wait_for(state="visible")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-orphan-parent")
|
||||
expect(card.locator(".post-card-comments")).to_contain_text(f"{marker}-reply")
|
||||
nested = card.locator(".post-card-comments .comment-replies .comment-text")
|
||||
expect(nested).to_contain_text(f"{marker}-reply")
|
||||
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
python3
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
/usr/bin/python3
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
python3
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
lib
|
||||
@@ -0,0 +1,5 @@
|
||||
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
|
||||
Reference in New Issue
Block a user