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

Retry the fix

Browse Source
This commit is contained in:
jude 2025-03-20 16:56:10 +00:00
parent c0583f2d43
commit 265e48f84b
2 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reminder-dashboard/src/components/Reminder/ButtonRow/EditButtonRow.tsx
View File

@ -32,6 +32,12 @@ export const EditButtonRow = () => {
setRecentlySaved(false); setRecentlySaved(false);
flash({ message: response.data.error, type: "error" }); flash({ message: response.data.error, type: "error" });
} else if (response.data.errors && response.data.errors.length > 0) {
setRecentlySaved(false);
for (const error of response.data.errors) {
flash({ message: error, type: "error" });
}
} else { } else {
setRecentlySaved(true); setRecentlySaved(true);

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

@ -274,9 +274,8 @@ pub async fn edit_reminder(
reminder.channel, id reminder.channel, id
); );
return Err(json!({"error": "Channel not found"})); error.push("Channel not found".to_string());
} } else {
let channel = create_database_channel( let channel = create_database_channel(
ctx.inner(), ctx.inner(),
ChannelId::new(reminder.channel), ChannelId::new(reminder.channel),
@ -284,16 +283,8 @@ pub async fn edit_reminder(
) )
.await; .await;
if let Err(e) = channel { match channel {
warn!("`create_database_channel` returned an error code: {:?}", e); Ok(channel) => {
return Err(
json!({"error": "Failed to configure channel for reminders. Please check the bot permissions"}),
);
}
let channel = channel.unwrap();
match sqlx::query!( match sqlx::query!(
"UPDATE reminders SET channel_id = ? WHERE uid = ?", "UPDATE reminders SET channel_id = ? WHERE uid = ?",
channel, channel,
@ -311,20 +302,31 @@ pub async fn edit_reminder(
} }
} }
Err(e) => {
warn!("`create_database_channel` returned an error code: {:?}", e);
error.push("Failed to configure channel for reminders. Please check the bot permissions".to_string());
}
}
}
}
None => { None => {
warn!( warn!(
"Error in `edit_reminder`: channel {:?} not found for guild {}", "Error in `edit_reminder`: channel {:?} not found for guild {}",
reminder.channel, id reminder.channel, id
); );
return Err(json!({"error": "Channel not found"})); error.push("Channel not found".to_string());
} }
} }
} }
if let Err(e) = transaction.commit().await { if let Err(e) = transaction.commit().await {
warn!("Couldn't commit transaction: {:?}", e); warn!("Couldn't commit transaction: {:?}", e);
return json_err!("Couldn't commit transaction"); return Err(
json!({"reminder": Option::<GetReminder>::None, "errors": vec!["Unknown error"]}),
);
} }
match sqlx::query_as_unchecked!( match sqlx::query_as_unchecked!(