Compare commits
7 Commits
maybe-skia
...
d3ad04bc33
| Author | SHA1 | Date | |
|---|---|---|---|
| d3ad04bc33 | |||
| 42270b18f0 | |||
| d6ea8977a6 | |||
| 5da8b2b193 | |||
| 158633d077 | |||
| 045d19c4c8 | |||
| 4841ab9f06 |
@ -1,3 +1,10 @@
|
||||
DISCORD_TOKEN=
|
||||
LASTFM_API_KEY=
|
||||
DATABASE_URL=sqlite:watcat.db
|
||||
|
||||
# optional, for spotify support
|
||||
RSPOTIFY_CLIENT_ID=
|
||||
RSPOTIFY_CLIENT_SECRET=
|
||||
|
||||
# optional, to set cache size, set to 0 to disable
|
||||
MAX_CACHE_SIZE=
|
||||
|
||||
259
Cargo.lock
generated
259
Cargo.lock
generated
@ -172,17 +172,6 @@ version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
||||
|
||||
[[package]]
|
||||
name = "auto-palette"
|
||||
version = "0.8.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "65e79afc54a4a4629411811a644e778c7d8f6889b8ecf4c1d4a13f3f33db408d"
|
||||
dependencies = [
|
||||
"image",
|
||||
"num-traits",
|
||||
"thiserror 2.0.12",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.4.0"
|
||||
@ -254,6 +243,29 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bindgen"
|
||||
version = "0.69.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"cexpr",
|
||||
"clang-sys",
|
||||
"itertools",
|
||||
"lazy_static",
|
||||
"lazycell",
|
||||
"log",
|
||||
"prettyplease",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"shlex",
|
||||
"syn 2.0.101",
|
||||
"which",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bit_field"
|
||||
version = "0.10.2"
|
||||
@ -398,15 +410,24 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.2.23"
|
||||
version = "1.2.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
|
||||
checksum = "32db95edf998450acc7881c932f94cd9b05c87b4b2599e8bab064753da4acfd1"
|
||||
dependencies = [
|
||||
"jobserver",
|
||||
"libc",
|
||||
"shlex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cexpr"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
|
||||
dependencies = [
|
||||
"nom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-expr"
|
||||
version = "0.15.8"
|
||||
@ -438,6 +459,17 @@ dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clang-sys"
|
||||
version = "1.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"libc",
|
||||
"libloading",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "color_quant"
|
||||
version = "1.1.0"
|
||||
@ -681,6 +713,18 @@ dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "enum_dispatch"
|
||||
version = "0.3.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.2"
|
||||
@ -947,8 +991,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"js-sys",
|
||||
"libc",
|
||||
"wasi 0.11.0+wasi-snapshot-preview1",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -1621,6 +1667,12 @@ dependencies = [
|
||||
"spin",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazycell"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
|
||||
|
||||
[[package]]
|
||||
name = "lebe"
|
||||
version = "0.5.2"
|
||||
@ -1649,6 +1701,16 @@ dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
version = "0.8.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"windows-targets 0.53.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libm"
|
||||
version = "0.2.15"
|
||||
@ -1666,6 +1728,12 @@ dependencies = [
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.9.4"
|
||||
@ -1703,6 +1771,26 @@ dependencies = [
|
||||
"imgref",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "magick_rust"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"bindgen",
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "maybe-async"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "maybe-rayon"
|
||||
version = "0.1.1"
|
||||
@ -2203,6 +2291,16 @@ dependencies = [
|
||||
"zerocopy",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "prettyplease"
|
||||
version = "0.2.32"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.95"
|
||||
@ -2389,7 +2487,7 @@ checksum = "78c81d000a2c524133cc00d2f92f019d399e57906c3b7119271a2495354fe895"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"rustix",
|
||||
"rustix 1.0.7",
|
||||
"windows",
|
||||
]
|
||||
|
||||
@ -2501,6 +2599,7 @@ dependencies = [
|
||||
"system-configuration 0.6.1",
|
||||
"tokio",
|
||||
"tokio-native-tls",
|
||||
"tokio-socks",
|
||||
"tower",
|
||||
"tower-service",
|
||||
"url",
|
||||
@ -2565,12 +2664,89 @@ dependencies = [
|
||||
"zeroize",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rspotify"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77beedc33ecff4c39e8ef0e6f7ebc8d849f3ffebbeb786f9997d96f0d9cf4017"
|
||||
dependencies = [
|
||||
"async-stream",
|
||||
"async-trait",
|
||||
"base64 0.22.1",
|
||||
"chrono",
|
||||
"futures",
|
||||
"getrandom 0.2.16",
|
||||
"log",
|
||||
"maybe-async",
|
||||
"rspotify-http",
|
||||
"rspotify-macros",
|
||||
"rspotify-model",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha2",
|
||||
"thiserror 2.0.12",
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rspotify-http"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fde1ea9e2a49698cffbc994a83f5f909b37736c31cccb202f9577e8a32df3a63"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"log",
|
||||
"maybe-async",
|
||||
"reqwest 0.12.15",
|
||||
"serde_json",
|
||||
"thiserror 2.0.12",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rspotify-macros"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ee3dfb51ee54bd754ad76e96ad60a3b64bc70ae33a89261d9dbabc4c148a496f"
|
||||
|
||||
[[package]]
|
||||
name = "rspotify-model"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "018f29a6a8c47cfe7923c48140ed546a395f660c7af05b73e6001d4505f89c8d"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"enum_dispatch",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"strum",
|
||||
"thiserror 2.0.12",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustc-demangle"
|
||||
version = "0.1.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-hash"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys 0.4.15",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "1.0.7"
|
||||
@ -2580,7 +2756,7 @@ dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"errno",
|
||||
"libc",
|
||||
"linux-raw-sys",
|
||||
"linux-raw-sys 0.9.4",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
@ -3255,6 +3431,27 @@ dependencies = [
|
||||
"unicode-properties",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum"
|
||||
version = "0.27.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
|
||||
dependencies = [
|
||||
"strum_macros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "strum_macros"
|
||||
version = "0.27.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.101",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "subtle"
|
||||
version = "2.6.1"
|
||||
@ -3385,7 +3582,7 @@ dependencies = [
|
||||
"fastrand",
|
||||
"getrandom 0.3.3",
|
||||
"once_cell",
|
||||
"rustix",
|
||||
"rustix 1.0.7",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
|
||||
@ -3592,6 +3789,18 @@ dependencies = [
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-socks"
|
||||
version = "0.5.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
|
||||
dependencies = [
|
||||
"either",
|
||||
"futures-util",
|
||||
"thiserror 1.0.69",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tokio-stream"
|
||||
version = "0.1.17"
|
||||
@ -4061,21 +4270,21 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "watcat"
|
||||
version = "0.2.0"
|
||||
version = "0.6.0"
|
||||
dependencies = [
|
||||
"arabic_reshaper",
|
||||
"auto-palette",
|
||||
"dotenvy",
|
||||
"http-cache-reqwest",
|
||||
"image",
|
||||
"imagetext",
|
||||
"lastfm",
|
||||
"magick_rust",
|
||||
"palette",
|
||||
"reqwest 0.12.15",
|
||||
"reqwest-middleware",
|
||||
"rspotify",
|
||||
"serenity",
|
||||
"sqlx",
|
||||
"tiny-skia",
|
||||
"tokio",
|
||||
"unicode-bidi",
|
||||
]
|
||||
@ -4120,6 +4329,18 @@ version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
|
||||
|
||||
[[package]]
|
||||
name = "which"
|
||||
version = "4.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
|
||||
dependencies = [
|
||||
"either",
|
||||
"home",
|
||||
"once_cell",
|
||||
"rustix 0.38.44",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "whoami"
|
||||
version = "1.6.0"
|
||||
|
||||
11
Cargo.toml
11
Cargo.toml
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "watcat"
|
||||
version = "0.2.0"
|
||||
version = "0.6.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
@ -11,18 +11,15 @@ reqwest = "0.12"
|
||||
reqwest-middleware = "0.4.2"
|
||||
http-cache-reqwest = "0.15.1"
|
||||
palette = "0.7.6"
|
||||
tiny-skia = "0.11.4"
|
||||
auto-palette = "0.8.2"
|
||||
#rand = "0.9.1"
|
||||
#rayon = "1.10.0"
|
||||
rspotify = "0.15.0"
|
||||
# text rendering dependencies
|
||||
arabic_reshaper = "0.4.2"
|
||||
unicode-bidi = "0.3.18"
|
||||
image = "0.25.6"
|
||||
imagetext = { git = "https://github.com/nathanielfernandes/imagetext" }
|
||||
|
||||
#[dependencies.magick_rust]
|
||||
#path = "./magick-rust"
|
||||
[dependencies.magick_rust]
|
||||
path = "./magick-rust"
|
||||
|
||||
[dependencies.tokio]
|
||||
version = "1.21.2"
|
||||
|
||||
@ -28,7 +28,12 @@ init the database ``sqlx migrate run``
|
||||
TODO
|
||||
----
|
||||
|
||||
+ ~~literally just add the text~~
|
||||
+ add easter egg
|
||||
+ ~~add art and lastfm url fetching~~
|
||||
+ ~~add help command~~
|
||||
+ ~~refactor to combine repeated parts of art, url, and fmi.~~
|
||||
+ use macro for commands
|
||||
+ use Option instead of empty string sentinel value
|
||||
+ ~~add cache for album art colors~~
|
||||
+ ~~add spotify link fetching~~
|
||||
+ make various parameters user-configurable
|
||||
+ use tiny-skia instead of magick-rust?
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 4.1 KiB |
93
src/img.rs
93
src/img.rs
@ -1,93 +0,0 @@
|
||||
|
||||
use image::{RgbaImage, ExtendedColorType, ImageEncoder, load_from_memory};
|
||||
use image::codecs::png::PngEncoder;
|
||||
use tiny_skia::{Pixmap, Transform, PixmapPaint, BlendMode, FilterQuality, Color, Paint, Shader};
|
||||
use palette::{Srgb, Lab, FromColor};
|
||||
use auto_palette::{ImageData, Palette};
|
||||
/*use palette::color_difference::{EuclideanDistance, ImprovedDeltaE};
|
||||
use palette::white_point::D65;
|
||||
use rand::{SeedableRng};
|
||||
use rand::prelude::{IteratorRandom};
|
||||
use rand::rngs::{SmallRng};
|
||||
use std::ops::{Add, Div};//{Add, Sub, Mul};*/
|
||||
|
||||
pub fn save_to_memory_png(p: &RgbaImage) -> Result<Vec<u8>, String> {
|
||||
let (width, height) = p.dimensions();
|
||||
let mut blob = Vec::<u8>::new();
|
||||
let png_encoder = PngEncoder::new(&mut blob);
|
||||
match png_encoder.write_image(p, width, height, ExtendedColorType::Rgba8) {
|
||||
Ok(()) => Ok(blob),
|
||||
Err(_) => Err("Failed to encode text png".to_string()),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ensure_32_bit_png(p: &[u8]) -> Result<Vec<u8>, String> {
|
||||
let img = match load_from_memory(p) {
|
||||
Ok(i) => i,
|
||||
Err(e) => return Err(format!("Failed to load png: {e}")),
|
||||
};
|
||||
save_to_memory_png(&img.into_rgba8())
|
||||
}
|
||||
|
||||
pub fn scale_skia_pixmap(p: Pixmap, width: u32, height: u32) -> Option<Pixmap> {
|
||||
let mut new_pixmap = Pixmap::new(width, height)?;
|
||||
let width_scale = width as f32 / p.width() as f32;
|
||||
let height_scale = height as f32 / p.width() as f32;
|
||||
let matrix = Transform::from_scale(width_scale, height_scale);
|
||||
let pixmap_paint = PixmapPaint {
|
||||
opacity: 1.0,
|
||||
blend_mode: BlendMode::Source,
|
||||
quality: FilterQuality::Bilinear,
|
||||
};
|
||||
new_pixmap.draw_pixmap(0, 0, p.as_ref(), &pixmap_paint, matrix, None);
|
||||
Some(new_pixmap)
|
||||
}
|
||||
|
||||
pub fn lab_to_skia_color(c: Lab) -> Result<Color, String> {
|
||||
let rgb: Srgb<f32> = Srgb::from_color(c).into_format();
|
||||
match Color::from_rgba(rgb.red, rgb.green, rgb.blue, 1.0) {
|
||||
Some(c) => Ok(c),
|
||||
None => Err(format!("Invalid color: {rgb:?}")),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn color_paint_from_lab_color<'a>(c: Lab) -> Result<Paint<'a>, String> {
|
||||
//let color = lab_to_skia_color(c)?;
|
||||
Ok(Paint {
|
||||
shader: Shader::SolidColor(lab_to_skia_color(c)?),
|
||||
anti_alias: true,
|
||||
blend_mode: BlendMode::Source,
|
||||
force_hq_pipeline: false,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn dominant_colors_as_paints<'a>(p: &Pixmap) -> Result<(Paint<'a>, Paint<'a>), String> {
|
||||
let imagedata = match ImageData::new(p.width(), p.height(), p.data()) {
|
||||
Ok(i) => i,
|
||||
Err(_) => return Err("Failed to load imagedata".to_string()),
|
||||
};
|
||||
let pal: Palette<f32> = match Palette::extract(&imagedata) {
|
||||
Ok(p) => p,
|
||||
Err(_) => return Err("Failed to to create palette".to_string()),
|
||||
};
|
||||
let colors: Vec<_> = match pal.find_swatches(2) {
|
||||
Ok(s) => s,
|
||||
Err(_) => return Err("Failed to get swatches".to_string()),
|
||||
};
|
||||
let colors = colors.iter().map(|swatch| {
|
||||
let rgb = swatch.color().to_rgb();
|
||||
Srgb::new(rgb.r, rgb.g, rgb.b).into()
|
||||
}).collect::<Vec<Srgb<f32>>>();
|
||||
Ok((Paint {
|
||||
shader: Shader::SolidColor(Color::from_rgba(colors[0].red, colors[0].green, colors[0].blue, 1.0).unwrap()),
|
||||
anti_alias: true,
|
||||
blend_mode: BlendMode::Source,
|
||||
force_hq_pipeline: false,
|
||||
},
|
||||
Paint {
|
||||
shader: Shader::SolidColor(Color::from_rgba(colors[1].red, colors[1].green, colors[1].blue, 1.0).unwrap()),
|
||||
anti_alias: true,
|
||||
blend_mode: BlendMode::Source,
|
||||
force_hq_pipeline: false,
|
||||
}))
|
||||
}
|
||||
402
src/main.rs
402
src/main.rs
@ -1,12 +1,8 @@
|
||||
//#![allow(dead_code)]
|
||||
//#![allow(unused_variables)]
|
||||
//#![allow(unused_imports)]
|
||||
//#![allow(unused_macros)]
|
||||
extern crate dotenvy;
|
||||
extern crate lastfm;
|
||||
extern crate reqwest;
|
||||
extern crate reqwest_middleware;
|
||||
use http_cache_reqwest::{CACacheManager, Cache, CacheMode, HttpCache, HttpCacheOptions};
|
||||
use http_cache_reqwest::{CACacheManager, Cache, CacheMode, HttpCache, HttpCacheOptions,};
|
||||
|
||||
use serenity::async_trait;
|
||||
use serenity::builder::{CreateAttachment, CreateMessage};
|
||||
@ -14,27 +10,30 @@ use serenity::model::channel::Message;
|
||||
use serenity::model::id::UserId;
|
||||
use serenity::prelude::*;
|
||||
|
||||
extern crate tiny_skia;
|
||||
extern crate image;
|
||||
|
||||
//extern crate magick_rust;
|
||||
//use magick_rust::{ColorspaceType, CompositeOperator, MagickWand, PixelWand, magick_wand_genesis, FilterType};
|
||||
extern crate magick_rust;
|
||||
use magick_rust::{
|
||||
ColorspaceType, CompositeOperator, FilterType, MagickWand, PixelWand, magick_wand_genesis,
|
||||
};
|
||||
|
||||
use std::env;
|
||||
use std::sync::Once;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::{Arc, Once};
|
||||
use tokio::sync::Mutex;
|
||||
|
||||
//use palette::color_difference::ImprovedCiede2000;
|
||||
//use palette::lab::Lab;
|
||||
//use palette::white_point::D65;
|
||||
use palette::color_difference::ImprovedCiede2000;
|
||||
use palette::lab::Lab;
|
||||
use palette::white_point::D65;
|
||||
|
||||
extern crate sqlx;
|
||||
use sqlx::sqlite::SqlitePool;
|
||||
|
||||
use rspotify::model::{enums::types::SearchType, search::SearchResult};
|
||||
use rspotify::{ClientCredsSpotify, Credentials, clients::BaseClient};
|
||||
|
||||
use imagetext::fontdb::FontDB;
|
||||
use imagetext::superfont::SuperFont;
|
||||
|
||||
mod text;
|
||||
mod img;
|
||||
|
||||
static START: Once = Once::new();
|
||||
|
||||
@ -56,19 +55,19 @@ macro_rules! now {
|
||||
|
||||
macro_rules! log {
|
||||
($a:expr) => {
|
||||
if env::var("DEBUG").unwrap_or("0".to_string()) == "1" {
|
||||
if env::var("DEBUG").unwrap_or("0".to_owned()) == "1" {
|
||||
println!(concat!("debug: {} ", $a), now!())
|
||||
}
|
||||
};
|
||||
|
||||
($a:expr, $($b:expr),+) => {
|
||||
if env::var("DEBUG").unwrap_or("0".to_string()) == "1" {
|
||||
if env::var("DEBUG").unwrap_or("0".to_owned()) == "1" {
|
||||
println!(concat!("debug: {} ", $a), now!(), $($b),+)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
macro_rules! handle_result {
|
||||
macro_rules! handle_magick_result {
|
||||
($a: expr, $b: literal) => {
|
||||
match $a {
|
||||
Ok(a) => {
|
||||
@ -80,16 +79,15 @@ macro_rules! handle_result {
|
||||
};
|
||||
}
|
||||
|
||||
macro_rules! handle_option {
|
||||
macro_rules! handle_magick_option {
|
||||
($a: expr, $b: literal) => {
|
||||
match $a {
|
||||
Some(res) => res,
|
||||
None => return Reply::Text($b.to_string()),
|
||||
None => return Reply::Text($b.to_owned()),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/*
|
||||
// this function is almost assuredly the least idiomatic rust code I will ever write.
|
||||
// but until I know what the "correct" way is, it'll have to do
|
||||
fn parse_cielab(s: String) -> Result<(f32, f32, f32), &'static str> {
|
||||
@ -110,9 +108,9 @@ fn parse_cielab(s: String) -> Result<(f32, f32, f32), &'static str> {
|
||||
&[a, b, c] => Ok((a, b, c)),
|
||||
_ => Err("Error parsing cielab string"),
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
/*fn validate_color(col: &PixelWand) -> Option<Lab> {
|
||||
fn validate_color(col: &PixelWand) -> Option<Lab> {
|
||||
let color_str = match col.get_color_as_string() {
|
||||
Ok(s) => s,
|
||||
Err(_) => return None,
|
||||
@ -122,29 +120,86 @@ fn parse_cielab(s: String) -> Result<(f32, f32, f32), &'static str> {
|
||||
Err(_) => return None,
|
||||
};
|
||||
Some(Lab::<D65>::from_components(color_raw))
|
||||
}*/
|
||||
}
|
||||
|
||||
const FMI_WIDTH: u32 = 548;
|
||||
const FMI_HEIGHT: u32 = 147;
|
||||
const FMI_GAP: u32 = 12;
|
||||
const FMI_AVATAR_SIZE: u32 = 64;
|
||||
const FMI_AVATAR_GAP: u32 = 10;
|
||||
|
||||
async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Reply {
|
||||
async fn get_track(
|
||||
ctx: &Context,
|
||||
arg: &str,
|
||||
id: UserId,
|
||||
) -> Result<lastfm::track::NowPlayingTrack, Reply> {
|
||||
let lastfm_user = match arg {
|
||||
"" => get_lastfm_username(ctx, id).await,
|
||||
_ => Some(arg.to_string()),
|
||||
_ => Some(arg.to_owned()),
|
||||
};
|
||||
let lastfm_client = match lastfm_user {
|
||||
Some(s) => lastfm::Client::<String, String>::from_env(s),
|
||||
None => return Err(Reply::Text("No last.fm username set.".to_owned())),
|
||||
};
|
||||
let lastfm_client = lastfm::Client::<String, String>::from_env(handle_option!(lastfm_user, "No last.fm username set."));
|
||||
let now_playing = match lastfm_client.now_playing().await {
|
||||
Ok(np) => np,
|
||||
Err(e) => return Reply::Text(format!("Error: grabbing last.fm user data failed {e}")),
|
||||
Err(e) => {
|
||||
return Err(Reply::Text(format!(
|
||||
"Error: grabbing last.fm user data failed {e}"
|
||||
)));
|
||||
}
|
||||
};
|
||||
let track = match now_playing {
|
||||
Some(track) => track,
|
||||
None => return Reply::Text("Nothing playing.".to_string()),
|
||||
None => return Err(Reply::Text("Nothing playing.".to_owned())),
|
||||
};
|
||||
Ok(track)
|
||||
}
|
||||
|
||||
async fn art(ctx: &Context, arg: &str, id: UserId) -> Reply {
|
||||
let track = match get_track(ctx, arg, id).await {
|
||||
Ok(track) => track,
|
||||
Err(e) => return e,
|
||||
};
|
||||
let track_art = match track.image.extralarge {
|
||||
Some(track_art) => track_art,
|
||||
None => return Reply::Text("Error: getting image uri failed".to_owned()),
|
||||
};
|
||||
Reply::Text(track_art.to_owned())
|
||||
}
|
||||
|
||||
async fn url(ctx: &Context, arg: &str, id: UserId) -> Reply {
|
||||
let track = match get_track(ctx, arg, id).await {
|
||||
Ok(track) => track,
|
||||
Err(e) => return e,
|
||||
};
|
||||
Reply::Text(track.url)
|
||||
}
|
||||
|
||||
async fn spot(ctx: &Context, arg: &str, id: UserId) -> Reply {
|
||||
let track = match get_track(ctx, arg, id).await {
|
||||
Ok(track) => track,
|
||||
Err(e) => return e,
|
||||
};
|
||||
let mut data = ctx.data.write().await;
|
||||
let spotify_option = data.get_mut::<SpotifyHaver>().expect("Failed to have spotify option");
|
||||
if spotify_option.is_none() {
|
||||
return Reply::Text("Unable to use Spotify command: Contact bot Administrator.".to_owned())
|
||||
}
|
||||
let spotify_arc_mutex = spotify_option.as_mut().unwrap();
|
||||
let spotify_client = spotify_arc_mutex.lock().await;
|
||||
spotify_client.request_token().await.unwrap();
|
||||
let search = spotify_client.search(format!("{} {}", track.name, track.artist.name).as_str(), SearchType::Track, None, None, None, None).await;
|
||||
let tracks = match search {
|
||||
Ok(SearchResult::Tracks(track_page)) => track_page,
|
||||
Err(e) => return Reply::Text(format!("Failed to get track {e}")),
|
||||
_ => return Reply::Text("Spotify search failed".to_owned()),
|
||||
};
|
||||
match &tracks.items.first().map(|x| x.external_urls.get("spotify")) {
|
||||
Some(Some(url)) => Reply::Text(url.to_owned().to_owned()),
|
||||
_ => Reply::Text("Unable to get spotify url".to_owned()),
|
||||
}
|
||||
}
|
||||
|
||||
async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Reply {
|
||||
let track = match get_track(ctx, arg, id).await {
|
||||
Ok(track) => track,
|
||||
Err(e) => return e,
|
||||
};
|
||||
#[allow(unused_variables)]
|
||||
let track_info = text::TrackInfo {
|
||||
title: track.name,
|
||||
artist: track.artist.name,
|
||||
@ -152,55 +207,22 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
};
|
||||
let image_uri = match track.image.extralarge {
|
||||
Some(iu) => iu,
|
||||
None => return Reply::Text("Error: getting image uri failed".to_string()),
|
||||
None => return Reply::Text("Error: getting image uri failed".to_owned()),
|
||||
};
|
||||
|
||||
let image_base = match get_image(ctx, image_uri.as_str()).await {
|
||||
Ok(i) => i,
|
||||
Err(e) => return Reply::Text(e.to_string()),
|
||||
};
|
||||
//let image_base_raw = Vec::<u8>::new();
|
||||
//let png_decoder = image::codecs::png::PngDecoder::new(&mut image_base);
|
||||
//let mut image_rgba8 = Vec::<u8>::new();
|
||||
//let png_encoder = image::codecs::png::PngEncoder::new(&mut image_rgba8);
|
||||
//png_encoder.write_image(&image_base, image)
|
||||
/*let mut base_color = PixelWand::new();
|
||||
let mut base_color = PixelWand::new();
|
||||
let mut accent_color = PixelWand::new();
|
||||
let mut white = PixelWand::new();
|
||||
let main_wand = MagickWand::new();
|
||||
let art_wand = MagickWand::new();
|
||||
let mut art_wand_cluster = MagickWand::new();
|
||||
let mask_wand = MagickWand::new();
|
||||
let text_image_wand = MagickWand::new();*/
|
||||
let mut main_image = handle_option!(tiny_skia::Pixmap::new(FMI_WIDTH, FMI_HEIGHT), "Failed to load main image");
|
||||
let mut album_image = handle_result!(tiny_skia::Pixmap::decode_png(&image_base), "Failed to load album art image");
|
||||
//let album_image = handle_result!(tiny_skia::Pixmap::decode_png(&image_rgba8), "Failed to decode album art");
|
||||
#[allow(unused_variables)]
|
||||
let (dom, sub) = match img::dominant_colors_as_paints(&album_image) {
|
||||
Ok(c) => c,
|
||||
Err(e) => return Reply::Text(e),
|
||||
let text_image_wand = MagickWand::new();
|
||||
|
||||
let image = match get_image(ctx, image_uri.as_str()).await {
|
||||
Ok(i) => i,
|
||||
Err(e) => return Reply::Text(format!("{e}")),
|
||||
};
|
||||
//let background_paint = handle_result!(img::color_paint_from_lab_color(dom), "Failed to create color paint");
|
||||
main_image.fill_rect(tiny_skia::Rect::from_xywh(0.0, 0.0, FMI_WIDTH as f32, FMI_HEIGHT as f32).unwrap(), &dom, tiny_skia::Transform::identity(), None);
|
||||
let mut pb = tiny_skia::PathBuilder::new();
|
||||
pb.move_to(FMI_WIDTH as f32, 0.0);
|
||||
pb.line_to((FMI_WIDTH - FMI_HEIGHT) as f32, FMI_HEIGHT as f32);
|
||||
pb.line_to(FMI_WIDTH as f32, FMI_HEIGHT as f32);
|
||||
pb.close();
|
||||
let path = pb.finish().unwrap();
|
||||
main_image.fill_path(&path, &sub, tiny_skia::FillRule::Winding, tiny_skia::Transform::identity(), None);
|
||||
let art_size = FMI_HEIGHT- 2 * FMI_GAP;
|
||||
album_image = handle_option!(img::scale_skia_pixmap(album_image, art_size, art_size), "Failed to scale bitmap");
|
||||
//let art_scale_matrix = tiny_skia::Transform::from_transla(art_size, art_size).pre_translate(FMI_GAP as f32, FMI_GAP as f32);
|
||||
let source_paint = tiny_skia::PixmapPaint {
|
||||
opacity: 1.0,
|
||||
blend_mode: tiny_skia::BlendMode::SourceOver,
|
||||
quality: tiny_skia::FilterQuality::Bilinear,
|
||||
};
|
||||
main_image.draw_pixmap(FMI_GAP as i32, FMI_GAP as i32, album_image.as_ref(), &source_paint, tiny_skia::Transform::identity(), None);
|
||||
/*handle_magick_result!(
|
||||
base_color.set_color("#7f7f7f"),
|
||||
"Failed to set init base color"
|
||||
);
|
||||
handle_magick_result!(
|
||||
art_wand.read_image_blob(image),
|
||||
"Failed to read image from uri"
|
||||
@ -210,6 +232,26 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
"Failed to set art colorspace"
|
||||
);
|
||||
|
||||
handle_magick_result!(
|
||||
base_color.set_color("#7f7f7f"),
|
||||
"Failed to set init base color"
|
||||
);
|
||||
|
||||
let color_cache_entry = {
|
||||
let data = ctx.data.write().await;
|
||||
let color_cache = data.get::<ColorsHaver>().expect("Failed to have colors option");
|
||||
if color_cache.max > 0 {
|
||||
let color_cache_map = color_cache.map.lock().await;
|
||||
color_cache_map.get(image_uri.as_str()).map(|s| s.to_owned())
|
||||
} else {
|
||||
None
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
let (base_lab, accent_lab) = match color_cache_entry {
|
||||
Some(value) => value.to_owned(),
|
||||
None => {
|
||||
let (art_width, art_height) = (art_wand.get_image_width(), art_wand.get_image_height());
|
||||
handle_magick_result!(
|
||||
art_wand_cluster.new_image(art_width, art_height, &base_color),
|
||||
@ -244,27 +286,33 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
let mut accent_color = PixelWand::new();
|
||||
handle_magick_result!(
|
||||
accent_color.set_color("cielab(0.0,0.0,0.0)"),
|
||||
"Failed to init accent color"
|
||||
);
|
||||
let mut accent_lab = "cielab(0.0,0.0,0.0)".to_owned();
|
||||
if let Some(color) = other_colors.first() {
|
||||
let col = format!("cielab{:?}", color.into_components());
|
||||
handle_magick_result!(
|
||||
accent_color.set_color(col.as_str()),
|
||||
"Failed to set accent color"
|
||||
);
|
||||
accent_lab = format!("cielab{:?}", color.into_components());
|
||||
}
|
||||
let base_lab = handle_magick_result!(colors[0].get_color_as_string(), "Failed to serialize base color");
|
||||
let data = ctx.data.write().await;
|
||||
let color_cache = data.get::<ColorsHaver>().expect("Failed to have colors option");
|
||||
let mut color_cache_map = color_cache.map.lock().await;
|
||||
if color_cache_map.keys().len() > color_cache.max {
|
||||
let key: String = color_cache_map.iter().next().unwrap().0.to_owned();
|
||||
color_cache_map.remove(&key);
|
||||
}
|
||||
color_cache_map.insert(image_uri, (base_lab.clone(), accent_lab.clone()));
|
||||
(base_lab, accent_lab)
|
||||
}
|
||||
};
|
||||
|
||||
handle_magick_result!(base_color.set_color(base_lab.as_str()), "Failed to deserialize base color");
|
||||
handle_magick_result!(accent_color.set_color(accent_lab.as_str()), "Failed to deserialize accent color");
|
||||
|
||||
let use_dark_color = match validate_color(&colors[0]) {
|
||||
let use_dark_color = match validate_color(&base_color) {
|
||||
Some(color) => {
|
||||
let black_delta_e = Lab::<D65>::new(0.0, 0.0, 0.0).improved_difference(color);
|
||||
let white_delta_e = Lab::<D65>::new(100.0, 0.0, 0.0).improved_difference(color);
|
||||
black_delta_e > white_delta_e
|
||||
}
|
||||
_ => false
|
||||
_ => false,
|
||||
};
|
||||
|
||||
handle_magick_result!(white.set_color("#ffffff"), "Failed to init white");
|
||||
@ -296,21 +344,8 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
avatar_wand.new_image(100, 100, &white),
|
||||
"Failed to load dummy avatar"
|
||||
),
|
||||
}*/
|
||||
let avatar_uri = avatar.unwrap(); // TODO: FIX THIS
|
||||
let avatar_base = match get_image(ctx, avatar_uri.as_str()).await {
|
||||
Ok(i) => i,
|
||||
Err(e) => return Reply::Text(e.to_string()),
|
||||
};
|
||||
let mut avatar_image = handle_result!(tiny_skia::Pixmap::decode_png(&avatar_base), "Failed to load album art image");
|
||||
let avatar_mask = handle_result!(tiny_skia::Mask::decode_png(include_bytes!("avatar_mask.png")), "Failed to load album art image");
|
||||
let (avatar_x, avatar_y) = (FMI_WIDTH - FMI_AVATAR_SIZE - FMI_AVATAR_GAP, FMI_HEIGHT - FMI_AVATAR_SIZE - FMI_AVATAR_GAP);
|
||||
avatar_image.apply_mask(&avatar_mask);
|
||||
avatar_image = handle_option!(img::scale_skia_pixmap(avatar_image, FMI_AVATAR_SIZE, FMI_AVATAR_SIZE), "Failed to scale avatar image");
|
||||
//let avatar_matrix = tiny_skia::Transform::from_scale(avatar_scale, avatar_scale).pre_translate(avatar_x as f32, avatar_y as f32);
|
||||
main_image.draw_pixmap(avatar_x as i32, avatar_y as i32, avatar_image.as_ref(), &source_paint, tiny_skia::Transform::identity(), None);
|
||||
|
||||
/*let avatar_mask_wand = MagickWand::new();
|
||||
}
|
||||
let avatar_mask_wand = MagickWand::new();
|
||||
handle_magick_result!(
|
||||
avatar_mask_wand.read_image_blob(include_bytes!("avatar_mask.png")),
|
||||
"Failed to load avatar mask"
|
||||
@ -330,20 +365,29 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
|
||||
let (image_width, image_height) = (548, 147);
|
||||
let data = ctx.data.write().await;
|
||||
let fonts = data
|
||||
.get::<FontsHaver>().expect("Failed to load fonts");
|
||||
let text_image_blob = match text::fmi_text(image_width, image_height, track_info, fonts, 19.0, use_dark_color) {
|
||||
let fonts = data.get::<FontsHaver>().expect("Failed to load fonts");
|
||||
let text_image_blob = match text::fmi_text(
|
||||
image_width,
|
||||
image_height,
|
||||
track_info,
|
||||
fonts,
|
||||
19.0,
|
||||
use_dark_color,
|
||||
) {
|
||||
Ok(bytes) => bytes,
|
||||
Err(e) => return Reply::Text(e),
|
||||
};
|
||||
handle_magick_result!(text_image_wand.read_image_blob(&text_image_blob), "Failed to load text image");
|
||||
handle_magick_result!(
|
||||
text_image_wand.read_image_blob(&text_image_blob),
|
||||
"Failed to load text image"
|
||||
);
|
||||
handle_magick_result!(
|
||||
text_image_wand.transform_image_colorspace(ColorspaceType::Lab),
|
||||
"Failed to set avatar colorspace"
|
||||
);
|
||||
|
||||
handle_magick_result!(
|
||||
main_wand.new_image(image_width as usize, image_height as usize, &colors[0]),
|
||||
main_wand.new_image(image_width as usize, image_height as usize, &base_color),
|
||||
"Failed to create wand"
|
||||
);
|
||||
handle_magick_result!(
|
||||
@ -354,10 +398,10 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
art_wand.adaptive_resize_image(124, 124),
|
||||
"Failed to resize art"
|
||||
);
|
||||
handle_magick_result!(
|
||||
/*handle_magick_result!(
|
||||
art_wand_cluster.adaptive_resize_image(124, 124),
|
||||
"Failed to resize art_cluster"
|
||||
);
|
||||
);*/
|
||||
handle_magick_result!(
|
||||
main_wand.compose_images(&art_wand, CompositeOperator::SrcOver, false, 12, 12),
|
||||
"Failed to combine art image"
|
||||
@ -367,7 +411,7 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
"Failed to combine mask"
|
||||
);
|
||||
#[cfg(debug_assertions)]
|
||||
if env::var("DEBUG_IMAGE").unwrap_or("0".to_string()) == "1" {
|
||||
if env::var("DEBUG_IMAGE").unwrap_or("0".to_owned()) == "1" {
|
||||
handle_magick_result!(
|
||||
main_wand.compose_images(
|
||||
&art_wand_cluster,
|
||||
@ -386,14 +430,40 @@ async fn fmi(ctx: &Context, arg: &str, id: UserId, avatar: Option<String>) -> Re
|
||||
handle_magick_result!(
|
||||
main_wand.compose_images(&avatar_wand, CompositeOperator::SrcOver, false, 473, 73),
|
||||
"Failed to combine avatar image"
|
||||
);*/
|
||||
//Reply::Image(main_wand.write_image_blob("png").unwrap())
|
||||
Reply::Image(main_image.encode_png().unwrap())
|
||||
);
|
||||
Reply::Image(main_wand.write_image_blob("png").unwrap())
|
||||
}
|
||||
|
||||
fn help(arg: &str) -> Reply {
|
||||
Reply::Text(format!(
|
||||
"```{}```",
|
||||
match arg {
|
||||
"" =>
|
||||
"usage: .k <img|set|art|url|spotify|help> [lastfm user]\n .k img [lastfm user]: get now playing\n .k set <lastfm user>: sets your username for the future\n .k art [lastfm user]: get now playing album art\n .k url [lastfm user]: get now playing lastfm url\n .k spot [lastfm user]: get now playing spotify link\n .k help [command]: displays a help message"
|
||||
.to_owned(),
|
||||
"img" | "fmi" | "fm" | "get" =>
|
||||
"usage: .k img [lastfm user]\nreturns a pretty-printed image of the user's now playing track on last.fm, using the album art's colors to theme the image. see also: .k set\naliases: .kfmi, .k <fmi|get|img>, .kf, .ki, or even just .k"
|
||||
.to_owned(),
|
||||
"set" =>
|
||||
"usage: .k set <lastfm user>\nties a lastfm username to your account. use this to not require your username for .k fmi every time, for example\naliases: .kset"
|
||||
.to_owned(),
|
||||
"art" =>
|
||||
"usage: .k art [lastfm user]\nfetches user's now playing track's album art\naliases: .k art, .kart, .ka"
|
||||
.to_owned(),
|
||||
"url" | "link" =>
|
||||
"usage: .k url [lastfm user]\nfetches a lastfm link to user's now playing track\naliases: .k url, .k link, .kl, .ku, .kurl"
|
||||
.to_owned(),
|
||||
"spot" | "spotify" =>
|
||||
"usage: .k spotify [lastfm user]\nsearches spotify for the user's now playing track and returns a link to that track\naliases: .k <spot|spotify>, .ks, .kspot"
|
||||
.to_owned(),
|
||||
_ => format!("unknown command: {arg}"),
|
||||
}
|
||||
))
|
||||
}
|
||||
|
||||
async fn set(ctx: &Context, arg: &str, id: UserId) -> Reply {
|
||||
set_lastfm_username(ctx, id, arg.to_string()).await;
|
||||
Reply::Text(format!("set user {}", arg))
|
||||
set_lastfm_username(ctx, id, arg.to_owned()).await;
|
||||
Reply::Text(format!("set user {arg}"))
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
@ -401,16 +471,40 @@ impl EventHandler for Handler {
|
||||
async fn message(&self, ctx: Context, msg: Message) {
|
||||
let mut cmd_iter = msg.content.split(" ");
|
||||
let cmd = cmd_iter.next().unwrap_or("");
|
||||
let arg = cmd_iter.next().unwrap_or("");
|
||||
let resp = match cmd {
|
||||
".fmi" => {
|
||||
log!("{} received", msg.content);
|
||||
Some(fmi(&ctx, arg, msg.author.id, msg.author.avatar_url()).await)
|
||||
}
|
||||
".set" => {
|
||||
let arg1 = cmd_iter.next().unwrap_or("");
|
||||
let arg2 = cmd_iter.next().unwrap_or("");
|
||||
let resp = match (cmd, arg1, arg2) {
|
||||
(".set", arg, "") | (".k", "set", arg) | (".kset", arg, "") => {
|
||||
log!("{} received", msg.content);
|
||||
Some(set(&ctx, arg, msg.author.id).await)
|
||||
}
|
||||
(".k", "art", arg) | (".k", arg, "art") | (".ka" | ".kart", arg, "") => {
|
||||
log!("{} received", msg.content);
|
||||
Some(art(&ctx, arg, msg.author.id).await)
|
||||
}
|
||||
(".k", "url" | "uri" | "link", arg)
|
||||
| (".k", arg, "url" | "uri" | "link")
|
||||
| (".ku" | ".kl" | ".kurl", arg, "") => {
|
||||
log!("{} received", msg.content);
|
||||
Some(url(&ctx, arg, msg.author.id).await)
|
||||
}
|
||||
(".k", "spot" | "spotify", arg)
|
||||
| (".k", arg, "spot" | "spotify")
|
||||
| (".ks" | ".kspot", arg, "") => {
|
||||
log!("{} received", msg.content);
|
||||
Some(spot(&ctx, arg, msg.author.id).await)
|
||||
}
|
||||
(".k", "help" | "h" | "?", arg)
|
||||
| (".k", arg, "help" | "h" | "?")
|
||||
| (".kh" | ".k?", arg, "") => {
|
||||
log!("{} received", msg.content);
|
||||
Some(help(arg))
|
||||
}
|
||||
(".fmi" | ".k" | ".kf" | ".ki" | ".kfmi", arg, "")
|
||||
| (".k", "fm" | "fmi" | "get" | "img", arg) => {
|
||||
log!("{} received", msg.content);
|
||||
Some(fmi(&ctx, arg, msg.author.id, msg.author.avatar_url()).await)
|
||||
}
|
||||
_ => None,
|
||||
};
|
||||
if let Some(reply) = resp {
|
||||
@ -445,6 +539,20 @@ impl TypeMapKey for FontsHaver {
|
||||
type Value = (SuperFont<'static>, SuperFont<'static>);
|
||||
}
|
||||
|
||||
struct SpotifyHaver;
|
||||
impl TypeMapKey for SpotifyHaver {
|
||||
type Value = Option<Arc<Mutex<ClientCredsSpotify>>>;
|
||||
}
|
||||
|
||||
struct ColorCache {
|
||||
map: Arc<Mutex<HashMap<String, (String, String)>>>,
|
||||
max: usize,
|
||||
}
|
||||
struct ColorsHaver;
|
||||
impl TypeMapKey for ColorsHaver {
|
||||
type Value = ColorCache;
|
||||
}
|
||||
|
||||
struct DBResponse {
|
||||
lastfm_username: String,
|
||||
}
|
||||
@ -478,7 +586,7 @@ async fn get_lastfm_username(ctx: &Context, id: UserId) -> Option<String> {
|
||||
|
||||
async fn set_lastfm_username(ctx: &Context, id: UserId, user: String) {
|
||||
log!("set db user {} {}", id, user);
|
||||
let data = ctx.data.write().await;
|
||||
let data = ctx.data.read().await;
|
||||
let pool = data
|
||||
.get::<PoolHaver>()
|
||||
.expect("Failed to get pool container");
|
||||
@ -496,23 +604,20 @@ async fn set_lastfm_username(ctx: &Context, id: UserId, user: String) {
|
||||
.expect("Failed to insert");
|
||||
}
|
||||
|
||||
async fn get_image(ctx: &Context, url: &str) -> Result<Vec<u8>, String> {
|
||||
async fn get_image(ctx: &Context, url: &str) -> Result<Vec<u8>, reqwest_middleware::Error> {
|
||||
log!("get {}", url);
|
||||
let data = ctx.data.write().await;
|
||||
let http = data
|
||||
.get::<HttpHaver>()
|
||||
.expect("Failed to get http client");
|
||||
let data = ctx.data.read().await;
|
||||
let http = data.get::<HttpHaver>().expect("Failed to get http client");
|
||||
match http.get(url).send().await {
|
||||
Ok(resp) => {
|
||||
log!("response received");
|
||||
let img_raw = resp
|
||||
Ok(resp
|
||||
.bytes()
|
||||
.await
|
||||
.expect("Unable to resolve bytes")
|
||||
.to_vec();
|
||||
img::ensure_32_bit_png(&img_raw)
|
||||
.to_vec())
|
||||
}
|
||||
Err(e) => Err(format!("{e}")),
|
||||
Err(e) => Err(e),
|
||||
}
|
||||
}
|
||||
|
||||
@ -520,7 +625,7 @@ async fn get_image(ctx: &Context, url: &str) -> Result<Vec<u8>, String> {
|
||||
async fn main() {
|
||||
START.call_once(|| {
|
||||
dotenvy::dotenv().expect("Failed to load .env");
|
||||
//magick_wand_genesis();
|
||||
magick_wand_genesis();
|
||||
});
|
||||
|
||||
let db_url = env::var("DATABASE_URL").expect("Failed to load DATABASE_URL");
|
||||
@ -543,7 +648,8 @@ async fn main() {
|
||||
.build();
|
||||
|
||||
FontDB::load_from_dir("fonts"); //singlet instance??? wha?????
|
||||
let regular_fonts = FontDB::query("
|
||||
let regular_fonts = FontDB::query(
|
||||
"
|
||||
NotoSans-Regular
|
||||
NotoSansHK-Regular
|
||||
NotoSansJP-Regular
|
||||
@ -555,8 +661,11 @@ async fn main() {
|
||||
NotoEmoji-Regular
|
||||
Symbola
|
||||
Unifont
|
||||
").expect("Failed to load regular fonts");
|
||||
let bold_fonts = FontDB::query("
|
||||
",
|
||||
)
|
||||
.expect("Failed to load regular fonts");
|
||||
let bold_fonts = FontDB::query(
|
||||
"
|
||||
NotoSans-SemiBold
|
||||
NotoSansJP-Medium
|
||||
NotoSansKR-Medium
|
||||
@ -567,7 +676,20 @@ async fn main() {
|
||||
NotoEmoji-Medium
|
||||
Symbola
|
||||
Unifont
|
||||
").expect("Failed to load bold fonts");
|
||||
",
|
||||
)
|
||||
.expect("Failed to load bold fonts");
|
||||
|
||||
let spotify_creds = Credentials::from_env();
|
||||
let spotify = spotify_creds.map(ClientCredsSpotify::new);
|
||||
if let Some(spotify_client) = &spotify {
|
||||
let _ = &spotify_client.request_token().await.unwrap();
|
||||
}
|
||||
|
||||
let colors_cache: ColorCache = ColorCache {
|
||||
map: Arc::new(Mutex::new(HashMap::new())),
|
||||
max: env::var("MAX_CACHE_SIZE").unwrap_or("".to_owned()).parse::<usize>().unwrap_or(1000000),
|
||||
};
|
||||
|
||||
let mut discord_client = Client::builder(&token, intents)
|
||||
.event_handler(Handler)
|
||||
@ -579,6 +701,8 @@ async fn main() {
|
||||
data.insert::<PoolHaver>(pool);
|
||||
data.insert::<HttpHaver>(http);
|
||||
data.insert::<FontsHaver>((regular_fonts, bold_fonts));
|
||||
data.insert::<SpotifyHaver>(spotify.map(Mutex::new).map(Arc::new));
|
||||
data.insert::<ColorsHaver>(colors_cache);
|
||||
}
|
||||
|
||||
if let Err(why) = discord_client.start().await {
|
||||
|
||||
69
src/text.rs
69
src/text.rs
@ -1,19 +1,16 @@
|
||||
/*
|
||||
// this code is mostly just blindly ported from
|
||||
// https://github.com/adamanldo/Cosmo/blob/946af25dcac8a81cb7b49d1a4f83731a5f7c7b46/cogs/utils/fmi_text.py
|
||||
// since I'm using the same text rendering library, my code is almost one-to-one
|
||||
|
||||
use arabic_reshaper::arabic_reshape;
|
||||
use imagetext::measure::text_width;
|
||||
use imagetext::superfont::SuperFont;
|
||||
use imagetext::wrap::{text_wrap, WrapStyle};
|
||||
use imagetext::prelude::{scale, BLACK, WHITE, Outline, draw_text_wrapped, TextAlign, stroke};
|
||||
use image::{RgbaImage, ExtendedColorType, ImageEncoder};
|
||||
use image::codecs::png::PngEncoder;
|
||||
use image::{ExtendedColorType, ImageEncoder, RgbaImage};
|
||||
use imagetext::measure::text_width;
|
||||
use imagetext::prelude::{BLACK, Outline, TextAlign, WHITE, draw_text_wrapped, scale, stroke};
|
||||
use imagetext::superfont::SuperFont;
|
||||
use imagetext::wrap::{WrapStyle, text_wrap};
|
||||
use unicode_bidi::BidiInfo;
|
||||
|
||||
use crate::img;
|
||||
|
||||
enum TextField {
|
||||
Title,
|
||||
Artist,
|
||||
@ -71,7 +68,14 @@ fn process_text(
|
||||
(wrapped_strs, width)
|
||||
}
|
||||
|
||||
fn draw_info(image: &mut RgbaImage, text: String, text_type: TextField, font: &SuperFont<'static>, font_size: f32, dark_text: bool) -> Result<(), String> {
|
||||
fn draw_info(
|
||||
image: &mut RgbaImage,
|
||||
text: String,
|
||||
text_type: TextField,
|
||||
font: &SuperFont<'static>,
|
||||
font_size: f32,
|
||||
dark_text: bool,
|
||||
) -> Result<(), String> {
|
||||
let (lines, width) = process_text(&text, &text_type, font, font_size);
|
||||
let text = lines.join("");
|
||||
let y = match text_type {
|
||||
@ -102,20 +106,51 @@ fn draw_info(image: &mut RgbaImage, text: String, text_type: TextField, font: &S
|
||||
Ok(_) => Ok(()),
|
||||
Err(e) => Err(e.to_string()),
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub struct TrackInfo {
|
||||
pub title: String,
|
||||
pub artist: String,
|
||||
pub album: String,
|
||||
}
|
||||
|
||||
/*pub fn fmi_text(width: u32, height: u32, track: TrackInfo, fonts: &(SuperFont<'static>, SuperFont<'static>), font_size: f32, dark_text: bool) -> Result<Vec<u8>, String> {
|
||||
pub fn fmi_text(
|
||||
width: u32,
|
||||
height: u32,
|
||||
track: TrackInfo,
|
||||
fonts: &(SuperFont<'static>, SuperFont<'static>),
|
||||
font_size: f32,
|
||||
dark_text: bool,
|
||||
) -> Result<Vec<u8>, String> {
|
||||
let mut img = RgbaImage::new(width, height);
|
||||
draw_info(&mut img, track.title, TextField::Title, &fonts.1.clone(), font_size, dark_text)?;
|
||||
draw_info(&mut img, track.artist, TextField::Artist, &fonts.0.clone(), font_size, dark_text)?;
|
||||
draw_info(&mut img, track.album, TextField::Album, &fonts.0.clone(), font_size, dark_text)?;
|
||||
img::save_to_memory_png(&img)
|
||||
draw_info(
|
||||
&mut img,
|
||||
track.title,
|
||||
TextField::Title,
|
||||
&fonts.1.clone(),
|
||||
font_size,
|
||||
dark_text,
|
||||
)?;
|
||||
draw_info(
|
||||
&mut img,
|
||||
track.artist,
|
||||
TextField::Artist,
|
||||
&fonts.0.clone(),
|
||||
font_size,
|
||||
dark_text,
|
||||
)?;
|
||||
draw_info(
|
||||
&mut img,
|
||||
track.album,
|
||||
TextField::Album,
|
||||
&fonts.0.clone(),
|
||||
font_size,
|
||||
dark_text,
|
||||
)?;
|
||||
let mut blob = Vec::<u8>::new();
|
||||
let png_encoder = PngEncoder::new(&mut blob);
|
||||
match png_encoder.write_image(&img, width, height, ExtendedColorType::Rgba8) {
|
||||
Ok(()) => Ok(blob),
|
||||
Err(_) => Err("Failed to encode text png".to_string()),
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user