grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change config pictrs key name (#2360)

Browse source
This commit is contained in:
Nutomic 2022-07-14 18:25:10 +00:00 committed by GitHub
parent d0a3d99636
commit 16fe149a6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/defaults.hjson
View file

@ -73,7 +73,7 @@
debug: false debug: false
} }
# Pictrs image server configuration. # Pictrs image server configuration.
pictrs_config: { pictrs: {
# Address where pictrs is available (for image hosting) # Address where pictrs is available (for image hosting)
url: "http://pictrs:8080/" url: "http://pictrs:8080/"
# Set a custom pictrs API key. ( Required for deleting images ) # Set a custom pictrs API key. ( Required for deleting images )

2
crates/utils/src/settings/mod.rs
View file

@ -101,7 +101,7 @@ impl Settings {
pub fn pictrs_config(&self) -> Result<PictrsConfig, LemmyError> { pub fn pictrs_config(&self) -> Result<PictrsConfig, LemmyError> {
self self
.pictrs_config .pictrs
.to_owned() .to_owned()
.ok_or_else(|| anyhow!("images_disabled").into()) .ok_or_else(|| anyhow!("images_disabled").into())
} }

4
crates/utils/src/settings/structs.rs
View file

@ -17,7 +17,7 @@ pub struct Settings {
pub federation: FederationConfig, pub federation: FederationConfig,
/// Pictrs image server configuration. /// Pictrs image server configuration.
#[default(Some(Default::default()))] #[default(Some(Default::default()))]
pub(crate) pictrs_config: Option<PictrsConfig>, pub(crate) pictrs: Option<PictrsConfig>,
#[default(Default::default())] #[default(Default::default())]
pub captcha: CaptchaConfig, pub captcha: CaptchaConfig,
/// Email sending configuration. All options except login/password are mandatory /// Email sending configuration. All options except login/password are mandatory
@ -61,7 +61,7 @@ pub struct Settings {
pub struct PictrsConfig { pub struct PictrsConfig {
/// Address where pictrs is available (for image hosting) /// Address where pictrs is available (for image hosting)
#[default(Url::parse("http://pictrs:8080").expect("parse pictrs url"))] #[default(Url::parse("http://pictrs:8080").expect("parse pictrs url"))]
#[doku(example = "Url::parse(\"http://pictrs:8080\").unwrap()")] #[doku(example = "http://pictrs:8080")]
pub url: Url, pub url: Url,
/// Set a custom pictrs API key. ( Required for deleting images ) /// Set a custom pictrs API key. ( Required for deleting images )