fix(blog): filter unpublished posts immediately (#264)

Previously, unpublished posts still appeared in the blog index.

Author: caugner

crates/rari-data/src/baseline.rs

@@ -7,8 +7,7 @@ use std::path::Path;
 use indexmap::IndexMap;
 use rari_utils::concat_strs;
 use rari_utils::io::read_to_string;
-use schemars::Schema;
-use schemars::{JsonSchema, SchemaGenerator};
+use schemars::{JsonSchema, Schema, SchemaGenerator};
 use serde::de::{self, value, SeqAccess, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_json::Value;

crates/rari-doc/src/build.rs

@@ -10,7 +10,7 @@ use std::io::{BufWriter, Write};
 use std::iter::once;
 use std::path::PathBuf;
 
-use chrono::{NaiveDateTime, Utc};
+use chrono::NaiveDateTime;
 use itertools::Itertools;
 use rari_types::globals::{
     base_url, blog_root, build_out_root, contributor_spotlight_root, curriculum_root,
@@ -34,7 +34,6 @@ use crate::pages::page::{Page, PageBuilder, PageLike};
 use crate::pages::types::spa::SPA;
 use crate::resolve::url_to_folder_path;
 use crate::rss::create_rss;
-use crate::utils::filter_unpublished_blog_post;
 
 #[derive(Clone, Debug, Default)]
 pub struct SitemapMeta<'a> {
@@ -266,7 +265,6 @@ pub fn build_blog_pages<'a>() -> Result<Vec<SitemapMeta<'a>>, DocError> {
         return Err(DocError::NoBlogRoot);
     }
     copy_blog_author_avatars()?;
-    let now = Utc::now().date_naive();
 
     let rss_file = build_out_root()?
         .join(default_locale().as_folder_str())
@@ -275,7 +273,6 @@ pub fn build_blog_pages<'a>() -> Result<Vec<SitemapMeta<'a>>, DocError> {
     let sorted_posts: Vec<_> = blog_files()
         .posts
         .values()
-        .filter(|post| filter_unpublished_blog_post(post, &now))
         .filter_map(|page| {
             if let Page::BlogPost(post) = page {
                 Some(post)
@@ -291,7 +288,6 @@ pub fn build_blog_pages<'a>() -> Result<Vec<SitemapMeta<'a>>, DocError> {
     blog_files()
         .posts
         .values()
-        .filter(|post| filter_unpublished_blog_post(post, &now))
         .chain(once(&SPA::from_url("/en-US/blog/").unwrap()))
         .map(|page| {
             build_single_page(page).map(|_| SitemapMeta {

crates/rari-doc/src/cached_readers.rs

@@ -27,6 +27,7 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 use std::sync::{Arc, LazyLock, OnceLock};
 
+use chrono::Utc;
 use dashmap::DashMap;
 use rari_types::globals::{
     blog_root, cache_content, content_root, content_translated_root, contributor_spotlight_root,
@@ -52,7 +53,7 @@ use crate::pages::types::generic::Generic;
 use crate::reader::read_docs_parallel;
 use crate::sidebars::jsref;
 use crate::translations::init_translations_from_static_docs;
-use crate::utils::split_fm;
+use crate::utils::{filter_unpublished_blog_post, split_fm};
 use crate::walker::walk_builder;
 
 pub(crate) static STATIC_DOC_PAGE_FILES: OnceLock<HashMap<(Locale, Cow<'_, str>), Page>> =
@@ -234,9 +235,11 @@ pub fn doc_page_from_static_files(path: &Path) -> Result<Page, DocError> {
 
 fn gather_blog_posts() -> Result<HashMap<String, Page>, DocError> {
     if let Some(blog_root) = blog_root() {
+        let now = Utc::now().date_naive();
         let post_root = blog_root.join("posts");
         Ok(read_docs_parallel::<Page, BlogPost>(&[post_root], None)?
             .into_iter()
+            .filter(|post| filter_unpublished_blog_post(&post, &now))
             .map(|page| (page.url().to_ascii_lowercase(), page))
             .collect())
     } else {

crates/rari-doc/src/html/banner.rs

@@ -1,11 +1,11 @@
-use rari_types::{templ::TemplType, Arg, Quotes};
+use rari_types::templ::TemplType;
+use rari_types::{Arg, Quotes};
 use tracing::{span, Level};
 
-use crate::{
-    error::DocError,
-    pages::{page::PageLike, types::utils::FmTempl},
-    templ::templs::invoke,
-};
+use crate::error::DocError;
+use crate::pages::page::PageLike;
+use crate::pages::types::utils::FmTempl;
+use crate::templ::templs::invoke;
 
 pub fn build_banner<T: PageLike>(banner: &FmTempl, page: &T) -> Result<String, DocError> {
     let rari_env = page.rari_env().ok_or(DocError::NoRariEnv)?;

crates/rari-doc/src/pages/types/spa.rs

@@ -4,17 +4,13 @@ use std::iter;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, LazyLock};
 
-use chrono::Utc;
 use constcat::concat;
 use rari_types::fm_types::{FeatureStatus, PageType};
 use rari_types::globals::{content_translated_root, settings};
 use rari_types::locale::Locale;
 use rari_types::RariEnv;
 use rari_utils::concat_strs;
 
-use crate::pages::templates::{BlogRenderer, HomeRenderer, SpaRenderer};
-use crate::pages::types::utils::FmTempl;
-
 use super::spa_homepage::{
     featured_articles, featured_contributor, latest_news, recent_contributions,
 };
@@ -29,9 +25,9 @@ use crate::pages::json::{
     JsonHomePage, JsonHomePageSPAHyData, JsonSpaPage, Parent,
 };
 use crate::pages::page::{Page, PageLike, PageReader};
-use crate::pages::templates::SpaBuildTemplate;
+use crate::pages::templates::{BlogRenderer, HomeRenderer, SpaBuildTemplate, SpaRenderer};
 use crate::pages::types::blog::BlogMeta;
-use crate::utils::filter_unpublished_blog_post;
+use crate::pages::types::utils::FmTempl;
 
 #[derive(Debug, Clone)]
 pub struct SPA {
@@ -321,12 +317,7 @@ static POSTS_PER_PAGE: LazyLock<usize> = LazyLock::new(|| {
 });
 
 fn blog_indices() -> Vec<(String, BuildSPA)> {
-    let now = Utc::now().date_naive();
-    let num_posts = blog_files()
-        .posts
-        .values()
-        .filter(|post| filter_unpublished_blog_post(post, &now))
-        .count();
+    let num_posts = blog_files().posts.values().count();
     let pages = num_posts / *POSTS_PER_PAGE;
     iter::once((
         "blog".to_string(),