add: slightly more advanced theming

add: profile "before you view" warning

crates/core/src/model/auth.rs

@@ -46,8 +46,7 @@ impl Default for ThemePreference {
     }
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-#[derive(Default)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct UserSettings {
     #[serde(default)]
     pub policy_consent: bool,
@@ -56,11 +55,18 @@ pub struct UserSettings {
     #[serde(default)]
     pub biography: String,
     #[serde(default)]
+    pub warning: String,
+    #[serde(default)]
     pub private_profile: bool,
     #[serde(default)]
     pub private_communities: bool,
+    /// The theme shown to the user.
     #[serde(default)]
     pub theme_preference: ThemePreference,
+    /// The theme used on the user's profile. Setting this to `Auto` will use
+    /// the viewing user's `theme_preference` setting.
+    #[serde(default)]
+    pub profile_theme: ThemePreference,
     #[serde(default)]
     pub private_last_seen: bool,
     #[serde(default)]
@@ -69,11 +75,52 @@ pub struct UserSettings {
     pub theme_sat: String,
     #[serde(default)]
     pub theme_lit: String,
+    /// Page background.
+    #[serde(default)]
+    pub theme_color_surface: String,
+    /// Text on elements with the surface backgrounds.
+    #[serde(default)]
+    pub theme_color_text: String,
+    /// Some cards, buttons, or anything else with a darker background color than the surface.
+    #[serde(default)]
+    pub theme_color_lowered: String,
+    /// Text on elements with the lowered backgrounds.
+    #[serde(default)]
+    pub theme_color_text_lowered: String,
+    /// Borders.
+    #[serde(default)]
+    pub theme_color_super_lowered: String,
+    /// Some cards, buttons, or anything else with a lighter background color than the surface.
+    #[serde(default)]
+    pub theme_color_raised: String,
+    /// Text on elements with the raised backgrounds.
+    #[serde(default)]
+    pub theme_color_text_raised: String,
+    /// Some borders.
+    #[serde(default)]
+    pub theme_color_super_raised: String,
+    /// Primary color; navigation bar, some buttons, etc.
+    #[serde(default)]
+    pub theme_color_primary: String,
+    /// Text on elements with the primary backgrounds.
+    #[serde(default)]
+    pub theme_color_text_primary: String,
+    /// Hover state for primary buttons.
+    #[serde(default)]
+    pub theme_color_primary_lowered: String,
+    /// Secondary color.
+    #[serde(default)]
+    pub theme_color_secondary: String,
+    /// Text on elements with the secondary backgrounds.
+    #[serde(default)]
+    pub theme_color_text_secondary: String,
+    /// Hover state for secondary buttons.
+    #[serde(default)]
+    pub theme_color_secondary_lowered: String,
     #[serde(default)]
     pub disable_other_themes: bool,
 }
 
-
 impl Default for User {
     fn default() -> Self {
         Self::new("<unknown>".to_string(), String::new())
@@ -204,7 +251,8 @@ impl User {
             self.totp.as_bytes().to_owned(),
             Some(issuer.unwrap_or("tetratto!".to_string())),
             self.username.clone(),
-        ).ok()
+        )
+        .ok()
     }
 }
 

crates/core/src/model/communities.rs

@@ -198,7 +198,7 @@ impl Default for PostContext {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct RepostContext {
-    /// Should be `false` is `repost_of` is `Some`.
+    /// Should be `false` is `reposting` is `Some`.
     ///
     /// Declares the post to be a repost of another post.
     pub is_repost: bool,