diff --git a/README.md b/README.md index 848134a..b8f37d2 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ of the notes even if it tried to. | `MAX_EXPIRATION` | `360` | Maximal expiration in minutes. | | `ALLOW_ADVANCED` | `true` | Allow custom configuration. If set to `false` all notes will be one view only. | | `ALLOW_FILES` | `true` | Allow uploading files. If set to `false`, users will only be allowed to create text notes. | +| `NEW_NOTE_NOTICE` | `true` | Show the message about how notes are stored in the memory and may be evicted after creating a new note. Defaults to `true`. | | `ID_LENGTH` | `32` | Set the size of the note `id` in bytes. By default this is `32` bytes. This is useful for reducing link size. _This setting does not affect encryption strength_. | | `VERBOSITY` | `warn` | Verbosity level for the backend. [Possible values](https://docs.rs/env_logger/latest/env_logger/#enabling-logging) are: `error`, `warn`, `info`, `debug`, `trace` | | `THEME_IMAGE` | `""` | Custom image for replacing the logo. Must be publicly reachable | diff --git a/packages/backend/src/config.rs b/packages/backend/src/config.rs index 5947f79..ce94df2 100644 --- a/packages/backend/src/config.rs +++ b/packages/backend/src/config.rs @@ -14,30 +14,34 @@ lazy_static! { // CONFIG lazy_static! { - pub static ref LIMIT: usize = - Byte::from_str(std::env::var("SIZE_LIMIT").unwrap_or("1 KiB".to_string())) - .unwrap() - .get_bytes() as usize; - pub static ref MAX_VIEWS: u32 = std::env::var("MAX_VIEWS") - .unwrap_or("100".to_string()) - .parse() - .unwrap(); - pub static ref MAX_EXPIRATION: u32 = std::env::var("MAX_EXPIRATION") - .unwrap_or("360".to_string()) // 6 hours in minutes - .parse() - .unwrap(); - pub static ref ALLOW_ADVANCED: bool = std::env::var("ALLOW_ADVANCED") - .unwrap_or("true".to_string()) - .parse() - .unwrap(); - pub static ref ID_LENGTH: u32 = std::env::var("ID_LENGTH") - .unwrap_or("32".to_string()) - .parse() - .unwrap(); - pub static ref ALLOW_FILES: bool = std::env::var("ALLOW_FILES") - .unwrap_or("true".to_string()) - .parse() - .unwrap(); +pub static ref LIMIT: usize = + Byte::from_str(std::env::var("SIZE_LIMIT").unwrap_or("1 KiB".to_string())) + .unwrap() + .get_bytes() as usize; +pub static ref MAX_VIEWS: u32 = std::env::var("MAX_VIEWS") + .unwrap_or("100".to_string()) + .parse() + .unwrap(); +pub static ref MAX_EXPIRATION: u32 = std::env::var("MAX_EXPIRATION") + .unwrap_or("360".to_string()) // 6 hours in minutes + .parse() + .unwrap(); +pub static ref ALLOW_ADVANCED: bool = std::env::var("ALLOW_ADVANCED") + .unwrap_or("true".to_string()) + .parse() + .unwrap(); +pub static ref ID_LENGTH: u32 = std::env::var("ID_LENGTH") + .unwrap_or("32".to_string()) + .parse() + .unwrap(); +pub static ref ALLOW_FILES: bool = std::env::var("ALLOW_FILES") + .unwrap_or("true".to_string()) + .parse() + .unwrap(); +pub static ref NEW_NOTE_NOTICE: bool = std::env::var("NEW_NOTE_NOTICE") + .unwrap_or("true".to_string()) + .parse() + .unwrap(); } // THEME diff --git a/packages/backend/src/status/model.rs b/packages/backend/src/status/model.rs index 98b0c6e..58843b1 100644 --- a/packages/backend/src/status/model.rs +++ b/packages/backend/src/status/model.rs @@ -10,6 +10,7 @@ pub struct Status { pub max_expiration: u32, pub allow_advanced: bool, pub allow_files: bool, + pub new_note_notice: bool, // Theme pub theme_image: String, pub theme_text: String, diff --git a/packages/backend/src/status/routes.rs b/packages/backend/src/status/routes.rs index 583b26d..3866d10 100644 --- a/packages/backend/src/status/routes.rs +++ b/packages/backend/src/status/routes.rs @@ -12,6 +12,7 @@ async fn get_status() -> impl Responder { max_expiration: *config::MAX_EXPIRATION, allow_advanced: *config::ALLOW_ADVANCED, allow_files: *config::ALLOW_FILES, + new_note_notice: *config::NEW_NOTE_NOTICE, theme_image: config::THEME_IMAGE.to_string(), theme_text: config::THEME_TEXT.to_string(), theme_page_title: config::THEME_PAGE_TITLE.to_string(), diff --git a/packages/frontend/src/lib/ui/NoteResult.svelte b/packages/frontend/src/lib/ui/NoteResult.svelte index 8246e75..f5f6f9e 100644 --- a/packages/frontend/src/lib/ui/NoteResult.svelte +++ b/packages/frontend/src/lib/ui/NoteResult.svelte @@ -7,7 +7,7 @@