.gitmodules

@@ -1,3 +0,0 @@
-[submodule "rss"]
-	path = rss
-	url = git@github.com:NoraCodes/rss.git

Cargo.lock

@@ -293,7 +293,7 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 
 [[package]]
 name = "corobel"
-version = "0.2.0"
+version = "0.1.0"
 dependencies = [
  "atom_syndication",
  "chrono",
@@ -1643,6 +1643,8 @@ dependencies = [
 [[package]]
 name = "rss"
 version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acaf1331b7fc4edc3c2920819fee1766c27e8d40da593155832db3d6dea64e92"
 dependencies = [
  "atom_syndication",
  "chrono",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "corobel"
-version = "0.2.0"
+version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -15,6 +15,6 @@ tokio = { version = "1.21.2", features = [ "full" ] }
 serde_json = "1.0.87"
 once_cell = "1.16.0"
 chrono = { version = "0.4.22", features = [ "serde" ] }
-rss = { path = "./rss/", version = "2.0.1-atom-link-fix", features = [ "builders", "atom", "chrono" ] }
+rss = { version = "2.0.1", features = [ "builders", "atom", "chrono" ] }
 pulldown-cmark = "0.9.2"
 atom_syndication = "0.11.0"

rss

@@ -1 +0,0 @@
-Subproject commit 1b001f74ff947b70b6bfe48711a9f29f682dd988

src/main.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use std::error::Error;
 #[macro_use]
 extern crate rocket;
-use reqwest::{Client, StatusCode};
+use reqwest::StatusCode;
 use rocket::response::content::RawHtml;
 use rocket::serde::json::Json;
 
@@ -30,15 +30,6 @@ fn default_base_url() -> String {
     "/".into()
 }
 
-fn user_agent() -> String {
-    format!(
-        "{}/{} (RSS feed converter) on {}",
-        env!("CARGO_PKG_NAME"),
-        env!("CARGO_PKG_VERSION"),
-        &ARGS.domain
-    )
-}
-
 static ARGS: once_cell::sync::Lazy<Args> = once_cell::sync::Lazy::new(|| Args::parse());
 
 #[get("/")]
@@ -70,17 +61,8 @@ async fn syndication_rss_route(
     let project_url = format!("{}{}", COHOST_ACCOUNT_API_URL, project);
     let posts_url = cohost_posts_api_url(project, page);
 
-    let client = match Client::builder().user_agent(user_agent()).build() {
-        Ok(v) => v,
-        Err(e) => {
-            let err = format!("Couldn't build a reqwest client: {:?}", e);
-            eprintln!("{}", err);
-            return Err(ErrorResponse::InternalError(err));
-        }
-    };
-
     eprintln!("making request to {}", project_url);
-    let project_data: CohostAccount = match client.get(project_url).send().await {
+    let project_data: CohostAccount = match reqwest::get(project_url).await {
         Ok(v) => match v.status() {
             StatusCode::OK => match v.json::<CohostAccount>().await {
                 Ok(a) => a,
@@ -111,7 +93,7 @@ async fn syndication_rss_route(
     };
 
     eprintln!("making request to {}", posts_url);
-    match client.get(posts_url).send().await {
+    match reqwest::get(posts_url).await {
         Ok(v) => match v.status() {
             StatusCode::OK => match v.json::<CohostPostsPage>().await {
                 Ok(page_data) => {
@@ -161,18 +143,10 @@ async fn webfinger_route(params: HashMap<String, String>) -> Option<Json<CohostW
         );
         return None;
     }
-    let client = match Client::builder().user_agent(user_agent()).build() {
-        Ok(v) => v,
-        Err(e) => {
-            let err = format!("Couldn't build a reqwest client: {:?}", e);
-            eprintln!("{}", err);
-            return None;
-        }
-    };
     if let Some(param) = params.iter().next() {
         let url = format!("{}{}", COHOST_ACCOUNT_API_URL, param.0);
         eprintln!("making request to {}", url);
-        match client.get(url).send().await {
+        match reqwest::get(url).await {
             Ok(v) => {
                 match v.status() {
                     StatusCode::OK => match v.json::<CohostAccount>().await {

src/syndication.rs

@@ -1,21 +1,12 @@
 use crate::cohost_account::CohostAccount;
 use crate::cohost_posts::*;
 use crate::ARGS;
-use atom_syndication::LinkBuilder;
-use rss::extension::atom::{AtomExtensionBuilder, Link};
 use rss::Channel;
+use rss::extension::atom::{AtomExtensionBuilder, Link};
+use  atom_syndication::LinkBuilder;
 
 fn rel_link_for(rel: &str, project_name: &str, page_number: u64) -> Link {
-    LinkBuilder::default()
+    LinkBuilder::default().rel(rel).href(format!("https://{}{}{}/feed.rss?page={}", &ARGS.domain, &ARGS.base_url, project_name.clone(), page_number)).build()
-        .rel(rel)
-        .href(format!(
-            "https://{}{}{}/feed.rss?page={}",
-            &ARGS.domain,
-            &ARGS.base_url,
-            project_name.clone(),
-            page_number
-        ))
-        .build()
 }
 
 pub fn channel_for_posts_page(
@@ -36,16 +27,14 @@ pub fn channel_for_posts_page(
         )))
         .link(format!(
             "https://cohost.org/{}?page={}",
-            project_name, page_number
+            project_name,
+            page_number
         ));
 
     let mut atom = AtomExtensionBuilder::default();
-    let mut links = vec![
+    let mut links = vec![rel_link_for("self", project_name, page_number), rel_link_for("first", project_name, 0)];
-        rel_link_for("self", project_name, page_number),
-        rel_link_for("first", project_name, 0),
-    ];
     if page_number > 0 {
-        links.push(rel_link_for("previous", project_name, page_number - 1));
+        links.push(rel_link_for("prev", project_name, page_number - 1));
     }
     if page.number_items > 0 {
         // Cohost API is wrong about the pagination so we can only guess. If there are posts, there might be more posts.

static/index.html

@@ -34,7 +34,7 @@
         Webfinger resources for accounts are provided at the Webfinger well-known URL <code>/.well-known/webfinger?project_name</code>.
     </p>
     <p>
-        Brought to you by <a href="https://nora.codes">Leonora Tindall</a>, written in Rust with Rocket. Code is <a href="https://git.nora.codes/nora/corobel">online</a>, bug reports should go to my email nora@nora.codes.
+        Brought to you by Leonora Tindall, written in Rust with Rocket.
     </p>
 </body>
 </html>