Autoplay videos and GIFs
diff --git a/tests/e2e/mockServer.js b/tests/e2e/mockServer.js
index 8a193da4..229399c7 100644
--- a/tests/e2e/mockServer.js
+++ b/tests/e2e/mockServer.js
@@ -120,9 +120,12 @@ export class MockServer {
// Seeded/captured improSearchHistoryPref state; null means the preference
// is absent from getPreferences and no putPreferences has written it.
this.searchHistory = null;
+ // Seeded/captured app.bsky.actor.defs#threadViewPref; null means absent.
+ this.threadViewPref = null;
this.getProfilesDelayMs = 0;
this.getStarterPackDelayMs = 0;
this.putPreferencesDelayMs = 0;
+ this.getPreferencesDelayMs = 0;
// Override the source served for the local test plugin's main.js; defaults
// to the standard fixture when null.
this.localPluginSource = null;
@@ -565,6 +568,10 @@ export class MockServer {
}
}
+ setThreadViewPref(threadViewPref) {
+ this.threadViewPref = threadViewPref;
+ }
+
setPostThreadOther(postUri, threadOther) {
this.postThreadOthers.set(postUri, threadOther);
}
@@ -1138,92 +1145,108 @@ export class MockServer {
}),
);
- await page.route("**/xrpc/app.bsky.actor.getPreferences*", (route) =>
- route.fulfill({
- status: 200,
- contentType: "application/json",
- body: JSON.stringify({
- preferences: [
- {
- $type: "app.bsky.actor.defs#savedFeedsPrefV2",
- items: [
- {
- type: "timeline",
- value: "following",
- pinned: true,
- id: "timeline-following",
- },
- ...this.pinnedFeedUris.map((uri) => ({
- type: "feed",
- value: uri,
- pinned: true,
- id: uri,
- })),
- ...this.pinnedListUris.map((uri) => ({
- type: "list",
- value: uri,
- pinned: true,
- id: uri,
- })),
- ...this.savedFeedUris.map((uri) => ({
- type: "feed",
- value: uri,
- pinned: false,
- id: uri,
- })),
- ],
- },
- ...(this.hiddenPostUris.length > 0
- ? [
- {
- $type: "app.bsky.actor.defs#improHiddenPostsPref",
- items: this.hiddenPostUris,
- },
- ]
- : []),
- ...(this.searchHistory
- ? [
- {
- $type: "app.bsky.actor.defs#improSearchHistoryPref",
- ...this.searchHistory,
- },
- ]
- : []),
- ...(this.labelerSubscriptions.length > 0
- ? [
- {
- $type: "app.bsky.actor.defs#labelersPref",
- labelers: this.labelerSubscriptions.map((did) => ({
- did,
- })),
- },
- ]
- : []),
- ...this.contentLabelPrefs,
- ...(this.mutedWords.length > 0
- ? [
- {
- $type: "app.bsky.actor.defs#mutedWordsPref",
- items: this.mutedWords,
- },
- ]
- : []),
- ...[...this.pluginSettings.entries()].map(([pluginId, data]) => ({
- $type: "app.bsky.actor.defs#improPluginSettingsPref",
- pluginId,
- data,
- })),
- ...(this.installedPlugins.length > 0
- ? [
+ await page.route(
+ "**/xrpc/app.bsky.actor.getPreferences*",
+ async (route) => {
+ if (this.getPreferencesDelayMs > 0) {
+ await new Promise((resolve) =>
+ setTimeout(resolve, this.getPreferencesDelayMs),
+ );
+ }
+ return route.fulfill({
+ status: 200,
+ contentType: "application/json",
+ body: JSON.stringify({
+ preferences: [
+ {
+ $type: "app.bsky.actor.defs#savedFeedsPrefV2",
+ items: [
{
- $type: "app.bsky.actor.defs#improInstalledPluginsPref",
- plugins: this.installedPlugins,
+ type: "timeline",
+ value: "following",
+ pinned: true,
+ id: "timeline-following",
},
- ]
- : []),
- ],
- }),
- }),
+ ...this.pinnedFeedUris.map((uri) => ({
+ type: "feed",
+ value: uri,
+ pinned: true,
+ id: uri,
+ })),
+ ...this.pinnedListUris.map((uri) => ({
+ type: "list",
+ value: uri,
+ pinned: true,
+ id: uri,
+ })),
+ ...this.savedFeedUris.map((uri) => ({
+ type: "feed",
+ value: uri,
+ pinned: false,
+ id: uri,
+ })),
+ ],
+ },
+ ...(this.hiddenPostUris.length > 0
+ ? [
+ {
+ $type: "app.bsky.actor.defs#improHiddenPostsPref",
+ items: this.hiddenPostUris,
+ },
+ ]
+ : []),
+ ...(this.searchHistory
+ ? [
+ {
+ $type: "app.bsky.actor.defs#improSearchHistoryPref",
+ ...this.searchHistory,
+ },
+ ]
+ : []),
+ ...(this.threadViewPref
+ ? [
+ {
+ $type: "app.bsky.actor.defs#threadViewPref",
+ ...this.threadViewPref,
+ },
+ ]
+ : []),
+ ...(this.labelerSubscriptions.length > 0
+ ? [
+ {
+ $type: "app.bsky.actor.defs#labelersPref",
+ labelers: this.labelerSubscriptions.map((did) => ({
+ did,
+ })),
+ },
+ ]
+ : []),
+ ...this.contentLabelPrefs,
+ ...(this.mutedWords.length > 0
+ ? [
+ {
+ $type: "app.bsky.actor.defs#mutedWordsPref",
+ items: this.mutedWords,
+ },
+ ]
+ : []),
+ ...[...this.pluginSettings.entries()].map(([pluginId, data]) => ({
+ $type: "app.bsky.actor.defs#improPluginSettingsPref",
+ pluginId,
+ data,
+ })),
+ ...(this.installedPlugins.length > 0
+ ? [
+ {
+ $type: "app.bsky.actor.defs#improInstalledPluginsPref",
+ plugins: this.installedPlugins,
+ },
+ ]
+ : []),
+ ],
+ }),
+ });
+ },
);
await page.route("**/xrpc/app.bsky.labeler.getServices*", (route) => {
@@ -3144,6 +3167,13 @@ export class MockServer {
profiles: searchHistoryPref.profiles || [],
};
}
+ const threadViewPref = body?.preferences?.find(
+ (p) => p.$type === "app.bsky.actor.defs#threadViewPref",
+ );
+ if (threadViewPref) {
+ const { $type, ...rest } = threadViewPref;
+ this.threadViewPref = rest;
+ }
const labelersPref = body?.preferences?.find(
(p) => p.$type === "app.bsky.actor.defs#labelersPref",
);
diff --git a/tests/e2e/specs/views/postThread.view.test.js b/tests/e2e/specs/views/postThread.view.test.js
index b585a6bb..bbd6778d 100644
--- a/tests/e2e/specs/views/postThread.view.test.js
+++ b/tests/e2e/specs/views/postThread.view.test.js
@@ -1,10 +1,8 @@
import { test, expect } from "../../base.js";
import { login } from "../../helpers.js";
import { MockServer } from "../../mockServer.js";
-import {
- createPost,
- createThreadViewPost,
-} from "../../../shared/factories.js";
+import { userProfile } from "../../testData.js";
+import { createPost, createThreadViewPost } from "../../../shared/factories.js";
const postUri = "at://did:plc:author1/app.bsky.feed.post/abc123";
@@ -979,7 +977,9 @@ test.describe("Post thread view", () => {
});
await expect(view).toContainText("This is the main post");
await expect(
- view.locator('[data-testid="large-post"] [data-testid="repost-button"]'),
+ view.locator(
+ '[data-testid="large-post"] [data-testid="repost-button"]',
+ ),
).toBeVisible();
await expect(
view.locator('[data-testid="thread-load-error"]'),
@@ -1031,7 +1031,9 @@ test.describe("Post thread view", () => {
});
await expect(view).toContainText("This is the main post");
await expect(
- view.locator('[data-testid="large-post"] [data-testid="repost-button"]'),
+ view.locator(
+ '[data-testid="large-post"] [data-testid="repost-button"]',
+ ),
).not.toBeAttached();
await expect(
view.locator('[data-testid="thread-load-error"]'),
@@ -1276,6 +1278,339 @@ test.describe("Post thread view", () => {
});
});
+ test.describe("Threaded view", () => {
+ // Builds a linear reply chain under the main post: reply depth 1 → depth n
+ function setupReplyChain(mockServer, depth) {
+ const replies = Array.from({ length: depth }).map((_, index) =>
+ createPost({
+ uri: `at://did:plc:nested${index}/app.bsky.feed.post/nested${index}`,
+ text: `Nested reply ${index + 1}`,
+ authorHandle: `nested${index}.bsky.social`,
+ replyCount: index < depth - 1 ? 1 : 0,
+ }),
+ );
+ let node = null;
+ for (const reply of replies.toReversed()) {
+ node = createThreadViewPost({
+ post: reply,
+ replies: node ? [node] : [],
+ });
+ }
+ const anchorPost = createPost({
+ uri: postUri,
+ text: "Threaded main post",
+ authorHandle: "author1.bsky.social",
+ replyCount: 2,
+ });
+ const siblingReply = createPost({
+ uri: "at://did:plc:sibling/app.bsky.feed.post/sibling",
+ text: "Sibling reply",
+ authorHandle: "sibling.bsky.social",
+ likeCount: 0,
+ });
+ mockServer.addPosts([anchorPost, siblingReply, ...replies]);
+ mockServer.setPostThread(
+ postUri,
+ createThreadViewPost({
+ post: anchorPost,
+ replies: [
+ node,
+ createThreadViewPost({ post: siblingReply, replies: [] }),
+ ],
+ }),
+ );
+ return replies;
+ }
+
+ test("should render replies as a linear reply chain by default", async ({
+ page,
+ }) => {
+ const mockServer = new MockServer();
+ setupReplyChain(mockServer, 3);
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/profile/author1.bsky.social/post/abc123");
+
+ const view = page.locator("#post-detail-view");
+ await expect(view.locator(".post-thread-reply-chains")).toBeVisible({
+ timeout: 10000,
+ });
+ await expect(
+ view.locator('[data-testid="post-thread-tree"]'),
+ ).not.toBeAttached();
+ });
+
+ test("should render nested replies as a tree when enabled", async ({
+ page,
+ }) => {
+ const mockServer = new MockServer();
+ mockServer.setThreadViewPref({ lab_treeViewEnabled: true });
+ setupReplyChain(mockServer, 3);
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/profile/author1.bsky.social/post/abc123");
+
+ const view = page.locator("#post-detail-view");
+ const tree = view.locator('[data-testid="post-thread-tree"]');
+ await expect(tree).toBeVisible({ timeout: 10000 });
+ const rows = tree.locator('[data-testid="thread-tree-reply"]');
+ await expect(rows).toHaveCount(4);
+ await expect(
+ rows.evaluateAll((elements) =>
+ elements.map((element) => element.dataset.depth),
+ ),
+ ).resolves.toEqual(["1", "2", "3", "1"]);
+ await expect(
+ tree.locator('[data-testid="thread-read-more"]'),
+ ).not.toBeAttached();
+ });
+
+ test("should cap a reply's children and add read more rows deepest first", async ({
+ page,
+ }) => {
+ const anchorPost = createPost({
+ uri: postUri,
+ text: "Threaded main post",
+ authorHandle: "author1.bsky.social",
+ replyCount: 1,
+ });
+ const children = Array.from({ length: 12 }).map((_, index) =>
+ createPost({
+ uri: `at://did:plc:child${index}/app.bsky.feed.post/child${index}`,
+ text: `Child reply ${index}`,
+ authorHandle: `child${index}.bsky.social`,
+ likeCount: 12 - index,
+ // The last child that fits under the cap has replies the server didn't return
+ replyCount: index === 9 ? 2 : 0,
+ }),
+ );
+ const topReply = createPost({
+ uri: "at://did:plc:top/app.bsky.feed.post/top",
+ text: "Top reply",
+ authorHandle: "top.bsky.social",
+ replyCount: 12,
+ });
+ const mockServer = new MockServer();
+ mockServer.setThreadViewPref({ lab_treeViewEnabled: true });
+ mockServer.addPosts([anchorPost, topReply, ...children]);
+ mockServer.setPostThread(
+ postUri,
+ createThreadViewPost({
+ post: anchorPost,
+ replies: [
+ createThreadViewPost({
+ post: topReply,
+ replies: children.map((child) =>
+ createThreadViewPost({ post: child, replies: [] }),
+ ),
+ }),
+ ],
+ }),
+ );
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/profile/author1.bsky.social/post/abc123");
+
+ const tree = page.locator(
+ '#post-detail-view [data-testid="post-thread-tree"]',
+ );
+ await expect(tree).toBeVisible({ timeout: 10000 });
+ await expect(
+ tree.locator('[data-testid="thread-tree-reply"][data-depth="2"]'),
+ ).toHaveCount(10);
+ await expect(tree).not.toContainText("Child reply 10");
+ const readMoreLinks = tree.locator('[data-testid="thread-read-more"]');
+ await expect(
+ readMoreLinks.evaluateAll((links) =>
+ links.map((link) => link.getAttribute("href")),
+ ),
+ ).resolves.toEqual([
+ "/profile/did:plc:child9/post/child9",
+ "/profile/did:plc:top/post/top",
+ ]);
+ });
+
+ test("should show hidden replies with their visible replies in the hidden section", async ({
+ page,
+ }) => {
+ const anchorPost = createPost({
+ uri: postUri,
+ text: "Threaded main post",
+ authorHandle: "author1.bsky.social",
+ replyCount: 2,
+ });
+ const normalReply = createPost({
+ uri: "at://did:plc:normal/app.bsky.feed.post/normal",
+ text: "Normal reply",
+ authorHandle: "normal.bsky.social",
+ });
+ const mutedReply = createPost({
+ uri: "at://did:plc:muted/app.bsky.feed.post/muted",
+ text: "Reply from muted user",
+ authorHandle: "muted.bsky.social",
+ authorViewer: { muted: true },
+ replyCount: 1,
+ });
+ const replyToMuted = createPost({
+ uri: "at://did:plc:child/app.bsky.feed.post/child",
+ text: "Reply to the muted user",
+ authorHandle: "child.bsky.social",
+ });
+ const mockServer = new MockServer();
+ mockServer.setThreadViewPref({ lab_treeViewEnabled: true });
+ mockServer.addPosts([anchorPost, normalReply, mutedReply, replyToMuted]);
+ mockServer.setPostThread(
+ postUri,
+ createThreadViewPost({
+ post: anchorPost,
+ replies: [
+ createThreadViewPost({ post: normalReply, replies: [] }),
+ createThreadViewPost({
+ post: mutedReply,
+ replies: [
+ createThreadViewPost({ post: replyToMuted, replies: [] }),
+ ],
+ }),
+ ],
+ }),
+ );
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/profile/author1.bsky.social/post/abc123");
+
+ const view = page.locator("#post-detail-view");
+ const tree = view.locator('[data-testid="post-thread-tree"]');
+ await expect(tree).toContainText("Normal reply", { timeout: 10000 });
+ await expect(tree).not.toContainText("Reply from muted user");
+ await expect(tree).not.toContainText("Reply to the muted user");
+
+ const hiddenSection = view.locator("hidden-replies-section");
+ await hiddenSection.locator(".hidden-replies-button").click();
+ const hiddenRows = hiddenSection.locator(
+ '[data-testid="thread-tree-reply"]',
+ );
+ await expect(hiddenRows).toHaveCount(2);
+ await expect(hiddenRows.nth(0)).toContainText("Reply from muted user");
+ await expect(hiddenRows.nth(1)).toHaveAttribute("data-depth", "2");
+ await expect(hiddenRows.nth(1)).toContainText("Reply to the muted user");
+ });
+
+ test("should keep the read more link after deleting a loaded reply", async ({
+ page,
+ }) => {
+ const anchorPost = createPost({
+ uri: postUri,
+ text: "Threaded main post",
+ authorHandle: "author1.bsky.social",
+ replyCount: 1,
+ });
+ const topReply = createPost({
+ uri: "at://did:plc:top/app.bsky.feed.post/top",
+ text: "Top reply",
+ authorHandle: "top.bsky.social",
+ replyCount: 3,
+ });
+ const replyRef = {
+ parent: { uri: topReply.uri, cid: topReply.cid },
+ root: { uri: anchorPost.uri, cid: anchorPost.cid },
+ };
+ const ownReply = createPost({
+ uri: `at://${userProfile.did}/app.bsky.feed.post/own`,
+ text: "My reply to delete",
+ authorHandle: userProfile.handle,
+ likeCount: 10,
+ reply: replyRef,
+ });
+ const otherReply = createPost({
+ uri: "at://did:plc:other/app.bsky.feed.post/other",
+ text: "Other reply",
+ authorHandle: "other.bsky.social",
+ reply: replyRef,
+ });
+ const mockServer = new MockServer();
+ mockServer.setThreadViewPref({ lab_treeViewEnabled: true });
+ mockServer.addPosts([anchorPost, topReply, ownReply, otherReply]);
+ mockServer.setPostThread(
+ postUri,
+ createThreadViewPost({
+ post: anchorPost,
+ replies: [
+ createThreadViewPost({
+ post: topReply,
+ replies: [
+ createThreadViewPost({ post: ownReply, replies: [] }),
+ createThreadViewPost({ post: otherReply, replies: [] }),
+ ],
+ }),
+ ],
+ }),
+ );
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/profile/author1.bsky.social/post/abc123");
+
+ const tree = page.locator(
+ '#post-detail-view [data-testid="post-thread-tree"]',
+ );
+ const nestedRows = tree.locator(
+ '[data-testid="thread-tree-reply"][data-depth="2"]',
+ );
+ await expect(nestedRows).toHaveCount(2, { timeout: 10000 });
+ const readMore = tree.locator('[data-testid="thread-read-more"]');
+ await expect(readMore).toHaveAttribute(
+ "href",
+ "/profile/did:plc:top/post/top",
+ );
+
+ await nestedRows.nth(0).locator(".text-button").click();
+ await page.locator('[data-testid="menu-action-post-delete"]').click();
+ await page.locator("button.confirm-button").click();
+
+ await expect(nestedRows).toHaveCount(1);
+ await expect(readMore).toHaveAttribute(
+ "href",
+ "/profile/did:plc:top/post/top",
+ );
+ });
+
+ test.describe("on mobile", () => {
+ test.use({ viewport: { width: 375, height: 667 } });
+
+ test("should cut deep replies off with a read more link", async ({
+ page,
+ }) => {
+ const mockServer = new MockServer();
+ mockServer.setThreadViewPref({ lab_treeViewEnabled: true });
+ setupReplyChain(mockServer, 5);
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/profile/author1.bsky.social/post/abc123");
+
+ const tree = page.locator(
+ '#post-detail-view [data-testid="post-thread-tree"]',
+ );
+ await expect(tree).toBeVisible({ timeout: 10000 });
+ await expect(
+ tree.locator('[data-testid="thread-tree-reply"][data-depth="4"]'),
+ ).toHaveCount(1);
+ await expect(
+ tree.locator('[data-testid="thread-tree-reply"][data-depth="5"]'),
+ ).toHaveCount(0);
+ const readMore = tree.locator('[data-testid="thread-read-more"]');
+ await expect(readMore).toHaveAttribute(
+ "href",
+ "/profile/did:plc:nested3/post/nested3",
+ );
+ });
+ });
+ });
+
test.describe("Hidden replies section", () => {
test("should place muted account replies in the hidden section", async ({
page,
@@ -2420,7 +2755,11 @@ test.describe("Post thread view", () => {
root,
replyCount: 2,
});
- const third = opPost("third1", { text: "Third post", parent: second, root });
+ const third = opPost("third1", {
+ text: "Third post",
+ parent: second,
+ root,
+ });
const other = createPost({
uri: "at://did:plc:other/app.bsky.feed.post/other1",
text: "Someone else's reply",
diff --git a/tests/e2e/specs/views/settings/contentAndMedia.view.test.js b/tests/e2e/specs/views/settings/contentAndMedia.view.test.js
index 359e4e4b..27f10aec 100644
--- a/tests/e2e/specs/views/settings/contentAndMedia.view.test.js
+++ b/tests/e2e/specs/views/settings/contentAndMedia.view.test.js
@@ -78,4 +78,49 @@ test.describe("Settings Content and media view", () => {
),
).not.toHaveAttribute("checked", { timeout: 10000 });
});
+
+ test("should save threaded replies to preferences and keep it after a reload", async ({
+ page,
+ }) => {
+ const mockServer = new MockServer();
+ mockServer.setThreadViewPref({ sort: "top" });
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/settings/content-and-media");
+
+ const view = page.locator("#settings-content-and-media-view");
+ const toggle = view.locator('[data-testid="thread-view-toggle"]');
+ await expect(toggle).toBeVisible({ timeout: 10000 });
+ await expect(toggle).not.toHaveAttribute("checked");
+ await toggle.click();
+ await expect(toggle).toHaveAttribute("checked", "");
+ await expect
+ .poll(() => mockServer.threadViewPref)
+ .toEqual({ sort: "top", lab_treeViewEnabled: true });
+
+ await page.reload();
+ await expect(
+ page.locator(
+ '#settings-content-and-media-view [data-testid="thread-view-toggle"]',
+ ),
+ ).toHaveAttribute("checked", "", { timeout: 10000 });
+ });
+
+ test("should disable the threaded replies toggle until preferences load", async ({
+ page,
+ }) => {
+ const mockServer = new MockServer();
+ mockServer.getPreferencesDelayMs = 1000;
+ await mockServer.setup(page);
+
+ await login(page);
+ await page.goto("/settings/content-and-media");
+
+ const toggle = page.locator(
+ '#settings-content-and-media-view [data-testid="thread-view-toggle"]',
+ );
+ await expect(toggle).toHaveAttribute("disabled", "", { timeout: 10000 });
+ await expect(toggle).not.toHaveAttribute("disabled", { timeout: 10000 });
+ });
});
diff --git a/tests/unit/specs/dataHelpers.test.js b/tests/unit/specs/dataHelpers.test.js
index c6886949..8acce640 100644
--- a/tests/unit/specs/dataHelpers.test.js
+++ b/tests/unit/specs/dataHelpers.test.js
@@ -7,6 +7,7 @@ import {
cdnImageUrl,
getPostNumberingForPostThread,
createNestedThreadViewPost,
+ insertReplyIntoThread,
getRKey,
getIsLiked,
isListFeed,
@@ -2863,3 +2864,46 @@ describe("isReferenceList", () => {
assert.deepEqual(isReferenceList(null), false);
});
});
+
+describe("insertReplyIntoThread", () => {
+ const newReply = createThreadViewPost({
+ post: createPost({ uri: "at://did:plc:me/app.bsky.feed.post/new" }),
+ replies: [],
+ });
+
+ function threadNode(id, replies = []) {
+ return createThreadViewPost({
+ post: createPost({ uri: `at://did:plc:x/app.bsky.feed.post/${id}` }),
+ replies,
+ });
+ }
+
+ it("prepends the reply under a nested match and copies only the changed path", () => {
+ const untouched = threadNode("untouched");
+ const target = threadNode("target", [threadNode("existing")]);
+ const thread = threadNode("root", [untouched, threadNode("mid", [target])]);
+ const updated = insertReplyIntoThread(
+ thread,
+ "at://did:plc:x/app.bsky.feed.post/target",
+ newReply,
+ );
+ assert.notEqual(updated, thread);
+ assert.equal(updated.replies[0], untouched);
+ const updatedTarget = updated.replies[1].replies[0];
+ assert.deepEqual(updatedTarget.replies.length, 2);
+ assert.equal(updatedTarget.replies[0], newReply);
+ assert.deepEqual(target.replies.length, 1);
+ });
+
+ it("returns the same thread when no post matches", () => {
+ const thread = threadNode("root", [threadNode("a")]);
+ assert.equal(
+ insertReplyIntoThread(
+ thread,
+ "at://did:plc:x/app.bsky.feed.post/nope",
+ newReply,
+ ),
+ thread,
+ );
+ });
+});
diff --git a/tests/unit/specs/dataLayer/derived.test.js b/tests/unit/specs/dataLayer/derived.test.js
index 2603d39b..7ca194ea 100644
--- a/tests/unit/specs/dataLayer/derived.test.js
+++ b/tests/unit/specs/dataLayer/derived.test.js
@@ -3071,3 +3071,19 @@ describe("thread mute hydration", () => {
assert.equal(derived.$hydratedPosts.get(rootUri).viewer, undefined);
});
});
+
+describe("$threadView", () => {
+ it("is null until preferences load, then reflects the thread view preference", () => {
+ const { derived } = makeDerived(new DataStore(createSessionState(null)));
+ derived.preferencesProvider.$preferences.set(null);
+ assert.equal(derived.$threadView.get(), null);
+
+ derived.preferencesProvider.$preferences.set(new Preferences([], []));
+ assert.equal(derived.$threadView.get(), "linear");
+
+ derived.preferencesProvider.$preferences.set(
+ new Preferences([], []).setThreadView("tree"),
+ );
+ assert.equal(derived.$threadView.get(), "tree");
+ });
+});
diff --git a/tests/unit/specs/dataLayer/mutations.test.js b/tests/unit/specs/dataLayer/mutations.test.js
index e5e336d0..930bbe1a 100644
--- a/tests/unit/specs/dataLayer/mutations.test.js
+++ b/tests/unit/specs/dataLayer/mutations.test.js
@@ -2462,6 +2462,66 @@ describe("pinFeed", () => {
});
});
+describe("setThreadView", () => {
+ function setup({ updatePreferences }) {
+ const preferences = new Preferences([], []);
+ const mockPreferencesProvider = {
+ requirePreferences: () => preferences,
+ updatePreferences,
+ };
+ const dataStore = new DataStore(createSessionState(null));
+ const patchStore = new PatchStore();
+ const mutations = makeMutations(
+ {},
+ dataStore,
+ patchStore,
+ mockPreferencesProvider,
+ );
+ return { mutations, patchStore };
+ }
+
+ it("should save the thread view and apply an optimistic patch until it resolves", async () => {
+ let updateResolve;
+ let updatedPreferences = null;
+ const { mutations, patchStore } = setup({
+ updatePreferences: (prefs) => {
+ updatedPreferences = prefs;
+ return new Promise((resolve) => {
+ updateResolve = resolve;
+ });
+ },
+ });
+
+ const promise = mutations.setThreadView("tree");
+ const patches = patchStore.$preferencePatches.get();
+ assert.deepEqual(patches.length, 1);
+ assert.deepEqual(patches[0].body, { type: "setThreadView", view: "tree" });
+ assert.deepEqual(
+ patchStore
+ .applyPreferencePatches(new Preferences([], []), patches)
+ .getThreadView(),
+ "tree",
+ );
+
+ await new Promise((resolve) => setTimeout(resolve, 0));
+ updateResolve();
+ await promise;
+ assert.deepEqual(updatedPreferences.getThreadView(), "tree");
+ assert.deepEqual(patchStore.$preferencePatches.get().length, 0);
+ });
+
+ it("should remove the patch and rethrow when saving fails", async (t) => {
+ t.mock.method(console, "error", () => {});
+ const { mutations, patchStore } = setup({
+ updatePreferences: async () => {
+ throw new Error("network");
+ },
+ });
+ await assert.rejects(mutations.setThreadView("tree"), /network/);
+ assert.deepEqual(patchStore.$preferencePatches.get().length, 0);
+ });
+});
+
describe("unpinFeed", () => {
const feedUri = "at://did:plc:feed/app.bsky.feed.generator/cool";
@@ -3328,6 +3388,61 @@ describe("createThread", () => {
assert.deepEqual(repliesFeed.feed[0].post.uri, newPostUri);
});
+ it("should insert the reply under a nested post in cached threads", async () => {
+ const rootUri = "at://did:plc:other/app.bsky.feed.post/root";
+ const nestedUri = "at://did:plc:other/app.bsky.feed.post/nested";
+ const siblingUri = "at://did:plc:other/app.bsky.feed.post/sibling";
+ const replyTo = { uri: nestedUri, cid: "cid-nested" };
+ const rootThread = {
+ $type: "app.bsky.feed.defs#threadViewPost",
+ post: { uri: rootUri },
+ replies: [
+ {
+ $type: "app.bsky.feed.defs#threadViewPost",
+ post: { uri: siblingUri },
+ replies: [],
+ },
+ {
+ $type: "app.bsky.feed.defs#threadViewPost",
+ post: replyTo,
+ replies: [],
+ },
+ ],
+ };
+ const { mutations, dataStore } = setup({ replyPostThread: rootThread });
+ const siblingNode = rootThread.replies[0];
+
+ await mutations.createThread({
+ posts: [{ postText: "hi" }],
+ replyTo,
+ replyRoot: { uri: rootUri, cid: "cid-root" },
+ });
+
+ const updatedThread = dataStore.$postThreads.get(rootUri);
+ assert.notEqual(updatedThread, rootThread);
+ assert.equal(updatedThread.replies[0], siblingNode);
+ const nestedNode = updatedThread.replies[1];
+ assert.deepEqual(nestedNode.replies.length, 1);
+ assert.deepEqual(nestedNode.replies[0].post.uri, newPostUri);
+ });
+
+ it("should increment the reply count of the replied-to post", async () => {
+ const replyTo = createPost({
+ uri: "at://did:plc:other/app.bsky.feed.post/parent",
+ replyCount: 3,
+ });
+ const { mutations, dataStore } = setup();
+ dataStore.$posts.set(replyTo.uri, replyTo);
+
+ await mutations.createThread({
+ posts: [{ postText: "hi" }],
+ replyTo,
+ replyRoot: replyTo,
+ });
+
+ assert.deepEqual(dataStore.$posts.get(replyTo.uri).replyCount, 4);
+ });
+
it("should extend the OP run numbering when the OP replies to their own thread", async () => {
const replyTo = {
uri: `at://${currentUserDid}/app.bsky.feed.post/root`,
@@ -3455,6 +3570,7 @@ describe("deletePost", () => {
const post = {
uri: "at://did:plc:me/app.bsky.feed.post/abc",
cid: "cid-abc",
+ record: { text: "hi" },
};
let apiCalledWith = null;
const dataStore = new DataStore(createSessionState(null));
@@ -3462,7 +3578,7 @@ describe("deletePost", () => {
const mockPreferencesProvider = {
requirePreferences: () => Preferences.createLoggedOutPreferences(),
};
- dataStore.$posts.set(post.uri, { ...post, record: { text: "hi" } });
+ dataStore.$posts.set(post.uri, post);
const mutations = makeMutations(
{
deletePost: async (passed) => {
@@ -3481,6 +3597,33 @@ describe("deletePost", () => {
assert.deepEqual(stored.uri, post.uri);
assert.deepEqual(stored.$type, "app.bsky.feed.defs#notFoundPost");
});
+
+ it("should decrement the parent's reply count when deleting a reply", async () => {
+ const parent = createPost({
+ uri: "at://did:plc:other/app.bsky.feed.post/parent",
+ replyCount: 2,
+ });
+ const reply = createPost({
+ uri: "at://did:plc:me/app.bsky.feed.post/reply",
+ reply: {
+ parent: { uri: parent.uri, cid: parent.cid },
+ root: { uri: parent.uri, cid: parent.cid },
+ },
+ });
+ const dataStore = new DataStore(createSessionState(null));
+ dataStore.$posts.set(parent.uri, parent);
+ dataStore.$posts.set(reply.uri, reply);
+ const mutations = makeMutations(
+ { deletePost: async () => {} },
+ dataStore,
+ new PatchStore(),
+ { requirePreferences: () => Preferences.createLoggedOutPreferences() },
+ );
+
+ await mutations.deletePost(reply);
+
+ assert.deepEqual(dataStore.$posts.get(parent.uri).replyCount, 1);
+ });
});
describe("createMessage", () => {
diff --git a/tests/unit/specs/preferences.test.js b/tests/unit/specs/preferences.test.js
index 75de46de..e017a6d2 100644
--- a/tests/unit/specs/preferences.test.js
+++ b/tests/unit/specs/preferences.test.js
@@ -6,6 +6,7 @@ import {
INSTALLED_PLUGINS_PREF_TYPE,
SEARCH_HISTORY_PREF_TYPE,
GIF_HISTORY_PREF_TYPE,
+ THREAD_VIEW_PREF_TYPE,
} from "/js/preferences.js";
import { createGif } from "../../shared/factories.js";
import { createMinimalGifObject } from "/js/embedHelpers.js";
@@ -3523,3 +3524,67 @@ describe("Preferences.setPostInteractionSettings", () => {
assert.deepEqual(original.obj, []);
});
});
+
+describe("Preferences.getThreadView", () => {
+ it("should default to linear when there is no thread view preference", () => {
+ const preferences = new Preferences([], []);
+ assert.deepEqual(preferences.getThreadView(), "linear");
+ });
+
+ it("should return tree when lab_treeViewEnabled is true", () => {
+ const preferences = new Preferences(
+ [
+ {
+ $type: THREAD_VIEW_PREF_TYPE,
+ sort: "top",
+ lab_treeViewEnabled: true,
+ },
+ ],
+ [],
+ );
+ assert.deepEqual(preferences.getThreadView(), "tree");
+ });
+
+ it("should return linear when lab_treeViewEnabled is false", () => {
+ const preferences = new Preferences(
+ [{ $type: THREAD_VIEW_PREF_TYPE, lab_treeViewEnabled: false }],
+ [],
+ );
+ assert.deepEqual(preferences.getThreadView(), "linear");
+ });
+});
+
+describe("Preferences.setThreadView", () => {
+ it("should create the thread view preference when missing", () => {
+ const preferences = new Preferences([], []);
+ const newPreferences = preferences.setThreadView("tree");
+ assert.deepEqual(preferences.obj, []);
+ assert.deepEqual(newPreferences.obj, [
+ { $type: THREAD_VIEW_PREF_TYPE, lab_treeViewEnabled: true },
+ ]);
+ });
+
+ it("should preserve sort and unknown keys on the existing preference", () => {
+ const preferences = new Preferences(
+ [
+ {
+ $type: THREAD_VIEW_PREF_TYPE,
+ sort: "hotness",
+ someFutureKey: 1,
+ lab_treeViewEnabled: true,
+ },
+ ],
+ [],
+ );
+ const newPreferences = preferences.setThreadView("linear");
+ assert.deepEqual(newPreferences.obj, [
+ {
+ $type: THREAD_VIEW_PREF_TYPE,
+ sort: "hotness",
+ someFutureKey: 1,
+ lab_treeViewEnabled: false,
+ },
+ ]);
+ assert.deepEqual(newPreferences.getThreadView(), "linear");
+ });
+});
--
2.54.0
From 86772fc4c835a8892bb902f1bb98c74771380cf0 Mon Sep 17 00:00:00 2001
From: Grace Kind
Date: Fri, 9 Oct 2026 23:10:51 -0500
Subject: [PATCH 2/2] Fix notification spec
---
tests/e2e/specs/views/notifications.view.test.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/e2e/specs/views/notifications.view.test.js b/tests/e2e/specs/views/notifications.view.test.js
index 61adad82..73dbe32e 100644
--- a/tests/e2e/specs/views/notifications.view.test.js
+++ b/tests/e2e/specs/views/notifications.view.test.js
@@ -157,6 +157,7 @@ test.describe("Notifications view", () => {
await login(page);
await page.goto("/");
+ await expect(page.locator("#home-view")).toBeVisible({ timeout: 10000 });
await page.evaluate(() => {
window.__sameDocument = true;
});