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

show newly created reminders. fix color rendering.

Browse Source
This commit is contained in:
jude 2022-03-27 14:15:01 +01:00
parent f8547bba70
commit f4ef7afea0
5 changed files with 197 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,6 +225,8 @@ pub async fn create_reminder(
let attachment_data = reminder.attachment.as_ref().map(|s| base64::decode(s).ok()).flatten();
let name = if reminder.name.is_empty() { name_default() } else { reminder.name.clone() };
let new_uid = generate_uid();
// write to db
match sqlx::query!(
"INSERT INTO reminders (
@ -254,7 +256,7 @@ pub async fn create_reminder(
username,
`utc_time`
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
generate_uid(),
new_uid,
attachment_data,
reminder.attachment_name,
channel,
@ -283,7 +285,47 @@ pub async fn create_reminder(
.execute(pool.inner())
.await
{
Ok(_) => json!({}),
Ok(_) => sqlx::query_as_unchecked!(
Reminder,
"SELECT
reminders.attachment,
reminders.attachment_name,
reminders.avatar,
channels.channel,
reminders.content,
reminders.embed_author,
reminders.embed_author_url,
reminders.embed_color,
reminders.embed_description,
reminders.embed_footer,
reminders.embed_footer_url,
reminders.embed_image_url,
reminders.embed_thumbnail_url,
reminders.embed_title,
reminders.enabled,
reminders.expires,
reminders.interval_seconds,
reminders.interval_months,
reminders.name,
reminders.pin,
reminders.restartable,
reminders.tts,
reminders.uid,
reminders.username,
reminders.utc_time
FROM reminders
LEFT JOIN channels ON channels.id = reminders.channel_id
WHERE uid = ?",
new_uid
)
.fetch_one(pool.inner())
.await
.map(|r| json!(r))
.unwrap_or_else(|e| {
warn!("Failed to complete SQL query: {:?}", e);
json!({"error": "Could not load reminders"})
}),
Err(e) => {
warn!("Error in `create_reminder`: Could not execute query: {:?}", e);

BIN
web/static/img/bg.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 762 B

After

Width:  |  Height:  |  Size: 762 B

122
web/static/js/main.js
View File

@ -4,6 +4,7 @@ const $loader = document.querySelector("#loader");
const $colorPickerModal = document.querySelector("div#pickColorModal");
const $colorPickerInput = $colorPickerModal.querySelector("input");
const $deleteReminderBtn = document.querySelector("#delete-reminder-confirm");
const $reminderTemplate = document.querySelector("template#guildReminder");
let channels;
let roles;
@ -14,7 +15,7 @@ function colorToInt(r, g, b) {
}
function intToColor(i) {
return `#${i.toString(16)}`;
return `#${i.toString(16).padStart(6, "0")}`;
}
function resize_textareas() {
@ -114,41 +115,13 @@ async function fetch_reminders(guild_id) {
if (data.error) {
show_error(data.error);
} else {
const $template = document.querySelector("template#guildReminder");
for (let reminder of data) {
let newFrame = $template.content.cloneNode(true);
let newFrame = $reminderTemplate.content.cloneNode(true);
newFrame.querySelector(".reminderContent").dataset.uid =
reminder["uid"];
// populate channels
set_channels(newFrame.querySelector("select.channel-selector"));
// populate majority of items
for (let prop in reminder) {
if (reminder.hasOwnProperty(prop) && reminder[prop] !== null) {
let $input = newFrame.querySelector(`*[name="${prop}"]`);
let $image = newFrame.querySelector(`img.${prop}`);
if ($input !== null) {
$input.value = reminder[prop];
} else if ($image !== null) {
$image.src = reminder[prop];
}
}
}
let $enableBtn = newFrame.querySelector(".disable-enable");
$enableBtn.dataset.action = reminder["enabled"]
? "disable"
: "enable";
let timeInput = newFrame.querySelector('input[name="time"]');
let localTime = luxon.DateTime.fromISO(reminder["utc_time"]).setZone(
timezone
);
timeInput.value = localTime.toFormat("yyyy-LL-dd'T'HH:mm:ss");
render_reminder(reminder, newFrame);
$reminderBox.appendChild(newFrame);
@ -164,6 +137,40 @@ async function fetch_reminders(guild_id) {
});
}
function render_reminder(reminder, frame) {
// populate channels
set_channels(frame.querySelector("select.channel-selector"));
// populate majority of items
for (let prop in reminder) {
if (reminder.hasOwnProperty(prop) && reminder[prop] !== null) {
if (prop === "attachment") {
} else if (prop === "attachment_name") {
frame.querySelector(".file-cta > .file-label").textContent =
reminder[prop];
} else {
let $input = frame.querySelector(`*[name="${prop}"]`);
let $image = frame.querySelector(`img.${prop}`);
if ($input !== null) {
$input.value = reminder[prop];
} else if ($image !== null) {
$image.src = reminder[prop];
}
}
}
}
let $enableBtn = frame.querySelector(".disable-enable");
$enableBtn.dataset.action = reminder["enabled"] ? "disable" : "enable";
let timeInput = frame.querySelector('input[name="time"]');
let localTime = luxon.DateTime.fromISO(reminder["utc_time"], { zone: "UTC" }).setZone(
timezone
);
timeInput.value = localTime.toFormat("yyyy-LL-dd'T'HH:mm:ss");
}
document.addEventListener("guildSwitched", async (e) => {
$loader.classList.remove("is-hidden");
@ -500,19 +507,18 @@ function has_source(string) {
}
let $createReminder = document.querySelector("#reminderCreator");
let $createBtn = $createReminder.querySelector("button#createReminder");
$createBtn.addEventListener("click", async () => {
$createBtn.querySelector("span.icon > i").classList = ["fas fa-spinner fa-spin"];
$createReminder
.querySelector("button#createReminder")
.addEventListener("click", async () => {
// create reminder object
let seconds =
parseInt(
$createReminder.querySelector('input[name="interval_seconds"]').value
) || null;
parseInt($createReminder.querySelector('input[name="interval_seconds"]').value) ||
null;
let months =
parseInt(
$createReminder.querySelector('input[name="interval_months"]').value
) || null;
parseInt($createReminder.querySelector('input[name="interval_months"]').value) ||
null;
let rgb_color = window.getComputedStyle(
$createReminder.querySelector("div.discord-embed")
@ -524,6 +530,12 @@ $createReminder
$createReminder.querySelector('input[name="time"]').value
).setZone("UTC");
if (utc_time.invalid) {
show_error("Time provided invalid.");
$createBtn.querySelector("span.icon > i").classList = ["fas fa-sparkles"];
return;
}
let attachment = null;
let attachment_name = null;
@ -587,12 +599,34 @@ $createReminder
body: JSON.stringify(reminder),
})
.then((response) => response.json())
.then((data) => console.log(data));
.then((data) => {
if (data.error) {
show_error(data.error);
} else {
const $reminderBox = document.querySelector("div#guildReminders");
let newFrame = $reminderTemplate.content.cloneNode(true);
// process response
fetch_reminders(guild);
newFrame.querySelector(".reminderContent").dataset["uid"] = data["uid"];
// reset inputs
render_reminder(data, newFrame);
$reminderBox.appendChild(newFrame);
data.node = $reminderBox.lastElementChild;
document.dispatchEvent(
new CustomEvent("remindersLoaded", {
detail: [data],
})
);
}
$createBtn.querySelector("span.icon > i").classList = ["fas fa-check"];
window.setTimeout(() => {
$createBtn.querySelector("span.icon > i").classList = ["fas fa-sparkles"];
}, 1500);
});
});
document.querySelectorAll("textarea.autoresize").forEach((element) => {

4
web/static/js/sort.js
View File

@ -66,7 +66,5 @@ selector.addEventListener("change", () => {
});
document.addEventListener("remindersLoaded", () => {
let select = document.querySelector("#orderBy");
sort_by(select.value);
sort_by(selector.value);
});

8
web/templates/reminder_dashboard/guild_reminder.html.tera
View File

@ -166,17 +166,17 @@
<div class="columns">
<div class="column has-text-centered">
<div style="display: inline-block;">
<div class="is-boxed">
<label class="label">Enable TTS <input type="checkbox" name="tts"></label>
</div>
</div>
<div class="column has-text-centered">
<div style="display: inline-block;">
<div class="is-boxed">
<label class="label">Pin Message <input type="checkbox" name="pin"></label>
</div>
</div>
<div class="column has-text-centered">
<div class="file is-boxed">
<div class="file is-small is-boxed">
<label class="file-label">
<input class="file-input" type="file" name="attachment">
<span class="file-cta">
@ -201,7 +201,7 @@
Create Template
</button>
<button class="button is-success" id="createReminder">
Create Reminder
<span>Create Reminder</span> <span class="icon"><i class="fas fa-sparkles"></i></span>
</button>
{% else %}
<button class="button is-primary save-btn">