Change config pictrs key name (#2360)

diff --git a/config/defaults.hjson b/config/defaults.hjson
index c856585676d20ec7b7e809eb0e21fa618a83a267..9e405407a57e21cdc028bd31d92f196229deeb5d 100644 (file)
--- a/config/defaults.hjson
+++ b/config/defaults.hjson
@@ -73,7 +73,7 @@
     debug: false
   }
   # Pictrs image server configuration.
     debug: false
   }
   # Pictrs image server configuration.

-  pictrs_config: {
+  pictrs: {

     # Address where pictrs is available (for image hosting)
     url: "http://pictrs:8080/"
     # Set a custom pictrs API key. ( Required for deleting images )
     # Address where pictrs is available (for image hosting)
     url: "http://pictrs:8080/"
     # Set a custom pictrs API key. ( Required for deleting images )

diff --git a/crates/utils/src/settings/mod.rs b/crates/utils/src/settings/mod.rs
index f095baf12740aff111795ed1f03c9817d48712a1..50d3fc583dabf9d9635de821008d0f12ba086a1e 100644 (file)
--- a/crates/utils/src/settings/mod.rs
+++ b/crates/utils/src/settings/mod.rs
@@ -101,7 +101,7 @@ impl Settings {
 
   pub fn pictrs_config(&self) -> Result<PictrsConfig, LemmyError> {
     self
 
   pub fn pictrs_config(&self) -> Result<PictrsConfig, LemmyError> {
     self

-      .pictrs_config
+      .pictrs

       .to_owned()
       .ok_or_else(|| anyhow!("images_disabled").into())
   }
       .to_owned()
       .ok_or_else(|| anyhow!("images_disabled").into())
   }

diff --git a/crates/utils/src/settings/structs.rs b/crates/utils/src/settings/structs.rs
index 7ee8cf18bca57a313b8d72dfda7379c679885c98..ecf19aaffbe871af1df0b05f8e7cd3d43a25bd44 100644 (file)
--- a/crates/utils/src/settings/structs.rs
+++ b/crates/utils/src/settings/structs.rs
@@ -17,7 +17,7 @@ pub struct Settings {
   pub federation: FederationConfig,
   /// Pictrs image server configuration.
   #[default(Some(Default::default()))]
   pub federation: FederationConfig,
   /// Pictrs image server configuration.
   #[default(Some(Default::default()))]

-  pub(crate) pictrs_config: Option<PictrsConfig>,
+  pub(crate) pictrs: Option<PictrsConfig>,

   #[default(Default::default())]
   pub captcha: CaptchaConfig,
   /// Email sending configuration. All options except login/password are mandatory
   #[default(Default::default())]
   pub captcha: CaptchaConfig,
   /// Email sending configuration. All options except login/password are mandatory


@@ -61,7 +61,7 @@ pub struct Settings {
 pub struct PictrsConfig {
   /// Address where pictrs is available (for image hosting)
   #[default(Url::parse("http://pictrs:8080").expect("parse pictrs url"))]
 pub struct PictrsConfig {
   /// Address where pictrs is available (for image hosting)
   #[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,
 
   /// Set a custom pictrs API key. ( Required for deleting images )
   pub url: Url,
 
   /// Set a custom pictrs API key. ( Required for deleting images )