add defaults for mascot fixes some of #7

.env.example

@@ -14,6 +14,8 @@ REDLIB_PUSHSHIFT_FRONTEND=undelete.pullpush.io
 # Default user settings
 # Set the default theme (options: system, light, dark, black, dracula, nord, laserwave, violet, gold, rosebox, gruvboxdark, gruvboxlight)
 REDLIB_DEFAULT_THEME=system
+# Set the default mascot
+REDLIB_DEFAULT_MASCOT=none
 # Set the default front page (options: default, popular, all)
 REDLIB_DEFAULT_FRONT_PAGE=default
 # Set the default layout (options: card, clean, compact)

src/config.rs

@@ -28,6 +28,10 @@ pub struct Config {
 	#[serde(alias = "LIBREDDIT_DEFAULT_THEME")]
 	pub(crate) default_theme: Option<String>,
 
+	#[serde(rename = "REDLIB_DEFAULT_MASCOT")]
+	#[serde(alias = "LIBREDDIT_DEFAULT_MASCOT")]
+	pub(crate) default_mascot: Option<String>,
+
 	#[serde(rename = "REDLIB_DEFAULT_FRONT_PAGE")]
 	#[serde(alias = "LIBREDDIT_DEFAULT_FRONT_PAGE")]
 	pub(crate) default_front_page: Option<String>,
@@ -121,6 +125,7 @@ impl Config {
 		Self {
 			sfw_only: parse("REDLIB_SFW_ONLY"),
 			default_theme: parse("REDLIB_DEFAULT_THEME"),
+			default_mascot: parse("REDLIB_DEFAULT_MASCOT"),
 			default_front_page: parse("REDLIB_DEFAULT_FRONT_PAGE"),
 			default_layout: parse("REDLIB_DEFAULT_LAYOUT"),
 			default_post_sort: parse("REDLIB_DEFAULT_POST_SORT"),
@@ -146,6 +151,7 @@ fn get_setting_from_config(name: &str, config: &Config) -> Option<String> {
 	match name {
 		"REDLIB_SFW_ONLY" => config.sfw_only.clone(),
 		"REDLIB_DEFAULT_THEME" => config.default_theme.clone(),
+		"REDLIB_DEFAULT_MASCOT" => config.default_mascot.clone(),
 		"REDLIB_DEFAULT_FRONT_PAGE" => config.default_front_page.clone(),
 		"REDLIB_DEFAULT_LAYOUT" => config.default_layout.clone(),
 		"REDLIB_DEFAULT_COMMENT_SORT" => config.default_comment_sort.clone(),

src/instance_info.rs

@@ -136,6 +136,7 @@ impl InstanceInfo {
 				["Hide awards", &convert(&self.config.default_hide_awards)],
 				["Hide score", &convert(&self.config.default_hide_score)],
 				["Theme", &convert(&self.config.default_theme)],
+				["Mascot", &convert(&self.config.default_mascot)],
 				["Front page", &convert(&self.config.default_front_page)],
 				["Layout", &convert(&self.config.default_layout)],
 				["Wide", &convert(&self.config.default_wide)],
@@ -168,6 +169,7 @@ impl InstanceInfo {
                     Hide awards: {:?}\n
                     Hide score: {:?}\n
                     Default theme: {:?}\n
+                    Default mascot: {:?}\n
                     Default front page: {:?}\n
                     Default layout: {:?}\n
                     Default wide: {:?}\n
@@ -190,6 +192,7 @@ impl InstanceInfo {
 					self.config.default_hide_awards,
 					self.config.default_hide_score,
 					self.config.default_theme,
+					self.config.default_mascot,
 					self.config.default_front_page,
 					self.config.default_layout,
 					self.config.default_wide,

templates/settings.html

@@ -153,7 +153,7 @@
 
 	<div id="settings_note">
 		<p><b>Note:</b> settings and subscriptions are saved in browser cookies. Clearing your cookies will reset them.</p><br>
-		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&front_page={{ prefs.front_page }}&layout={{ prefs.layout }}&wide={{ prefs.wide }}&post_sort={{ prefs.post_sort }}&comment_sort={{ prefs.comment_sort }}&show_nsfw={{ prefs.show_nsfw }}&use_hls={{ prefs.use_hls }}&hide_hls_notification={{ prefs.hide_hls_notification }}&hide_awards={{ prefs.hide_awards }}&fixed_navbar={{ prefs.fixed_navbar }}&subscriptions={{ prefs.subscriptions.join("%2B") }}&filters={{ prefs.filters.join("%2B") }}">this link</a>.</p>
+		<p>You can restore your current settings and subscriptions after clearing your cookies using <a href="/settings/restore/?theme={{ prefs.theme }}&mascot={{ prefs.mascot }}&front_page={{ prefs.front_page }}&layout={{ prefs.layout }}&wide={{ prefs.wide }}&post_sort={{ prefs.post_sort }}&comment_sort={{ prefs.comment_sort }}&show_nsfw={{ prefs.show_nsfw }}&use_hls={{ prefs.use_hls }}&hide_hls_notification={{ prefs.hide_hls_notification }}&hide_awards={{ prefs.hide_awards }}&fixed_navbar={{ prefs.fixed_navbar }}&hide_sidebar_and_summary={{ prefs.hide_sidebar_and_summary}}&subscriptions={{ prefs.subscriptions.join("%2B") }}&filters={{ prefs.filters.join("%2B") }}">this link</a>.</p>
 	</div>
 </div>