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

Don't send attachments over API

Browse Source
This commit is contained in:
jude
2024-03-28 19:34:30 +00:00
parent 15dbed2f0f
commit 30f011fcd5
3 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/web/routes/dashboard/api/guild/reminders.rs
View File

@ -17,7 +17,9 @@ use crate::web::{
consts::MIN_INTERVAL,
guards::transaction::Transaction,
routes::{
dashboard::{create_database_channel, create_reminder, PatchReminder, Reminder},
dashboard::{
create_database_channel, create_reminder, CreateReminder, GetReminder, PatchReminder,
},
JsonResult,
},
Database,
@ -26,7 +28,7 @@ use crate::web::{
#[post("/api/guild/<id>/reminders", data = "<reminder>")]
pub async fn create_guild_reminder(
id: u64,
reminder: Json<Reminder>,
reminder: Json<CreateReminder>,
cookies: &CookieJar<'_>,
ctx: &State<Context>,
mut transaction: Transaction<'_>,
@ -78,9 +80,9 @@ pub async fn get_reminders(
.join(",");
sqlx::query_as_unchecked!(
Reminder,
"SELECT
reminders.attachment,
GetReminder,
"
SELECT
reminders.attachment_name,
reminders.avatar,
channels.channel,
@ -192,7 +194,7 @@ pub async fn edit_reminder(
.await
.map_err(|e| {
warn!("Error updating reminder interval: {:?}", e);
json!({ "reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"] })
json!({ "reminder": Option::<GetReminder>::None, "errors": vec!["Unknown error"] })
})?
.days
.unwrap_or(0),
@ -206,7 +208,7 @@ pub async fn edit_reminder(
.await
.map_err(|e| {
warn!("Error updating reminder interval: {:?}", e);
json!({ "reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"] })
json!({ "reminder": Option::<GetReminder>::None, "errors": vec!["Unknown error"] })
})?
.months
.unwrap_or(0),
@ -220,7 +222,7 @@ pub async fn edit_reminder(
.await
.map_err(|e| {
warn!("Error updating reminder interval: {:?}", e);
json!({ "reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"] })
json!({ "reminder": Option::<GetReminder>::None, "errors": vec!["Unknown error"] })
})?
.seconds
.unwrap_or(0),
@ -249,7 +251,7 @@ pub async fn edit_reminder(
.await
.map_err(|e| {
warn!("Error updating reminder interval: {:?}", e);
json!({ "reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"] })
json!({ "reminder": Option::<GetReminder>::None, "errors": vec!["Unknown error"] })
})?;
}
@ -321,8 +323,9 @@ pub async fn edit_reminder(
}
match sqlx::query_as_unchecked!(
Reminder,
"SELECT reminders.attachment,
GetReminder,
"
SELECT
reminders.attachment_name,
reminders.avatar,
channels.channel,
@ -361,7 +364,7 @@ pub async fn edit_reminder(
Err(e) => {
warn!("Error exiting `edit_reminder': {:?}", e);
Err(json!({"reminder": Option::<Reminder>::None, "errors": vec!["Unknown error"]}))
Err(json!({"reminder": Option::<GetReminder>::None, "errors": vec!["Unknown error"]}))
}
}
}