From 4e32d9bbca4493cfdafd0d0628d9ba18b5873fbc Mon Sep 17 00:00:00 2001 From: Grace Kind Date: Fri, 27 Mar 2026 15:00:17 -0500 Subject: [PATCH] Add feeds to profile view --- package.json | 2 +- src/js/api.js | 14 ++ src/js/dataLayer/dataStore.js | 17 ++ src/js/dataLayer/requests.js | 26 +++ src/js/dataLayer/selectors.js | 4 + .../feedGeneratorListItem.template.js | 33 ++++ src/js/views/feeds.view.js | 51 ++--- src/js/views/profile.view.js | 91 ++++++++- tests/e2e/mockServer.js | 34 ++++ tests/e2e/specs/views/profile.view.test.js | 175 ++++++++++++++++++ 10 files changed, 405 insertions(+), 42 deletions(-) create mode 100644 src/js/templates/feedGeneratorListItem.template.js diff --git a/package.json b/package.json index 3310bf64..2b222874 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "impro", - "version": "0.8.15", + "version": "0.8.16", "type": "module", "scripts": { "start": "rm -rf build && NODE_ENV=development eleventy --serve", diff --git a/src/js/api.js b/src/js/api.js index c1f233b8..79b4b77b 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -279,6 +279,20 @@ export class Api { return res.data.feeds; } + async getActorFeeds(did, { limit = 50, cursor = "" } = {}) { + const query = { actor: did, limit }; + if (cursor) { + query.cursor = cursor; + } + const res = await this.request(`app.bsky.feed.getActorFeeds`, { + query, + headers: { + "atproto-proxy": this.bskyAppViewServiceDid, + }, + }); + return res.data; + } + async searchFeedGenerators(query, { limit = 15, cursor = "" } = {}) { const queryParams = { limit, query }; if (cursor) { diff --git a/src/js/dataLayer/dataStore.js b/src/js/dataLayer/dataStore.js index c0870694..f034f924 100644 --- a/src/js/dataLayer/dataStore.js +++ b/src/js/dataLayer/dataStore.js @@ -38,6 +38,7 @@ export class DataStore extends EventEmitter { this.postQuotes = new Map(); this.postReposts = new Map(); this.feedGenerators = new Map(); + this.actorFeeds = new Map(); this.hashtagFeeds = new Map(); this.pinnedFeedGenerators = null; this.bookmarks = null; @@ -520,6 +521,22 @@ export class DataStore extends EventEmitter { this.feedGenerators.delete(feedUri); } + hasActorFeeds(did) { + return this.actorFeeds.has(did); + } + + getActorFeeds(did) { + return this.actorFeeds.get(did); + } + + setActorFeeds(did, actorFeeds) { + this.actorFeeds.set(did, actorFeeds); + } + + clearActorFeeds(did) { + this.actorFeeds.delete(did); + } + hasHashtagFeed(hashtagKey) { return this.hashtagFeeds.has(hashtagKey); } diff --git a/src/js/dataLayer/requests.js b/src/js/dataLayer/requests.js index 22079532..ec56f7be 100644 --- a/src/js/dataLayer/requests.js +++ b/src/js/dataLayer/requests.js @@ -800,6 +800,32 @@ export class Requests { this.dataStore.setPinnedFeedGenerators(feedGenerators); } + async loadActorFeeds(did, { reload = false, limit = 50 } = {}) { + const existing = this.dataStore.getActorFeeds(did); + let cursor = existing ? existing.cursor : ""; + if (reload) { + cursor = ""; + } + if (existing && !existing.cursor && !reload) { + return; + } + const data = await this.api.getActorFeeds(did, { limit, cursor }); + for (const feed of data.feeds) { + this.dataStore.setFeedGenerator(feed.uri, feed); + } + if (reload || !existing) { + this.dataStore.setActorFeeds(did, { + feeds: data.feeds, + cursor: data.cursor ?? null, + }); + } else { + this.dataStore.setActorFeeds(did, { + feeds: [...existing.feeds, ...data.feeds], + cursor: data.cursor ?? null, + }); + } + } + async loadHashtagFeed(hashtag, sort, { reload = false, limit = 25 } = {}) { const hashtagKey = `${hashtag}-${sort}`; const labelers = this.requireLabelers(); diff --git a/src/js/dataLayer/selectors.js b/src/js/dataLayer/selectors.js index 1fc9c804..56abe545 100644 --- a/src/js/dataLayer/selectors.js +++ b/src/js/dataLayer/selectors.js @@ -485,6 +485,10 @@ export class Selectors { return this.dataStore.getFeedGenerator(feedUri); } + getActorFeeds(did) { + return this.dataStore.getActorFeeds(did); + } + getHashtagFeed(hashtag, sort) { const hashtagKey = `${hashtag}-${sort}`; const feed = this.dataStore.getHashtagFeed(hashtagKey); diff --git a/src/js/templates/feedGeneratorListItem.template.js b/src/js/templates/feedGeneratorListItem.template.js new file mode 100644 index 00000000..c1e556d6 --- /dev/null +++ b/src/js/templates/feedGeneratorListItem.template.js @@ -0,0 +1,33 @@ +import { html } from "/js/lib/lit-html.js"; +import { linkToFeed } from "/js/navigation.js"; + +export function feedGeneratorListItemTemplate({ feedGenerator }) { + return html` +
window.router.go(linkToFeed(feedGenerator))} + > +
+ ${feedGenerator.avatar + ? html`${feedGenerator.displayName}` + : html`${feedGenerator.displayName}`} +
+
+
${feedGenerator.displayName}
+ ${feedGenerator.creator + ? html`
+ by @${feedGenerator.creator.handle} +
` + : ""} +
+
+ `; +} diff --git a/src/js/views/feeds.view.js b/src/js/views/feeds.view.js index 906074ae..07709ef6 100644 --- a/src/js/views/feeds.view.js +++ b/src/js/views/feeds.view.js @@ -1,10 +1,9 @@ import { View } from "./view.js"; import { html, render } from "/js/lib/lit-html.js"; -import { classnames } from "/js/utils.js"; import { requireAuth } from "/js/auth.js"; import { mainLayoutTemplate } from "/js/templates/mainLayout.template.js"; import { textHeaderTemplate } from "/js/templates/textHeader.template.js"; -import { linkToFeed } from "/js/navigation.js"; +import { feedGeneratorListItemTemplate } from "/js/templates/feedGeneratorListItem.template.js"; class FeedsView extends View { async render({ @@ -47,43 +46,25 @@ class FeedsView extends View {
Pinned Feeds
${pinnedFeedGenerators - ? pinnedFeedGenerators.map( - (feedGenerator) => html` -
{ - if (feedGenerator.uri !== "following") { - window.router.go(linkToFeed(feedGenerator)); - } - }} - > -
- ${feedGenerator.avatar - ? html`${feedGenerator.displayName}` - : html` + feedGenerator.uri === "following" + ? html` +
+
+ ${feedGenerator.displayName}`} -
-
-
- ${feedGenerator.displayName} + /> +
+
+
+ ${feedGenerator.displayName} +
+
- ${feedGenerator.creator - ? html`
- by @${feedGenerator.creator.handle} -
` - : ""} -
-
- `, + ` + : feedGeneratorListItemTemplate({ feedGenerator }), ) : html`
`}
diff --git a/src/js/views/profile.view.js b/src/js/views/profile.view.js index 830030f1..fcb1176c 100644 --- a/src/js/views/profile.view.js +++ b/src/js/views/profile.view.js @@ -16,6 +16,7 @@ import { ProfileInteractionHandler } from "/js/profileInteractionHandler.js"; import { AUTHOR_FEED_PAGE_SIZE, BSKY_LABELER_DID } from "/js/config.js"; import { showToast } from "/js/toasts.js"; import { tabBarTemplate } from "/js/templates/tabBar.template.js"; +import { feedGeneratorListItemTemplate } from "/js/templates/feedGeneratorListItem.template.js"; class ProfileView extends View { async render({ @@ -98,7 +99,11 @@ class ProfileView extends View { async function handleTabClick(tab) { if (tab === state.activeTab) { - scrollAndReloadFeed(); + if (tab === "feeds") { + scrollAndReloadActorFeeds(); + } else { + scrollAndReloadFeed(); + } return; } // Save scroll state @@ -113,9 +118,15 @@ class ProfileView extends View { window.scrollTo(0, 0); } // Load feed if needed - const isFeedTab = tab !== "labeler-settings"; - if (isFeedTab && !dataLayer.hasCachedAuthorFeed(profileDid, tab)) { - await loadAuthorFeed(); + if (tab === "feeds") { + if (!dataLayer.selectors.getActorFeeds(profileDid)) { + await loadActorFeeds(); + } + } else { + const isFeedTab = tab !== "labeler-settings"; + if (isFeedTab && !dataLayer.hasCachedAuthorFeed(profileDid, tab)) { + await loadAuthorFeed(); + } } } @@ -138,6 +149,38 @@ class ProfileView extends View { } } + function actorFeedsTemplate({ actorFeeds, onLoadMore }) { + if (!actorFeeds) { + return html`
+
+
`; + } + if (actorFeeds.feeds.length === 0) { + return html`
+
No custom feeds.
+
`; + } + const hasMore = !!actorFeeds.cursor; + return html` + { + if (hasMore && onLoadMore) { + await onLoadMore(); + e.detail.resume(); + } + }} + > +
+ ${actorFeeds.feeds.map((feedGenerator) => + feedGeneratorListItemTemplate({ feedGenerator }), + )} + ${hasMore ? html`
` : ""} +
+
+ `; + } + function profileErrorTemplate({ error }) { if ( error instanceof ApiError && @@ -193,6 +236,13 @@ class ProfileView extends View { (feed) => feed.feedType !== "media", ); } + const feedGenCount = profile.associated?.feedgens || 0; + if (feedGenCount > 0) { + authorFeedsToShow = [ + ...authorFeedsToShow, + { feedType: "feeds", name: "Feeds" }, + ]; + } let isDefaultLabeler = profile.did === BSKY_LABELER_DID; let isSubscribed = false; let labelerSettings = null; @@ -215,7 +265,8 @@ class ProfileView extends View { showSubscribeButton: !isDefaultLabeler, labelerInfo, isSubscribed, - activitySubscription: profile.viewer?.activitySubscription ?? null, + activitySubscription: + profile.viewer?.activitySubscription ?? null, onClickPostNotifications: (profile) => profileInteractionHandler.handlePostNotificationSubscription( profile, @@ -301,6 +352,19 @@ class ProfileView extends View {
` : null} ${authorFeedsToShow.map((feedInfo) => { + if (feedInfo.feedType === "feeds") { + const actorFeeds = + dataLayer.selectors.getActorFeeds(profileDid); + return html`
+ ${actorFeedsTemplate({ + actorFeeds, + onLoadMore: () => loadActorFeeds(), + })} +
`; + } const authorFeed = dataLayer.selectors.getAuthorFeed( profileDid, feedInfo.feedType, @@ -394,7 +458,10 @@ class ProfileView extends View { } async function loadAuthorFeed({ reload = false } = {}) { - if (state.activeTab === "labeler-settings") { + if ( + state.activeTab === "labeler-settings" || + state.activeTab === "feeds" + ) { return; } await dataLayer.requests.loadNextAuthorFeedPage( @@ -408,6 +475,18 @@ class ProfileView extends View { renderPage(); } + async function loadActorFeeds({ reload = false } = {}) { + await dataLayer.requests.loadActorFeeds(profileDid, { reload }); + renderPage(); + } + + async function scrollAndReloadActorFeeds() { + if (window.scrollY > 0) { + window.scrollTo({ top: 0, behavior: "smooth" }); + } + await loadActorFeeds({ reload: true }); + } + async function preloadHiddenFeeds() { for (const feed of defaultAuthorFeeds) { await dataLayer.requests.loadNextAuthorFeedPage( diff --git a/tests/e2e/mockServer.js b/tests/e2e/mockServer.js index cca96b88..22dc20b5 100644 --- a/tests/e2e/mockServer.js +++ b/tests/e2e/mockServer.js @@ -32,6 +32,7 @@ export class MockServer { this.profileFollows = new Map(); this.profiles = new Map(); this.savedFeedUris = []; + this.actorFeeds = new Map(); this.searchFeedGenerators = []; this.searchPosts = []; this.searchProfiles = []; @@ -46,6 +47,11 @@ export class MockServer { this.bookmarks.push(...bookmarks); } + addActorFeeds(did, feedGenerators) { + const existing = this.actorFeeds.get(did) || []; + this.actorFeeds.set(did, [...existing, ...feedGenerators]); + } + addFeedGenerators(feedGenerators) { this.feedGenerators.push(...feedGenerators); } @@ -713,6 +719,34 @@ export class MockServer { }, ); + await page.route( + "**/xrpc/app.bsky.feed.getActorFeeds*", + (route) => { + const url = new URL(route.request().url()); + const actor = url.searchParams.get("actor") || ""; + const cursor = url.searchParams.get("cursor") || ""; + const limit = parseInt(url.searchParams.get("limit") || "0", 10); + const offset = cursor ? parseInt(cursor, 10) : 0; + const allFeeds = this.actorFeeds.get(actor) || []; + + let feeds, nextCursor; + if (limit) { + feeds = allFeeds.slice(offset, offset + limit); + nextCursor = + offset + limit < allFeeds.length ? String(offset + limit) : ""; + } else { + feeds = allFeeds; + nextCursor = ""; + } + + return route.fulfill({ + status: 200, + contentType: "application/json", + body: JSON.stringify({ feeds, cursor: nextCursor }), + }); + }, + ); + await page.route("**/xrpc/app.bsky.feed.searchPosts*", (route) => { const url = new URL(route.request().url()); const cursor = url.searchParams.get("cursor") || ""; diff --git a/tests/e2e/specs/views/profile.view.test.js b/tests/e2e/specs/views/profile.view.test.js index 823047d1..6c408b1d 100644 --- a/tests/e2e/specs/views/profile.view.test.js +++ b/tests/e2e/specs/views/profile.view.test.js @@ -5,6 +5,7 @@ import { MockServer } from "../../mockServer.js"; import { createPost, createProfile, + createFeedGenerator, createLabelerView, } from "../../factories.js"; @@ -1678,4 +1679,178 @@ test.describe("Profile view", () => { ); }); }); + + test.describe("Feeds tab", () => { + const userWithFeeds = createProfile({ + did: "did:plc:feedcreator1", + handle: "feedcreator.bsky.social", + displayName: "Feed Creator", + followersCount: 200, + followsCount: 50, + postsCount: 100, + associated: { feedgens: 2 }, + }); + + const feed1 = createFeedGenerator({ + uri: "at://did:plc:feedcreator1/app.bsky.feed.generator/trending", + displayName: "Trending Topics", + creatorHandle: "feedcreator.bsky.social", + }); + + const feed2 = createFeedGenerator({ + uri: "at://did:plc:feedcreator1/app.bsky.feed.generator/science", + displayName: "Science Feed", + creatorHandle: "feedcreator.bsky.social", + }); + + test("should show Feeds tab when profile has feed generators", async ({ + page, + }) => { + const mockServer = new MockServer(); + mockServer.addProfile(userWithFeeds); + mockServer.addActorFeeds(userWithFeeds.did, [feed1, feed2]); + await mockServer.setup(page); + await login(page); + await page.goto(`/profile/${userWithFeeds.did}`); + + const view = page.locator("#profile-view"); + const tabBar = view.locator(".tab-bar"); + await expect( + tabBar.locator(".tab-bar-button", { hasText: "Feeds" }), + ).toBeVisible({ timeout: 10000 }); + }); + + test("should not show Feeds tab when profile has no feed generators", async ({ + page, + }) => { + const mockServer = new MockServer(); + mockServer.addProfile(otherUser); + await mockServer.setup(page); + await login(page); + await page.goto(`/profile/${otherUser.did}`); + + const view = page.locator("#profile-view"); + const tabBar = view.locator(".tab-bar"); + await expect(tabBar.locator(".tab-bar-button").first()).toBeVisible({ + timeout: 10000, + }); + await expect( + tabBar.locator(".tab-bar-button", { hasText: "Feeds" }), + ).not.toBeVisible(); + }); + + test("should display feed generators when Feeds tab is clicked", async ({ + page, + }) => { + const mockServer = new MockServer(); + mockServer.addProfile(userWithFeeds); + mockServer.addActorFeeds(userWithFeeds.did, [feed1, feed2]); + await mockServer.setup(page); + await login(page); + await page.goto(`/profile/${userWithFeeds.did}`); + + const view = page.locator("#profile-view"); + const tabBar = view.locator(".tab-bar"); + await expect( + tabBar.locator(".tab-bar-button", { hasText: "Feeds" }), + ).toBeVisible({ timeout: 10000 }); + + await tabBar.locator(".tab-bar-button", { hasText: "Feeds" }).click(); + await expect(tabBar.locator(".tab-bar-button.active")).toContainText( + "Feeds", + ); + + const feedsList = view.locator(".feeds-list"); + await expect(feedsList.locator(".feeds-list-item")).toHaveCount(2, { + timeout: 10000, + }); + await expect(feedsList).toContainText("Trending Topics"); + await expect(feedsList).toContainText("Science Feed"); + await expect(feedsList).toContainText("by @feedcreator.bsky.social"); + }); + + test("should navigate to feed detail when clicking a feed generator", async ({ + page, + }) => { + const mockServer = new MockServer(); + mockServer.addProfile(userWithFeeds); + mockServer.addActorFeeds(userWithFeeds.did, [feed1]); + mockServer.addFeedGenerators([feed1]); + await mockServer.setup(page); + await login(page); + await page.goto(`/profile/${userWithFeeds.did}`); + + const view = page.locator("#profile-view"); + const tabBar = view.locator(".tab-bar"); + await expect( + tabBar.locator(".tab-bar-button", { hasText: "Feeds" }), + ).toBeVisible({ timeout: 10000 }); + + await tabBar.locator(".tab-bar-button", { hasText: "Feeds" }).click(); + + const feedsList = view.locator(".feeds-list"); + await expect(feedsList.locator(".feeds-list-item")).toHaveCount(1, { + timeout: 10000, + }); + + await feedsList + .locator(".feeds-list-item", { hasText: "Trending Topics" }) + .click(); + + await expect(page).toHaveURL( + "/profile/feedcreator.bsky.social/feed/trending", + { timeout: 10000 }, + ); + + const detailView = page.locator("#feed-detail-view"); + await expect( + detailView.locator('[data-testid="header-title"]'), + ).toContainText("Trending Topics", { timeout: 10000 }); + }); + + test("should show Feeds tab on own profile when user has feed generators", async ({ + page, + }) => { + const currentUserWithFeeds = { + ...userProfile, + associated: { feedgens: 1 }, + }; + const userFeed = createFeedGenerator({ + uri: `at://${userProfile.did}/app.bsky.feed.generator/myfeed`, + displayName: "My Custom Feed", + creatorHandle: userProfile.handle, + }); + + const mockServer = new MockServer(); + mockServer.addProfile(currentUserWithFeeds); + mockServer.addActorFeeds(userProfile.did, [userFeed]); + await mockServer.setup(page); + await login(page); + await page.goto(`/profile/${userProfile.did}`); + + const view = page.locator("#profile-view"); + const tabBar = view.locator(".tab-bar"); + await expect( + tabBar.locator(".tab-bar-button", { hasText: "Feeds" }), + ).toBeVisible({ timeout: 10000 }); + }); + + test("should not show Feeds tab on own profile when user has no feed generators", async ({ + page, + }) => { + const mockServer = new MockServer(); + await mockServer.setup(page); + await login(page); + await page.goto(`/profile/${userProfile.did}`); + + const view = page.locator("#profile-view"); + const tabBar = view.locator(".tab-bar"); + await expect(tabBar.locator(".tab-bar-button").first()).toBeVisible({ + timeout: 10000, + }); + await expect( + tabBar.locator(".tab-bar-button", { hasText: "Feeds" }), + ).not.toBeVisible(); + }); + }); }); -- knotmirror 0.0.1