diff --git a/apps/waterfall-wiki/db/011_post_archiving.sql b/apps/waterfall-wiki/db/011_post_archiving.sql new file mode 100644 index 0000000..55a330c --- /dev/null +++ b/apps/waterfall-wiki/db/011_post_archiving.sql @@ -0,0 +1,6 @@ +BEGIN; +ALTER TABLE posts ADD COLUMN IF NOT EXISTS archived boolean NOT NULL DEFAULT false; +ALTER TABLE posts ADD COLUMN IF NOT EXISTS archived_at timestamptz; +CREATE INDEX IF NOT EXISTS posts_active_timeline ON posts(created_at DESC,id DESC) WHERE NOT archived; +INSERT INTO schema_migrations(version) VALUES('011_post_archiving') ON CONFLICT DO NOTHING; +COMMIT; diff --git a/apps/waterfall-wiki/src/components/ExploreDetail.tsx b/apps/waterfall-wiki/src/components/ExploreDetail.tsx index a6a15ac..6eac498 100644 --- a/apps/waterfall-wiki/src/components/ExploreDetail.tsx +++ b/apps/waterfall-wiki/src/components/ExploreDetail.tsx @@ -2,7 +2,7 @@ import Head from 'next/head'; import Link from 'next/link'; import {useEffect,useRef,useState} from 'react'; import {useRouter} from 'next/router'; -import {X,ChevronLeft,ChevronRight,Link as LinkIcon,FileText,Pencil} from 'lucide-react'; +import {X,ChevronLeft,ChevronRight,Link as LinkIcon,FileText,Pencil,Archive,ArchiveRestore} from 'lucide-react'; import type {ExploreEntry} from '@/lib/explore'; import {previewUrl,exploreUrl} from '@/content/page-links'; import {Shell} from './Shell'; @@ -11,7 +11,7 @@ import {NoteMarkdown} from './NoteMarkdown'; import {QuickTags} from './QuickTags'; import {NoteEditor} from './NoteEditor'; export function ExploreDetail({entry:initial,background}:{entry:ExploreEntry;background:ExploreEntry[]}){ - const [entry,setEntry]=useState(initial),[index,setIndex]=useState(0),[copied,setCopied]=useState(''),[editing,setEditing]=useState(false),[copyError,setCopyError]=useState(''); + const [entry,setEntry]=useState(initial),[index,setIndex]=useState(0),[copied,setCopied]=useState(''),[editing,setEditing]=useState(false),[copyError,setCopyError]=useState(''),[archiveBusy,setArchiveBusy]=useState(false); const router=useRouter();const closeRef=useRef(null),detailRef=useRef(null);const media=entry.media[index]; useEffect(()=>{setEntry(initial);setIndex(0);setCopied('');setEditing(false)},[initial]); const close=()=>{if(editing){setEditing(false);return;}void router.push('/')}; @@ -32,6 +32,9 @@ export function ExploreDetail({entry:initial,background}:{entry:ExploreEntry;bac setCopied(mode);setCopyError(''); }catch{setCopied('');setCopyError('复制失败,请重试。')} } + async function archive(){ + setArchiveBusy(true);setCopyError('');try{const r=await fetch('/api/posts/'+entry.id+'/archive',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({archived:!entry.archived})});const d=await r.json();if(!r.ok)throw Error(d.error||'操作失败');const state=await fetch('/api/notes/'+entry.id).then(r=>r.json());setEntry(state.entry);void router.replace(router.asPath,undefined,{scroll:false})}catch(e){setCopyError(e instanceof Error?e.message:'操作失败')}finally{setArchiveBusy(false)} + } return {entry.title} · PROMPT
{if(!editing)close()}}>
e.stopPropagation()}> @@ -40,7 +43,7 @@ export function ExploreDetail({entry:initial,background}:{entry:ExploreEntry;bac {media?.kind==='image'?{media.title}:media?.kind==='video'?
{!editing&&
{entry.postSlug&&}{copyError&&{copyError}}
}
; } diff --git a/apps/waterfall-wiki/src/lib/api-documentation.ts b/apps/waterfall-wiki/src/lib/api-documentation.ts index 1cd3140..e5096d4 100644 --- a/apps/waterfall-wiki/src/lib/api-documentation.ts +++ b/apps/waterfall-wiki/src/lib/api-documentation.ts @@ -2,6 +2,13 @@ import type {NextApiRequest,NextApiResponse} from 'next'; // Read documentation before business validation or storage access. Mutations never enter this branch. export const apiDocuments:Record={ + "/api/posts/{id}/archive": [ + "归档或恢复笔记", "POST", + "路径参数 id 为存储 UUID 或24位 publicId。JSON 参数:{archived:true} 归档,{archived:false} 恢复。重复调用幂等,不删除 post、正文、媒体、标签或页面记录。", + "200 {post:{id,publicId,title,archived,archivedAt,url}}。归档内容不出现在首页、分类、搜索和普通素材流,仍可通过原地址读取并恢复。GET /api/feed?archived=true 列举归档内容;默认只列出未归档内容。", + "POST /api/posts/{id}/archive\n{\"archived\":true}", + "400 参数不合法;404 笔记不存在;405 方法不支持。" + ], "/api/explore-feed": [ "统一内容流", "GET", @@ -13,7 +20,7 @@ export const apiDocuments:Record={ "/api/feed": [ "素材列表", "GET", - "查询参数:section(images / videos / audio / articles / motion,可选);path(可选,标签 path);q(可选,最多 200 字符);cursor(可选,上一页 nextCursor)。", + "查询参数:archived(字符串 true / false,默认 false;true 只列出归档);section(images / videos / audio / articles / motion,可选);path(可选,标签 path);q(可选,最多 200 字符);cursor(可选,上一页 nextCursor)。", "JSON:posts、tags、contributions、nextCursor;每页最多 24 个 post。", "GET /api/feed?section=images", "400:未知 section、标签或无效游标。" diff --git a/apps/waterfall-wiki/src/lib/explore.ts b/apps/waterfall-wiki/src/lib/explore.ts index d5513be..6a4257a 100644 --- a/apps/waterfall-wiki/src/lib/explore.ts +++ b/apps/waterfall-wiki/src/lib/explore.ts @@ -7,11 +7,11 @@ import {wikiPages,wikiMarkdown} from '@/content/wiki'; import {skillCatalog} from '@/content/skills/catalog'; import {publicPostId} from './model'; import {pageId,exploreUrl,guidanceUrl} from '@/content/page-links'; -import {getPostById,discoveryDocuments,postsByPublicIds} from './library'; +import {getPostById,discoveryDocuments,postsByPublicIds,publishedPublicIds} from './library'; import {backlinksFor,rankDocuments,discoveryPage,type SearchDocument,type Backlink} from './discovery'; import {applyStaticEdit,staticEdits,withRevision} from './note-edits'; export type ExploreMedia={kind:'image'|'video'|'audio';url:string;title:string;poster?:string}; -export type ExploreEntry={id:string;title:string;description:string;imageCount:number;namespace:string;categories:string[];systemTags?:Tag[];markdown:string;media:ExploreMedia[];color:string;postSlug?:string;editableMarkdown?:string;revision?:string;assets?:{id:string;kind:string;role:string}[];coverAssetId?:string|null;backlinkCount?:number;backlinks?:Backlink[];searchExcerpt?:string}; +export type ExploreEntry={archived?:boolean;id:string;title:string;description:string;imageCount:number;namespace:string;categories:string[];systemTags?:Tag[];markdown:string;media:ExploreMedia[];color:string;postSlug?:string;editableMarkdown?:string;revision?:string;assets?:{id:string;kind:string;role:string}[];coverAssetId?:string|null;backlinkCount?:number;backlinks?:Backlink[];searchExcerpt?:string}; export const staticEntries:ExploreEntry[]=[...guidanceDocuments.map(doc=>{const card=skillCatalog.find(c=>doc.path===c.id);return {id:pageId('guidance:'+doc.path),title:doc.title,description:noteDescriptions[doc.path]||doc.blocks.find(b=>b.type==='paragraph')?.text||doc.title,imageCount:new Set([...(card?[card.image]:[]),...doc.resources.filter(r=>r.kind==='image').map(r=>r.href)]).size,namespace:'Main',categories:[doc.collection,...(doc.collection==='照片入皮影'?['中国风']:doc.collection==='街头小人'?['贴纸']:[])],systemTags:card?[systemTags[0]]:[],markdown:guidanceMarkdown(doc.path)!,media:Array.from(new Map([...(card?[{kind:'image' as const,url:card.image,title:card.alt}]:[]),...doc.resources.filter(r=>r.kind==='image').map(r=>({kind:'image' as const,url:r.href,title:r.title}))].map(m=>[m.url,m])).values()),color:'#eee5dc'};}),...wikiPages.map(page=>({id:pageId('wiki:'+page.namespace+':'+page.slug),title:page.title,description:page.summary,imageCount:0,namespace:page.namespace,categories:page.categories,markdown:wikiMarkdown(page),media:[],color:page.color}))]; // Canonicalize document references, including absolute links; pictures remain explicit links. export function canonicalMarkdown(text:string){return text.replace(/\]\((?:http:\/\/8\.211\.154\.134:18131)?\/skills\/([^ )]+)\)/g,(whole,path:string)=>{const clean=path.replace(/\/index\.md$/,'').replace(/\.md$/,'');return pageId('guidance:'+clean)?']('+guidanceUrl(clean)+'?agent_mode=True)':whole;});} @@ -23,11 +23,12 @@ async function readEntry(id:string,client?:PoolClient):Promisea.kind!=='text'&&a.role==='content').map(a=>({kind:a.kind as ExploreMedia['kind'],url:'/api/media/'+a.id,title:a.filename||post.title,...(a.kind==='video'&&a.variants.includes('poster')?{poster:'/api/media/'+post.assets.find(p=>p.source_asset_id===a.id&&p.derivation==='poster')?.id}:{})})); const editableMarkdown=post.assets.filter(a=>a.kind==='text').map(a=>a.body||'').join('\n\n'); const body=editableMarkdown+'\n\n'+post.assets.filter(a=>a.derivation).map(a=>'['+({poster:'视频封面',audio_track:'独立音轨',silent_video:'静音视频'}[a.derivation||'']||a.derivation)+'](/api/media/'+a.id+')').join(' · '); - return withRevision({id:publicPostId(post),assets:post.assets.filter(a=>a.kind!=='text').map(a=>({id:a.id,kind:a.kind,role:a.role})),coverAssetId:post.cover_asset_id,title:post.title,editableMarkdown,description:post.description||body.slice(0,180)||post.title,imageCount:media.filter(m=>m.kind==='image').length,namespace:['image','video','audio'].includes(post.kind)?'File':'Main',categories:ordinaryTags(post.tags).map(t=>t.name),systemTags:selectedSystemTags(post.tags),markdown:'# '+post.title+'\n\n'+body,media,color:'#eee5dc',postSlug:post.slug}); + return withRevision({archived:post.archived||false,id:publicPostId(post),assets:post.assets.filter(a=>a.kind!=='text').map(a=>({id:a.id,kind:a.kind,role:a.role})),coverAssetId:post.cover_asset_id,title:post.title,editableMarkdown,description:post.description||body.slice(0,180)||post.title,imageCount:media.filter(m=>m.kind==='image').length,namespace:['image','video','audio'].includes(post.kind)?'File':'Main',categories:ordinaryTags(post.tags).map(t=>t.name),systemTags:selectedSystemTags(post.tags),markdown:'# '+post.title+'\n\n'+body,media,color:'#eee5dc',postSlug:post.slug}); } export async function discoveryCorpus(client?:PoolClient){ - const [stored,edits]=await Promise.all([process.env.DATABASE_URL||client?discoveryDocuments(client):Promise.resolve([]),staticEdits(client)]); - const published=new Set(stored.map(p=>p.public_id)); + const [stored,edits,publishedIds]=await Promise.all([process.env.DATABASE_URL||client?discoveryDocuments(client):Promise.resolve([]),staticEdits(client),process.env.DATABASE_URL||client?publishedPublicIds(client):Promise.resolve([])]); + // Archived database notes must still suppress their file-backed predecessors. + const published=new Set(publishedIds); const pages=staticEntries.filter(e=>!published.has(e.id)).map(e=>applyStaticEdit(e,edits.find(edit=>edit.page_id===e.id))); const documents:SearchDocument[]=[...pages.map(e=>({id:e.id,title:e.title,description:e.description,markdown:canonicalMarkdown(e.markdown),categories:e.categories,systemTags:e.systemTags?.flatMap(t=>[t.name,t.system_key||'']),namespace:e.namespace,createdAt:''})),...stored.map(p=>({id:p.public_id||p.id,aliases:[p.id],title:p.title,description:p.description,markdown:canonicalMarkdown(p.markdown),categories:p.categories,systemTags:(p.system_tags||[]).flatMap((t:Tag)=>[t.name,t.system_key||'']),namespace:['image','video','audio'].includes(p.kind)?'File':'Main',createdAt:new Date(p.created_at).toISOString()}))]; return {documents,pages}; @@ -49,4 +50,4 @@ export async function exploreFeed(q='',category='',cursor?:string){ });return {entries,nextCursor:page.nextCursor,total:page.total,sort:q?'relevance,backlinks,newest':'backlinks,newest'}; } function excerpt(markdown:string,q:string){const clean=markdown.replace(/[`#*_[\]<>]/g,'').replace(/\s+/g,' '),term=q.trim().replace(/^"|"$/g,'').split(/\s+/)[0]||'',at=clean.toLocaleLowerCase().indexOf(term.toLocaleLowerCase());return (at>50?'…':'')+clean.slice(Math.max(0,at-50),Math.max(0,at-50)+180);} -export function entryText(entry:ExploreEntry){return `${entry.markdown}\n\nDescription: ${entry.description}\nBacklinks: ${entry.backlinkCount??0}\n${(entry.backlinks||[]).map(b=>'引用来源:['+b.title+']('+exploreUrl(b.id)+')').join('\n')}\nSystem tags: ${(entry.systemTags||[]).map(t=>t.name).join(', ')}\nNamespace: ${entry.namespace}\nCategories: ${entry.categories.join(', ')}\n\n`+entry.media.map(m=>`- ${m.kind}: [${m.title}](${m.url})`).join('\n')+'\n\n[网页]('+exploreUrl(entry.id)+')\n';} +export function entryText(entry:ExploreEntry){return `${entry.markdown}\n\nArchived: ${entry.archived?'true':'false'}\nDescription: ${entry.description}\nBacklinks: ${entry.backlinkCount??0}\n${(entry.backlinks||[]).map(b=>'引用来源:['+b.title+']('+exploreUrl(b.id)+')').join('\n')}\nSystem tags: ${(entry.systemTags||[]).map(t=>t.name).join(', ')}\nNamespace: ${entry.namespace}\nCategories: ${entry.categories.join(', ')}\n\n`+entry.media.map(m=>`- ${m.kind}: [${m.title}](${m.url})`).join('\n')+'\n\n[网页]('+exploreUrl(entry.id)+')\n';} diff --git a/apps/waterfall-wiki/src/lib/library.ts b/apps/waterfall-wiki/src/lib/library.ts index a2b66e3..cf549b5 100644 --- a/apps/waterfall-wiki/src/lib/library.ts +++ b/apps/waterfall-wiki/src/lib/library.ts @@ -17,11 +17,11 @@ export async function getPostById(id:string,client?:PoolClient):Promise { +export async function feed(options: {kind?: PostKind; path?: string; cursor?: string; q?: string;archived?:boolean} = {}): Promise { const allTags=await tags(); const target=options.path ? allTags.find(t=>t.path===options.path) : undefined; if(options.path&&!target) throw new Error("Tag not found"); const cursor=decodeCursor(options.cursor); const values: unknown[]=[]; - const where=[`EXISTS(SELECT 1 FROM post_assets pa JOIN assets a ON a.id=pa.asset_id WHERE pa.post_id=p.id AND pa.role IN ('content','caption') AND ((a.storage_key IS NOT NULL AND a.byte_size>0) OR (a.kind='text' AND a.body IS NOT NULL)))`]; + const where=[`p.archived=${options.archived===true?'true':'false'}`,`EXISTS(SELECT 1 FROM post_assets pa JOIN assets a ON a.id=pa.asset_id WHERE pa.post_id=p.id AND pa.role IN ('content','caption') AND ((a.storage_key IS NOT NULL AND a.byte_size>0) OR (a.kind='text' AND a.body IS NOT NULL)))`]; if(options.kind){values.push(options.kind);where.push(`p.kind=$${values.length}`);} if(target){values.push([target.id]);where.push(`EXISTS(SELECT 1 FROM post_tags WHERE post_id=p.id AND tag_id=ANY($${values.length}::uuid[]))`);} if(options.q){values.push(`%${options.q.replace(/[\\%_]/g,"\\$&")}%`);where.push(`p.title ILIKE $${values.length}`);} @@ -32,7 +32,7 @@ export async function feed(options: {kind?: PostKind; path?: string; cursor?: st return {posts,tags:allTags,contributions,nextCursor:hasMore&&last?encodeCursor(last.created_at,last.id):null}; } -export async function publishedPublicIds():Promise{return (await db().query("SELECT public_id FROM posts WHERE public_id IS NOT NULL")).rows.map(p=>p.public_id);} +export async function publishedPublicIds(client?:PoolClient):Promise{return (await (client||db()).query("SELECT public_id FROM posts WHERE public_id IS NOT NULL")).rows.map(p=>p.public_id);} /** Lightweight text corpus: no image bodies or media files are loaded. */ export async function discoveryDocuments(client?:PoolClient){ @@ -40,7 +40,7 @@ export async function discoveryDocuments(client?:PoolClient){ COALESCE((SELECT string_agg(a.body,E'\n\n' ORDER BY pa.position) FROM post_assets pa JOIN assets a ON a.id=pa.asset_id WHERE pa.post_id=p.id AND a.kind='text'),'') AS markdown, COALESCE((SELECT jsonb_agg(t.name) FROM tags t JOIN post_tags pt ON pt.tag_id=t.id WHERE pt.post_id=p.id AND t.kind='normal'),'[]') AS categories, COALESCE((SELECT jsonb_agg(t) FROM tags t JOIN post_tags pt ON pt.tag_id=t.id WHERE pt.post_id=p.id AND t.kind='system'),'[]') AS system_tags - FROM posts p WHERE EXISTS(SELECT 1 FROM post_assets pa JOIN assets a ON a.id=pa.asset_id WHERE pa.post_id=p.id AND pa.role IN ('content','caption') AND ((a.storage_key IS NOT NULL AND a.byte_size>0) OR (a.kind='text' AND a.body IS NOT NULL)))`)).rows; + FROM posts p WHERE NOT p.archived AND EXISTS(SELECT 1 FROM post_assets pa JOIN assets a ON a.id=pa.asset_id WHERE pa.post_id=p.id AND pa.role IN ('content','caption') AND ((a.storage_key IS NOT NULL AND a.byte_size>0) OR (a.kind='text' AND a.body IS NOT NULL)))`)).rows; } export async function postsByPublicIds(ids:string[],client?:PoolClient):Promise{ if(!ids.length)return [];const rows=(await (client||db()).query(`${expand} WHERE COALESCE(p.public_id,p.id::text)=ANY($1::text[])`,[ids])).rows; diff --git a/apps/waterfall-wiki/src/lib/model.ts b/apps/waterfall-wiki/src/lib/model.ts index f01ff45..974c359 100644 --- a/apps/waterfall-wiki/src/lib/model.ts +++ b/apps/waterfall-wiki/src/lib/model.ts @@ -8,7 +8,7 @@ export const sections = [ export type PostKind = typeof sections[number]["kind"]; export type Asset = { id: string; kind: "image" | "video" | "audio" | "text"; filename: string | null; body: string | null; width: number | null; height: number | null; duration: number | null; has_audio: boolean | null; processing_status: string; variants: string[]; role: string; source_asset_id: string | null; derivation: string | null }; export type Tag = { id: string; name: string; slug: string; path: string;kind?:'normal'|'system';system_key?:string|null }; -export type Post = { description: string; id: string; public_id?: string | null; slug: string; kind: PostKind; title: string; created_at: string; updated_at: string; cover_asset_id: string | null; assets: Asset[]; tags: Tag[] }; +export type Post = { archived?:boolean;archived_at?:string|null; description: string; id: string; public_id?: string | null; slug: string; kind: PostKind; title: string; created_at: string; updated_at: string; cover_asset_id: string | null; assets: Asset[]; tags: Tag[] }; export type FeedData = { posts: Post[]; tags: Tag[]; contributions: { day: string; total: number }[]; nextCursor: string | null; unavailable?: boolean }; export function validSection(path: string) { return sections.find(s => s.path === path); } export const mediaUrl = (id: string, variant?: string) => `/api/media/${id}${variant ? `?variant=${variant}` : ""}`; diff --git a/apps/waterfall-wiki/src/lib/note-edits.ts b/apps/waterfall-wiki/src/lib/note-edits.ts index b9d0035..05795c6 100644 --- a/apps/waterfall-wiki/src/lib/note-edits.ts +++ b/apps/waterfall-wiki/src/lib/note-edits.ts @@ -8,7 +8,7 @@ import {postInput} from './write'; export function withoutTitle(markdown:string){return markdown.replace(/^# [^\n]*(?:\n|$)\n?/,'');} export function withRevision(entry:ExploreEntry):ExploreEntry{ const editableMarkdown=entry.editableMarkdown??withoutTitle(entry.markdown); - const revision=createHash('sha256').update(JSON.stringify([entry.title,entry.description,editableMarkdown,[...entry.categories].sort(),(entry.systemTags||[]).map(t=>t.id).sort(),entry.coverAssetId??null,entry.assets?.map(a=>[a.id,a.role])??[]])).digest('hex'); + const revision=createHash('sha256').update(JSON.stringify([entry.archived||false,entry.title,entry.description,editableMarkdown,[...entry.categories].sort(),(entry.systemTags||[]).map(t=>t.id).sort(),entry.coverAssetId??null,entry.assets?.map(a=>[a.id,a.role])??[]])).digest('hex'); return {...entry,editableMarkdown,revision}; } export async function staticEdits(client?:PoolClient){if(!process.env.DATABASE_URL)return [];return (await (client||db()).query(`SELECT e.*,COALESCE((SELECT jsonb_agg(t.name ORDER BY t.name) FROM note_edit_tags et JOIN tags t ON t.id=et.tag_id WHERE et.page_id=e.page_id AND t.kind='normal'),'[]') AS categories,COALESCE((SELECT jsonb_agg(t ORDER BY t.name) FROM note_edit_tags et JOIN tags t ON t.id=et.tag_id WHERE et.page_id=e.page_id AND t.kind='system'),'[]') AS "systemTags" FROM note_edits e`)).rows;} diff --git a/apps/waterfall-wiki/src/lib/post-archive.ts b/apps/waterfall-wiki/src/lib/post-archive.ts new file mode 100644 index 0000000..a87b35a --- /dev/null +++ b/apps/waterfall-wiki/src/lib/post-archive.ts @@ -0,0 +1,11 @@ +import {z} from 'zod'; +import {db} from './db'; +export const archiveInput=z.object({archived:z.boolean()}).strict(); +export const postIdentifier=z.string().regex(/^(?:[a-f0-9]{24}|[a-f0-9]{8}-(?:[a-f0-9]{4}-){3}[a-f0-9]{12})$/); +export async function setPostArchived(id:string,archived:boolean){ + const result=await db().query(`UPDATE posts SET archived=$2, + archived_at=CASE WHEN $2 THEN COALESCE(archived_at,now()) ELSE NULL END, + updated_at=CASE WHEN archived IS DISTINCT FROM $2 THEN now() ELSE updated_at END + WHERE id::text=$1 OR public_id=$1 RETURNING id,public_id,title,archived,archived_at`,[id,archived]); + const post=result.rows[0];return post?{id:post.id,publicId:post.public_id,title:post.title,archived:post.archived,archivedAt:post.archived_at,url:'/explore/'+(post.public_id||post.id)}:null; +} diff --git a/apps/waterfall-wiki/src/pages/api/feed.ts b/apps/waterfall-wiki/src/pages/api/feed.ts index 1bac43d..970e0dc 100644 --- a/apps/waterfall-wiki/src/pages/api/feed.ts +++ b/apps/waterfall-wiki/src/pages/api/feed.ts @@ -1,3 +1,4 @@ +import {z} from 'zod'; import {serveApiDocumentation} from '@/lib/api-documentation'; import type { NextApiRequest,NextApiResponse } from "next"; import { feed } from "@/lib/library"; @@ -7,6 +8,6 @@ export default async function handler(req:NextApiRequest,res:NextApiResponse){ if(serveApiDocumentation(req,res,'/api/feed'))return; if(req.method!=='GET')return res.status(405).end(); try {const section=String(req.query.section||'');if(section&&!validSection(section))return res.status(400).json({error:'未知分类'}); - res.setHeader('Cache-Control','no-store');return res.json(await feed({kind:validSection(section)?.kind,path:String(req.query.path||''),cursor:String(req.query.cursor||''),q:String(req.query.q||'').slice(0,200)})); + res.setHeader('Cache-Control','no-store');return res.json(await feed({kind:validSection(section)?.kind,path:String(req.query.path||''),cursor:String(req.query.cursor||''),q:String(req.query.q||'').slice(0,200),archived:z.enum(['true','false']).default('false').parse(req.query.archived)==='true'})); }catch(e){return apiError(res,e);} } diff --git a/apps/waterfall-wiki/src/pages/api/posts/[id]/archive.ts b/apps/waterfall-wiki/src/pages/api/posts/[id]/archive.ts new file mode 100644 index 0000000..11c738a --- /dev/null +++ b/apps/waterfall-wiki/src/pages/api/posts/[id]/archive.ts @@ -0,0 +1,10 @@ +import type {NextApiRequest,NextApiResponse} from 'next'; +import {serveApiDocumentation} from '@/lib/api-documentation'; +import {sameOrigin,apiError} from '@/lib/api'; +import {archiveInput,postIdentifier,setPostArchived} from '@/lib/post-archive'; +export default async function handler(req:NextApiRequest,res:NextApiResponse){ + if(serveApiDocumentation(req,res,'/api/posts/{id}/archive'))return; + res.setHeader('Cache-Control','no-store');if(req.method!=='POST'){res.setHeader('Allow','POST');return res.status(405).end()} + try{sameOrigin(req);const post=await setPostArchived(postIdentifier.parse(req.query.id),archiveInput.parse(req.body).archived);return post?res.json({post}):res.status(404).json({error:'笔记不存在'})}catch(error){return apiError(res,error)} +} +export const config={api:{bodyParser:{sizeLimit:'1kb'}}}; diff --git a/apps/waterfall-wiki/src/styles/globals.css b/apps/waterfall-wiki/src/styles/globals.css index 8347f0a..cbc8c49 100644 --- a/apps/waterfall-wiki/src/styles/globals.css +++ b/apps/waterfall-wiki/src/styles/globals.css @@ -64,3 +64,5 @@ @media(min-width:761px){.tag-popover{position:fixed;left:50%;right:auto;top:50%;width:min(380px,calc(100vw - 32px));transform:translate(-50%,-50%);z-index:1100}} .discovery-card-meta .backlink-count svg{width:16px;height:16px}.discovery-card .discovery-image-count svg{width:15px;height:15px} + +.note-archive-status{background:#fff1db;color:#795d31;padding:10px 12px;border-radius:8px;font-size:13px;line-height:1.6}.note-info>footer{flex-wrap:wrap} diff --git a/apps/waterfall-wiki/tests/api-documentation.test.ts b/apps/waterfall-wiki/tests/api-documentation.test.ts index eb6151f..c0c12ca 100644 --- a/apps/waterfall-wiki/tests/api-documentation.test.ts +++ b/apps/waterfall-wiki/tests/api-documentation.test.ts @@ -14,7 +14,7 @@ const request=(method:string,agent_mode:unknown)=>({method,query:{agent_mode}} a test('every business handler serves documentation before validating parameters or accessing dependencies',async()=>{ const routes:Record={ '/api/explore-feed':'explore-feed','/api/feed':'feed','/api/notes/{id}':'notes/[id]', - '/api/posts':'posts/index','/api/tags':'tags','/api/upload':'upload', + '/api/posts/{id}/archive':'posts/[id]/archive','/api/posts':'posts/index','/api/tags':'tags','/api/upload':'upload', '/api/media/{id}':'media/[id]','/api/preview':'preview', '/api/skills/street-people':'skills/street-people','/api/health':'health','/api/ready':'ready', }; diff --git a/apps/waterfall-wiki/tests/integration.test.ts b/apps/waterfall-wiki/tests/integration.test.ts index 42ae7db..5c26fce 100644 --- a/apps/waterfall-wiki/tests/integration.test.ts +++ b/apps/waterfall-wiki/tests/integration.test.ts @@ -212,6 +212,22 @@ test('real PostgreSQL + S3 notes, flat tags, resource sharing and video processi assert.equal((await patchTags({tags:[],revision:afterTags.revision})).status,200); const cleared=(await request('/api/notes/'+targetNote.id)).entry;assert.equal(cleared.categories.length,0);assert.equal(cleared.systemTags.length,0); const categoriesHtml=await fetch(base+'/categories').then(r=>r.text());const tabs=categoriesHtml.match(/aria-label="系统标签分类"[\s\S]*?<\/nav>/)?.[0]||'';assert.ok(tabs.includes('文档入口'));assert.ok(tabs.includes('参考图'));assert.ok(!tabs.includes(plain.name)); + // Archive is a reversible visibility change, including code-backed public IDs. + const archiveTarget=(await request('/api/notes/'+publishedNote.publicId)).entry; + const archive=(value:boolean)=>fetch(base+'/api/posts/'+publishedNote.publicId+'/archive',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({archived:value})}); + const archivedResponse=await archive(true);assert.equal(archivedResponse.status,200);const archived=(await archivedResponse.json()).post;assert.equal(archived.archived,true);assert.ok(archived.archivedAt); + assert.equal((await (await archive(true)).json()).post.archivedAt,archived.archivedAt,'Repeated archive preserves the archive timestamp'); + const archivedEntry=(await request('/api/notes/'+publishedNote.publicId)).entry;assert.equal(archivedEntry.archived,true);assert.equal(archivedEntry.editableMarkdown,archiveTarget.editableMarkdown);assert.deepEqual(archivedEntry.assets,archiveTarget.assets);assert.notEqual(archivedEntry.revision,archiveTarget.revision); + assert.ok(!(await request('/api/explore-feed?q='+encodeURIComponent(archiveTarget.title))).entries.some((e:{id:string})=>e.id===publishedNote.publicId),'Archived database note must not reappear from its static predecessor'); + assert.ok(!(await request('/api/feed?q='+encodeURIComponent(archiveTarget.title))).posts.some((p:{id:string})=>p.id===publishedNote.id)); + assert.ok((await request('/api/feed?archived=true&q='+encodeURIComponent(archiveTarget.title))).posts.some((p:{id:string})=>p.id===publishedNote.id)); + assert.ok(!(await fetch(base+'/api/wiki-index').then(r=>r.text())).includes('['+archiveTarget.title+']')); + assert.equal((await fetch(base+'/explore/'+publishedNote.publicId)).status,200,'Direct archived links remain readable for recovery'); + const restored=await archive(false);assert.equal(restored.status,200);assert.equal((await restored.json()).post.archived,false); + assert.ok((await request('/api/explore-feed?q='+encodeURIComponent(archiveTarget.title))).entries.some((e:{id:string})=>e.id===publishedNote.publicId)); + assert.equal((await fetch(base+'/api/feed?archived=invalid')).status,400); + assert.equal((await fetch(base+'/api/posts/'+randomUUID()+'/archive',{method:'POST',headers:{'Content-Type':'application/json'},body:'{"archived":true}'})).status,404); + }finally{ for(const child of [worker,server])if(child&&child.exitCode===null&&child.signalCode===null){const stopped=once(child,'exit');child.kill('SIGTERM');await stopped;} await rm(dir,{recursive:true,force:true});await db().end();