Author:
Hash:
Timestamp:
+21 -8 +/-5 browse
Kevin Schoon [me@kevinschoon.com]
68cb20445b9d6abfb76acb5c597cc78d762f55be
Fri, 23 May 2025 22:44:02 +0000 (5 months ago)
| 1 | diff --git a/ayllu/src/config.rs b/ayllu/src/config.rs |
| 2 | index 8bc8b13..bdcb3b4 100644 |
| 3 | --- a/ayllu/src/config.rs |
| 4 | +++ b/ayllu/src/config.rs |
| 5 | @@ -205,7 +205,8 @@ pub struct PublicKey { |
| 6 | impl Serialize for PublicKey { |
| 7 | fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> |
| 8 | where |
| 9 | - S: serde::Serializer { |
| 10 | + S: serde::Serializer, |
| 11 | + { |
| 12 | self.inner.to_string().serialize(serializer) |
| 13 | } |
| 14 | } |
| 15 | diff --git a/ayllu/src/web2/mod.rs b/ayllu/src/web2/mod.rs |
| 16 | index e9fa26c..fa88894 100644 |
| 17 | --- a/ayllu/src/web2/mod.rs |
| 18 | +++ b/ayllu/src/web2/mod.rs |
| 19 | @@ -5,7 +5,7 @@ mod middleware; |
| 20 | mod navigation; |
| 21 | mod routes; |
| 22 | mod server; |
| 23 | - mod util; |
| 24 | mod template; |
| 25 | + mod util; |
| 26 | |
| 27 | pub use server::serve; |
| 28 | diff --git a/ayllu/src/web2/routes/commit.rs b/ayllu/src/web2/routes/commit.rs |
| 29 | index d3e7c0f..e56265d 100644 |
| 30 | --- a/ayllu/src/web2/routes/commit.rs |
| 31 | +++ b/ayllu/src/web2/routes/commit.rs |
| 32 | @@ -4,11 +4,11 @@ use axum::{ |
| 33 | response::Html, |
| 34 | }; |
| 35 | |
| 36 | - use crate::{web2::template::filters, with_preamble}; |
| 37 | use crate::web2::middleware::repository::Preamble; |
| 38 | use crate::web2::navigation; |
| 39 | use crate::{highlight::Highlighter, web2::template::Base}; |
| 40 | use crate::{languages::Hint, web2::error::Error}; |
| 41 | + use crate::{web2::template::filters, with_preamble}; |
| 42 | use ayllu_git::{Commit, Note, Stats, Wrapper}; |
| 43 | |
| 44 | #[derive(Template)] |
| 45 | diff --git a/ayllu/src/web2/routes/repo.rs b/ayllu/src/web2/routes/repo.rs |
| 46 | index 8e7c45b..e7ebde3 100644 |
| 47 | --- a/ayllu/src/web2/routes/repo.rs |
| 48 | +++ b/ayllu/src/web2/routes/repo.rs |
| 49 | @@ -143,10 +143,22 @@ pub async fn serve( |
| 50 | None => None, |
| 51 | }; |
| 52 | |
| 53 | - let rss_link_all = format!("/{}/{}/rss/firehose.xml", preamble.collection_name, preamble.repo_name); |
| 54 | - let rss_link_1d = format!("/{}/{}/rss/1d.xml", preamble.collection_name, preamble.repo_name); |
| 55 | - let rss_link_1w = format!("/{}/{}/rss/1w.xml", preamble.collection_name, preamble.repo_name); |
| 56 | - let rss_link_1m = format!("/{}/{}/rss/1m.xml", preamble.collection_name, preamble.repo_name); |
| 57 | + let rss_link_all = format!( |
| 58 | + "/{}/{}/rss/firehose.xml", |
| 59 | + preamble.collection_name, preamble.repo_name |
| 60 | + ); |
| 61 | + let rss_link_1d = format!( |
| 62 | + "/{}/{}/rss/1d.xml", |
| 63 | + preamble.collection_name, preamble.repo_name |
| 64 | + ); |
| 65 | + let rss_link_1w = format!( |
| 66 | + "/{}/{}/rss/1w.xml", |
| 67 | + preamble.collection_name, preamble.repo_name |
| 68 | + ); |
| 69 | + let rss_link_1m = format!( |
| 70 | + "/{}/{}/rss/1m.xml", |
| 71 | + preamble.collection_name, preamble.repo_name |
| 72 | + ); |
| 73 | |
| 74 | base.nav_elements = |
| 75 | navigation::primary("project", &preamble.collection_name, &preamble.repo_name); |
| 76 | diff --git a/ayllu/src/web2/server.rs b/ayllu/src/web2/server.rs |
| 77 | index 45fcbdd..bd822ff 100644 |
| 78 | --- a/ayllu/src/web2/server.rs |
| 79 | +++ b/ayllu/src/web2/server.rs |
| 80 | @@ -1,7 +1,7 @@ |
| 81 | - use std::{collections::HashMap, path::Path}; |
| 82 | use std::error::Error; |
| 83 | use std::net::SocketAddrV4; |
| 84 | use std::sync::Arc; |
| 85 | + use std::{collections::HashMap, path::Path}; |
| 86 | |
| 87 | use axum::{ |
| 88 | body::Body, extract::Request, middleware::from_fn_with_state, routing, routing::MethodFilter, |