jude/reminder-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

mentions

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/routes/dashboard/guild.rs
View File

@ -420,12 +420,11 @@ pub async fn create_reminder(
interval_seconds,
interval_months,
name,
pin,
restartable,
tts,
username,
`utc_time`
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
new_uid,
attachment_data,
reminder.attachment_name,
@ -447,7 +446,6 @@ pub async fn create_reminder(
reminder.interval_seconds,
reminder.interval_months,
name,
reminder.pin,
reminder.restartable,
reminder.tts,
reminder.username,
@ -479,7 +477,6 @@ pub async fn create_reminder(
reminders.interval_seconds,
reminders.interval_months,
reminders.name,
reminders.pin,
reminders.restartable,
reminders.tts,
reminders.uid,
@ -543,7 +540,6 @@ pub async fn get_reminders(id: u64, ctx: &State<Context>, pool: &State<Pool<MySq
reminders.interval_seconds,
reminders.interval_months,
reminders.name,
reminders.pin,
reminders.restartable,
reminders.tts,
reminders.uid,
@ -600,7 +596,6 @@ pub async fn edit_reminder(
interval_seconds,
interval_months,
name,
pin,
restartable,
tts,
username,
@ -687,7 +682,6 @@ pub async fn edit_reminder(
reminders.interval_seconds,
reminders.interval_months,
reminders.name,
reminders.pin,
reminders.restartable,
reminders.tts,
reminders.uid,

7
web/src/routes/dashboard/mod.rs
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()
}
}