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

Merge f3043932a5 into cbc3e49923

Browse source
This commit is contained in:
Nazar 2025-03-19 23:25:08 -04:00 • committed by GitHub
commit f2655232e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/main.rs
View file

@ -4,8 +4,6 @@
use cached::proc_macro::cached;
use clap::{Arg, ArgAction, Command};
use std::str::FromStr;
use futures_lite::FutureExt;
use hyper::Uri;
use hyper::{header::HeaderValue, Body, Request, Response};
@ -83,9 +81,9 @@ async fn resource(body: &str, content_type: &str, cache: bool) -> Result<Respons
.unwrap_or_default();
if cache {
if let Ok(val) = HeaderValue::from_str("public, max-age=1209600, s-maxage=86400") {
res.headers_mut().insert("Cache-Control", val);
}
res
.headers_mut()
.insert("Cache-Control", HeaderValue::from_static("public, max-age=1209600, s-maxage=86400"));
}
Ok(res)
@ -260,8 +258,8 @@ async fn main() {
.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("/commits.atom").get(|_| async move { proxy_commit_info().await }.boxed());
app.at("/instances.json").get(|_| async move { proxy_instances().await }.boxed());
app.at("/commits.atom").get(|_| async move { Ok(proxy_commit_info().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.
// Proxy media through Redlib
app.at("/vid/:id/:size").get(|r| proxy(r, "https://v.redd.it/{id}/DASH_{size}").boxed());
@ -421,40 +419,36 @@ 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(
Response::builder()
.status(200)
.header("content-type", "application/atom+xml")
.body(Body::from(fetch_commit_info().await))
.body(Body::from(fetch_commit_info().await?))
.unwrap_or_default(),
)
}
#[cached(time = 600)]
async fn fetch_commit_info() -> String {
let uri = Uri::from_str("https://github.com/redlib-org/redlib/commits/main.atom").expect("Invalid URI");
let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body();
hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect()
#[cached(time = 600, result = true, result_fallback = true)]
async fn fetch_commit_info() -> Result<String, hyper::Error> {
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
Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect())
}
pub async fn proxy_instances() -> Result<Response<Body>, String> {
pub async fn proxy_instances() -> Result<Response<Body>, hyper::Error> {
Ok(
Response::builder()
.status(200)
.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(),
)
}
#[cached(time = 600)]
async fn fetch_instances() -> String {
let uri = Uri::from_str("https://raw.githubusercontent.com/redlib-org/redlib-instances/refs/heads/main/instances.json").expect("Invalid URI");
let resp: Body = CLIENT.get(uri).await.expect("Failed to request GitHub").into_body();
hyper::body::to_bytes(resp).await.expect("Failed to read body").iter().copied().map(|x| x as char).collect()
#[cached(time = 600, result = true, result_fallback = true)]
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 resp: Body = CLIENT.get(uri).await?.into_body(); // Could fail if no internet
Ok(hyper::body::to_bytes(resp).await?.iter().copied().map(|x| x as char).collect())
}