From f06819cff139562581acfb10715b6176b567ab92 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 18 Apr 2021 10:40:03 -0400 Subject: [PATCH] Revert "backpost a bunch of other articles, make linkposts work properly" This reverts commit 4dde8b26b8be9d9c11bb3920c942ecd6624e419e. --- ...mal-crossing-stability-2021-02-28.markdown | 12 ------------ blog/immigration-2021-04-11.markdown | 12 ------------ blog/mara-ransack-castle-2021-03-28.markdown | 12 ------------ ...per-mario-origami-king-2021-01-30.markdown | 12 ------------ ...ty-cyberpunk-xenoblade-2021-02-14.markdown | 12 ------------ ...phean-dns-client-linux-2021-04-15.markdown | 12 ------------ ...ial-proximity-networks-2021-02-02.markdown | 12 ------------ src/post/mod.rs | 19 +++---------------- templates/blog_atom.rs.xml | 4 ++-- templates/blog_rss.rs.xml | 4 ++-- templates/blogindex.rs.html | 2 +- 11 files changed, 8 insertions(+), 105 deletions(-) delete mode 100644 blog/animal-crossing-stability-2021-02-28.markdown delete mode 100644 blog/immigration-2021-04-11.markdown delete mode 100644 blog/mara-ransack-castle-2021-03-28.markdown delete mode 100644 blog/paper-mario-origami-king-2021-01-30.markdown delete mode 100644 blog/plurality-cyberpunk-xenoblade-2021-02-14.markdown delete mode 100644 blog/sisyphean-dns-client-linux-2021-04-15.markdown delete mode 100644 blog/social-proximity-networks-2021-02-02.markdown diff --git a/blog/animal-crossing-stability-2021-02-28.markdown b/blog/animal-crossing-stability-2021-02-28.markdown deleted file mode 100644 index b8513be..0000000 --- a/blog/animal-crossing-stability-2021-02-28.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Animal Crossing New Horizons: An Island of Stability in an Unstable World" -date: 2021-02-28 -tags: - - link -redirect_to: https://www.getrevue.co/profile/theprincessxena/issues/animal-crossing-new-horizons-an-island-of-stability-in-an-unstable-world-313933 ---- - -# Animal Crossing New Horizons: An Island of Stability in an Unstable World - -Check out this post [on my -newsletter](https://www.getrevue.co/profile/theprincessxena/issues/animal-crossing-new-horizons-an-island-of-stability-in-an-unstable-world-313933)! diff --git a/blog/immigration-2021-04-11.markdown b/blog/immigration-2021-04-11.markdown deleted file mode 100644 index 0d00cea..0000000 --- a/blog/immigration-2021-04-11.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Immigration" -date: 2021-04-11 -tags: - - link -redirect_to: https://www.getrevue.co/profile/theprincessxena/issues/immigration-313938 ---- - -# Immigration - -Check out this post [on my -newsletter](https://www.getrevue.co/profile/theprincessxena/issues/immigration-313938)! diff --git a/blog/mara-ransack-castle-2021-03-28.markdown b/blog/mara-ransack-castle-2021-03-28.markdown deleted file mode 100644 index 3857390..0000000 --- a/blog/mara-ransack-castle-2021-03-28.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Mara's Ransack of Castle Charon" -date: 2021-03-28 -tags: - - link -redirect_to: https://www.getrevue.co/profile/theprincessxena/issues/mara-s-ransack-of-castle-charon-313935 ---- - -# Mara's Ransack of Castle Charon - -Check out this post [on my -newsletter](https://www.getrevue.co/profile/theprincessxena/issues/mara-s-ransack-of-castle-charon-313935)! diff --git a/blog/paper-mario-origami-king-2021-01-30.markdown b/blog/paper-mario-origami-king-2021-01-30.markdown deleted file mode 100644 index 9930fcf..0000000 --- a/blog/paper-mario-origami-king-2021-01-30.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "My Thoughts on Paper Mario and the Origami King" -date: 2021-01-30 -tags: - - link -redirect_to: https://www.getrevue.co/profile/theprincessxena/issues/my-thoughts-on-paper-mario-and-the-origami-king-312718 ---- - -# My Thoughts on Paper Mario and the Origami King - -Check out this post [on my -newsletter](https://www.getrevue.co/profile/theprincessxena/issues/my-thoughts-on-paper-mario-and-the-origami-king-312718)! diff --git a/blog/plurality-cyberpunk-xenoblade-2021-02-14.markdown b/blog/plurality-cyberpunk-xenoblade-2021-02-14.markdown deleted file mode 100644 index 508d294..0000000 --- a/blog/plurality-cyberpunk-xenoblade-2021-02-14.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Plurality as Portrayed in Cyberpunk 2077 and Xenoblade Chronicles 2" -date: 2021-02-14 -tags: - - link -redirect_to: https://www.getrevue.co/profile/theprincessxena/issues/plurality-as-portrayed-in-cyberpunk-2077-and-xenoblade-chronicles-2-313929 ---- - -# Plurality as Portrayed in Cyberpunk 2077 and Xenoblade Chronicles 2 - -Check out this post [on my -newsletter](https://www.getrevue.co/profile/theprincessxena/issues/plurality-as-portrayed-in-cyberpunk-2077-and-xenoblade-chronicles-2-313929)! diff --git a/blog/sisyphean-dns-client-linux-2021-04-15.markdown b/blog/sisyphean-dns-client-linux-2021-04-15.markdown deleted file mode 100644 index b5b652f..0000000 --- a/blog/sisyphean-dns-client-linux-2021-04-15.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "The Sisyphean Task Of DNS Client Config on Linux" -date: 2021-04-15 -tags: - - link -redirect_to: https://tailscale.com/blog/sisyphean-dns-client-linux/ ---- - -# The Sisyphean Task Of DNS Client Config on Linux - -Check out this post [on the Tailscale -blog](https://tailscale.com/blog/sisyphean-dns-client-linux/)! diff --git a/blog/social-proximity-networks-2021-02-02.markdown b/blog/social-proximity-networks-2021-02-02.markdown deleted file mode 100644 index beb395c..0000000 --- a/blog/social-proximity-networks-2021-02-02.markdown +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: "Philosophy of Tailscale: Social proximity networks" -date: 2021-02-02 -tags: - - link -redirect_to: https://tailscale.com/blog/social-proximity-networks/ ---- - -# Philosophy of Tailscale: Social proximity networks - -Check out this post [on the Tailscale -blog](https://tailscale.com/blog/social-proximity-networks/)! diff --git a/src/post/mod.rs b/src/post/mod.rs index 2b1b7e2..b5303a8 100644 --- a/src/post/mod.rs +++ b/src/post/mod.rs @@ -20,8 +20,8 @@ impl Into for Post { let mut result = jsonfeed::Item::builder() .title(self.front_matter.title) .content_html(self.body_html) - .id(self.link.clone()) - .url(self.link) + .id(format!("https://christine.website/{}", self.link)) + .url(format!("https://christine.website/{}", self.link)) .date_published(self.date.to_rfc3339()) .author( jsonfeed::Author::new() @@ -30,10 +30,6 @@ impl Into for Post { .avatar("https://christine.website/static/img/avatar.png"), ); - if let Some(url) = self.front_matter.redirect_to { - result = result.url(url); - } - let mut tags: Vec = vec![]; if let Some(series) = self.front_matter.series { @@ -83,16 +79,7 @@ async fn read_post(dir: &str, fname: PathBuf) -> Result { let body = &body[content_offset..]; let date = NaiveDate::parse_from_str(&front_matter.clone().date, "%Y-%m-%d") .map_err(|why| eyre!("error parsing date in {:?}: {}", fname, why))?; - - let link = match front_matter.redirect_to { - Some(ref url) => url.clone(), - None => format!( - "https://christine.website/{}/{}", - dir, - fname.file_stem().unwrap().to_str().unwrap() - ), - }; - + let link = format!("{}/{}", dir, fname.file_stem().unwrap().to_str().unwrap()); let body_html = crate::app::markdown::render(&body) .wrap_err_with(|| format!("can't parse markdown for {:?}", fname))?; let date: DateTime = diff --git a/templates/blog_atom.rs.xml b/templates/blog_atom.rs.xml index 5fffaad..0296da6 100644 --- a/templates/blog_atom.rs.xml +++ b/templates/blog_atom.rs.xml @@ -17,10 +17,10 @@ @env!("CARGO_PKG_NAME") @for post in posts { - @post.link + https://christine.website/@post.link @post.front_matter.title @post.date.to_rfc3339() - + } diff --git a/templates/blog_rss.rs.xml b/templates/blog_rss.rs.xml index e300d75..0e87ad1 100644 --- a/templates/blog_rss.rs.xml +++ b/templates/blog_rss.rs.xml @@ -12,9 +12,9 @@ 1440 @for post in posts { - @post.link + https://christine.website/@post.link @post.front_matter.title - @post.link + https://christine.website/@post.link @post.date.to_rfc2822() diff --git a/templates/blogindex.rs.html b/templates/blogindex.rs.html index 02f34d6..e050e5b 100644 --- a/templates/blogindex.rs.html +++ b/templates/blogindex.rs.html @@ -14,7 +14,7 @@