Compare commits
156 Commits
jude/confi
...
current
Author | SHA1 | Date | |
---|---|---|---|
|
e7c840a4d4 | ||
|
96dc80fef9 | ||
|
ef76611d33 | ||
|
febd04c374 | ||
|
54ee3594eb | ||
|
d7e90614c8 | ||
|
b5dbfe336d | ||
|
b673a2fe6b | ||
|
f26682e6de | ||
|
218be2f0b1 | ||
|
d7515f3611 | ||
|
6ae1096d79 | ||
|
1f0d7adae3 | ||
|
fc96ae526f | ||
|
8881ef0f85 | ||
|
5e82a687f9 | ||
|
de4ecf8dd6 | ||
|
064efd4386 | ||
|
65b8ba3b47 | ||
9d452ed8cb | |||
|
441419b92b | ||
|
aecf2c15be | ||
|
79da56c794 | ||
|
ef10902c1e | ||
|
c277f85c2a | ||
|
035653c7fa | ||
|
6358bc3deb | ||
|
9f5066f982 | ||
|
1d06999e41 | ||
|
1cf707140c | ||
|
e38c63f5ba | ||
|
d52b8b26f2 | ||
bb2128a7ed | |||
5e99a6f9de | |||
5406e6b8ec | |||
|
4ee0bc4e37 | ||
|
b99bb7dcbf | ||
|
98f925dc84 | ||
|
24e316b12f | ||
|
4063334953 | ||
|
e128b9848f | ||
|
9989ab3b35 | ||
|
b951db3f55 | ||
|
884a47bf36 | ||
|
b0f932445c | ||
|
2861cdda0b | ||
|
7ba8fcd6b7 | ||
|
850f0fad57 | ||
|
a770a17ee7 | ||
|
d15a66d9d9 | ||
|
30f011fcd5 | ||
|
15dbed2f0f | ||
|
18cac0345b | ||
|
334b1bc084 | ||
|
ba3c76c25f | ||
|
67b6f30c62 | ||
|
8ae311190f | ||
|
016164affb | ||
|
2c0aeef700 | ||
|
ecd75d6f55 | ||
|
4a80d42f86 | ||
|
075fde71df | ||
|
55136aecdc | ||
|
63fc2cdcbc | ||
|
3190738fc5 | ||
|
8f4810b532 | ||
|
a5e6c41fa5 | ||
|
5f0aa0f834 | ||
|
dbe8e8e358 | ||
|
85a114e55c | ||
|
329492b244 | ||
|
66135ecd08 | ||
|
382c2a5a1e | ||
|
b91245a3f7 | ||
|
6f0bdf9852 | ||
|
dcee9e0d2a | ||
|
8e6e1a18b7 | ||
|
72af0532fa | ||
|
e83b643d86 | ||
|
0e0ab053f3 | ||
|
8c2296b9c8 | ||
|
1c6103142f | ||
|
328127c55e | ||
|
b0e37b56c0 | ||
|
45f5b6261a | ||
|
5f6326179c | ||
|
6254f91841 | ||
|
60b90a61d4 | ||
|
90f05758d0 | ||
|
74b7b5d711 | ||
|
90550dc2c7 | ||
|
79e6498245 | ||
|
a8ef3d03f9 | ||
|
53e13844f9 | ||
|
dd7e681285 | ||
|
6c20bf2a0f | ||
|
15aa9ccffd | ||
|
525471bcad | ||
|
86d53b63b6 | ||
|
d8f266852a | ||
|
76a286076b | ||
|
5e39e16060 | ||
|
c1305cfb36 | ||
|
4823754955 | ||
|
eb92eacb90 | ||
|
d0833b7bca | ||
|
b81c3c80c1 | ||
|
2f6d035efe | ||
|
96012ce43c | ||
|
fa7ec8731b | ||
|
def43bfa78 | ||
|
e4e9af2bb4 | ||
|
cce0de7c75 | ||
e7803b98e8 | |||
|
7aae246388 | ||
a2d442bc54 | |||
59982df827 | |||
|
7a6372ed02 | ||
|
14a54471f7 | ||
|
5d3b77f1cd | ||
|
1d64c8bb79 | ||
8ba0f02b98 | |||
d36438c6ce | |||
e0c60e2ce3 | |||
|
e7160215b0 | ||
|
6eaa6f0f28 | ||
|
9db0fa2513 | ||
|
ca13fd4fa7 | ||
|
55acc8fd16 | ||
|
145711fa5d | ||
|
5524215786 | ||
|
e8bd05893f | ||
|
e3d3418f99 | ||
|
2681280a39 | ||
|
00579428a1 | ||
|
b8ef999710 | ||
|
e8f84e281a | ||
|
8ddff698e5 | ||
|
541633270c | ||
|
25286da5e0 | ||
|
4bad1324b9 | ||
|
bd1462a00c | ||
|
56ffc43616 | ||
|
52cf642455 | ||
|
0bf578357a | ||
|
6e9eccb62e | ||
|
6ea28284ce | ||
|
a6525f3052 | ||
|
348639270d | ||
|
37177c2431 | ||
|
8587bed703 | ||
|
6c9af1ae8e | ||
|
7695b7a476 | ||
651da7b28e | |||
eb086146bf | |||
4ebd705e5e |
29
.gitignore
vendored
|
@ -1,5 +1,30 @@
|
|||
/target
|
||||
target
|
||||
.env
|
||||
/venv
|
||||
.cargo
|
||||
/.idea
|
||||
.idea
|
||||
web/static/index.html
|
||||
web/static/assets
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
|
|
2819
Cargo.lock
generated
49
Cargo.toml
|
@ -1,22 +1,21 @@
|
|||
[package]
|
||||
name = "reminder-rs"
|
||||
version = "1.6.36"
|
||||
version = "1.7.24"
|
||||
authors = ["Jude Southworth <judesouthworth@pm.me>"]
|
||||
edition = "2021"
|
||||
license = "AGPL-3.0 only"
|
||||
description = "Reminder Bot for Discord, now in Rust"
|
||||
|
||||
[dependencies]
|
||||
poise = "0.5.5"
|
||||
poise = "0.6.1"
|
||||
dotenv = "0.15"
|
||||
tokio = { version = "1", features = ["process", "full"] }
|
||||
reqwest = "0.11"
|
||||
lazy-regex = "2.3.0"
|
||||
regex = "1.6"
|
||||
reqwest = { version = "0.12", features = ["json"] }
|
||||
regex = "1.10"
|
||||
log = "0.4"
|
||||
env_logger = "0.10"
|
||||
env_logger = "0.11"
|
||||
chrono = "0.4"
|
||||
chrono-tz = { version = "0.8", features = ["serde"] }
|
||||
chrono-tz = { version = "0.9", features = ["serde"] }
|
||||
lazy_static = "1.4"
|
||||
num-integer = "0.1"
|
||||
serde = "1.0"
|
||||
|
@ -25,14 +24,23 @@ serde_repr = "0.1"
|
|||
rmp-serde = "1.1"
|
||||
rand = "0.8"
|
||||
levenshtein = "1.0"
|
||||
sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "migrate"]}
|
||||
base64 = "0.21.0"
|
||||
sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "migrate"] }
|
||||
base64 = "0.22"
|
||||
secrecy = "0.8.0"
|
||||
futures = "0.3.30"
|
||||
prometheus = "0.13.3"
|
||||
rocket = { version = "0.5.0", features = ["tls", "secrets", "json"] }
|
||||
rocket_dyn_templates = { version = "0.2.0", features = ["tera"] }
|
||||
serenity = { version = "0.12", default-features = false, features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"] }
|
||||
oauth2 = "4"
|
||||
csv = "1.2"
|
||||
sd-notify = "0.4.1"
|
||||
|
||||
[dependencies.postman]
|
||||
path = "postman"
|
||||
[dependencies.extract_derive]
|
||||
path = "extract_derive"
|
||||
|
||||
[dependencies.reminder_web]
|
||||
path = "web"
|
||||
[dependencies.recordable_derive]
|
||||
path = "recordable_derive"
|
||||
|
||||
[package.metadata.deb]
|
||||
depends = "$auto, python3-dateparser (>= 1.0.0)"
|
||||
|
@ -40,13 +48,18 @@ suggests = "mysql-server-8.0, nginx"
|
|||
maintainer-scripts = "debian"
|
||||
assets = [
|
||||
["target/release/reminder-rs", "usr/bin/reminder-rs", "755"],
|
||||
["static/css/*", "lib/reminder-rs/static/css", "644"],
|
||||
["static/favicon/*", "lib/reminder-rs/static/favicon", "644"],
|
||||
["static/img/*", "lib/reminder-rs/static/img", "644"],
|
||||
["static/js/*", "lib/reminder-rs/static/js", "644"],
|
||||
["static/webfonts/*", "lib/reminder-rs/static/webfonts", "644"],
|
||||
["static/site.webmanifest", "lib/reminder-rs/static/site.webmanifest", "644"],
|
||||
["templates/**/*", "lib/reminder-rs/templates", "644"],
|
||||
["reminder-dashboard/dist/static/assets/*", "lib/reminder-rs/static/assets", "644"],
|
||||
["reminder-dashboard/dist/index.html", "lib/reminder-rs/static/index.html", "644"],
|
||||
["conf/default.env", "etc/reminder-rs/config.env", "600"],
|
||||
["conf/Rocket.toml", "etc/reminder-rs/Rocket.toml", "600"],
|
||||
["web/static/**/*", "lib/reminder-rs/static", "644"],
|
||||
["web/templates/**/*", "lib/reminder-rs/templates", "644"],
|
||||
["healthcheck", "lib/reminder-rs/healthcheck", "755"],
|
||||
["cron.d/reminder_health", "etc/cron.d/reminder_health", "644"],
|
||||
# ["nginx/reminder-rs", "etc/nginx/sites-available/reminder-rs", "755"]
|
||||
# ["nginx/reminder-rs", "etc/nginx/sites-available/reminder-rs", "755"]
|
||||
]
|
||||
conf-files = [
|
||||
"/etc/reminder-rs/config.env",
|
||||
|
|
|
@ -4,6 +4,6 @@ ENV RUSTUP_HOME=/usr/local/rustup \
|
|||
CARGO_HOME=/usr/local/cargo \
|
||||
PATH=/usr/local/cargo/bin:$PATH
|
||||
|
||||
RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y gcc gcc-multilib cmake pkg-config libssl-dev curl mysql-client-8.0
|
||||
RUN apt update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y gcc gcc-multilib cmake pkg-config libssl-dev curl mysql-client-8.0 npm
|
||||
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain nightly
|
||||
RUN cargo install cargo-deb
|
||||
|
|
22
Rocket.toml
|
@ -1,28 +1,28 @@
|
|||
[default]
|
||||
address = "0.0.0.0"
|
||||
port = 18920
|
||||
template_dir = "web/templates"
|
||||
template_dir = "templates"
|
||||
limits = { json = "10MiB" }
|
||||
|
||||
[debug]
|
||||
secret_key = "tR8krio5FXTnnyIZNiJDXPondz0kI1v6X6BXZcBGIRY="
|
||||
|
||||
[debug.tls]
|
||||
certs = "web/private/rsa_sha256_cert.pem"
|
||||
key = "web/private/rsa_sha256_key.pem"
|
||||
certs = "private/rsa_sha256_cert.pem"
|
||||
key = "private/rsa_sha256_key.pem"
|
||||
|
||||
[debug.rsa_sha256.tls]
|
||||
certs = "web/private/rsa_sha256_cert.pem"
|
||||
key = "web/private/rsa_sha256_key.pem"
|
||||
certs = "private/rsa_sha256_cert.pem"
|
||||
key = "private/rsa_sha256_key.pem"
|
||||
|
||||
[debug.ecdsa_nistp256_sha256.tls]
|
||||
certs = "web/private/ecdsa_nistp256_sha256_cert.pem"
|
||||
key = "web/private/ecdsa_nistp256_sha256_key_pkcs8.pem"
|
||||
certs = "private/ecdsa_nistp256_sha256_cert.pem"
|
||||
key = "private/ecdsa_nistp256_sha256_key_pkcs8.pem"
|
||||
|
||||
[debug.ecdsa_nistp384_sha384.tls]
|
||||
certs = "web/private/ecdsa_nistp384_sha384_cert.pem"
|
||||
key = "web/private/ecdsa_nistp384_sha384_key_pkcs8.pem"
|
||||
certs = "private/ecdsa_nistp384_sha384_cert.pem"
|
||||
key = "private/ecdsa_nistp384_sha384_key_pkcs8.pem"
|
||||
|
||||
[debug.ed25519.tls]
|
||||
certs = "web/private/ed25519_cert.pem"
|
||||
key = "eb/private/ed25519_key.pem"
|
||||
certs = "private/ed25519_cert.pem"
|
||||
key = "private/ed25519_key.pem"
|
||||
|
|
10
build.rs
|
@ -1,3 +1,13 @@
|
|||
use std::{path::Path, process::Command};
|
||||
|
||||
fn main() {
|
||||
println!("cargo:rerun-if-changed=migrations");
|
||||
println!("cargo:rerun-if-changed=reminder-dashboard");
|
||||
|
||||
Command::new("npm")
|
||||
.arg("run")
|
||||
.arg("build")
|
||||
.current_dir(Path::new("reminder-dashboard"))
|
||||
.spawn()
|
||||
.expect("Failed to build NPM");
|
||||
}
|
||||
|
|
46
extract_derive/Cargo.lock
generated
Normal file
|
@ -0,0 +1,46 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "extract_macro"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.78"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.35"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.49"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
11
extract_derive/Cargo.toml
Normal file
|
@ -0,0 +1,11 @@
|
|||
[package]
|
||||
name = "extract_derive"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
proc-macro = true
|
||||
|
||||
[dependencies]
|
||||
quote = "1.0.35"
|
||||
syn = { version = "2.0.49", features = ["full"] }
|
53
extract_derive/src/lib.rs
Normal file
|
@ -0,0 +1,53 @@
|
|||
use proc_macro::TokenStream;
|
||||
use syn::{spanned::Spanned, Data, Fields};
|
||||
|
||||
#[proc_macro_derive(Extract)]
|
||||
pub fn extract(input: TokenStream) -> TokenStream {
|
||||
let ast = syn::parse_macro_input!(input);
|
||||
|
||||
impl_extract(&ast)
|
||||
}
|
||||
|
||||
fn impl_extract(ast: &syn::DeriveInput) -> TokenStream {
|
||||
let name = &ast.ident;
|
||||
|
||||
match &ast.data {
|
||||
// Dispatch over struct: extract args directly from context
|
||||
Data::Struct(st) => match &st.fields {
|
||||
Fields::Named(fields) => {
|
||||
let extracted = fields.named.iter().map(|field| {
|
||||
let ident = &field.ident;
|
||||
let ty = &field.ty;
|
||||
|
||||
quote::quote_spanned! {field.span()=>
|
||||
#ident : crate::utils::extract_arg!(ctx, #ident, #ty)
|
||||
}
|
||||
});
|
||||
|
||||
TokenStream::from(quote::quote! {
|
||||
impl Extract for #name {
|
||||
fn extract(ctx: crate::ApplicationContext) -> Self {
|
||||
Self {
|
||||
#(#extracted,)*
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
Fields::Unit => TokenStream::from(quote::quote! {
|
||||
impl Extract for #name {
|
||||
fn extract(ctx: crate::ApplicationContext) -> Self {
|
||||
Self {}
|
||||
}
|
||||
}
|
||||
}),
|
||||
_ => {
|
||||
panic!("Only named/unit structs can derive Extract");
|
||||
}
|
||||
},
|
||||
|
||||
_ => {
|
||||
panic!("Only structs can derive Extract");
|
||||
}
|
||||
}
|
||||
}
|
13
healthcheck
|
@ -1,13 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
export $(grep -v '^#' /etc/reminder-rs/config.env | xargs -d '\n')
|
||||
|
||||
REGEX='mysql://([A-Za-z]+)@(.+)/(.+)'
|
||||
[[ $DATABASE_URL =~ $REGEX ]]
|
||||
|
||||
VAR=$(mysql -u "${BASH_REMATCH[1]}" -h "${BASH_REMATCH[2]}" -N -D "${BASH_REMATCH[3]}" -e "SELECT COUNT(1) FROM reminders WHERE utc_time < NOW() - INTERVAL 10 MINUTE AND enabled = 1 AND status = 'pending'")
|
||||
|
||||
if [ "$VAR" -gt 0 ]
|
||||
then
|
||||
echo "This is to inform that there is a reminder backlog which must be resolved." | mail -s "Backlog: $VAR" "$REPORT_EMAIL"
|
||||
fi
|
|
@ -136,9 +136,9 @@ CREATE TABLE reminders (
|
|||
set_by INT UNSIGNED,
|
||||
|
||||
PRIMARY KEY (id),
|
||||
FOREIGN KEY (message_id) REFERENCES messages(id) ON DELETE RESTRICT,
|
||||
FOREIGN KEY (channel_id) REFERENCES channels(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (set_by) REFERENCES users(id) ON DELETE SET NULL
|
||||
CONSTRAINT `reminder_message_fk` FOREIGN KEY (message_id) REFERENCES messages(id) ON DELETE RESTRICT,
|
||||
CONSTRAINT `reminder_channel_fk` FOREIGN KEY (channel_id) REFERENCES channels(id) ON DELETE CASCADE,
|
||||
CONSTRAINT `reminder_user_fk` FOREIGN KEY (set_by) REFERENCES users(id) ON DELETE SET NULL
|
||||
);
|
||||
|
||||
CREATE TRIGGER message_cleanup AFTER DELETE ON reminders
|
||||
|
@ -157,9 +157,9 @@ CREATE TABLE todos (
|
|||
value VARCHAR(2000) NOT NULL,
|
||||
|
||||
PRIMARY KEY (id),
|
||||
FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE SET NULL,
|
||||
FOREIGN KEY (guild_id) REFERENCES guilds(id) ON DELETE CASCADE,
|
||||
FOREIGN KEY (channel_id) REFERENCES channels(id) ON DELETE SET NULL
|
||||
CONSTRAINT todos_ibfk_5 FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE SET NULL,
|
||||
CONSTRAINT todos_ibfk_4 FOREIGN KEY (guild_id) REFERENCES guilds(id) ON DELETE CASCADE,
|
||||
CONSTRAINT todos_ibfk_3 FOREIGN KEY (channel_id) REFERENCES channels(id) ON DELETE SET NULL
|
||||
);
|
||||
|
||||
CREATE TABLE command_restrictions (
|
||||
|
|
|
@ -46,7 +46,7 @@ CREATE TABLE reminders_new (
|
|||
PRIMARY KEY (id),
|
||||
|
||||
FOREIGN KEY (`channel_id`) REFERENCES channels (`id`) ON DELETE CASCADE,
|
||||
FOREIGN KEY (`set_by`) REFERENCES users (`id`) ON DELETE SET NULL
|
||||
CONSTRAINT `reminders_ibfk_2` FOREIGN KEY (`set_by`) REFERENCES `users` (`id`) ON DELETE SET NULL
|
||||
|
||||
# disallow having a reminder as restartable if it has no interval
|
||||
-- , CONSTRAINT restartable_interval_mutex CHECK (`restartable` = 0 OR `interval` IS NULL)
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
ALTER TABLE `reminder_template` ADD COLUMN `interval_seconds` INT UNSIGNED;
|
||||
ALTER TABLE `reminder_template` ADD COLUMN `interval_days` INT UNSIGNED;
|
||||
ALTER TABLE `reminder_template` ADD COLUMN `interval_months` INT UNSIGNED;
|
50
migrations/20240210133900_macro_restructure.sql
Normal file
|
@ -0,0 +1,50 @@
|
|||
CREATE TABLE command_macro (
|
||||
id INT UNSIGNED AUTO_INCREMENT,
|
||||
guild_id INT UNSIGNED NOT NULL,
|
||||
|
||||
name VARCHAR(100) NOT NULL,
|
||||
description VARCHAR(100),
|
||||
commands JSON NOT NULL,
|
||||
|
||||
FOREIGN KEY (guild_id) REFERENCES guilds(id) ON DELETE CASCADE,
|
||||
PRIMARY KEY (id)
|
||||
);
|
||||
|
||||
# New JSON structure is {command_name: "Remind", "<option name>": "<option value>", ...}
|
||||
INSERT INTO command_macro (guild_id, description, name, commands)
|
||||
SELECT
|
||||
guild_id,
|
||||
description,
|
||||
name,
|
||||
(
|
||||
SELECT JSON_ARRAYAGG(
|
||||
(
|
||||
SELECT JSON_OBJECTAGG(t2.name, t2.value)
|
||||
FROM JSON_TABLE(
|
||||
JSON_ARRAY_APPEND(t1.options, '$', JSON_OBJECT('name', 'command_name', 'value', t1.command_name)),
|
||||
'$[*]' COLUMNS (
|
||||
name VARCHAR(64) PATH '$.name' ERROR ON ERROR,
|
||||
value TEXT PATH '$.value' ERROR ON ERROR
|
||||
)) AS t2
|
||||
)
|
||||
)
|
||||
FROM macro m2
|
||||
JOIN JSON_TABLE(
|
||||
commands,
|
||||
'$[*]' COLUMNS (
|
||||
command_name VARCHAR(64) PATH '$.command_name' ERROR ON ERROR,
|
||||
options JSON PATH '$.options' ERROR ON ERROR
|
||||
)) AS t1
|
||||
WHERE m1.id = m2.id
|
||||
)
|
||||
FROM macro m1;
|
||||
|
||||
# # Check which commands are used in macros
|
||||
# SELECT DISTINCT command_name
|
||||
# FROM macro m2
|
||||
# JOIN JSON_TABLE(
|
||||
# commands,
|
||||
# '$[*]' COLUMNS (
|
||||
# command_name VARCHAR(64) PATH '$.command_name' ERROR ON ERROR,
|
||||
# options JSON PATH '$.options' ERROR ON ERROR
|
||||
# )) AS t1
|
5
migrations/20240303125837_add_indexes.sql
Normal file
|
@ -0,0 +1,5 @@
|
|||
-- Add migration script here
|
||||
ALTER TABLE reminders
|
||||
ADD INDEX `utc_time_index` (`utc_time`);
|
||||
ALTER TABLE reminders
|
||||
ADD INDEX `status_index` (`status`);
|
27
migrations/20240630150936_dashboard_preferences.sql
Normal file
|
@ -0,0 +1,27 @@
|
|||
SET FOREIGN_KEY_CHECKS=0;
|
||||
|
||||
-- Tables no longer needed as old dashboard is decomm.
|
||||
DROP TABLE guild_users;
|
||||
DROP TABLE events;
|
||||
|
||||
ALTER TABLE users ADD COLUMN `reset_inputs_on_create` BOOLEAN NOT NULL DEFAULT 0;
|
||||
ALTER TABLE users ADD COLUMN `use_browser_timezone` BOOLEAN NOT NULL DEFAULT 1;
|
||||
ALTER TABLE users ADD COLUMN `dashboard_color_scheme` ENUM('system', 'light', 'dark') NOT NULL DEFAULT 'system';
|
||||
|
||||
ALTER TABLE users DROP COLUMN `language`;
|
||||
ALTER TABLE users DROP COLUMN `patreon`;
|
||||
ALTER TABLE users DROP COLUMN `name`;
|
||||
|
||||
ALTER TABLE todos DROP CONSTRAINT todos_ibfk_5, MODIFY COLUMN user_id BIGINT UNSIGNED;
|
||||
UPDATE todos SET user_id = (SELECT user FROM users WHERE id = user_id);
|
||||
ALTER TABLE todos ADD CONSTRAINT todos_user_fk FOREIGN KEY (user_id) REFERENCES users(user);
|
||||
|
||||
ALTER TABLE reminders DROP CONSTRAINT reminders_ibfk_2, MODIFY COLUMN set_by BIGINT UNSIGNED;
|
||||
UPDATE reminders SET set_by = (SELECT user FROM users WHERE id = set_by);
|
||||
ALTER TABLE reminders ADD CONSTRAINT reminder_user_fk FOREIGN KEY (set_by) REFERENCES users(user);
|
||||
|
||||
ALTER TABLE users DROP PRIMARY KEY, CHANGE id id INT UNSIGNED, ADD PRIMARY KEY (`user`);
|
||||
ALTER TABLE users DROP COLUMN `id`;
|
||||
ALTER TABLE users RENAME COLUMN `user` TO `id`;
|
||||
|
||||
SET FOREIGN_KEY_CHECKS=1;
|
53
nginx/reminder-bot
Normal file
|
@ -0,0 +1,53 @@
|
|||
server {
|
||||
server_name www.reminder-bot.com;
|
||||
|
||||
return 301 https://reminder-bot.com$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name beta.reminder-bot.com;
|
||||
|
||||
return 301 https://reminder-bot.com$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name beta.reminder-bot.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/beta.reminder-bot.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/beta.reminder-bot.com/privkey.pem;
|
||||
|
||||
return 301 https://reminder-bot.com$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name reminder-bot.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/reminder-bot.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/reminder-bot.com/privkey.pem;
|
||||
|
||||
access_log /var/log/nginx/access.log;
|
||||
error_log /var/log/nginx/error.log;
|
||||
|
||||
proxy_buffer_size 128k;
|
||||
proxy_buffers 4 256k;
|
||||
proxy_busy_buffers_size 256k;
|
||||
|
||||
client_max_body_size 10M;
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:18920;
|
||||
proxy_redirect off;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /static {
|
||||
alias /var/www/reminder-rs/static;
|
||||
expires 30d;
|
||||
}
|
||||
}
|
|
@ -1,41 +0,0 @@
|
|||
server {
|
||||
server_name www.reminder-bot.com;
|
||||
|
||||
return 301 $scheme://reminder-bot.com$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name reminder-bot.com;
|
||||
|
||||
return 301 https://reminder-bot.com$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name reminder-bot.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/reminder-bot.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/reminder-bot.com/privkey.pem;
|
||||
|
||||
access_log /var/log/nginx/access.log;
|
||||
error_log /var/log/nginx/error.log;
|
||||
|
||||
proxy_buffer_size 128k;
|
||||
proxy_buffers 4 256k;
|
||||
proxy_busy_buffers_size 256k;
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:18920;
|
||||
proxy_redirect off;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /static {
|
||||
alias /var/www/reminder-rs/static;
|
||||
expires 30d;
|
||||
}
|
||||
}
|
|
@ -1,16 +0,0 @@
|
|||
[package]
|
||||
name = "postman"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
tokio = { version = "1", features = ["process", "full"] }
|
||||
regex = "1.4"
|
||||
log = "0.4"
|
||||
chrono = "0.4"
|
||||
chrono-tz = { version = "0.5", features = ["serde"] }
|
||||
lazy_static = "1.4"
|
||||
num-integer = "0.1"
|
||||
serde = "1.0"
|
||||
sqlx = { version = "0.6", features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "chrono", "json"]}
|
||||
serenity = { version = "0.11.1", default-features = false, features = ["builder", "cache", "client", "gateway", "http", "model", "utils", "rustls_backend"] }
|
11
recordable_derive/Cargo.toml
Normal file
|
@ -0,0 +1,11 @@
|
|||
[package]
|
||||
name = "recordable_derive"
|
||||
version = "0.1.0"
|
||||
edition = "2021"
|
||||
|
||||
[lib]
|
||||
proc-macro = true
|
||||
|
||||
[dependencies]
|
||||
quote = "1.0.35"
|
||||
syn = { version = "2.0.49", features = ["full"] }
|
42
recordable_derive/src/lib.rs
Normal file
|
@ -0,0 +1,42 @@
|
|||
use proc_macro::TokenStream;
|
||||
use syn::{spanned::Spanned, Data};
|
||||
|
||||
/// Macro to allow Recordable to be implemented on an enum by dispatching over each variant.
|
||||
#[proc_macro_derive(Recordable)]
|
||||
pub fn extract(input: TokenStream) -> TokenStream {
|
||||
let ast = syn::parse_macro_input!(input);
|
||||
|
||||
impl_recordable(&ast)
|
||||
}
|
||||
|
||||
fn impl_recordable(ast: &syn::DeriveInput) -> TokenStream {
|
||||
let name = &ast.ident;
|
||||
|
||||
match &ast.data {
|
||||
Data::Enum(en) => {
|
||||
let extracted = en.variants.iter().map(|var| {
|
||||
let ident = &var.ident;
|
||||
|
||||
quote::quote_spanned! {var.span()=>
|
||||
Self::#ident (opt) => opt.run(ctx).await?
|
||||
}
|
||||
});
|
||||
|
||||
TokenStream::from(quote::quote! {
|
||||
impl Recordable for #name {
|
||||
async fn run(self, ctx: crate::Context<'_>) -> Result<(), crate::Error> {
|
||||
match self {
|
||||
#(#extracted,)*
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
_ => {
|
||||
panic!("Only enums can derive Recordable");
|
||||
}
|
||||
}
|
||||
}
|
2
reminder-dashboard/.prettierrc.toml
Normal file
|
@ -0,0 +1,2 @@
|
|||
printWidth = 100
|
||||
tabWidth = 4
|
19
reminder-dashboard/README.md
Normal file
|
@ -0,0 +1,19 @@
|
|||
# reminder-dashboard
|
||||
|
||||
The re-re-rewrite of the dashboard.
|
||||
|
||||
## Why
|
||||
|
||||
The existing beta variant of the dashboard is written using vanilla JavaScript. This is fine,
|
||||
but annoying to update. This would've been okay if I was more dedicated to updating the vanilla
|
||||
JavaScript too, but I want to experiment with "new" things.
|
||||
|
||||
This also allows me to expand my frontend skills, which is relevant to part of my job.
|
||||
|
||||
## Developing
|
||||
|
||||
1. Run both `npm run dev` and `cargo run`
|
||||
2. Symlink assets: assuming cloned
|
||||
into `$HOME`, `ln -s $HOME/reminder-bot/reminder-dashboard/dist/index.html $HOME/reminder-bot/web/static/index.html`
|
||||
and
|
||||
`ln -s $HOME/reminder-bot/reminder-dashboard/dist/static/assets $HOME/reminder-bot/web/static/assets`
|
33
reminder-dashboard/index.html
Normal file
|
@ -0,0 +1,33 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="EN">
|
||||
<head>
|
||||
<meta name="description" content="The most powerful Discord Reminders Bot">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta charset="UTF-8">
|
||||
<meta name="yandex-verification" content="bb77b8681eb64a90"/>
|
||||
<meta name="google-site-verification" content="7h7UVTeEe0AOzHiH3cFtsqMULYGN-zCZdMT_YCkW1Ho"/>
|
||||
<!-- <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src *; font-src fonts.gstatic.com 'self'"> -->
|
||||
|
||||
<!-- favicon -->
|
||||
<link rel="apple-touch-icon" sizes="180x180"
|
||||
href="/static/favicon/apple-touch-icon.png">
|
||||
<link rel="icon" type="image/png" sizes="32x32"
|
||||
href="/static/favicon/favicon-32x32.png">
|
||||
<link rel="icon" type="image/png" sizes="16x16"
|
||||
href="/static/favicon/favicon-16x16.png">
|
||||
<link rel="manifest" href="/static/site.webmanifest">
|
||||
<meta name="msapplication-TileColor" content="#da532c">
|
||||
<meta name="theme-color" content="#ffffff">
|
||||
|
||||
<title>Reminder Bot | Dashboard</title>
|
||||
|
||||
<!-- styles -->
|
||||
<link rel="stylesheet" href="/static/css/fa.css">
|
||||
<link rel="stylesheet" href="/static/css/font.css">
|
||||
<link rel="stylesheet" href="/static/css/style.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/index.tsx"></script>
|
||||
</body>
|
||||
</html>
|
5626
reminder-dashboard/package-lock.json
generated
Normal file
32
reminder-dashboard/package.json
Normal file
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"name": "example",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite build --watch --mode development",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"axios": "^1.5.1",
|
||||
"bulma": "^0.9.4",
|
||||
"luxon": "^3.4.3",
|
||||
"preact": "^10.13.1",
|
||||
"react-colorful": "^5.6.1",
|
||||
"react-query": "^3.39.3",
|
||||
"tributejs": "^5.1.3",
|
||||
"use-debounce": "^10.0.0",
|
||||
"wouter": "^3.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@preact/preset-vite": "^2.5.0",
|
||||
"@types/luxon": "^3.3.2",
|
||||
"eslint": "^8.50.0",
|
||||
"eslint-config-preact": "^1.3.0",
|
||||
"prettier": "^3.0.3",
|
||||
"react-datepicker": "^4.21.0",
|
||||
"sass": "^1.71.1",
|
||||
"typescript": "^5.2.2",
|
||||
"vite": "^5.1"
|
||||
}
|
||||
}
|
|
@ -15,6 +15,22 @@ div.reminderContent.is-collapsed .column.settings {
|
|||
display: none;
|
||||
}
|
||||
|
||||
div.reminderContent.is-collapsed .reminder-settings {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
div.reminderContent.is-collapsed .button-row {
|
||||
display: none;
|
||||
}
|
||||
|
||||
div.reminderContent.is-collapsed .button-row-edit {
|
||||
display: none;
|
||||
}
|
||||
|
||||
div.reminderContent.is-collapsed .reminder-topbar {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
div.reminderContent.is-collapsed .invert-collapses {
|
||||
display: inline-flex;
|
||||
}
|
||||
|
@ -129,6 +145,12 @@ div.split-controls {
|
|||
margin-top: 0 !important;
|
||||
}
|
||||
|
||||
.reminder-settings > .column {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
flex-basis: 50%;
|
||||
}
|
||||
|
||||
div.reminderContent {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 10px;
|
||||
|
@ -249,11 +271,11 @@ div#pageNavbar a {
|
|||
|
||||
.navbar-item.pageTitle {
|
||||
flex-shrink: 1;
|
||||
text-wrap: nowrap;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.navbar-burger, .navbar-burger:active, .navbar-burger.is-active {
|
||||
.dashboard-burger, .dashboard-burger:active, .dashboard-burger.is-active {
|
||||
background-color: #adc99c !important;
|
||||
border-radius: 14px;
|
||||
padding: 6px;
|
||||
|
@ -286,17 +308,24 @@ div.dashboard-sidebar {
|
|||
padding-right: 0;
|
||||
}
|
||||
|
||||
div.dashboard-sidebar:not(.mobile-sidebar) {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
ul.guildList {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
div.dashboard-sidebar:not(.mobile-sidebar) .aside-footer {
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
width: 226px;
|
||||
}
|
||||
|
||||
div.dashboard-sidebar svg {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
div.mobile-sidebar {
|
||||
z-index: 100;
|
||||
min-height: 100vh;
|
||||
|
@ -444,8 +473,7 @@ input.default-width {
|
|||
.customizable.is-400x300 img {
|
||||
margin-top: 10px;
|
||||
width: 100%;
|
||||
min-height: 100px;
|
||||
max-height: 400px;
|
||||
height: 100px;
|
||||
}
|
||||
|
||||
.customizable.is-32x32 img {
|
||||
|
@ -589,6 +617,14 @@ input.default-width {
|
|||
border-bottom: 1px solid #fff;
|
||||
}
|
||||
|
||||
.channel-selector {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.select {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
li.highlight {
|
||||
margin-bottom: 0 !important;
|
||||
}
|
||||
|
@ -612,7 +648,22 @@ li.highlight {
|
|||
padding: 2px;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 1408px) {
|
||||
@media only screen and (max-width: 1023px) {
|
||||
p.title.pageTitle {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.dashboard-frame {
|
||||
margin-top: 4rem !important;
|
||||
}
|
||||
|
||||
.customizable.thumbnail img {
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 768px) {
|
||||
.button-row {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
@ -630,41 +681,20 @@ li.highlight {
|
|||
.button-row button {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 768px) {
|
||||
.button-row-edit {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.reminder-settings {
|
||||
margin-bottom: 0 !important;
|
||||
}
|
||||
|
||||
.button-row-edit > button {
|
||||
width: 100%;
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
p.title.pageTitle {
|
||||
visibility: hidden;
|
||||
text-wrap: nowrap;
|
||||
overflow: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 768px) {
|
||||
.customizable.thumbnail img {
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
.customizable.is-24x24 img {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
.tts-row {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* loader */
|
||||
#loader {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
background-color: rgba(255, 255, 255, 0.8);
|
||||
width: 100vw;
|
||||
z-index: 999;
|
||||
|
@ -676,6 +706,86 @@ li.highlight {
|
|||
|
||||
/* END */
|
||||
|
||||
div.reminderError {
|
||||
margin: 10px;
|
||||
padding: 14px;
|
||||
background-color: #f5f5f5;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
div.reminderError .errorHead {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
div.reminderError .errorIcon {
|
||||
padding: 8px;
|
||||
border-radius: 4px;
|
||||
margin-right: 12px;
|
||||
}
|
||||
|
||||
div.reminderError .errorIcon .fas {
|
||||
display: none
|
||||
}
|
||||
|
||||
div.reminderError[data-case="deleted"] .errorIcon {
|
||||
background-color: #e7e5e4;
|
||||
}
|
||||
|
||||
div.reminderError[data-case="failed"] .errorIcon {
|
||||
background-color: #fecaca;
|
||||
}
|
||||
|
||||
div.reminderError[data-case="sent"] .errorIcon {
|
||||
background-color: #d9f99d;
|
||||
}
|
||||
|
||||
div.reminderError[data-case="deleted"] .errorIcon .fas.fa-trash {
|
||||
display: block;
|
||||
}
|
||||
|
||||
div.reminderError[data-case="failed"] .errorIcon .fas.fa-exclamation-triangle {
|
||||
display: block;
|
||||
}
|
||||
|
||||
div.reminderError[data-case="sent"] .errorIcon .fas.fa-check {
|
||||
display: block;
|
||||
}
|
||||
|
||||
div.reminderError .errorHead .reminderName {
|
||||
font-size: 1rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
color: rgb(54, 54, 54);
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
div.reminderError .errorHead .reminderTime {
|
||||
font-size: 1rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-shrink: 1;
|
||||
justify-content: center;
|
||||
color: rgb(54, 54, 54);
|
||||
background-color: #ffffff;
|
||||
padding: 8px;
|
||||
border-radius: 4px;
|
||||
border-color: #e5e5e5;
|
||||
border-width: 1px;
|
||||
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 {
|
||||
|
@ -713,15 +823,38 @@ a.switch-pane {
|
|||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.guild-submenu {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.guild-submenu li {
|
||||
font-size: 0.8rem;
|
||||
}
|
||||
|
||||
a.switch-pane.is-active ~ .guild-submenu {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.feedback {
|
||||
background-color: #5865F2;
|
||||
}
|
||||
|
||||
.is-locked {
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
.is-locked > :not(.patreon-invert) {
|
||||
opacity: 0.4;
|
||||
}
|
||||
|
||||
.is-locked .patreon-invert {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.patreon-invert {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.is-locked .foreground {
|
||||
pointer-events: auto;
|
||||
}
|
||||
|
@ -751,5 +884,5 @@ a.switch-pane {
|
|||
}
|
||||
|
||||
.figure-num {
|
||||
font-size: 2em;
|
||||
font-size: 2rem;
|
||||
}
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.2 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 6.8 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.2 KiB |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
Before Width: | Height: | Size: 762 B After Width: | Height: | Size: 762 B |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 323 KiB After Width: | Height: | Size: 323 KiB |
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 81 KiB |
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 35 KiB |
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 55 KiB |
Before Width: | Height: | Size: 3.6 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 24 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
|
@ -223,11 +223,10 @@ async function fetch_reminders(guild_id) {
|
|||
}
|
||||
|
||||
async function serialize_reminder(node, mode) {
|
||||
let interval, utc_time, expiration_time;
|
||||
let utc_time, expiration_time;
|
||||
let interval = get_interval(node);
|
||||
|
||||
if (mode !== "template") {
|
||||
interval = get_interval(node);
|
||||
|
||||
utc_time = luxon.DateTime.fromISO(
|
||||
node.querySelector('input[name="time"]').value
|
||||
).setZone("UTC");
|
||||
|
@ -356,9 +355,9 @@ async function serialize_reminder(node, mode) {
|
|||
embed_title: embed_title,
|
||||
embed_fields: fields,
|
||||
expires: expiration_time,
|
||||
interval_seconds: mode !== "template" ? interval.seconds : null,
|
||||
interval_days: mode !== "template" ? interval.days : null,
|
||||
interval_months: mode !== "template" ? interval.months : null,
|
||||
interval_seconds: interval.seconds,
|
||||
interval_days: interval.days,
|
||||
interval_months: interval.months,
|
||||
name: node.querySelector('input[name="name"]').value,
|
||||
tts: node.querySelector('input[name="tts"]').checked,
|
||||
username: node.querySelector('input[name="username"]').value,
|
||||
|
@ -420,9 +419,9 @@ function deserialize_reminder(reminder, frame, mode) {
|
|||
.insertBefore(embed_field, lastChild);
|
||||
}
|
||||
|
||||
if (mode !== "template") {
|
||||
if (reminder["interval_seconds"]) update_interval(frame);
|
||||
if (reminder["interval_seconds"]) update_interval(frame);
|
||||
|
||||
if (mode !== "template") {
|
||||
let $enableBtn = frame.querySelector(".disable-enable");
|
||||
$enableBtn.dataset["action"] = reminder["enabled"] ? "disable" : "enable";
|
||||
|
||||
|
@ -604,6 +603,16 @@ function show_error(error) {
|
|||
}, 5000);
|
||||
}
|
||||
|
||||
function show_success(error) {
|
||||
document.getElementById("success").querySelector("span.success-message").textContent =
|
||||
error;
|
||||
document.getElementById("success").classList.add("is-active");
|
||||
|
||||
window.setTimeout(() => {
|
||||
document.getElementById("success").classList.remove("is-active");
|
||||
}, 5000);
|
||||
}
|
||||
|
||||
$colorPickerInput.value = colorPicker.color.hexString;
|
||||
|
||||
$colorPickerInput.addEventListener("input", () => {
|
||||
|
@ -754,12 +763,26 @@ $uploader.addEventListener("change", (ev) => {
|
|||
fileReader.onload = (e) => resolve(fileReader.result);
|
||||
fileReader.readAsDataURL($uploader.files[0]);
|
||||
}).then((dataUrl) => {
|
||||
$importBtn.setAttribute("disabled", true);
|
||||
|
||||
fetch(`/dashboard/api/guild/${guildId()}/export/${urlTail}`, {
|
||||
method: "PUT",
|
||||
body: JSON.stringify({ body: dataUrl.split(",")[1] }),
|
||||
}).then(() => {
|
||||
delete $uploader.files[0];
|
||||
});
|
||||
})
|
||||
.then((response) => response.json())
|
||||
.then((data) => {
|
||||
$importBtn.removeAttribute("disabled");
|
||||
|
||||
if (data.error) {
|
||||
show_error(data.error);
|
||||
} else {
|
||||
show_success(data.message);
|
||||
}
|
||||
})
|
||||
.then(() => {
|
||||
delete $uploader.files[0];
|
||||
fetch_reminders(guild);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
Before Width: | Height: | Size: 712 KiB After Width: | Height: | Size: 712 KiB |
Before Width: | Height: | Size: 2.5 MiB After Width: | Height: | Size: 2.5 MiB |
Before Width: | Height: | Size: 2.3 MiB After Width: | Height: | Size: 2.3 MiB |
Before Width: | Height: | Size: 2.1 MiB After Width: | Height: | Size: 2.1 MiB |