- {!!q && !columnMode && (
-
- {!!type && (
-
- All
-
- )}
- {sorted(
- [
- {
- label: t`Accounts`,
- type: 'accounts',
- to: `/search?q=${encodeURIComponent(q)}&type=accounts`,
- },
- {
- label: t`Hashtags`,
- type: 'hashtags',
- to: `/search?q=${encodeURIComponent(q)}&type=hashtags`,
- },
- {
- label: t`Posts`,
- type: 'statuses',
- to: `/search?q=${encodeURIComponent(q)}&type=statuses`,
- },
- ],
- (a, b) => {
- if (a.type === type) return -1;
- if (b.type === type) return 1;
- return 0;
- },
- ).map((link) => (
-
- {link.label}
-
- ))}
-
- )}
+ {useNestedFilterBar ? null : filterBar}
{q ? (
atproto && type !== 'hashtags' ? (
) : (
<>
diff --git a/src/render/moderation-decision.ts b/src/render/moderation-decision.ts
index 7a45640d..9ff2d883 100644
--- a/src/render/moderation-decision.ts
+++ b/src/render/moderation-decision.ts
@@ -213,7 +213,10 @@ function profileFieldBlurred(
}
export function decideProfileModeration(
- profile: AppBskyActorDefs.ProfileView | AppBskyActorDefs.ProfileViewDetailed,
+ profile:
+ | AppBskyActorDefs.ProfileViewBasic
+ | AppBskyActorDefs.ProfileView
+ | AppBskyActorDefs.ProfileViewDetailed,
ctx: ModerationContext,
): ProfileModerationDecision {
const mod = moderateProfile(profile, moderationContextToOpts(ctx));
diff --git a/src/render/profile-moderation-policy.ts b/src/render/profile-moderation-policy.ts
new file mode 100644
index 00000000..7cea875e
--- /dev/null
+++ b/src/render/profile-moderation-policy.ts
@@ -0,0 +1,13 @@
+import type { ProfileModerationDecision } from './moderation-decision';
+
+export function profileModerationShowsContent(
+ decision: ProfileModerationDecision | undefined,
+ revealed: boolean,
+): boolean {
+ return (
+ !decision ||
+ decision.visibility === 'show' ||
+ decision.visibility === 'warn' ||
+ revealed
+ );
+}
diff --git a/src/render/profile-view-map.ts b/src/render/profile-view-map.ts
new file mode 100644
index 00000000..731c6f7e
--- /dev/null
+++ b/src/render/profile-view-map.ts
@@ -0,0 +1,59 @@
+import type { AppBskyActorDefs } from '@atproto/api';
+import type { mastodon } from 'masto';
+
+export type RenderableProfile =
+ | AppBskyActorDefs.ProfileViewBasic
+ | AppBskyActorDefs.ProfileView
+ | AppBskyActorDefs.ProfileViewDetailed;
+
+export function profileToAccount(
+ profile: RenderableProfile,
+): mastodon.v1.Account {
+ const createdAt =
+ 'indexedAt' in profile && profile.indexedAt
+ ? profile.indexedAt
+ : 'createdAt' in profile &&
+ typeof profile.createdAt === 'string' &&
+ profile.createdAt
+ ? profile.createdAt
+ : new Date().toISOString();
+ const banner = 'banner' in profile ? (profile.banner ?? '') : '';
+ const description =
+ 'description' in profile ? (profile.description ?? '') : '';
+ const followersCount =
+ 'followersCount' in profile && profile.followersCount
+ ? profile.followersCount
+ : 0;
+ const followingCount =
+ 'followsCount' in profile && profile.followsCount
+ ? profile.followsCount
+ : 0;
+ const postsCount =
+ 'postsCount' in profile && profile.postsCount
+ ? profile.postsCount
+ : 0;
+
+ return {
+ id: profile.did,
+ acct: profile.handle,
+ username: profile.handle.split('.')[0] ?? profile.handle,
+ displayName: profile.displayName || profile.handle,
+ avatar: profile.avatar || '',
+ avatarStatic: profile.avatar || '',
+ header: banner,
+ headerStatic: banner,
+ locked: false,
+ bot: false,
+ group: false,
+ createdAt,
+ note: description,
+ url: `https://bsky.app/profile/${profile.handle}`,
+ followersCount,
+ followingCount,
+ statusesCount: postsCount,
+ lastStatusAt: createdAt,
+ emojis: [],
+ fields: [],
+ roles: [],
+ } as mastodon.v1.Account;
+}
diff --git a/tests/logged-out-view.spec.js b/tests/logged-out-view.spec.js
index 18bf0220..2a180e02 100644
--- a/tests/logged-out-view.spec.js
+++ b/tests/logged-out-view.spec.js
@@ -696,16 +696,16 @@ function getBootReloadAttempts() {
/**
* @param {import('@playwright/test').Page} page
- * @param {{ homeTimeline?: { type: string; id: string } }} [options]
+ * @param {{ accessToken?: string; homeTimeline?: { type: string; id: string } }} [options]
*/
async function seedAtprotoLogin(page, options = {}) {
await page.addInitScript(
- ({ avatar, homeTimeline, repo }) => {
+ ({ accessToken, avatar, homeTimeline, repo }) => {
localStorage.setItem(
'accounts',
JSON.stringify([
{
- accessToken: 'test-token',
+ accessToken,
atproto: true,
info: {
id: repo,
@@ -738,6 +738,7 @@ async function seedAtprotoLogin(page, options = {}) {
}
},
{
+ accessToken: options.accessToken ?? 'test-token',
avatar: AT_PROFILE_AVATAR,
homeTimeline: options.homeTimeline,
repo: AT_REPO,
@@ -1156,7 +1157,13 @@ async function routeAtprotoScrollableFeed(page) {
* blackskyOmitPresentation?: boolean;
* blueskyOmitPresentation?: boolean;
* fallbackFails?: boolean;
+ * labelerViews?: unknown[];
* onBlueskyProfile?: () => void;
+ * profileFailures?: string[];
+ * preferences?: unknown[];
+ * profilesByDid?: Record;
+ * searchActorsByQuery?: Record;
+ * searchActorTypeaheadByQuery?: Record;
* searchPostsByQuery?: Record;
* }} [options]
*/
@@ -1166,7 +1173,13 @@ async function routeAtprotoRecords(page, options = {}) {
blackskyOmitPresentation = false,
blueskyOmitPresentation = false,
fallbackFails = false,
+ labelerViews = [],
onBlueskyProfile,
+ profileFailures = [],
+ preferences = [],
+ profilesByDid = {},
+ searchActorsByQuery = {},
+ searchActorTypeaheadByQuery = {},
searchPostsByQuery = {},
} = options;
const post = makeAtprotoPost();
@@ -1227,8 +1240,12 @@ async function routeAtprotoRecords(page, options = {}) {
const endpoint = url.pathname.replace('/xrpc/', '');
if (endpoint === 'app.bsky.actor.getProfile') {
const isBlacksky = url.hostname === 'api.blacksky.community';
+ const actor = url.searchParams.get('actor') || '';
if (!isBlacksky) onBlueskyProfile?.();
- if (!isBlacksky && fallbackFails) {
+ if (
+ !isBlacksky &&
+ (fallbackFails || profileFailures.includes(actor))
+ ) {
await route.fulfill({
headers,
status: 500,
@@ -1241,7 +1258,9 @@ async function routeAtprotoRecords(page, options = {}) {
: blueskyOmitPresentation;
await route.fulfill({
headers,
- json: omitPresentation
+ json: profilesByDid[actor]
+ ? profilesByDid[actor]
+ : omitPresentation
? {
...profile,
displayName: undefined,
@@ -1339,6 +1358,34 @@ async function routeAtprotoRecords(page, options = {}) {
});
return;
}
+ if (endpoint === 'app.bsky.actor.searchActors') {
+ const query = url.searchParams.get('q') || '';
+ await route.fulfill({
+ headers,
+ json: { actors: searchActorsByQuery[query] || [] },
+ });
+ return;
+ }
+ if (endpoint === 'app.bsky.actor.searchActorsTypeahead') {
+ const query = url.searchParams.get('q') || '';
+ await route.fulfill({
+ headers,
+ json: { actors: searchActorTypeaheadByQuery[query] || [] },
+ });
+ return;
+ }
+ if (endpoint === 'app.bsky.actor.getPreferences') {
+ await route.fulfill({ headers, json: { preferences } });
+ return;
+ }
+ if (endpoint === 'app.bsky.actor.putPreferences') {
+ await route.fulfill({ headers, json: {} });
+ return;
+ }
+ if (endpoint === 'app.bsky.labeler.getServices') {
+ await route.fulfill({ headers, json: { views: labelerViews } });
+ return;
+ }
await route.fulfill({ headers, json: {} });
},
);
@@ -1774,24 +1821,85 @@ test('keeps mobile search controls at the bottom and resets post results scroll'
waitUntil: 'domcontentloaded',
});
await expect(page.getByText('Alpha first search result')).toBeVisible();
+ await expect(page.locator('#compose-button')).toBeHidden();
const controlsGeometry = await page.evaluate(() => {
const input = document.querySelector('#search-page input[type="search"]');
- const filter = document.querySelector('#search-page main > .filter-bar');
+ const filter = document.querySelector('.search-filter-bar');
const inputBox = input?.getBoundingClientRect();
const filterBox = filter?.getBoundingClientRect();
+ const filterStyle = filter ? getComputedStyle(filter) : undefined;
return {
filterBottom: filterBox?.bottom ?? 0,
inputTop: inputBox?.top ?? 0,
viewportHeight: window.innerHeight,
+ filterPosition: filterStyle?.position,
+ filterBackground: filterStyle?.backgroundColor,
+ filterRadius: filterStyle?.borderRadius,
};
});
+ expect(controlsGeometry.filterPosition).toBe('fixed');
+ expect(controlsGeometry.filterBackground).not.toBe('rgb(220, 226, 234)');
+ expect(Number.parseFloat(controlsGeometry.filterRadius || '0')).toBeGreaterThan(
+ 20,
+ );
+ await expect
+ .poll(() =>
+ page
+ .locator('.search-filter-bar a')
+ .evaluateAll((links) =>
+ links.map((link) => link.textContent?.trim() || ''),
+ ),
+ )
+ .toEqual(['All', 'Accounts', 'Hashtags', 'Posts']);
expect(controlsGeometry.filterBottom).toBeLessThanOrEqual(
controlsGeometry.inputTop,
);
expect(controlsGeometry.filterBottom).toBeGreaterThan(
controlsGeometry.viewportHeight - 180,
);
+ await expect
+ .poll(() =>
+ page
+ .locator('#search-posts-page > .timeline-deck > header')
+ .evaluate((element) => getComputedStyle(element).position),
+ )
+ .not.toBe('fixed');
+
+ await page.locator('#search-posts-page').evaluate((element) => {
+ element.scrollTop = 160;
+ });
+ const scrolledControlsGeometry = await page.evaluate(() => {
+ const input = document.querySelector('#search-page input[type="search"]');
+ const filter = document.querySelector('.search-filter-bar');
+ const inputBox = input?.getBoundingClientRect();
+ const filterBox = filter?.getBoundingClientRect();
+ return {
+ filterBottom: filterBox?.bottom ?? 0,
+ inputTop: inputBox?.top ?? 0,
+ };
+ });
+ expect(scrolledControlsGeometry).toEqual({
+ filterBottom: controlsGeometry.filterBottom,
+ inputTop: controlsGeometry.inputTop,
+ });
+ await page.locator('#search-page').evaluate((element) => {
+ element.scrollTop = 160;
+ });
+ const outerScrolledControlsGeometry = await page.evaluate(() => {
+ const input = document.querySelector('#search-page input[type="search"]');
+ const filter = document.querySelector('.search-filter-bar');
+ const inputBox = input?.getBoundingClientRect();
+ const filterBox = filter?.getBoundingClientRect();
+ return {
+ filterBottom: filterBox?.bottom ?? 0,
+ inputTop: inputBox?.top ?? 0,
+ };
+ });
+ expect(outerScrolledControlsGeometry).toEqual({
+ filterBottom: controlsGeometry.filterBottom,
+ inputTop: controlsGeometry.inputTop,
+ });
await page.locator('#search-posts-page').evaluate((element) => {
element.scrollTop = 320;
@@ -1813,6 +1921,118 @@ test('keeps mobile search controls at the bottom and resets post results scroll'
.toBeLessThan(8);
});
+test('keeps the leading account search match visible', async ({ page }) => {
+ await page.setViewportSize({ width: 390, height: 844 });
+ await seedAtprotoLogin(page, {
+ accessToken: JSON.stringify({
+ type: 'atproto',
+ service: 'https://bsky.social',
+ session: {
+ refreshJwt: 'test-refresh',
+ accessJwt: 'test-access',
+ handle: 'alice.test',
+ did: AT_REPO,
+ active: true,
+ },
+ }),
+ });
+ const warningLabelerDid = 'did:plc:dm6tjhimvcxsgh2yxbppbqkx';
+ const exactActor = {
+ ...makeAtprotoTestActor(
+ 'did:plc:samuelexact',
+ 'samuel.fm',
+ 'Samuel',
+ ),
+ labels: [
+ {
+ src: warningLabelerDid,
+ uri: 'did:plc:samuelexact',
+ val: 'folklore',
+ cts: '2024-11-08T20:16:43.383Z',
+ },
+ ],
+ };
+ const fallbackActor = makeAtprotoTestActor(
+ 'did:plc:samuelfallback',
+ 'samueloakford.bsky.social',
+ 'Samuel Oakford',
+ );
+ await routeAtprotoRecords(page, {
+ labelerViews: [
+ {
+ $type: 'app.bsky.labeler.defs#labelerViewDetailed',
+ uri: `at://${warningLabelerDid}/app.bsky.labeler.service/self`,
+ cid: 'bafyreididididididididididididididididididididididididid',
+ creator: {
+ did: warningLabelerDid,
+ handle: 'labels.example.com',
+ displayName: 'Example Labeler',
+ labels: [],
+ viewer: {},
+ },
+ policies: {
+ labelValues: ['folklore'],
+ labelValueDefinitions: [
+ {
+ identifier: 'folklore',
+ severity: 'alert',
+ blurs: 'none',
+ defaultSetting: 'warn',
+ locales: [
+ {
+ lang: 'en',
+ name: 'Folklore',
+ description: 'Folklore label used by the regression fixture.',
+ },
+ ],
+ },
+ ],
+ },
+ indexedAt: '2024-01-01T00:00:00.000Z',
+ },
+ ],
+ preferences: [
+ {
+ $type: 'app.bsky.actor.defs#labelersPref',
+ labelers: [{ did: warningLabelerDid }],
+ },
+ {
+ $type: 'app.bsky.actor.defs#contentLabelPref',
+ label: 'folklore',
+ labelerDid: warningLabelerDid,
+ visibility: 'warn',
+ },
+ ],
+ searchActorsByQuery: {
+ samuel: [exactActor, fallbackActor],
+ },
+ searchActorTypeaheadByQuery: {
+ samuel: [exactActor],
+ },
+ });
+
+ await page.goto('/search?q=samuel&type=accounts', {
+ waitUntil: 'domcontentloaded',
+ });
+
+ await expect(page.getByText('@samuel.fm')).toBeVisible();
+ await expect(page.getByText('@samueloakford.bsky.social')).toBeVisible();
+ const firstAccount = page.locator('.accounts-list .account-block').first();
+ await expect(firstAccount).toContainText('Samuel');
+ await expect(firstAccount).toContainText('@samuel.fm');
+ await page.waitForTimeout(1000);
+ await expect(firstAccount).toContainText('@samuel.fm');
+ await expect
+ .poll(() =>
+ page
+ .locator('.search-filter-bar a')
+ .evaluateAll((links) =>
+ links.map((link) => link.textContent?.trim() || ''),
+ ),
+ )
+ .toEqual(['All', 'Accounts', 'Hashtags', 'Posts']);
+});
+
test('restores AT feed position after opening a feed post in the sidebar', async ({
page,
}) => {
diff --git a/tests/profile-moderation-gate.test.tsx b/tests/profile-moderation-gate.test.tsx
new file mode 100644
index 00000000..f3aec4b7
--- /dev/null
+++ b/tests/profile-moderation-gate.test.tsx
@@ -0,0 +1,22 @@
+import { describe, expect, test } from 'bun:test';
+
+import { profileModerationShowsContent } from '../src/render/profile-moderation-policy';
+import type { ProfileModerationDecision } from '../src/render/moderation-decision';
+
+function decision(
+ visibility: ProfileModerationDecision['visibility'],
+): ProfileModerationDecision {
+ return { visibility };
+}
+
+describe('profileModerationShowsContent', () => {
+ test('shows warn profiles without replacing the account row', () => {
+ expect(profileModerationShowsContent(decision('warn'), false)).toBe(true);
+ });
+
+ test('covers blur and hide profiles until revealed', () => {
+ expect(profileModerationShowsContent(decision('blur'), false)).toBe(false);
+ expect(profileModerationShowsContent(decision('hide'), false)).toBe(false);
+ expect(profileModerationShowsContent(decision('blur'), true)).toBe(true);
+ });
+});