mirrors/redlib
1
0
Fork 0
mirror of https://github.com/redlib-org/redlib.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Same fix for another function

Browse source
This commit is contained in:
Tokarak 2025-03-18 03:33:52 +00:00
parent 87206772b8
commit 47771b57c0
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main.rs
View file

@ -256,7 +256,7 @@ async fn main() {
.get(|_| resource(include_str!("../static/check_update.js"), "text/javascript", false).boxed()); .get(|_| resource(include_str!("../static/check_update.js"), "text/javascript", false).boxed());
app.at("/copy.js").get(|_| resource(include_str!("../static/copy.js"), "text/javascript", false).boxed()); app.at("/copy.js").get(|_| resource(include_str!("../static/copy.js"), "text/javascript", false).boxed());
app.at("/commits.atom").get(|_| async move { proxy_commit_info().await }.boxed()); app.at("/commits.atom").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: see below
app.at("/instances.json").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: In the process of migrating error handling. (I recommend thiserror crate for dynamic errors.) No proper error handling yes, so functionality unimpacted. app.at("/instances.json").get(|_| async move { Ok(proxy_instances().await.unwrap()) }.boxed()); // TODO: In the process of migrating error handling. (I recommend thiserror crate for dynamic errors.) No proper error handling yes, so functionality unimpacted.
// Proxy media through Redlib // Proxy media through Redlib
@ -417,23 +417,21 @@ async fn main() {
} }
} }
pub async fn proxy_commit_info() -> Result<Response<Body>, String> { pub async fn proxy_commit_info() -> Result<Response<Body>, hyper::Error> {
Ok( Ok(
Response::builder() Response::builder()
.status(200) .status(200)
.header("content-type", "application/atom+xml") .header("content-type", "application/atom+xml")
.body(Body::from(fetch_commit_info().await)) .body(Body::from(fetch_commit_info().await?))
.unwrap_or_default(), .unwrap_or_default(),
) )
} }
#[cached(time = 600)] #[cached(time = 600, result = true, result_fallback = true)]
async fn fetch_commit_info() -> String { async fn fetch_commit_info() -> Result<String, hyper::Error> {
let uri = Uri::from_static("https://github.com/redlib-org/redlib/commits/main.atom"); let uri = Uri::from_static("https://github.com/redlib-org/redlib/commits/main.atom");
let resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if there is no internet
let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body(); Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect())
hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect()
} }
pub async fn proxy_instances() -> Result<Response<Body>, hyper::Error> { pub async fn proxy_instances() -> Result<Response<Body>, hyper::Error> {
@ -441,7 +439,7 @@ pub async fn proxy_instances() -> Result<Response<Body>, hyper::Error> {
Response::builder() Response::builder()
.status(200) .status(200)
.header("content-type", "application/json") .header("content-type", "application/json")
.body(Body::from(fetch_instances().await?)) .body(Body::from(fetch_instances().await?))// Could fail if no internet
.unwrap_or_default(), .unwrap_or_default(),
) )
} }
@ -449,8 +447,6 @@ pub async fn proxy_instances() -> Result<Response<Body>, hyper::Error> {
#[cached(time = 600, result = true, result_fallback = true)] #[cached(time = 600, result = true, result_fallback = true)]
async fn fetch_instances() -> Result<String, hyper::Error> { async fn fetch_instances() -> Result<String, hyper::Error> {
let uri = Uri::from_static("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json"); let uri = Uri::from_static("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json");
let resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if no internet
let resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if there is no internet
Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect()) Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect())
} }