pavel/discord
1
0
Fork 0
Code Issues Pull requests Projects Releases 60 Packages Wiki Activity Actions

feat: media uploads
All checks were successful
/ upload (release) Successful in 5m37s
Details

Browse source
This commit is contained in:
pavel 2026-02-27 15:38:46 +01:00
commit e1dd679c47
19 changed files with 1807 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/config.rs
View file

@ -17,6 +17,16 @@ pub struct Settings {
pub turn_urls: Vec<String>,
pub turn_username: Option<String>,
pub turn_password: Option<String>,
pub media: Option<MediaSettings>,
}
#[derive(Clone, Debug)]
pub struct MediaSettings {
pub account_id: String,
pub access_key_id: String,
pub secret_access_key: String,
pub bucket: String,
pub public_base_url: String,
}
impl Settings {
@ -33,7 +43,8 @@ impl Settings {
oidc_token_url: required("OIDC_TOKEN_URL")?,
oidc_userinfo_url: required("OIDC_USERINFO_URL")?,
oidc_redirect_url: required("OIDC_REDIRECT_URL")?,
oidc_scopes: std::env::var("OIDC_SCOPES").unwrap_or_else(|_| "openid profile email".to_string()),
oidc_scopes: std::env::var("OIDC_SCOPES")
.unwrap_or_else(|_| "openid profile email".to_string()),
session_secret: required("SESSION_SECRET")?,
cookie_secure: std::env::var("COOKIE_SECURE")
.unwrap_or_else(|_| "false".into())
@ -43,10 +54,42 @@ impl Settings {
turn_urls: parse_csv_env("TURN_URLS", ""),
turn_username: optional("TURN_USERNAME"),
turn_password: optional("TURN_PASSWORD"),
media: MediaSettings::from_env()?,
})
}
}
impl MediaSettings {
fn from_env() -> Result<Option<Self>> {
let account_id = optional("R2_ACCOUNT_ID");
let access_key_id = optional("R2_ACCESS_KEY_ID");
let secret_access_key = optional("R2_SECRET_ACCESS_KEY");
let bucket = optional("R2_BUCKET");
let public_base_url = optional("R2_PUBLIC_BASE_URL");
if account_id.is_none()
&& access_key_id.is_none()
&& secret_access_key.is_none()
&& bucket.is_none()
&& public_base_url.is_none()
{
return Ok(None);
}
Ok(Some(Self {
account_id: account_id.context("missing env var R2_ACCOUNT_ID")?,
access_key_id: access_key_id.context("missing env var R2_ACCESS_KEY_ID")?,
secret_access_key: secret_access_key.context("missing env var R2_SECRET_ACCESS_KEY")?,
bucket: bucket.context("missing env var R2_BUCKET")?,
public_base_url: public_base_url.context("missing env var R2_PUBLIC_BASE_URL")?,
}))
}
pub fn endpoint_url(&self) -> String {
format!("https://{}.r2.cloudflarestorage.com", self.account_id)
}
}
fn required(name: &str) -> Result<String> {
std::env::var(name).with_context(|| format!("missing env var {name}"))
}