aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorXe Iaso <me@christine.website>2022-09-20 21:05:44 -0400
committerXe Iaso <me@christine.website>2022-09-20 21:05:44 -0400
commit67005bc59dd918eadcbd9c7c9285aed0c3422292 (patch)
treede54bbad6aa651d4e56517af56a6773f02766fcf /lib
parent839c44e535d03f8ae747139acd27109e897c76e4 (diff)
downloadxesite-67005bc59dd918eadcbd9c7c9285aed0c3422292.tar.xz
xesite-67005bc59dd918eadcbd9c7c9285aed0c3422292.zip
move markdown and templates into a dedicated crate
This does not move the ructe templates around, only the newer Maud ones. The only template I can't move easily is the salary history one, but I should get rid of that anyways.
Diffstat (limited to 'lib')
-rw-r--r--lib/jsonfeed/src/item.rs1
-rw-r--r--lib/xesite_markdown/Cargo.toml18
-rw-r--r--lib/xesite_markdown/src/lib.rs171
-rw-r--r--lib/xesite_templates/Cargo.toml9
-rw-r--r--lib/xesite_templates/src/lib.rs91
5 files changed, 289 insertions, 1 deletions
diff --git a/lib/jsonfeed/src/item.rs b/lib/jsonfeed/src/item.rs
index 7b5d734..3b308cb 100644
--- a/lib/jsonfeed/src/item.rs
+++ b/lib/jsonfeed/src/item.rs
@@ -1,4 +1,3 @@
-use std::collections::HashMap;
use std::default::Default;
use std::fmt;
diff --git a/lib/xesite_markdown/Cargo.toml b/lib/xesite_markdown/Cargo.toml
new file mode 100644
index 0000000..b05ca75
--- /dev/null
+++ b/lib/xesite_markdown/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "xesite_markdown"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+color-eyre = "0.6"
+comrak = "0.14.0"
+lazy_static = "1.4"
+lol_html = "0.3"
+maud = "0.23.0"
+tracing = "0.1"
+url = "2"
+
+# local deps
+xesite_templates = { path = "../xesite_templates" } \ No newline at end of file
diff --git a/lib/xesite_markdown/src/lib.rs b/lib/xesite_markdown/src/lib.rs
new file mode 100644
index 0000000..882278b
--- /dev/null
+++ b/lib/xesite_markdown/src/lib.rs
@@ -0,0 +1,171 @@
+use color_eyre::eyre::{Result, WrapErr};
+use comrak::nodes::{Ast, AstNode, NodeValue};
+use comrak::plugins::syntect::SyntectAdapter;
+use comrak::{
+ format_html_with_plugins, markdown_to_html_with_plugins, parse_document, Arena, ComrakOptions,
+ ComrakPlugins,
+};
+use lazy_static::lazy_static;
+use lol_html::{element, html_content::ContentType, rewrite_str, RewriteStrSettings};
+use maud::PreEscaped;
+use std::{cell::RefCell, io::Write};
+use url::Url;
+
+lazy_static! {
+ static ref SYNTECT_ADAPTER: SyntectAdapter<'static> = SyntectAdapter::new("base16-mocha.dark");
+}
+
+pub fn render(inp: &str) -> Result<String> {
+ let mut options = ComrakOptions::default();
+
+ options.extension.autolink = true;
+ options.extension.table = true;
+ options.extension.description_lists = true;
+ options.extension.superscript = true;
+ options.extension.strikethrough = true;
+ options.extension.footnotes = true;
+
+ options.render.unsafe_ = true;
+
+ let arena = Arena::new();
+ let root = parse_document(&arena, inp, &options);
+
+ let mut plugins = ComrakPlugins::default();
+ plugins.render.codefence_syntax_highlighter = Some(&*SYNTECT_ADAPTER);
+
+ iter_nodes(root, &|node| {
+ let mut data = node.data.borrow_mut();
+ match &mut data.value {
+ &mut NodeValue::Link(ref mut link) => {
+ let base = Url::parse("https://xeiaso.net/")?;
+ let u = base.join(std::str::from_utf8(&link.url.clone())?)?;
+ if u.scheme() != "conversation" {
+ return Ok(());
+ }
+ let parent = node.parent().unwrap();
+ node.detach();
+ let mut message = vec![];
+ for child in node.children() {
+ format_html_with_plugins(child, &options, &mut message, &plugins)?;
+ }
+ let message = std::str::from_utf8(&message)?;
+ let mut message = markdown_to_html_with_plugins(message, &options, &plugins);
+ crop_letters(&mut message, 3);
+ message.drain((message.len() - 5)..);
+ let mood = without_first(u.path());
+ let name = u.host_str().unwrap_or("Mara");
+
+ let mut html = vec![];
+ write!(
+ html,
+ "{}",
+ xesite_templates::conv(
+ name.to_string(),
+ mood.to_string(),
+ PreEscaped(message.trim().into())
+ )
+ .0
+ )?;
+
+ let new_node = arena.alloc(AstNode::new(RefCell::new(Ast::new(
+ NodeValue::HtmlInline(html),
+ ))));
+ parent.append(new_node);
+
+ Ok(())
+ }
+ _ => Ok(()),
+ }
+ })?;
+
+ let mut html = vec![];
+ format_html_with_plugins(root, &options, &mut html, &plugins).unwrap();
+
+ let html = String::from_utf8(html).wrap_err("post is somehow invalid UTF-8")?;
+
+ let html = rewrite_str(&html, RewriteStrSettings{
+ element_content_handlers: vec![
+ element!("xeblog-conv", |el| {
+ let name = el.get_attribute("name").expect("wanted xeblog-conv to contain name");
+ let name_lower = name.clone().to_lowercase();
+ let mood = el.get_attribute("mood").expect("wanted xeblog-conv to contain mood");
+
+ el.before(&format!(r#"
+<div class="conversation">
+ <div class="conversation-picture conversation-smol">
+ <picture>
+ <source srcset="https://cdn.xeiaso.net/file/christine-static/stickers/{name_lower}/{mood}.avif" type="image/avif">
+ <source srcset="https://cdn.xeiaso.net/file/christine-static/stickers/{name_lower}/{mood}.webp" type="image/webp">
+ <img src="https://cdn.xeiaso.net/file/christine-static/stickers/{name_lower}/{mood}.png" alt="{name} is {mood}">
+ </picture>
+ </div>
+ <div class="conversation-chat">&lt;<b>{name}</b>&gt; "#), ContentType::Html);
+ el.after("</div></div>", ContentType::Html);
+
+ el.remove_and_keep_content();
+ Ok(())
+ }),
+ element!("xeblog-picture", |el| {
+ let path = el.get_attribute("path").expect("wanted xeblog-picture to contain path");
+ el.replace(&xesite_templates::picture(path).0, ContentType::Html);
+ Ok(())
+ }),
+ element!("xeblog-hero", |el| {
+ let file = el.get_attribute("file").expect("wanted xeblog-hero to contain file");
+ el.replace(&xesite_templates::hero(file, el.get_attribute("prompt"), el.get_attribute("ai")).0, ContentType::Html);
+ Ok(())
+ }),
+ element!("xeblog-sticker", |el| {
+ let name = el.get_attribute("name").expect("wanted xeblog-sticker to contain name");
+ let mood = el.get_attribute("mood").expect("wanted xeblog-sticker to contain mood");
+ el.replace(&xesite_templates::sticker(name, mood).0, ContentType::Html);
+
+ Ok(())
+ }),
+ element!("xeblog-slide", |el| {
+ let name = el.get_attribute("name").expect("wanted xeblog-slide to contain name");
+ let essential = el.get_attribute("essential").is_some();
+ el.replace(&xesite_templates::slide(name, essential).0, ContentType::Html);
+
+ Ok(())
+ }),
+ element!("xeblog-talk-warning", |el| {
+ el.replace(&xesite_templates::talk_warning().0, ContentType::Html);
+ Ok(())
+ }),
+ ],
+ ..RewriteStrSettings::default()
+ }).unwrap();
+
+ Ok(html)
+}
+
+fn iter_nodes<'a, F>(node: &'a AstNode<'a>, f: &F) -> Result<()>
+where
+ F: Fn(&'a AstNode<'a>) -> Result<()>,
+{
+ f(node)?;
+ for c in node.children() {
+ iter_nodes(c, f)?;
+ }
+ Ok(())
+}
+
+fn without_first(string: &str) -> &str {
+ string
+ .char_indices()
+ .nth(1)
+ .and_then(|(i, _)| string.get(i..))
+ .unwrap_or("")
+}
+
+fn crop_letters(s: &mut String, pos: usize) {
+ match s.char_indices().nth(pos) {
+ Some((pos, _)) => {
+ s.drain(..pos);
+ }
+ None => {
+ s.clear();
+ }
+ }
+}
diff --git a/lib/xesite_templates/Cargo.toml b/lib/xesite_templates/Cargo.toml
new file mode 100644
index 0000000..06ab92d
--- /dev/null
+++ b/lib/xesite_templates/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "xesite_templates"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+maud = "0.23.0" \ No newline at end of file
diff --git a/lib/xesite_templates/src/lib.rs b/lib/xesite_templates/src/lib.rs
new file mode 100644
index 0000000..0a8ff1d
--- /dev/null
+++ b/lib/xesite_templates/src/lib.rs
@@ -0,0 +1,91 @@
+use maud::{html, Markup};
+
+pub fn talk_warning() -> Markup {
+ html! {
+ div.warning {
+ (conv("Cadey".to_string(), "coffee".to_string(), html!{
+ "So you are aware: you are reading the written version of a conference talk. This is written in a different style that is more lighthearted, conversational and different than the content normally on this blog. The words being said are the verbatim words that were spoken at the conference. The slides are the literal slides for each spoken utterance. If you want to hide the non-essential slides, please install this userstyle: "
+ a href="/css/no-fun-allowed.user.css" {code {"No fun allowed"}}
+ ". If this isn't enough, please edit it to also hide this CSS class: "
+ code { "xeblog-slides-essential" }
+ ". Doing this may make the presentation page harder to understand."
+ }))
+ }
+ }
+}
+
+pub fn slide(name: String, essential: bool) -> Markup {
+ html! {
+ div.hero.{@if essential {("xeblog-slides-essential")} @else {("xeblog-slides-fluff")}} {
+ picture style="margin:0" {
+ source type="image/avif" srcset={"https://cdn.xeiaso.net/file/christine-static/talks/" (name) ".avif"};
+ source type="image/webp" srcset={"https://cdn.xeiaso.net/file/christine-static/talks/" (name) ".webp"};
+ img style="padding:0" loading="lazy" src={"https://cdn.xeiaso.net/file/christine-static/talks/" (name) "-smol.png"};
+ }
+ }
+ }
+}
+
+pub fn picture(path: String) -> Markup {
+ html! {
+ picture style="margin:0" {
+ source type="image/avif" srcset={"https://cdn.xeiaso.net/file/christine-static/" (path) ".avif"};
+ source type="image/webp" srcset={"https://cdn.xeiaso.net/file/christine-static/" (path) ".webp"};
+ img style="padding:0" loading="lazy" alt={"hero image " (path)} src={"https://cdn.xeiaso.net/file/christine-static/" (path) "-smol.png"};
+ }
+ }
+}
+
+pub fn hero(file: String, prompt: Option<String>, ai: Option<String>) -> Markup {
+ let ai = ai.unwrap_or("MidJourney".to_string());
+ html! {
+ meta property="og:image" content={"https://cdn.xeiaso.net/file/christine-static/hero/" (file) "-smol.png"}
+ figure.hero style="margin:0" {
+ picture style="margin:0" {
+ source type="image/avif" srcset={"https://cdn.xeiaso.net/file/christine-static/hero/" (file) ".avif"};
+ source type="image/webp" srcset={"https://cdn.xeiaso.net/file/christine-static/hero/" (file) ".webp"};
+ img style="padding:0" loading="lazy" alt={"hero image " (file)} src={"https://cdn.xeiaso.net/file/christine-static/hero/" (file) "-smol.png"};
+ }
+ figcaption {
+ "Image generated by "
+ (ai)
+ @if let Some(prompt) = prompt { " -- " (prompt) }
+ }
+ }
+ }
+}
+
+pub fn conv(name: String, mood: String, body: Markup) -> Markup {
+ let name_lower = name.clone().to_lowercase();
+
+ html! {
+ .conversation {
+ ."conversation-picture"."conversation-smol" {
+ picture {
+ source type="image/avif" srcset={"https://cdn.xeiaso.net/file/christine-static/stickers/" (name_lower) "/" (mood) ".avif"};
+ source type="image/webp" srcset={"https://cdn.xeiaso.net/file/christine-static/stickers/" (name_lower) "/" (mood) ".webp"};
+ img alt={(name) " is " (mood)} loading="lazy" src={"https://cdn.xeiaso.net/file/christine-static/stickers/" (name_lower) "/" (mood) ".png"};
+ }
+ }
+ ."conversation-chat" {
+ "<"
+ b { (name) }
+ "> "
+ (body)
+ }
+ }
+ }
+}
+
+pub fn sticker(name: String, mood: String) -> Markup {
+ let name_lower = name.to_lowercase();
+ html! {
+ center {
+ picture {
+ source type="image/avif" srcset={"https://cdn.xeiaso.net/file/christine-static/stickers/" (name_lower) "/" (mood) ".avif"};
+ source type="image/webp" srcset={"https://cdn.xeiaso.net/file/christine-static/stickers/" (name_lower) "/" (mood) ".webp"};
+ img alt={(name) " is " (mood)} src={"https://cdn.xeiaso.net/file/christine-static/stickers/" (name_lower) "/" (mood) ".png"};
+ }
+ }
+ }
+}