Compare commits

..
Author SHA1 Message Date
Typosaurus ffdb25739c ticket #26 attempt 1 2026-07-19 19:57:50 +00:00
19 changed files with 327 additions and 74 deletions
File diff suppressed because one or more lines are too long
+30
View File
@@ -93,6 +93,36 @@ 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:
-18
View File
@@ -513,24 +513,6 @@ img {
display: inline-block;
}
.post-action-btn.is-loading,
.comment-vote-btn.is-loading,
.comment-action-btn.is-loading,
.comment-form-submit.is-loading,
.vote-star.is-loading,
.poll-option.is-loading {
pointer-events: none;
}
.post-action-btn.is-loading .btn-spinner,
.comment-vote-btn.is-loading .btn-spinner,
.comment-action-btn.is-loading .btn-spinner,
.comment-form-submit.is-loading .btn-spinner,
.vote-star.is-loading .btn-spinner,
.poll-option.is-loading .btn-spinner {
display: inline-block;
}
.badge {
display: inline-flex;
align-items: center;
+1 -1
View File
@@ -22,6 +22,6 @@ export class BookmarkManager extends OptimisticAction {
if (label) {
label.textContent = result.saved ? "Saved" : "Save";
}
}, button);
});
}
}
+5 -20
View File
@@ -23,10 +23,7 @@ export class CommentManager {
const wrapper = form.closest(".comment");
if (!wrapper) return;
const button = form.querySelector("button[type='submit']");
if (button) {
button.disabled = true;
button.classList.add("is-loading");
}
if (button) button.disabled = true;
const anchor = wrapper.previousElementSibling
&& wrapper.previousElementSibling.classList.contains("comment")
@@ -41,10 +38,7 @@ export class CommentManager {
wrapper.remove();
window.scrollTo({ top: Math.max(anchorTop, 0) });
} catch (err) {
if (button) {
button.disabled = false;
button.classList.remove("is-loading");
}
if (button) button.disabled = false;
}
}
@@ -124,10 +118,7 @@ export class CommentManager {
async submitEdit(form, text) {
const save = form.querySelector("button[type='submit']");
if (save) {
save.disabled = true;
save.classList.add("is-loading");
}
if (save) save.disabled = true;
const content = form.querySelector("textarea").value;
try {
const result = await Http.send(form.action, { content });
@@ -141,10 +132,7 @@ export class CommentManager {
form.remove();
text.style.display = "";
} catch (err) {
if (save) {
save.disabled = false;
save.classList.remove("is-loading");
}
if (save) save.disabled = false;
}
}
@@ -217,10 +205,7 @@ export class CommentManager {
}
form.addEventListener("submit", () => {
const btn = form.querySelector("button[type='submit']");
if (btn) {
btn.disabled = true;
btn.classList.add("is-loading");
}
if (btn) btn.disabled = true;
});
}
}
+2 -20
View File
@@ -4,11 +4,7 @@ import { Http } from "./Http.js";
import { Toast } from "./Toast.js";
export class OptimisticAction {
async submit(url, params, errorTarget, render, button = null) {
if (button) {
button.disabled = true;
button.classList.add("is-loading");
}
async submit(url, params, errorTarget, render) {
try {
const result = await Http.sendForm(url, params, { silent: true });
if (render) render(result);
@@ -17,19 +13,10 @@ export class OptimisticAction {
console.error("optimistic action failed", error);
if (errorTarget) Toast.flash(errorTarget, "Error", 1500);
return null;
} finally {
if (button) {
button.disabled = false;
button.classList.remove("is-loading");
}
}
}
async submitOptimistic(url, params, errorTarget, apply, revert, reconcile, button = null) {
if (button) {
button.disabled = true;
button.classList.add("is-loading");
}
async submitOptimistic(url, params, errorTarget, apply, revert, reconcile) {
apply();
try {
const result = await Http.sendForm(url, params, { silent: true });
@@ -40,11 +27,6 @@ export class OptimisticAction {
revert();
if (errorTarget) Toast.flash(errorTarget, "Error", 1500);
return null;
} finally {
if (button) {
button.disabled = false;
button.classList.remove("is-loading");
}
}
}
}
+1 -1
View File
@@ -42,7 +42,7 @@ export class PollManager extends OptimisticAction {
}
const pollUid = poll.dataset.pollUid;
const optionUid = option.dataset.optionUid;
await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, null, (result) => this.render(poll, result), option);
await this.submit(`/polls/${pollUid}/vote`, { option_uid: optionUid }, null, (result) => this.render(poll, result));
}
render(poll, result) {
+1 -1
View File
@@ -75,7 +75,7 @@ export class ReactionBar extends OptimisticAction {
const type = bar.dataset.reactionType;
const uid = bar.dataset.reactionUid;
const emoji = trigger.dataset.reactionEmoji;
await this.submit(`/reactions/${type}/${uid}`, { emoji }, null, (result) => this.render(bar, result), trigger);
await this.submit(`/reactions/${type}/${uid}`, { emoji }, null, (result) => this.render(bar, result));
this.closeAllPalettes();
}
-1
View File
@@ -34,7 +34,6 @@ export class VoteManager extends OptimisticAction {
() => this.render(action, { net: predictedNet, value: newValue }),
() => this.render(action, { net: prevNet, value: prevValue }),
(result) => this.render(action, result),
button,
);
}
+1 -1
View File
@@ -1,3 +1,3 @@
<button type="button" class="post-action-btn bookmark-btn{% if _bookmarked %} bookmarked{% endif %}" data-bookmark-type="{{ _type }}" data-bookmark-uid="{{ _uid }}" title="Save" aria-label="Save" aria-pressed="{% if _bookmarked %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>
<span class="btn-spinner" aria-hidden="true"></span><span class="bookmark-icon">&#x1F516;</span> <span class="bookmark-label">{% if _bookmarked %}Saved{% else %}Save{% endif %}</span>
<span class="bookmark-icon">&#x1F516;</span> <span class="bookmark-label">{% if _bookmarked %}Saved{% else %}Save{% endif %}</span>
</button>
+5 -5
View File
@@ -3,12 +3,12 @@
<div class="comment-votes" role="group" aria-label="Comment votes">
<form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
<input type="hidden" name="value" value="1">
<button type="submit" class="comment-vote-btn vote-up{% if item.my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if item.my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>+</button>
<button type="submit" class="comment-vote-btn vote-up{% if item.my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if item.my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>+</button>
</form>
<span class="comment-vote-count" data-vote-count="{{ item.comment['uid'] }}">{{ item.votes.up - item.votes.down }}</span>
<form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
<input type="hidden" name="value" value="-1">
<button type="submit" class="comment-vote-btn vote-down{% if item.my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if item.my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>-</button>
<button type="submit" class="comment-vote-btn vote-down{% if item.my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if item.my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>-</button>
</form>
</div>
@@ -25,11 +25,11 @@
{% include "_attachment_display.html" %}
{% endif %}
<div class="comment-actions">
<button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span><span class="icon">💬</span><span class="label"> Reply</span></button>
<button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
{% if owns(item.comment, user) %}
<button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">✏️</span><span class="label"> Edit</span></button>
<button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
<form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
<button type="submit" class="comment-action-btn" data-confirm="Delete this comment?"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">🗑️</span><span class="label"> Delete</span></button>
<button type="submit" class="comment-action-btn" data-confirm="Delete this comment?"><span class="icon">🗑️</span><span class="label"> Delete</span></button>
</form>
{% endif %}
{% set _type = "comment" %}{% set _uid = item.comment['uid'] %}{% set _reactions = item.reactions %}{% include "_reaction_bar.html" %}
+1 -1
View File
@@ -9,7 +9,7 @@
max-size="{{ max_upload_size_mb() }}"
max-files="{{ max_attachments_per_resource() }}"
allowed-types="{{ allowed_file_types() }}"></dp-upload>
<button type="submit" class="comment-form-submit"><span class="btn-spinner" aria-hidden="true"></span><span class="icon">&#x1F4E4;</span><span class="label"> Post</span></button>
<button type="submit" class="comment-form-submit"><span class="icon">&#x1F4E4;</span><span class="label"> Post</span></button>
</div>
</form>
{% else %}
-1
View File
@@ -4,7 +4,6 @@
<div class="poll-options" role="group" aria-label="Poll options">
{% for opt in _poll.options %}
<button type="button" class="poll-option{% if _poll.my_choice == opt.uid %} chosen{% endif %}" data-option-uid="{{ opt.uid }}" aria-pressed="{% if _poll.my_choice == opt.uid %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>
<span class="btn-spinner" aria-hidden="true"></span>
<span class="poll-option-bar" style="--poll-pct: {{ opt.pct }}%;"></span>
<span class="poll-option-label">{{ render_title(opt.label) }}</span>
<span class="poll-option-meta">
+2 -2
View File
@@ -1,11 +1,11 @@
<div class="post-votes" role="group" aria-label="Post votes">
<form method="POST" action="/votes/post/{{ _uid }}" class="inline-form">
<input type="hidden" name="value" value="-1">
<button type="submit" class="post-action-btn vote-down{% if _my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if _my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span></button>
<button type="submit" class="post-action-btn vote-down{% if _my_vote == -1 %} voted{% endif %}" aria-label="Downvote" title="Downvote" aria-pressed="{% if _my_vote == -1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}></button>
</form>
<span class="post-vote-count" data-vote-count="{{ _uid }}">{{ _count }}</span>
<form method="POST" action="/votes/post/{{ _uid }}" class="inline-form">
<input type="hidden" name="value" value="1">
<button type="submit" class="post-action-btn vote-up{% if _my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span>+</button>
<button type="submit" class="post-action-btn vote-up{% if _my_vote == 1 %} voted{% endif %}" aria-label="Upvote" title="Upvote" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}>+</button>
</form>
</div>
+1 -1
View File
@@ -1,4 +1,4 @@
<form method="POST" action="/votes/{{ _type }}/{{ _uid }}" class="inline-form"{% if _stop %} data-stop-propagation{% endif %}>
<input type="hidden" name="value" value="1">
<button type="submit" class="{{ _btn_class }} vote-star{% if _my_vote == 1 %} voted{% endif %}" aria-label="Star" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="btn-spinner" aria-hidden="true"></span><span class="vote-count-value" data-vote-count="{{ _uid }}">{{ _count }}</span></button>
<button type="submit" class="{{ _btn_class }} vote-star{% if _my_vote == 1 %} voted{% endif %}" aria-label="Star" aria-pressed="{% if _my_vote == 1 %}true{% else %}false{% endif %}"{{ guest_disabled(user) }}><span class="vote-count-value" data-vote-count="{{ _uid }}">{{ _count }}</span></button>
</form>
+69
View File
@@ -959,3 +959,72 @@ 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")
+67
View File
@@ -468,3 +468,70 @@ 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")
+72
View File
@@ -387,3 +387,75 @@ 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")
+68
View File
@@ -1015,3 +1015,71 @@ 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")