terry-staging #5

Merged
terry merged 13 commits from terry-staging into main 2026-05-28 08:56:30 +00:00
6 changed files with 48 additions and 24 deletions
Showing only changes of commit 4c15e01460 - Show all commits

View File

@@ -18,10 +18,12 @@ export function MessageStream({ scope }: MessageStreamProps) {
const type = sp.get("type") || "all"; const type = sp.get("type") || "all";
const q = (sp.get("q") || "").trim(); const q = (sp.get("q") || "").trim();
const sort = sp.get("sort") || "";
const tag = sp.get("tag") || "";
const params = useMemo( const params = useMemo(
() => ({ scope, type, q, lang }), () => ({ scope, type, q, sort, tag, lang }),
[scope, type, q, lang], [scope, type, q, sort, tag, lang],
); );
const { items, isLoading, error, hasMore, loadMore, reset } = const { items, isLoading, error, hasMore, loadMore, reset } =

View File

@@ -77,15 +77,23 @@ function VideoAttachmentCard({
}} }}
> >
{playing && !compact ? ( {playing && !compact ? (
<video <>
ref={videoRef} <video
src={attachment.url} ref={videoRef}
poster={attachment.posterUrl} src={attachment.url}
controls poster={attachment.posterUrl}
playsInline controls
autoPlay playsInline
className="absolute inset-0 h-full w-full" autoPlay
/> className="absolute inset-0 h-full w-full"
/>
<AttachmentDownloadPill
postId={postId}
attachment={attachment}
leadingLabel={duration}
className="absolute left-2 top-2 z-20"
/>
</>
) : ( ) : (
<> <>
{posterUrl ? ( {posterUrl ? (

View File

@@ -16,6 +16,7 @@ export type PostStreamParams = {
language?: string; language?: string;
q?: string; q?: string;
sort?: string; sort?: string;
tag?: string;
lang: Lang; lang: Lang;
}; };
@@ -60,6 +61,9 @@ function filterMock(params: PostStreamParams): Post[] {
return false; return false;
const q = params.q?.trim().toLowerCase(); const q = params.q?.trim().toLowerCase();
if (params.language && p.language !== params.language) return false; if (params.language && p.language !== params.language) return false;
const tag = params.tag?.trim().toLowerCase();
if (tag && !(p.tags ?? []).some((t) => t.toLowerCase() === tag))
return false;
if (q) { if (q) {
const haystack = [ const haystack = [
p.text ?? "", p.text ?? "",
@@ -89,6 +93,7 @@ function buildRealUrl(params: PostStreamParams, cursor?: string): string {
if (params.scope.kind === "category") sp.set("category", params.scope.slug); if (params.scope.kind === "category") sp.set("category", params.scope.slug);
if (params.type && params.type !== "all") sp.set("type", params.type); if (params.type && params.type !== "all") sp.set("type", params.type);
if (params.sort) sp.set("sort", params.sort); if (params.sort) sp.set("sort", params.sort);
if (params.tag) sp.set("tag", params.tag);
if (params.language) sp.set("language", sourceLanguageQuery(params.language)); if (params.language) sp.set("language", sourceLanguageQuery(params.language));
if (cursor) sp.set("cursor", cursor); if (cursor) sp.set("cursor", cursor);
return `${q ? "/api/posts/search" : "/api/posts"}?${sp.toString()}`; return `${q ? "/api/posts/search" : "/api/posts"}?${sp.toString()}`;
@@ -166,6 +171,7 @@ export function usePostStream(params: PostStreamParams): PostStreamResult {
params.language, params.language,
params.q, params.q,
params.sort, params.sort,
params.tag,
params.lang, params.lang,
]); ]);

View File

@@ -4,6 +4,7 @@ import { Link, Outlet, useLocation, useNavigate } from "react-router-dom";
import { ArkLogoMark } from "../components/ArkLogoMark"; import { ArkLogoMark } from "../components/ArkLogoMark";
import { useI18n, type Lang } from "../i18n"; import { useI18n, type Lang } from "../i18n";
import { LANG_OPTIONS } from "../i18nLanguages"; import { LANG_OPTIONS } from "../i18nLanguages";
import { isPopularTag, popularTagParam } from "../utils/popularTag";
type PublicNavWhich = type PublicNavWhich =
| "home" | "home"
@@ -20,6 +21,7 @@ function navIsActive(
search: string, search: string,
hash: string, hash: string,
which: PublicNavWhich, which: PublicNavWhich,
currentLang: Lang,
): boolean { ): boolean {
const sp = new URLSearchParams(search); const sp = new URLSearchParams(search);
switch (which) { switch (which) {
@@ -37,7 +39,9 @@ function navIsActive(
case "browseRecommended": case "browseRecommended":
return pathname === "/official-recommendations"; return pathname === "/official-recommendations";
case "browsePopular": case "browsePopular":
return pathname === "/browse" && sp.get("sort") === "popular"; return (
pathname === "/browse" && isPopularTag(sp.get("tag") || "", currentLang)
);
case "favorites": case "favorites":
return ( return (
pathname === "/favorites" || (pathname === "/" && hash === "#favorites") pathname === "/favorites" || (pathname === "/" && hash === "#favorites")
@@ -273,9 +277,10 @@ export function PublicLayout() {
const nav = useNavigate(); const nav = useNavigate();
const na = (which: PublicNavWhich) => const na = (which: PublicNavWhich) =>
navIsActive(pathname, search, hash, which); navIsActive(pathname, search, hash, which, lang);
const isHome = pathname === "/"; const isHome = pathname === "/";
const footerInContentFlow = pathname === "/browse"; const footerInContentFlow = pathname === "/browse";
const popularHref = `/browse?tag=${popularTagParam(lang)}`;
const goSearch = () => { const goSearch = () => {
const s = q.trim(); const s = q.trim();
@@ -416,7 +421,7 @@ export function PublicLayout() {
{t("latest")} {t("latest")}
</Link> </Link>
<Link <Link
to="/browse?sort=popular" to={popularHref}
className={navClassName(na("browsePopular"))} className={navClassName(na("browsePopular"))}
aria-current={na("browsePopular") ? "page" : undefined} aria-current={na("browsePopular") ? "page" : undefined}
> >
@@ -518,7 +523,7 @@ export function PublicLayout() {
{t("latest")} {t("latest")}
</Link> </Link>
<Link <Link
to="/browse?sort=popular" to={popularHref}
className={navClassName(na("browsePopular"))} className={navClassName(na("browsePopular"))}
aria-current={na("browsePopular") ? "page" : undefined} aria-current={na("browsePopular") ? "page" : undefined}
onClick={() => setOpen(false)} onClick={() => setOpen(false)}
@@ -593,12 +598,12 @@ export function PublicLayout() {
active={na("favorites")} active={na("favorites")}
/> />
<BottomNavIcon <BottomNavIcon
to="/browse?sort=popular" to={popularHref}
label={t("popular")} label={t("popular")}
icon="update" icon="update"
active={ active={
pathname === "/browse" && pathname === "/browse" &&
new URLSearchParams(search).get("sort") === "popular" new URLSearchParams(search).get("tag") === "popular"
} }
/> />
</div> </div>

View File

@@ -2,18 +2,20 @@ import { useSearchParams } from "react-router-dom";
import { MessageStream } from "../../components/messageStream/MessageStream"; import { MessageStream } from "../../components/messageStream/MessageStream";
import { SectionHeader } from "../../components/SectionHeader"; import { SectionHeader } from "../../components/SectionHeader";
import { useI18n } from "../../i18n"; import { useI18n } from "../../i18n";
import { isPopularTag } from "../../utils/popularTag";
export function Browse() { export function Browse() {
const { t } = useI18n(); const { t, lang } = useI18n();
const [sp] = useSearchParams(); const [sp] = useSearchParams();
const q = sp.get("q") || ""; const q = sp.get("q") || "";
const sort = sp.get("sort") || ""; const sort = sp.get("sort") || "";
const tag = sp.get("tag") || "";
const title = q const title = q
? `${t("search")}: ${q}` ? `${t("search")}: ${q}`
: sort === "latest" : isPopularTag(tag, lang)
? t("latest") ? t("popular")
: sort === "popular" : sort === "latest"
? t("popular") ? t("latest")
: sort === "recommended" : sort === "recommended"
? t("official") ? t("official")
: t("all"); : t("all");

View File

@@ -13,6 +13,7 @@ import { SectionHeader } from "../../components/SectionHeader";
import { MessageBubble } from "../../components/messageStream/MessageBubble"; import { MessageBubble } from "../../components/messageStream/MessageBubble";
import { langQuery, useI18n } from "../../i18n"; import { langQuery, useI18n } from "../../i18n";
import { sourceLanguageQuery } from "../../i18nLanguages"; import { sourceLanguageQuery } from "../../i18nLanguages";
import { popularTagParam } from "../../utils/popularTag";
import { cleanCategoryDisplayName } from "../../utils/categoryDisplay"; import { cleanCategoryDisplayName } from "../../utils/categoryDisplay";
import { import {
postToResource, postToResource,
@@ -69,7 +70,7 @@ export function Home() {
getJSON<{ items: Post[] }>(`/api/posts/recommended${postQ}&limit=12`), getJSON<{ items: Post[] }>(`/api/posts/recommended${postQ}&limit=12`),
getJSON<{ items: Post[] }>(`/api/posts/latest${postQ}&limit=5`), getJSON<{ items: Post[] }>(`/api/posts/latest${postQ}&limit=5`),
getJSON<{ items: Post[] }>( getJSON<{ items: Post[] }>(
`/api/posts${postQ}&sort=popular&limit=5`, `/api/posts${postQ}&tag=${popularTagParam(lang)}&limit=5`,
).catch((): { items: Post[] } => ({ items: [] })), ).catch((): { items: Post[] } => ({ items: [] })),
]) ])
.then(([c, r, l, p]) => { .then(([c, r, l, p]) => {
@@ -392,7 +393,7 @@ export function Home() {
<div className="px-4 md:px-0"> <div className="px-4 md:px-0">
<SectionHeader <SectionHeader
title={t("popularSection")} title={t("popularSection")}
viewAllTo="/browse?sort=popular" viewAllTo={`/browse?tag=${popularTagParam(lang)}`}
viewAllLabel={t("viewAll")} viewAllLabel={t("viewAll")}
/> />
</div> </div>