create reminder route. formatting on frontend
This commit is contained in:
parent
6ae2353c92
commit
e2e5b022a0
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -2131,6 +2131,7 @@ version = "0.1.0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"chrono-tz 0.5.3",
|
"chrono-tz 0.5.3",
|
||||||
|
"lazy_static",
|
||||||
"log",
|
"log",
|
||||||
"oauth2",
|
"oauth2",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
|
@ -15,3 +15,4 @@ serde = { version = "1.0", features = ["derive"] }
|
|||||||
sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "macros", "mysql", "chrono"] }
|
sqlx = { version = "0.5", features = ["runtime-tokio-rustls", "macros", "mysql", "chrono"] }
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
chrono-tz = "0.5"
|
chrono-tz = "0.5"
|
||||||
|
lazy_static = "1.4.0"
|
||||||
|
@ -2,3 +2,50 @@ pub const DISCORD_OAUTH_TOKEN: &'static str = "https://discord.com/api/oauth2/to
|
|||||||
pub const DISCORD_OAUTH_AUTHORIZE: &'static str = "https://discord.com/api/oauth2/authorize";
|
pub const DISCORD_OAUTH_AUTHORIZE: &'static str = "https://discord.com/api/oauth2/authorize";
|
||||||
pub const DISCORD_API: &'static str = "https://discord.com/api";
|
pub const DISCORD_API: &'static str = "https://discord.com/api";
|
||||||
pub const DISCORD_CDN: &'static str = "https://cdn.discordapp.com/avatars";
|
pub const DISCORD_CDN: &'static str = "https://cdn.discordapp.com/avatars";
|
||||||
|
|
||||||
|
pub const MAX_CONTENT_LENGTH: usize = 2000;
|
||||||
|
pub const MAX_EMBED_DESCRIPTION_LENGTH: usize = 4096;
|
||||||
|
pub const MAX_EMBED_TITLE_LENGTH: usize = 256;
|
||||||
|
pub const MAX_EMBED_AUTHOR_LENGTH: usize = 256;
|
||||||
|
pub const MAX_EMBED_FOOTER_LENGTH: usize = 2048;
|
||||||
|
pub const MAX_URL_LENGTH: usize = 512;
|
||||||
|
pub const MAX_USERNAME_LENGTH: usize = 100;
|
||||||
|
pub const MAX_EMBED_FIELD_TITLE_LENGTH: usize = 256;
|
||||||
|
pub const MAX_EMBED_FIELD_VALUE_LENGTH: usize = 1024;
|
||||||
|
pub const MAX_EMBED_FIELDS: usize = 25;
|
||||||
|
|
||||||
|
pub const MINUTE: usize = 60;
|
||||||
|
pub const HOUR: usize = 60 * MINUTE;
|
||||||
|
pub const DAY: usize = 24 * HOUR;
|
||||||
|
|
||||||
|
use std::{collections::HashSet, env, iter::FromIterator};
|
||||||
|
|
||||||
|
use lazy_static::lazy_static;
|
||||||
|
use serenity::model::prelude::AttachmentType;
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
pub static ref DEFAULT_AVATAR: AttachmentType<'static> = (
|
||||||
|
include_bytes!(concat!(
|
||||||
|
env!("CARGO_MANIFEST_DIR"),
|
||||||
|
"/../assets/",
|
||||||
|
env!("WEBHOOK_AVATAR", "WEBHOOK_AVATAR not provided for compilation")
|
||||||
|
)) as &[u8],
|
||||||
|
env!("WEBHOOK_AVATAR"),
|
||||||
|
)
|
||||||
|
.into();
|
||||||
|
pub static ref SUBSCRIPTION_ROLES: HashSet<u64> = HashSet::from_iter(
|
||||||
|
env::var("SUBSCRIPTION_ROLES")
|
||||||
|
.map(|var| var
|
||||||
|
.split(',')
|
||||||
|
.filter_map(|item| { item.parse::<u64>().ok() })
|
||||||
|
.collect::<Vec<u64>>())
|
||||||
|
.unwrap_or_else(|_| Vec::new())
|
||||||
|
);
|
||||||
|
pub static ref CNC_GUILD: Option<u64> =
|
||||||
|
env::var("CNC_GUILD").map(|var| var.parse::<u64>().ok()).ok().flatten();
|
||||||
|
pub static ref MIN_INTERVAL: u32 = env::var("MIN_INTERVAL")
|
||||||
|
.ok()
|
||||||
|
.map(|inner| inner.parse::<u32>().ok())
|
||||||
|
.flatten()
|
||||||
|
.unwrap_or(600);
|
||||||
|
}
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
extern crate rocket;
|
extern crate rocket;
|
||||||
|
|
||||||
mod consts;
|
mod consts;
|
||||||
|
#[macro_use]
|
||||||
|
mod macros;
|
||||||
mod routes;
|
mod routes;
|
||||||
|
|
||||||
use std::{collections::HashMap, env};
|
use std::{collections::HashMap, env};
|
||||||
@ -9,13 +11,23 @@ use std::{collections::HashMap, env};
|
|||||||
use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
|
use oauth2::{basic::BasicClient, AuthUrl, ClientId, ClientSecret, RedirectUrl, TokenUrl};
|
||||||
use rocket::fs::FileServer;
|
use rocket::fs::FileServer;
|
||||||
use rocket_dyn_templates::Template;
|
use rocket_dyn_templates::Template;
|
||||||
use serenity::client::Context;
|
use serenity::{
|
||||||
|
client::Context,
|
||||||
|
http::CacheHttp,
|
||||||
|
model::id::{GuildId, UserId},
|
||||||
|
};
|
||||||
use sqlx::{MySql, Pool};
|
use sqlx::{MySql, Pool};
|
||||||
|
|
||||||
use crate::consts::{DISCORD_OAUTH_AUTHORIZE, DISCORD_OAUTH_TOKEN};
|
use crate::consts::{CNC_GUILD, DISCORD_OAUTH_AUTHORIZE, DISCORD_OAUTH_TOKEN, SUBSCRIPTION_ROLES};
|
||||||
|
|
||||||
type Database = MySql;
|
type Database = MySql;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
enum Error {
|
||||||
|
SQLx(sqlx::Error),
|
||||||
|
serenity(serenity::Error),
|
||||||
|
}
|
||||||
|
|
||||||
#[catch(401)]
|
#[catch(401)]
|
||||||
async fn not_authorized() -> Template {
|
async fn not_authorized() -> Template {
|
||||||
let map: HashMap<String, String> = HashMap::new();
|
let map: HashMap<String, String> = HashMap::new();
|
||||||
@ -98,3 +110,34 @@ pub async fn initialize(
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn check_subscription(cache_http: impl CacheHttp, user_id: impl Into<UserId>) -> bool {
|
||||||
|
if let Some(subscription_guild) = *CNC_GUILD {
|
||||||
|
let guild_member = GuildId(subscription_guild).member(cache_http, user_id).await;
|
||||||
|
|
||||||
|
if let Ok(member) = guild_member {
|
||||||
|
for role in member.roles {
|
||||||
|
if SUBSCRIPTION_ROLES.contains(role.as_u64()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
false
|
||||||
|
} else {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn check_guild_subscription(
|
||||||
|
cache_http: impl CacheHttp,
|
||||||
|
guild_id: impl Into<GuildId>,
|
||||||
|
) -> bool {
|
||||||
|
if let Some(guild) = cache_http.cache().unwrap().guild(guild_id) {
|
||||||
|
let owner = guild.owner_id;
|
||||||
|
|
||||||
|
check_subscription(&cache_http, owner).await
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
47
web/src/macros.rs
Normal file
47
web/src/macros.rs
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
macro_rules! check_length {
|
||||||
|
($max:ident, $field:expr) => {
|
||||||
|
if $field.len() > $max {
|
||||||
|
return json!({ "error": format!("{} exceeded", stringify!($max)) });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
($max:ident, $field:expr, $($fields:expr),+) => {
|
||||||
|
check_length!($max, $field);
|
||||||
|
check_length!($max, $($fields),+);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! check_length_opt {
|
||||||
|
($max:ident, $field:expr) => {
|
||||||
|
if let Some(field) = &$field {
|
||||||
|
check_length!($max, field);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
($max:ident, $field:expr, $($fields:expr),+) => {
|
||||||
|
check_length_opt!($max, $field);
|
||||||
|
check_length_opt!($max, $($fields),+);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! check_url {
|
||||||
|
($field:expr) => {
|
||||||
|
if $field.starts_with("http://") || $field.starts_with("https://") {
|
||||||
|
return json!({ "error": "URL invalid" });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
($field:expr, $($fields:expr),+) => {
|
||||||
|
check_url!($max, $field);
|
||||||
|
check_url!($max, $($fields),+);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
macro_rules! check_url_opt {
|
||||||
|
($field:expr) => {
|
||||||
|
if let Some(field) = &$field {
|
||||||
|
check_url!(field);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
($field:expr, $($fields:expr),+) => {
|
||||||
|
check_url_opt!($field);
|
||||||
|
check_url_opt!($($fields),+);
|
||||||
|
};
|
||||||
|
}
|
@ -1,13 +1,25 @@
|
|||||||
|
use chrono::Utc;
|
||||||
use rocket::{
|
use rocket::{
|
||||||
|
http::CookieJar,
|
||||||
serde::json::{json, Json, Value as JsonValue},
|
serde::json::{json, Json, Value as JsonValue},
|
||||||
State,
|
State,
|
||||||
};
|
};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use serenity::{client::Context, model::id::GuildId};
|
use serenity::{
|
||||||
|
client::Context,
|
||||||
|
model::id::{ChannelId, GuildId},
|
||||||
|
};
|
||||||
use sqlx::{MySql, Pool};
|
use sqlx::{MySql, Pool};
|
||||||
|
|
||||||
use super::Reminder;
|
use crate::{
|
||||||
use crate::consts::DISCORD_CDN;
|
check_guild_subscription, check_subscription,
|
||||||
|
consts::{
|
||||||
|
DAY, DISCORD_CDN, MAX_CONTENT_LENGTH, MAX_EMBED_AUTHOR_LENGTH,
|
||||||
|
MAX_EMBED_DESCRIPTION_LENGTH, MAX_EMBED_FOOTER_LENGTH, MAX_EMBED_TITLE_LENGTH,
|
||||||
|
MAX_URL_LENGTH, MAX_USERNAME_LENGTH, MIN_INTERVAL,
|
||||||
|
},
|
||||||
|
routes::dashboard::{create_database_channel, DeleteReminder, Reminder},
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
struct ChannelInfo {
|
struct ChannelInfo {
|
||||||
@ -108,10 +120,178 @@ pub async fn get_guild_roles(id: u64, ctx: &State<Context>) -> JsonValue {
|
|||||||
pub async fn create_reminder(
|
pub async fn create_reminder(
|
||||||
id: u64,
|
id: u64,
|
||||||
reminder: Json<Reminder>,
|
reminder: Json<Reminder>,
|
||||||
|
cookies: &CookieJar<'_>,
|
||||||
serenity_context: &State<Context>,
|
serenity_context: &State<Context>,
|
||||||
pool: &State<Pool<MySql>>,
|
pool: &State<Pool<MySql>>,
|
||||||
) -> JsonValue {
|
) -> JsonValue {
|
||||||
json!({"error": "Not implemented"})
|
// get userid from cookies
|
||||||
|
let user_id = cookies.get_private("userid").map(|c| c.value().parse::<u64>().ok()).flatten();
|
||||||
|
|
||||||
|
if user_id.is_none() {
|
||||||
|
return json!({"error": "User not authorized"});
|
||||||
|
}
|
||||||
|
|
||||||
|
let user_id = user_id.unwrap();
|
||||||
|
|
||||||
|
// validate channel
|
||||||
|
let channel = ChannelId(reminder.channel).to_channel_cached(&serenity_context.inner());
|
||||||
|
let channel_exists = channel.is_some();
|
||||||
|
|
||||||
|
let channel_matches_guild =
|
||||||
|
channel.map_or(false, |c| c.guild().map_or(false, |c| c.guild_id.0 == id));
|
||||||
|
|
||||||
|
if !channel_matches_guild || !channel_exists {
|
||||||
|
warn!(
|
||||||
|
"Error in `create_reminder`: channel {} not found for guild {} (channel exists: {})",
|
||||||
|
reminder.channel, id, channel_exists
|
||||||
|
);
|
||||||
|
|
||||||
|
return json!({"error": "Channel not found"});
|
||||||
|
}
|
||||||
|
|
||||||
|
let channel = create_database_channel(
|
||||||
|
serenity_context.inner(),
|
||||||
|
ChannelId(reminder.channel),
|
||||||
|
pool.inner(),
|
||||||
|
)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
if let Err(e) = channel {
|
||||||
|
warn!("`create_database_channel` returned an error code: {:?}", e);
|
||||||
|
|
||||||
|
return json!({"error": "Failed to configure channel for reminders. Please check the bot permissions"});
|
||||||
|
}
|
||||||
|
|
||||||
|
let channel = channel.unwrap();
|
||||||
|
|
||||||
|
// validate lengths
|
||||||
|
check_length!(MAX_CONTENT_LENGTH, reminder.content);
|
||||||
|
check_length!(MAX_EMBED_DESCRIPTION_LENGTH, reminder.embed_description);
|
||||||
|
check_length!(MAX_EMBED_TITLE_LENGTH, reminder.embed_title);
|
||||||
|
check_length!(MAX_EMBED_AUTHOR_LENGTH, reminder.embed_author);
|
||||||
|
check_length!(MAX_EMBED_FOOTER_LENGTH, reminder.embed_footer);
|
||||||
|
check_length_opt!(MAX_USERNAME_LENGTH, reminder.username);
|
||||||
|
check_length_opt!(
|
||||||
|
MAX_URL_LENGTH,
|
||||||
|
reminder.embed_footer_url,
|
||||||
|
reminder.embed_thumbnail_url,
|
||||||
|
reminder.embed_author_url,
|
||||||
|
reminder.embed_image_url,
|
||||||
|
reminder.avatar
|
||||||
|
);
|
||||||
|
|
||||||
|
// validate urls
|
||||||
|
check_url_opt!(
|
||||||
|
reminder.embed_footer_url,
|
||||||
|
reminder.embed_thumbnail_url,
|
||||||
|
reminder.embed_author_url,
|
||||||
|
reminder.embed_image_url,
|
||||||
|
reminder.avatar
|
||||||
|
);
|
||||||
|
|
||||||
|
// validate time and interval
|
||||||
|
if reminder.utc_time < Utc::now().naive_utc() {
|
||||||
|
return json!({"error": "Time must be in the future"});
|
||||||
|
}
|
||||||
|
if reminder.interval_months.unwrap_or(0) * 30 * DAY as u32
|
||||||
|
+ reminder.interval_seconds.unwrap_or(0)
|
||||||
|
< *MIN_INTERVAL
|
||||||
|
{
|
||||||
|
return json!({"error": "Interval too short"});
|
||||||
|
}
|
||||||
|
|
||||||
|
// check patreon if necessary
|
||||||
|
if reminder.interval_seconds.is_some() || reminder.interval_months.is_some() {
|
||||||
|
if !check_guild_subscription(serenity_context.inner(), GuildId(id)).await
|
||||||
|
&& !check_subscription(serenity_context.inner(), user_id).await
|
||||||
|
{
|
||||||
|
return json!({"error": "Patreon is required to set intervals"});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// write to db
|
||||||
|
match sqlx::query!(
|
||||||
|
"INSERT INTO reminders (
|
||||||
|
channel_id,
|
||||||
|
avatar,
|
||||||
|
content,
|
||||||
|
embed_author,
|
||||||
|
embed_author_url,
|
||||||
|
embed_color,
|
||||||
|
embed_description,
|
||||||
|
embed_footer,
|
||||||
|
embed_footer_url,
|
||||||
|
embed_image_url,
|
||||||
|
embed_thumbnail_url,
|
||||||
|
embed_title,
|
||||||
|
enabled,
|
||||||
|
expires,
|
||||||
|
interval_seconds,
|
||||||
|
interval_months,
|
||||||
|
name,
|
||||||
|
pin,
|
||||||
|
restartable,
|
||||||
|
tts,
|
||||||
|
username,
|
||||||
|
`utc_time`
|
||||||
|
) VALUES (
|
||||||
|
channel_id = ?,
|
||||||
|
avatar = ?,
|
||||||
|
content = ?,
|
||||||
|
embed_author = ?,
|
||||||
|
embed_author_url = ?,
|
||||||
|
embed_color = ?,
|
||||||
|
embed_description = ?,
|
||||||
|
embed_footer = ?,
|
||||||
|
embed_footer_url = ?,
|
||||||
|
embed_image_url = ?,
|
||||||
|
embed_thumbnail_url = ?,
|
||||||
|
embed_title = ?,
|
||||||
|
enabled = ?,
|
||||||
|
expires = ?,
|
||||||
|
interval_seconds = ?,
|
||||||
|
interval_months = ?,
|
||||||
|
name = ?,
|
||||||
|
pin = ?,
|
||||||
|
restartable = ?,
|
||||||
|
tts = ?,
|
||||||
|
username = ?,
|
||||||
|
`utc_time` = ?
|
||||||
|
)",
|
||||||
|
channel,
|
||||||
|
reminder.avatar,
|
||||||
|
reminder.content,
|
||||||
|
reminder.embed_author,
|
||||||
|
reminder.embed_author_url,
|
||||||
|
reminder.embed_color,
|
||||||
|
reminder.embed_description,
|
||||||
|
reminder.embed_footer,
|
||||||
|
reminder.embed_footer_url,
|
||||||
|
reminder.embed_image_url,
|
||||||
|
reminder.embed_thumbnail_url,
|
||||||
|
reminder.embed_title,
|
||||||
|
reminder.enabled,
|
||||||
|
reminder.expires,
|
||||||
|
reminder.interval_seconds,
|
||||||
|
reminder.interval_months,
|
||||||
|
reminder.name,
|
||||||
|
reminder.pin,
|
||||||
|
reminder.restartable,
|
||||||
|
reminder.tts,
|
||||||
|
reminder.username,
|
||||||
|
reminder.utc_time,
|
||||||
|
)
|
||||||
|
.execute(pool.inner())
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(_) => json!({}),
|
||||||
|
|
||||||
|
Err(e) => {
|
||||||
|
warn!("Error in `create_reminder`: Could not execute query: {:?}", e);
|
||||||
|
|
||||||
|
json!({"error": "Unknown error"})
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[get("/api/guild/<id>/reminders")]
|
#[get("/api/guild/<id>/reminders")]
|
||||||
@ -197,8 +377,21 @@ pub async fn edit_reminder(
|
|||||||
#[delete("/api/guild/<id>/reminders", data = "<reminder>")]
|
#[delete("/api/guild/<id>/reminders", data = "<reminder>")]
|
||||||
pub async fn delete_reminder(
|
pub async fn delete_reminder(
|
||||||
id: u64,
|
id: u64,
|
||||||
reminder: Json<Reminder>,
|
reminder: Json<DeleteReminder>,
|
||||||
pool: &State<Pool<MySql>>,
|
pool: &State<Pool<MySql>>,
|
||||||
) -> JsonValue {
|
) -> JsonValue {
|
||||||
json!({"error": "Not implemented"})
|
match sqlx::query!("DELETE FROM reminders WHERE uid = ?", reminder.uid)
|
||||||
|
.execute(pool.inner())
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(_) => {
|
||||||
|
json!({})
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(e) => {
|
||||||
|
warn!("Error in `delete_reminder`: {:?}", e);
|
||||||
|
|
||||||
|
json!({"error": "Could not delete reminder"})
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,17 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use chrono::naive::NaiveDateTime;
|
use chrono::naive::NaiveDateTime;
|
||||||
use rocket::http::CookieJar;
|
use rocket::{http::CookieJar, response::Redirect};
|
||||||
use rocket::response::Redirect;
|
|
||||||
use rocket_dyn_templates::Template;
|
use rocket_dyn_templates::Template;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::collections::HashMap;
|
use serenity::{
|
||||||
|
client::Context,
|
||||||
|
http::{CacheHttp, Http},
|
||||||
|
model::id::ChannelId,
|
||||||
|
};
|
||||||
|
use sqlx::{Executor, Pool};
|
||||||
|
|
||||||
|
use crate::{consts::DEFAULT_AVATAR, Database, Error};
|
||||||
|
|
||||||
pub mod guild;
|
pub mod guild;
|
||||||
pub mod user;
|
pub mod user;
|
||||||
@ -46,8 +54,7 @@ pub struct Reminder {
|
|||||||
|
|
||||||
// https://github.com/serde-rs/json/issues/329#issuecomment-305608405
|
// https://github.com/serde-rs/json/issues/329#issuecomment-305608405
|
||||||
mod string {
|
mod string {
|
||||||
use std::fmt::Display;
|
use std::{fmt::Display, str::FromStr};
|
||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
use serde::{de, Deserialize, Deserializer, Serializer};
|
use serde::{de, Deserialize, Deserializer, Serializer};
|
||||||
|
|
||||||
@ -74,6 +81,78 @@ pub struct DeleteReminder {
|
|||||||
uid: String,
|
uid: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn create_database_channel(
|
||||||
|
ctx: impl AsRef<Http>,
|
||||||
|
channel: ChannelId,
|
||||||
|
pool: impl Executor<'_, Database = Database> + Copy,
|
||||||
|
) -> Result<u32, crate::Error> {
|
||||||
|
let row =
|
||||||
|
sqlx::query!("SELECT webhook_token, webhook_id FROM channels WHERE channel = ?", channel.0)
|
||||||
|
.fetch_one(pool)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
match row {
|
||||||
|
Ok(row) => {
|
||||||
|
if row.webhook_token.is_none() || row.webhook_id.is_none() {
|
||||||
|
let webhook = channel
|
||||||
|
.create_webhook_with_avatar(&ctx, "Reminder", DEFAULT_AVATAR.clone())
|
||||||
|
.await
|
||||||
|
.map_err(|e| Error::serenity(e))?;
|
||||||
|
|
||||||
|
sqlx::query!(
|
||||||
|
"UPDATE channels SET webhook_id = ?, webhook_token = ? WHERE channel = ?",
|
||||||
|
webhook.id.0,
|
||||||
|
webhook.token,
|
||||||
|
channel.0
|
||||||
|
)
|
||||||
|
.execute(pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| Error::SQLx(e))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(sqlx::Error::RowNotFound) => {
|
||||||
|
// create webhook
|
||||||
|
let webhook = channel
|
||||||
|
.create_webhook_with_avatar(&ctx, "Reminder", DEFAULT_AVATAR.clone())
|
||||||
|
.await
|
||||||
|
.map_err(|e| Error::serenity(e))?;
|
||||||
|
|
||||||
|
// create database entry
|
||||||
|
sqlx::query!(
|
||||||
|
"INSERT INTO channels (
|
||||||
|
webhook_id,
|
||||||
|
webhook_token,
|
||||||
|
channel
|
||||||
|
) VALUES (
|
||||||
|
webhook_id = ?,
|
||||||
|
webhook_token = ?,
|
||||||
|
channel = ?
|
||||||
|
)",
|
||||||
|
webhook.id.0,
|
||||||
|
webhook.token,
|
||||||
|
channel.0
|
||||||
|
)
|
||||||
|
.execute(pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| Error::SQLx(e))?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(e) => Err(Error::SQLx(e)),
|
||||||
|
}?;
|
||||||
|
|
||||||
|
let row = sqlx::query!("SELECT id FROM channels WHERE channel = ?", channel.0)
|
||||||
|
.fetch_one(pool)
|
||||||
|
.await
|
||||||
|
.map_err(|e| Error::SQLx(e))?;
|
||||||
|
|
||||||
|
Ok(row.id)
|
||||||
|
}
|
||||||
|
|
||||||
#[get("/")]
|
#[get("/")]
|
||||||
pub async fn dashboard_home(cookies: &CookieJar<'_>) -> Result<Template, Redirect> {
|
pub async fn dashboard_home(cookies: &CookieJar<'_>) -> Result<Template, Redirect> {
|
||||||
if cookies.get_private("userid").is_some() {
|
if cookies.get_private("userid").is_some() {
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
use crate::consts::DISCORD_API;
|
|
||||||
use log::warn;
|
use log::warn;
|
||||||
use oauth2::basic::BasicClient;
|
|
||||||
use oauth2::reqwest::async_http_client;
|
|
||||||
use oauth2::{
|
use oauth2::{
|
||||||
AuthorizationCode, CsrfToken, PkceCodeChallenge, PkceCodeVerifier, Scope, TokenResponse,
|
basic::BasicClient, reqwest::async_http_client, AuthorizationCode, CsrfToken,
|
||||||
|
PkceCodeChallenge, PkceCodeVerifier, Scope, TokenResponse,
|
||||||
};
|
};
|
||||||
use reqwest::Client;
|
use reqwest::Client;
|
||||||
use rocket::http::private::cookie::Expiration;
|
use rocket::{
|
||||||
use rocket::http::{Cookie, CookieJar, SameSite};
|
http::{private::cookie::Expiration, Cookie, CookieJar, SameSite},
|
||||||
use rocket::response::{Flash, Redirect};
|
response::{Flash, Redirect},
|
||||||
use rocket::uri;
|
uri, State,
|
||||||
use rocket::State;
|
};
|
||||||
use serenity::model::user::User;
|
use serenity::model::user::User;
|
||||||
|
|
||||||
|
use crate::consts::DISCORD_API;
|
||||||
|
|
||||||
#[get("/discord")]
|
#[get("/discord")]
|
||||||
pub async fn discord_login(
|
pub async fn discord_login(
|
||||||
oauth2_client: &State<BasicClient>,
|
oauth2_client: &State<BasicClient>,
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
<section class="section">
|
<section class="section">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h2 class="title">User Data</h2>
|
<h2 class="title">User data</h2>
|
||||||
<p class="is-size-5 pl-6">
|
<p class="is-size-5 pl-6">
|
||||||
This website uses some necessary cookies and session data to operate. None of this can be disabled, since
|
This website uses some necessary cookies and session data to operate. None of this can be disabled, since
|
||||||
it is all necessary for the site to function. <strong>However,</strong> it is worth mentioning that all of
|
it is all necessary for the site to function. <strong>However,</strong> it is worth mentioning that all of
|
||||||
@ -38,7 +38,7 @@
|
|||||||
|
|
||||||
<section class="section">
|
<section class="section">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h2 class="title">Session Storage</h2>
|
<h2 class="title">Session storage</h2>
|
||||||
<p class="is-size-5 pl-6">
|
<p class="is-size-5 pl-6">
|
||||||
Session data are data that is stored just for the active browser session. Session storage is read and
|
Session data are data that is stored just for the active browser session. Session storage is read and
|
||||||
written by our server and cannot be modified on your computer.
|
written by our server and cannot be modified on your computer.
|
||||||
@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
<section class="section">
|
<section class="section">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h2 class="title">How Can We Trust You?</h2>
|
<h2 class="title">How can we trust you?</h2>
|
||||||
<p class="is-size-5 pl-6">
|
<p class="is-size-5 pl-6">
|
||||||
Feel free to audit this website. Go to our <a href="https://github.com/reminder-bot">GitHub</a> to get started, or just press <kbd>F12</kbd>
|
Feel free to audit this website. Go to our <a href="https://github.com/reminder-bot">GitHub</a> to get started, or just press <kbd>F12</kbd>
|
||||||
</p>
|
</p>
|
||||||
|
@ -722,6 +722,27 @@
|
|||||||
document.querySelector('div#reminderCreator').classList.toggle('is-hidden');
|
document.querySelector('div#reminderCreator').classList.toggle('is-hidden');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
let $showInterval = document.querySelectorAll('a.intervalLabel');
|
||||||
|
|
||||||
|
$showInterval.forEach((element) => {
|
||||||
|
element.addEventListener('click', () => {
|
||||||
|
element.querySelector('i').classList.toggle('fa-chevron-right');
|
||||||
|
element.querySelector('i').classList.toggle('fa-chevron-down');
|
||||||
|
element.nextElementSibling.classList.toggle('is-hidden');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
const fileInput = document.querySelectorAll('input[type=file]');
|
||||||
|
|
||||||
|
fileInput.forEach((element) => {
|
||||||
|
element.addEventListener('change', () => {
|
||||||
|
if (element.files.length > 0) {
|
||||||
|
const fileName = element.parentElement.querySelector('.file-label');
|
||||||
|
fileName.textContent = element.files[0].name;
|
||||||
|
}
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
document.querySelectorAll('.discord-field-title').forEach((element) => {
|
document.querySelectorAll('.discord-field-title').forEach((element) => {
|
||||||
const $template = document.querySelector('template#embedFieldTemplate');
|
const $template = document.querySelector('template#embedFieldTemplate');
|
||||||
const $complement = element.parentElement.querySelector('.discord-field-value');
|
const $complement = element.parentElement.querySelector('.discord-field-value');
|
||||||
|
@ -12,8 +12,63 @@
|
|||||||
|
|
||||||
<section class="section">
|
<section class="section">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h2 class="title">Privacy Policy</h2>
|
<h2 class="title">Who we are</h2>
|
||||||
<p class="is-size-5 pl-6">
|
<p class="is-size-5 pl-6">
|
||||||
|
Reminder Bot is operated solely by Jude Southworth. You can contact me by email at
|
||||||
|
<a href="mailto:jude@jellywx.com">jude@jellywx.com</a>, or via private/public message on Discord at
|
||||||
|
<a href="https://discord.jellywx.com">https://discord.jellywx.com</a>.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="section">
|
||||||
|
<div class="container">
|
||||||
|
<h2 class="title">What data we collect</h2>
|
||||||
|
<p class="is-size-5 pl-6">
|
||||||
|
Reminder Bot stores limited data necessary for the function of the bot. This data
|
||||||
|
is your <strong>unique user ID</strong>, <strong>timezone</strong>, and <strong>direct message channel</strong>.
|
||||||
|
<br>
|
||||||
|
<br>
|
||||||
|
Timezones are provided by the user or the user's browser.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="section">
|
||||||
|
<div class="container">
|
||||||
|
<h2 class="title">Why we collect this data</h2>
|
||||||
|
<p class="is-size-5 pl-6">
|
||||||
|
Unique user IDs are stored to <strong>keep track of who sets reminders</strong>. User timezones are
|
||||||
|
stored to allow users to set reminders in their local timezone. Direct message channels are stored to
|
||||||
|
allow the setting of reminders for your direct message channel.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="section">
|
||||||
|
<div class="container">
|
||||||
|
<h2 class="title">Who your data is shared with</h2>
|
||||||
|
<p class="is-size-5 pl-6">
|
||||||
|
Your data may also be guarded by the privacy policies of <strong>MEGA</strong>, our backup provider, and
|
||||||
|
<strong>Hetzner</strong>, our hosting provider.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section class="section">
|
||||||
|
<div class="container">
|
||||||
|
<h2 class="title">Accessing or removing your data</h2>
|
||||||
|
<p class="is-size-5 pl-6">
|
||||||
|
Your timezone can be removed with the command <strong>/timezone UTC</strong>. Other data can be removed
|
||||||
|
on request. Please contact me.
|
||||||
|
<br>
|
||||||
|
<br>
|
||||||
|
Reminders created in a guild/channel will be removed automatically when the bot is removed from the
|
||||||
|
guild, the guild is deleted, or channel is deleted. Data is otherwise not removed automatically.
|
||||||
|
<br>
|
||||||
|
<br>
|
||||||
|
Reminders deleted with <strong>/del</strong> or via the dashboard are removed from the live database
|
||||||
|
instantly, but may persist in backups.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
@ -126,45 +126,69 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="field">
|
<div class="field">
|
||||||
|
<label class="label">Time</label>
|
||||||
<div class="control">
|
<div class="control">
|
||||||
<label class="checkbox">
|
<input class="input" type="datetime-local" name="time">
|
||||||
Enable TTS
|
|
||||||
<input type="checkbox">
|
|
||||||
</label>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<div class="control">
|
<a class="intervalLabel"><label class="label">Interval <i class="fas fa-chevron-down"></i></label></a>
|
||||||
<label class="checkbox">
|
<div class="control intervalSelector">
|
||||||
Pin Reminder
|
<div class="columns">
|
||||||
<input type="checkbox">
|
<div class="column">
|
||||||
|
<input class="input" type="number" name="interval_months" placeholder="Months">
|
||||||
|
</div>
|
||||||
|
<div class="column">
|
||||||
|
<input class="input" type="number" name="interval_seconds" placeholder="Days">
|
||||||
|
</div>
|
||||||
|
<div class="column">
|
||||||
|
<input class="input" type="number" name="interval_seconds" placeholder="Hours">
|
||||||
|
</div>
|
||||||
|
<div class="column">
|
||||||
|
<input class="input" type="number" name="interval_seconds" placeholder="Minutes">
|
||||||
|
</div>
|
||||||
|
<div class="column">
|
||||||
|
<input class="input" type="number" name="interval_seconds" placeholder="Seconds">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="columns">
|
||||||
|
<div class="column has-text-centered">
|
||||||
|
<div style="display: inline-block;">
|
||||||
|
<label class="label">Enable TTS <input type="checkbox" name="tts"></label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="column has-text-centered">
|
||||||
|
<div style="display: inline-block;">
|
||||||
|
<label class="label">Pin Message <input type="checkbox" name="pin"></label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="column has-text-centered">
|
||||||
|
<div class="file is-boxed">
|
||||||
|
<label class="file-label">
|
||||||
|
<input class="file-input" type="file">
|
||||||
|
<span class="file-cta">
|
||||||
|
<span class="file-label">
|
||||||
|
Add Attachment
|
||||||
|
</span>
|
||||||
|
<span class="file-icon">
|
||||||
|
<i class="fas fa-upload"></i>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<a class="set-color">
|
<a class="set-color">
|
||||||
<p>
|
<p>
|
||||||
Set Embed Color <span class="icon is-small"><i
|
Set Embed Color <span class="icon is-small"><i class="far fa-eye-dropper"></i></span>
|
||||||
class="far fa-eye-dropper"></i></span>
|
|
||||||
</p>
|
|
||||||
</a>
|
|
||||||
<a class="level-item file-upload">
|
|
||||||
<div class="file">
|
|
||||||
<input class="file-input" type="file" name="attachment">
|
|
||||||
<p>
|
|
||||||
Attach File
|
|
||||||
<span class="icon is-small">
|
|
||||||
<i class="far fa-file-upload"></i>
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
<a class="level-item set-interval">
|
|
||||||
<p>
|
|
||||||
Set Interval <span class="icon is-small"><i class="far fa-repeat"></i></span>
|
|
||||||
</p>
|
</p>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<span style="width: 12px;"></span>
|
<span style="width: 12px;"></span>
|
||||||
{% if creating %}
|
{% if creating %}
|
||||||
<button class="button is-outlined">
|
<button class="button is-outlined">
|
||||||
|
Loading…
Reference in New Issue
Block a user