This commit is contained in:
jude
2022-05-15 12:14:07 +01:00
parent bfc2d71ca0
commit 6f7d0f67b3
8 changed files with 68 additions and 39 deletions

View File

@ -97,7 +97,6 @@ pub struct Reminder {
interval_months: Option<u32>,
#[serde(default = "name_default")]
name: String,
pin: bool,
restartable: bool,
tts: bool,
#[serde(default)]
@ -151,8 +150,6 @@ pub struct PatchReminder {
#[serde(default)]
name: Unset<String>,
#[serde(default)]
pin: Unset<bool>,
#[serde(default)]
restartable: Unset<bool>,
#[serde(default)]
tts: Unset<bool>,
@ -213,8 +210,8 @@ mod base64s {
where
D: Deserializer<'de>,
{
let string = String::deserialize(deserializer)?;
Some(base64::decode(string).map_err(de::Error::custom)).transpose()
let string = Option::<String>::deserialize(deserializer)?;
Some(string.map(|b| base64::decode(b).map_err(de::Error::custom))).flatten().transpose()
}
}