Handle deleted channels in sender

This commit is contained in:
jude
2023-09-17 14:09:50 +01:00
parent 82dab53744
commit 5ee9094bac
8 changed files with 192 additions and 122 deletions

View File

@ -173,6 +173,7 @@ pub async fn import_reminders(
utc_time: record.utc_time,
status: "pending".to_string(),
status_change_time: None,
status_message: None,
};
create_reminder(

View File

@ -361,7 +361,8 @@ pub async fn get_reminders(
reminders.username,
reminders.utc_time,
reminders.status,
reminders.status_change_time
reminders.status_change_time,
reminders.status_message
FROM reminders
LEFT JOIN channels ON channels.id = reminders.channel_id
WHERE FIND_IN_SET(`status`, ?) AND reminders.guild_id = (SELECT id FROM guilds WHERE guild = ?)",
@ -549,7 +550,8 @@ pub async fn edit_reminder(
match sqlx::query_as_unchecked!(
Reminder,
"SELECT reminders.attachment,
"
SELECT reminders.attachment,
reminders.attachment_name,
reminders.avatar,
channels.channel,
@ -576,7 +578,8 @@ pub async fn edit_reminder(
reminders.username,
reminders.utc_time,
reminders.status,
reminders.status_change_time
reminders.status_change_time,
reminders.status_message
FROM reminders
LEFT JOIN channels ON channels.id = reminders.channel_id
WHERE uid = ?",

View File

@ -151,6 +151,7 @@ pub struct Reminder {
username: Option<String>,
utc_time: NaiveDateTime,
status: String,
status_message: Option<String>,
status_change_time: Option<NaiveDateTime>,
}
@ -504,7 +505,8 @@ pub async fn create_reminder(
// write to db
match sqlx::query!(
"INSERT INTO reminders (
"
INSERT INTO reminders (
uid,
attachment,
attachment_name,
@ -594,7 +596,8 @@ pub async fn create_reminder(
reminders.username,
reminders.utc_time,
reminders.status,
reminders.status_change_time
reminders.status_change_time,
reminders.status_message
FROM reminders
LEFT JOIN channels ON channels.id = reminders.channel_id
WHERE uid = ?",

View File

@ -758,6 +758,16 @@ div.reminderError .errorHead .reminderTime {
border-style: solid;
}
div.reminderError .reminderMessage {
font-size: 1rem;
display: flex;
flex-direction: column;
justify-content: center;
color: rgb(54, 54, 54);
flex-grow: 1;
font-style: italic;
}
/* other stuff */
.half-rem {

View File

@ -30,6 +30,8 @@ document.addEventListener("paneLoad", (ev) => {
{ zone: "UTC" }
);
newRow.querySelector(".reminderName").textContent = reminder.name;
newRow.querySelector(".reminderMessage").textContent =
reminder.status_message;
newRow.querySelector(".reminderTime").textContent = statusTime
.toLocal()
.toLocaleString(luxon.DateTime.DATETIME_MED);

View File

@ -9,6 +9,9 @@
</div>
<div class="reminderName">
Reminder
</div>
<div class="reminderMessage">
</div>
<div class="reminderTime">