Files
blog/src/pages/en/archives/[...slug].astro
T
wait4xandGLM-5.3 49acb4cbd1 fix(posts): 隐藏开关是假开关——修「隐藏+置顶仍显示并排第一」;贡献数据去重
用户实测:「有的文章同时选择了置顶和隐藏,还会显示并置顶」。

根因:后台「隐藏」开关(hiddenTag)是个假开关——它只写 `hiddenTag: true` 这个
没人读的字段,而全站过滤只认 `tags` 里的 `hidden`。于是隐藏从未生效;
叠加置顶后,这篇还在列表最前面。

- 新增 src/lib/post-visibility.ts:可见性契约单一事实源——`!draft && !hidden &&
  !tags.includes('hidden')`(两条通道都认,历史写法兼容)
- postsSchema 增真字段 `hidden`;七处消费点(首页双轨/归档 zh/en/书架/RSS zh/en/
  文章页导航)统一走 isVisiblePost
- 后台假开关 hiddenTag 换成真开关 hidden,hint 写清语义:不进列表/RSS/sitemap,
  页面本身仍生成(链接可分享);与置顶同时打开时以隐藏为准
- sitemap 过滤隐藏文章(astro.config 配置期扫 frontmatter,两种写法都认;
  内容目录不可读时宁可不排除也不炸构建)

贡献数据去重(5j T2,回答用户「连续贡献是否实时」):
- 连续贡献不再构建期抓取 streak.svg 快照(不实时、暗色需滤镜、与热力图同源重复),
  改为热力图同一份 GraphQL 日历本地计算(src/lib/heatmap.ts streakStats):
  当前连续(以最后有贡献日为终点)/ 最长 / 总贡献,界面上标注「数据更新于 X」
- 贡献蛇块与自托管 snake/streak SVG 删除,fetch 脚本 ASSETS 清空,
  build.sh 守卫改为退役说明;开源页数据板整块并入热力图区

验证: 构建 51 页 exit 0;content-lint 52 页 0/0/0;E2E 56/56;
      临时两篇「置顶+隐藏」(新字段/旧 tags 各一)实测——首页/归档/书架/
      双语首页/RSS 双语/sitemap 全部零命中,页面本身仍生成;
      清理后归档首条恢复 writing-template(普通置顶不受影响);
      开源页 snake/streak 资产零残留、连续统计条与更新时间标注就位

Spec: 2026-11-03_blog-5j-content-refine (T2 + 隐藏 bug 修复)

Co-authored-by: GLM-5.3
2026-11-04 22:00:15 +08:00

