diff --git a/Cargo.lock b/Cargo.lock index 3ad6cbd..5e961d1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,28 +17,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" -[[package]] -name = "aggregate_rss_zine" -version = "0.3.0" -dependencies = [ - "anyhow", - "chrono", - "clippy", - "feed-rs", - "html-escape", - "log", - "maud", - "rand", - "rayon", - "regex", - "reqwest", - "rss", - "scraper", - "simple_logger", - "time", - "url", -] - [[package]] name = "ahash" version = "0.8.11" @@ -278,14 +256,14 @@ checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "cssparser" -version = "0.31.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" +checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.2", + "phf", "smallvec", ] @@ -422,9 +400,9 @@ dependencies = [ [[package]] name = "ego-tree" -version = "0.6.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642" +checksum = "7c6ba7d4eec39eaa9ab24d44a0e73a7949a1095a8b3f3abb11eddf27dbb56a53" [[package]] name = "either" @@ -658,9 +636,9 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +checksum = "2e15626aaf9c351bc696217cbe29cb9b5e86c43f8a46b5e2f5c6c5cf7cb904ce" dependencies = [ "log", "mac", @@ -895,13 +873,13 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +checksum = "82c88c6129bd24319e62a0359cb6b958fa7e8be6e19bb1663bc396b90883aca5" dependencies = [ "log", - "phf 0.11.2", - "phf_codegen 0.11.2", + "phf", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", @@ -1109,15 +1087,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - [[package]] name = "phf" version = "0.11.2" @@ -1128,16 +1097,6 @@ dependencies = [ "phf_shared 0.11.2", ] -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - [[package]] name = "phf_codegen" version = "0.11.2" @@ -1387,9 +1346,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1399,9 +1358,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -1410,9 +1369,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -1579,16 +1538,16 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scraper" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90460b31bfe1fc07be8262e42c665ad97118d4585869de9345a84d501a9eaf0" +checksum = "b0e749d29b2064585327af5038a5a8eb73aeebad4a3472e83531a436563f7208" dependencies = [ "ahash", "cssparser", "ego-tree", "getopts", "html5ever", - "once_cell", + "precomputed-hash", "selectors", "tendril", ] @@ -1618,9 +1577,9 @@ dependencies = [ [[package]] name = "selectors" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" +checksum = "fd568a4c9bb598e291a08244a5c1f5a8a6650bee243b5b0f8dbb3d9cc1d87fe8" dependencies = [ "bitflags", "cssparser", @@ -1628,8 +1587,8 @@ dependencies = [ "fxhash", "log", "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen 0.10.0", + "phf", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -1681,9 +1640,9 @@ dependencies = [ [[package]] name = "servo_arc" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" +checksum = "ae65c4249478a2647db249fb43e23cec56a2c8974a427e7bd8cb5a1d0964921a" dependencies = [ "stable_deref_trait", ] @@ -1869,6 +1828,28 @@ dependencies = [ "winapi", ] +[[package]] +name = "the_biggs_brief" +version = "0.4.0" +dependencies = [ + "anyhow", + "chrono", + "clippy", + "feed-rs", + "html-escape", + "log", + "maud", + "rand", + "rayon", + "regex", + "reqwest", + "rss", + "scraper", + "simple_logger", + "time", + "url", +] + [[package]] name = "time" version = "0.3.36" diff --git a/Cargo.toml b/Cargo.toml index 1a244cb..f60742b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "aggregate_rss_zine" +name = "the_biggs_brief" description = "Blogroll of RSS feeds I enjoy in the form of a newspaper." -version = "0.3.0" +version = "0.4.0" edition = "2021" authors = ["Anson Biggs"] homepage = "https://zine.ansonbiggs.com" @@ -16,10 +16,10 @@ log = "0.4" maud = "0.26" rand = "0.8" rayon = "1.8" -regex = "1.10" +regex = "1.11" reqwest = { version = "0.12", features = ["blocking"] } rss = "2.0" -scraper = "0.20" +scraper = "0.21" simple_logger = "5.0" time = "0.3.36" url = "2.5" diff --git a/feeds.txt b/feeds.txt index 4139d4b..1a799ef 100644 --- a/feeds.txt +++ b/feeds.txt @@ -1,6 +1,7 @@ http://ascii.textfiles.com/feed http://www.aaronsw.com/2002/feeds/pgessays.rss https://0xd34df00d.me/rss.xml +https://30fps.net/atom.xml https://adamsilver.io/atom.xml https://alexharri.com/rss.xml https://alexturek.com/feed @@ -60,6 +61,7 @@ https://laplab.me/posts/index.xml https://larslofgren.com/feed/ https://lemire.me/blog/feed/ https://levels.io/rss/ +https://lilymara.xyz/posts/index.xml https://lisyarus.github.io/blog/feed.xml https://lookingsideways.co.uk/rss/ https://lucumr.pocoo.org/feed.atom @@ -85,6 +87,8 @@ https://projects.ansonbiggs.com/index.xml https://rednafi.com/index.xml https://research.swtch.com/feed.atom https://retrotechtive.wordpress.com/feed/ +https://rmondello.com/feed/ +https://rosenzweig.io/feed.xml https://rss.beehiiv.com/feeds/BX2SPZ0naG.xml https://saccade.com/blog/feed/ https://samhenri.gold/feed.xml @@ -99,7 +103,9 @@ https://steveklabnik.com/feed.xml https://stfn.pl/rss.xml https://switowski.com/feed.xml https://taylor.town/feed.xml +https://technology.riotgames.com/news/feed https://theluddite.org/feed.rss +https://theshamblog.com/feed/ https://theturnsignalblog.com/rss.xml https://third-bit.com/atom.xml https://tim.mcnamara.nz/rss diff --git a/src/site_generator.rs b/src/site_generator.rs index 702a2f9..0b4bcaa 100644 --- a/src/site_generator.rs +++ b/src/site_generator.rs @@ -72,7 +72,7 @@ fn generate_footer() -> Markup { " - " a href=("/feed.xml") target="_blank" rel="noopener noreferrer" { "RSS Feed" } " - " - a href="https://gitlab.com/MisterBiggs/zine" { "Source Code" } + a href="https://gitlab.com/Anson-Projects/zine" { "Source Code" } " - " "Page generated at: " em data-tooltip="Automatic builds daily 8AM Mountain Time" { (formatted_utc) " UTC" } } @@ -86,7 +86,7 @@ fn generate_header() -> Markup { header { nav { ul { - li { h1 { "Anson's Blogroll Zine" }} + li { h1 { "The Biggs Brief" }} } ul { li { button data-target="about" onclick="toggleModal(event)" { "About" } } @@ -130,10 +130,10 @@ fn about_modal(entries: Vec) -> Markup { p { strong { "About" }} } p { - "When looking for a RSS reader I came across " - a href="https://news.russellsaw.io/" {"news.russellsaw.io"} - " I thought the idea of building my own personalised newspaper was cool. \ - So, I decided to build a clone using my own subscribed RSS feeds." + "I couldn't find a RSS reader that I liked so I decided to build my own." + "I thought it would be neat if it was public and formatted kind of like a magazine or a newspaper, so here we are." + "This is a feed of all the feeds that I want to keep up with. I try to keep it independant and keep out things like" + "enigneering blogs that are just advertisements, but its all up to my discretion." } p { "This page updates daily at 8:11ish AM Mountain Time. The following blogs are" @@ -146,7 +146,7 @@ fn about_modal(entries: Vec) -> Markup { } p { "For the full list of feeds that are followed see the raw list " - a href="https://gitlab.com/MisterBiggs/zine/-/blob/master/feeds.txt" { "here." } + a href="https://gitlab.com/Anson-Projects/zine/-/blob/master/feeds.txt" { "here." } } } } @@ -156,10 +156,10 @@ fn about_modal(entries: Vec) -> Markup { pub fn generate_head() -> Markup { html! { head { - title { "Anson's Zine | Public RSS Feed" } + title { "Biggs Brief | Public RSS Feed" } meta charset="utf-8"; meta name="viewport" content="width=device-width, initial-scale=1"; - meta name="description" content="Blogroll zine of RSS feeds for Anson" + meta name="description" content="Blogroll of RSS feeds in the format of a magazine for Anson Biggs" link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png"; link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png"; link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png"; @@ -168,9 +168,9 @@ pub fn generate_head() -> Markup { link rel="stylesheet" href="style.css"; // Open Graph meta tags - meta property="og:title" content="Anson's Zine | Public RSS Feed"; - meta property="og:description" content="Blogroll zine of RSS feeds for Anson"; - meta property="og:url" content="https://blogroll.ansonbiggs.com"; + meta property="og:title" content="Biggs Brief | Public RSS Feed"; + meta property="og:description" content="Blogroll of RSS feeds in the format of a magazine for Anson Biggs"; + meta property="og:url" content="https://zine.ansonbiggs.com"; meta property="og:type" content="website"; } }