{}
", text) + let text = if let Some(s) = block_content.and_then(|c| c.as_str()) { + s.to_string() + } else { + block_content + .and_then(|c| c.get("text")) + .and_then(|t| t.as_str()) + .map(escape_html) + .unwrap_or_default() + }; + if text.is_empty() { + String::new() + } else if text.contains('<') && text.contains('>') { + text.clone() + } else { + format!("{}
", text) + } } "image" => { - let url = sanitize_url(block_content.and_then(|c| c.get("url")).and_then(|u| u.as_str()).unwrap_or_default()).unwrap_or_default(); - let alt = escape_html(block_content.and_then(|c| c.get("alt")).and_then(|a| a.as_str()).unwrap_or("")); - format!("{}{}{}", text, citation) } "hero" => { let title = escape_html(block_content.and_then(|c| c.get("title")).and_then(|t| t.as_str()).unwrap_or("")); let subtitle = escape_html(block_content.and_then(|c| c.get("subtitle")).and_then(|t| t.as_str()).unwrap_or("")); - let bg = sanitize_url(block_content.and_then(|c| c.get("backgroundImage")).and_then(|t| t.as_str()).unwrap_or_default()).unwrap_or_default(); - let cta_text = escape_html(block_content.and_then(|c| c.get("ctaText")).and_then(|t| t.as_str()).unwrap_or("")); - let cta_link = sanitize_url(block_content.and_then(|c| c.get("ctaLink")).and_then(|t| t.as_str()).unwrap_or_default()).unwrap_or_else(|| "#".to_string()); + let bg = block_content.and_then(|c| c.get("backgroundImage")).and_then(|t| t.as_str()).unwrap_or(""); + let cta_text = block_content.and_then(|c| c.get("ctaText")).and_then(|t| t.as_str()).unwrap_or(""); + let cta_link = block_content.and_then(|c| c.get("ctaLink")).and_then(|t| t.as_str()).unwrap_or("#"); let bg_style = if !bg.is_empty() { format!("background-image: linear-gradient(rgba(0,0,0,0.6), rgba(0,0,0,0.6)), url('{}'); background-size: cover; background-position: center;", bg) } else { @@ -643,7 +548,7 @@ fn render_blocks(content: &serde_json::Value) -> String { "#, bg_style, title, subtitle, if !cta_text.is_empty() { format!("{}", cta_link, cta_text) } else { String::new() }) } "video" => { - let url = escape_html(block_content.and_then(|c| c.get("url")).and_then(|t| t.as_str()).unwrap_or("")); + let url = block_content.and_then(|c| c.get("url")).and_then(|t| t.as_str()).unwrap_or(""); let caption = escape_html(block_content.and_then(|c| c.get("caption")).and_then(|t| t.as_str()).unwrap_or("")); let embed_html = if url.contains("youtube.com") || url.contains("youtu.be") { let video_id = if url.contains("v=") { @@ -665,10 +570,18 @@ fn render_blocks(content: &serde_json::Value) -> String { } else { String::new() } } "columns" => { - let left = escape_html(block_content.and_then(|c| c.get("left")).and_then(|t| t.as_str()).unwrap_or("")); - let right = escape_html(block_content.and_then(|c| c.get("right")).and_then(|t| t.as_str()).unwrap_or("")); - let left_img = sanitize_url(block_content.and_then(|c| c.get("leftImage")).and_then(|t| t.as_str()).unwrap_or("")).unwrap_or_default(); - let right_img = sanitize_url(block_content.and_then(|c| c.get("rightImage")).and_then(|t| t.as_str()).unwrap_or("")).unwrap_or_default(); + let left = block_content + .and_then(|c| c.get("left")) + .and_then(|t| t.as_str()) + .map(escape_html) + .unwrap_or_default(); + let right = block_content + .and_then(|c| c.get("right")) + .and_then(|t| t.as_str()) + .map(escape_html) + .unwrap_or_default(); + let left_img = block_content.and_then(|c| c.get("leftImage")).and_then(|t| t.as_str()).unwrap_or(""); + let right_img = block_content.and_then(|c| c.get("rightImage")).and_then(|t| t.as_str()).unwrap_or(""); format!(r#"
{} {}
@@ -684,8 +597,20 @@ fn render_blocks(content: &serde_json::Value) -> String {
)
}
_ => {
- let text = escape_html(block_content.and_then(|c| c.get("text")).and_then(|t| t.as_str()).unwrap_or(""));
- format!("> {
let project_name = std::env::var("CLOUDFLARE_PAGES_PROJECT")
.map_err(|_| "CLOUDFLARE_PAGES_PROJECT not set")?;
@@ -786,7 +637,6 @@ pub async fn deploy_to_cloudflare() -> Result Result
{% if title and title != site_name %}{{ title }} - {% endif %}{{ site_name }}
- {% if meta_description %}{% elif site_description %}{% endif %}
+ {% if site_description %}{% endif %}
{% if favicon_url %}{% endif %}
{% if logo_url %}{% endif %}
-
+
+
- {% if meta_description %}{% elif site_description %}{% endif %}
+ {% if site_description %}{% endif %}
{% if featured_image %}
@@ -26,51 +27,28 @@
- {% if meta_description %}{% elif site_description %}{% endif %}
+ {% if site_description %}{% endif %}
{% if featured_image %}
{% elif logo_url %}
{% endif %}
- {% if is_blog_post %}
-
-
- {% else %}
-
+
- {% endif %}
{}
", text) + let text = if let Some(s) = block_content.and_then(|c| c.as_str()) { + s.to_string() + } else { + block_content + .and_then(|c| c.get("text")) + .and_then(|t| t.as_str()) + .map(escape_html) + .unwrap_or_default() + }; + if text.is_empty() { + String::new() + } else { + format!("{}
", text) + } } } }) @@ -696,80 +621,6 @@ fn render_blocks(content: &serde_json::Value) -> String { } } -fn extract_plain_text(content: &serde_json::Value) -> String { - if let Some(blocks) = content.as_array() { - let mut text = String::new(); - - for block in blocks.iter() { - let block_type = block - .get("block_type") - .and_then(|b| b.as_str()) - .unwrap_or("text"); - let block_content = block.get("content"); - - let block_text: String = match block_type { - "heading" => block_content - .and_then(|c| c.get("text")) - .and_then(|t| t.as_str()) - .unwrap_or("") - .to_string(), - "paragraph" => block_content - .and_then(|c| c.get("text")) - .and_then(|t| t.as_str()) - .unwrap_or("") - .to_string(), - "quote" => block_content - .and_then(|c| c.get("text")) - .and_then(|t| t.as_str()) - .unwrap_or("") - .to_string(), - "hero" => { - let title = block_content - .and_then(|c| c.get("title")) - .and_then(|t| t.as_str()) - .unwrap_or(""); - let subtitle = block_content - .and_then(|c| c.get("subtitle")) - .and_then(|t| t.as_str()) - .unwrap_or(""); - format!("{} {}", title, subtitle) - } - "columns" => { - let left = block_content - .and_then(|c| c.get("left")) - .and_then(|t| t.as_str()) - .unwrap_or(""); - let right = block_content - .and_then(|c| c.get("right")) - .and_then(|t| t.as_str()) - .unwrap_or(""); - format!("{} {}", left, right) - } - _ => block_content - .and_then(|c| c.get("text")) - .and_then(|t| t.as_str()) - .unwrap_or("") - .to_string(), - }; - - if !block_text.trim().is_empty() { - if !text.is_empty() { - text.push(' '); - } - text.push_str(block_text.trim()); - } - } - - if text.len() > 160 { - format!("{}...", &text[..157]) - } else { - text - } - } else { - String::new() - } -} - pub async fn deploy_to_cloudflare() -> Result