170 lines
6.7 KiB
Plaintext
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
---
// /en/archives/{slug}:英文版文章页——postsEn 优先;缺译回退 zh 正文 + 醒目标注
import type { CollectionEntry } from 'astro:content';
import { isVisiblePost } from '../../../lib/post-visibility';
import { getCollection, render } from 'astro:content';
import LinkCardStyles from '../../../components/geek/LinkCardStyles.astro';
import PhotoZoom from '../../../components/geek/PhotoZoom.astro';
import BaseLayout from '../../../layouts/BaseLayout.astro';
import ArtalkComments from '../../../components/ArtalkComments.astro';
import ViewMeta from '../../../components/geek/ViewMeta.astro';
import AiTranslatedBadge from '../../../components/AiTranslatedBadge.astro';
import { t } from '../../../i18n/ui';
export async function getStaticPaths() {
// 路径全量(hidden 样张出页);prev/next 滤 hidden(同 zh 轨修正)
const all = (await getCollection('posts', ({ data }) => !data.draft)).sort(
(a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime(),
);
const nav = all.filter(({ data }) => isVisiblePost(data));
const en = new Map((await getCollection('postsEn')).map((e) => [e.id, e]));
return all.map((entry) => {
const i = nav.findIndex((e) => e.id === entry.id);
return {
params: { slug: entry.id },
props: {
entry,
enEntry: en.get(entry.id) ?? null,
prev: i >= 0 ? (nav[i + 1] ?? null) : null,
next: i > 0 ? (nav[i - 1] ?? null) : null,
},
};
});
}
interface Props {
entry: CollectionEntry<'posts'>;
enEntry: CollectionEntry<'postsEn'> | null;
prev: CollectionEntry<'posts'> | null;
next: CollectionEntry<'posts'> | null;
}
const { entry, enEntry, prev, next } = Astro.props;
// 译文存在则渲染译文;否则回退 zh 正文(语言切换的降级承诺:单篇未译不破站)
const { Content } = await render(enEntry ?? entry);
const isReading = entry.data.category === 'reading';
const date = entry.data.pubDate.toISOString().slice(0, 10);
const words = (enEntry?.body ?? entry.body ?? '').split(/\s+/).length;
const minutes = Math.max(1, Math.ceil(words / 220));
---
<BaseLayout title={`${enEntry?.data.title ?? entry.data.title} · wait4x`} track={isReading ? 'reading' : 'tech'}>
<article class={`post ${isReading ? 'post-reading' : 'post-tech'}`}>
<header class="post-head">
<p class="post-cat">
{isReading ? t('category_reading', 'en') : entry.data.category === 'tech' ? t('category_tech', 'en') : t('category_photo', 'en')}
</p>
<h1 class="post-title">{enEntry?.data.title ?? entry.data.title}</h1>
<p class="post-meta">
<i class="emo" style={`background:${entry.data.mood ?? 'var(--mood)'}`} aria-hidden="true" />
<time datetime={entry.data.pubDate.toISOString()}>{date}</time>
<span aria-hidden="true">·</span>
<span>{minutes} {t('reading_time_min', 'en')}</span>
</p>
<ViewMeta pageKey={`/archives/${entry.id}/`} locale="en" mode="page" variant="inline" />
</header>
<AiTranslatedBadge />
<div class={isReading ? 'prose-reading' : 'prose-tech'}>
<Content />
{entry.data.video && (
<figure class="post-video">
<video controls preload="metadata" playsinline poster={entry.data.poster}>
<source src={entry.data.video} />
Your browser cannot play embedded video — <a href={entry.data.video}>download it instead</a>.
</video>
</figure>
)}
</div>
<nav class="pn">
{prev && <a class="pn-item" href={`/en/archives/${prev.id}/`}>← {t('prev_post', 'en')} · {prev.data.title}</a>}
{next && <a class="pn-item" href={`/en/archives/${next.id}/`}>{t('next_post', 'en')} · {next.data.title} →</a>}
</nav>
<ArtalkComments pageKey={`/archives/${entry.id}/`} pageTitle={entry.data.title} />
</article>
<LinkCardStyles />
<PhotoZoom />
</BaseLayout>
<style>
.post-head { margin-bottom: var(--space-4); }
.post-cat { font-family: var(--font-mono); font-size: 12px; color: var(--ink-3); letter-spacing: 0.08em; }
.post-title { font-size: var(--text-h1); line-height: var(--leading-heading); color: var(--ink-1); text-wrap: balance; }
/* 计数徽标紧贴 meta 行(组件根元素在子作用域,需 :global) */
.post-head :global(.viewmeta) { margin-top: 8px; }
.post-meta { display: flex; align-items: center; gap: var(--space-2); margin-top: var(--space-2); font-size: 13px; color: var(--ink-3); }
.emo { display: inline-block; width: 10px; height: 10px; border-radius: 50%; }
.pn { display: flex; flex-direction: column; gap: var(--space-2); margin-top: var(--space-5); }
.pn-item { font-size: 14px; color: var(--ink-2); transition: color var(--dur) var(--ease); }
.pn-item:hover { color: var(--accent); }
/* ---- T5 code window bar (§6-3): ≥4-line blocks only ---- */
.prose-tech :global(pre.code-win) {
position: relative;
padding-top: calc(var(--space-3) + 30px);
}
.prose-tech :global(pre.code-win::before) {
content: attr(data-lang);
position: absolute;
inset: 0 0 auto 0;
height: calc(var(--space-3) + 30px - 1px);
display: flex;
align-items: flex-end;
padding: 0 14px 8px 66px;
background: #161b22;
border-bottom: 1px solid rgba(255, 255, 255, 0.06);
border-radius: 8px 8px 0 0;
font-family: var(--font-mono);
font-size: 11px;
letter-spacing: 0.04em;
color: #6e7681;
text-transform: lowercase;
}
.prose-tech :global(pre.code-win::after) {
content: '';
position: absolute;
top: 10px;
left: 14px;
width: 10px;
height: 10px;
border-radius: 50%;
background: #30363d;
box-shadow: 18px 0 0 #30363d, 36px 0 0 #30363d;
}
/* ---- T6 reading paper card (§6-2) ---- */
/* 文章附视频:与 zh 版同构(cms 车道 B) */
.post-video {
margin: var(--space-4) 0 0;
}
.post-video video {
width: 100%;
height: auto;
border-radius: 10px;
background: #000;
display: block;
}
.prose-reading {
border: 1px solid var(--paper-line);
border-radius: 12px;
padding: var(--space-5) clamp(20px, 4vw, 32px);
}
</style>
<script>
// Code window bar marker (same as zh track): count lines, tag .code-win + data-lang
const markCodeWins = () => {
document.querySelectorAll('.prose-tech pre:not(.code-win)').forEach((pre) => {
const code = pre.querySelector('code');
if (!code) return;
const lines = (code.textContent ?? '').split('\n').length;
if (lines >= 4) {
// astro shiki 语言落 pre[data-language](code 类名为空)
const lang = pre.dataset.language ?? /language-([\w-]+)/.exec(code.className)?.[1] ?? 'text';
pre.dataset.lang = lang;
pre.classList.add('code-win');
}
});
};
document.addEventListener('astro:page-load', markCodeWins);
markCodeWins();
</script>