mirror of
https://github.com/eRgo35/lyra.git
synced 2026-02-04 20:36:10 +01:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f1b52d2be2
|
|||
|
e77818e09b
|
|||
|
5a026afc52
|
|||
|
8a0d08de4e
|
|||
|
f224ccfbdf
|
|||
|
d0af34833b
|
|||
|
c2e653b3ea
|
|||
|
78a1937210
|
|||
|
fc42427437
|
|||
|
9474577233
|
|||
|
b86e8b9daf
|
|||
|
ef29e5319a
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,3 +1,3 @@
|
|||||||
/target
|
/target
|
||||||
|
**/target
|
||||||
.env
|
.env
|
||||||
|
|
||||||
|
|||||||
12
.gitmodules
vendored
12
.gitmodules
vendored
@@ -1,3 +1,9 @@
|
|||||||
[submodule "src/spotify-parser"]
|
[submodule "libs/songbird"]
|
||||||
path = src/spotify-parser
|
path = libs/songbird
|
||||||
url = https://github.com/eRgo35/spotify-parser
|
url = git@github.com:eRgo35/songbird.git
|
||||||
|
[submodule "libs/serenity"]
|
||||||
|
path = libs/serenity
|
||||||
|
url = git@github.com:eRgo35/serenity.git
|
||||||
|
[submodule "libs/poise"]
|
||||||
|
path = libs/poise
|
||||||
|
url = git@github.com:eRgo35/poise.git
|
||||||
|
|||||||
1935
Cargo.lock
generated
1935
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
49
Cargo.toml
49
Cargo.toml
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lyra"
|
name = "lyra"
|
||||||
version = "0.7.0"
|
version = "0.9.1"
|
||||||
authors = ["Michał Czyż <mike@c2yz.com>"]
|
authors = ["Michał Czyż <mike@c2yz.com>"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "A featureful Discord bot written in Rust."
|
description = "A featureful Discord bot written in Rust."
|
||||||
@@ -10,23 +10,46 @@ homepage = "https://lyra.c2yz.com"
|
|||||||
license-file = "LICENSE.md"
|
license-file = "LICENSE.md"
|
||||||
keywords = ["discord", "bot", "rust", "music", "featureful"]
|
keywords = ["discord", "bot", "rust", "music", "featureful"]
|
||||||
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
lib-spotify-parser = { path = "./libs/spotify-parser" }
|
||||||
dotenv = "0.15.0"
|
dotenv = "0.15.0"
|
||||||
fancy-regex = "0.13.0"
|
fancy-regex = "0.13.0"
|
||||||
json = "0.12.4"
|
json = "0.12.4"
|
||||||
openssl = { version = "0.10.63", features = ["vendored"] }
|
openssl = { version = "0.10.66", features = ["vendored"] }
|
||||||
poise = "0.6.1"
|
owoify = "0.1.5"
|
||||||
|
poise = { default-features = true, version = "0.6.1" }
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
regex = "1.10.3"
|
regex = "1.10.6"
|
||||||
reqwest = { version = "0.11.23", features = ["json"]}
|
reqwest = { version = "0.11.27", features = ["json"] }
|
||||||
serde = { version = "1.0.197", features = ["derive"] }
|
serde = { version = "1.0.204", features = ["derive"] }
|
||||||
serde_json = "1.0.114"
|
serde_json = "1.0.122"
|
||||||
serenity = { version = "0.12.0", features = ["cache", "framework", "standard_framework", "voice"] }
|
songbird = { version = "0.4.3", default-features = true, features = [
|
||||||
songbird = { version = "0.4.0", features = ["builtin-queue", "serenity"] }
|
"builtin-queue",
|
||||||
symphonia = { version = "0.5.3", features = ["aac", "adpcm", "alac", "flac", "mpa", "isomp4"] }
|
] }
|
||||||
tokio = { version = "1.35.1", features = ["macros", "full", "signal"] }
|
serenity = { default-features = true, features = [
|
||||||
|
"cache",
|
||||||
|
"framework",
|
||||||
|
"standard_framework",
|
||||||
|
"voice",
|
||||||
|
"http",
|
||||||
|
"rustls_backend",
|
||||||
|
], version = "0.12" }
|
||||||
|
|
||||||
|
symphonia = { version = "0.5.4", features = [
|
||||||
|
"aac",
|
||||||
|
"adpcm",
|
||||||
|
"alac",
|
||||||
|
"flac",
|
||||||
|
"mpa",
|
||||||
|
"isomp4",
|
||||||
|
] }
|
||||||
|
tokio = { version = "1.39.2", features = ["macros", "full", "signal"] }
|
||||||
tracing = "0.1.40"
|
tracing = "0.1.40"
|
||||||
tracing-futures = "0.2.5"
|
tracing-futures = "0.2.5"
|
||||||
tracing-subscriber = "0.3.18"
|
tracing-subscriber = "0.3.18"
|
||||||
url = "2.5.0"
|
url = "2.5.2"
|
||||||
|
once_cell = "1.19.0"
|
||||||
|
|
||||||
|
[patch.crates-io.serenity-voice-model]
|
||||||
|
git = "https://github.com/serenity-rs/serenity"
|
||||||
|
branch = "current"
|
||||||
|
|||||||
19
Dockerfile
19
Dockerfile
@@ -1,19 +0,0 @@
|
|||||||
FROM rust:1.71-alpine
|
|
||||||
|
|
||||||
RUN apk add --update \
|
|
||||||
alpine-sdk \
|
|
||||||
ffmpeg \
|
|
||||||
youtube-dl \
|
|
||||||
pkgconfig \
|
|
||||||
cmake \
|
|
||||||
openssl-dev \
|
|
||||||
musl-dev \
|
|
||||||
openssl
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
RUN cargo build --release
|
|
||||||
|
|
||||||
CMD ["./target/release/lyra"]
|
|
||||||
22
LICENSE.md
22
LICENSE.md
@@ -1,7 +1,21 @@
|
|||||||
# License
|
MIT License
|
||||||
|
|
||||||
Copyright (C) 2024 Michał Czyż
|
Copyright (c) 2024 Michał Czyż
|
||||||
|
|
||||||
All Rights Reserved.
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
This build is private and shall not be distributed nor modified without permission.
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|||||||
73
README.md
73
README.md
@@ -3,10 +3,79 @@
|
|||||||

|

|
||||||
|
|
||||||
Lyra is a music bot written in Rust.
|
Lyra is a music bot written in Rust.
|
||||||
More features coming soon!
|
|
||||||
|
|
||||||
## Getting Started
|
## Getting Started
|
||||||
|
|
||||||
## Building
|
Lyra is an open source, discord music bot written in Rust.
|
||||||
|
|
||||||
|
The idea behind this project is to allow a user to self-host one's own instance of the bot.
|
||||||
|
|
||||||
|
User no longer has to rely on 3rd parties to provide them an invite link.
|
||||||
|
|
||||||
|
The bot can be run even on a desktop or a phone because after compilation, it's just a simple binary.
|
||||||
|
|
||||||
|
As of now, the bot supports spotify url track recognition through a separate nodejs script. I plan to write the actual parser inside the bot iteself but as of now I postponed it into future release.
|
||||||
|
|
||||||
|
Slash commands are still work in progress! Currently bot is still heavily in development!
|
||||||
|
|
||||||
|
## Setting up
|
||||||
|
|
||||||
|
To compile the source code on your own, you need `rust` and `cargo`
|
||||||
|
|
||||||
|
To run a dev version use
|
||||||
|
```bash
|
||||||
|
$ cargo run
|
||||||
|
```
|
||||||
|
|
||||||
|
To build a production version use
|
||||||
|
```bash
|
||||||
|
$ cargo build --release
|
||||||
|
```
|
||||||
|
|
||||||
|
If you need an ARM version and just don't want to wait for ages for the program to compile, use
|
||||||
|
```bash
|
||||||
|
$ cross build -r --target aarch64-unknown-linux-gnu
|
||||||
|
```
|
||||||
|
|
||||||
|
To run a program, just type
|
||||||
|
```bash
|
||||||
|
$ ./lyra
|
||||||
|
```
|
||||||
|
|
||||||
|
if you want to disown it from the shell, I recommend using the script I provided in `scripts` folder
|
||||||
|
|
||||||
## Commands
|
## Commands
|
||||||
|
|
||||||
|
As of now, working commands are:
|
||||||
|
|
||||||
|
```
|
||||||
|
Music:
|
||||||
|
/deafen Deafens itself while in a voice channel; aliases: deafen, undeaden, shuush
|
||||||
|
/join Joins your voice channel
|
||||||
|
/leave Leaves the voice channel; aliases: leave, qa!
|
||||||
|
/mute Mutes itself while in a voice channel; aliases: mute, unmute, shhh
|
||||||
|
/pause Pauses the currently playing song
|
||||||
|
/play Plays a song; you can search by query or paste an url; aliases: play, p, enqueue
|
||||||
|
/queue Shows next tracks in queue; aliases: queue, q
|
||||||
|
/repeat Loops currently playing song provided amount of times; aliases: repeat, loop, while, for
|
||||||
|
/resume Resumes currently paused song
|
||||||
|
/seek Seeks a track by provided seconds
|
||||||
|
/skip Skips the currently playing song
|
||||||
|
/stop Stops playback and destroys the queue; aliases: stop, end
|
||||||
|
/volume Changes output volume
|
||||||
|
/effect Plays one of available audio effects
|
||||||
|
/stream Hijacks output and plays audio; search by query or paste an url; aliases: stream, override, hijack
|
||||||
|
|
||||||
|
Tools:
|
||||||
|
/ai Asks AI
|
||||||
|
/dice Rolls a dice
|
||||||
|
/owoify Owoifies whatever you want uwu
|
||||||
|
/ping Pings you backs with a response time
|
||||||
|
/posix Prints current time in POSIX format
|
||||||
|
/qr Creates a qr code from text
|
||||||
|
/verse Reference Bible by verse
|
||||||
|
|
||||||
|
Help:
|
||||||
|
/help Prints this help message; aliases: help, huh, welp
|
||||||
|
|
||||||
|
```
|
||||||
|
|||||||
BIN
assets/lyra-nightly.png
Normal file
BIN
assets/lyra-nightly.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 291 KiB |
@@ -1,6 +0,0 @@
|
|||||||
version: '2'
|
|
||||||
|
|
||||||
services:
|
|
||||||
melvinjs:
|
|
||||||
container_name: lyra
|
|
||||||
build: .
|
|
||||||
1
libs/poise
Submodule
1
libs/poise
Submodule
Submodule libs/poise added at 575025909b
1
libs/serenity
Submodule
1
libs/serenity
Submodule
Submodule libs/serenity added at 658b6a7261
1
libs/songbird
Submodule
1
libs/songbird
Submodule
Submodule libs/songbird added at 2d7dc29fd6
1906
libs/spotify-parser/Cargo.lock
generated
Normal file
1906
libs/spotify-parser/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
12
libs/spotify-parser/Cargo.toml
Normal file
12
libs/spotify-parser/Cargo.toml
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
[package]
|
||||||
|
name = "lib-spotify-parser"
|
||||||
|
version = "1.0.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
regex = "1.10.6"
|
||||||
|
reqwest = { version = "0.12.5", features = ["blocking", "rustls-tls"] }
|
||||||
|
scraper = "0.19.1"
|
||||||
|
serde = "1.0.204"
|
||||||
|
serde_json = "1.0.122"
|
||||||
|
tokio = { version = "1.39.2", features = ["macros"] }
|
||||||
14
libs/spotify-parser/src/error.rs
Normal file
14
libs/spotify-parser/src/error.rs
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
use std::fmt;
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum ParseError {
|
||||||
|
InvalidUrl,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for ParseError {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||||
|
write!(f, "Invalid URL")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::error::Error for ParseError {}
|
||||||
154
libs/spotify-parser/src/lib.rs
Normal file
154
libs/spotify-parser/src/lib.rs
Normal file
@@ -0,0 +1,154 @@
|
|||||||
|
mod error;
|
||||||
|
mod parser;
|
||||||
|
mod retriever;
|
||||||
|
|
||||||
|
use error::ParseError;
|
||||||
|
use parser::{parse_list, parse_single, USER_AGENT};
|
||||||
|
use regex::Regex;
|
||||||
|
use reqwest;
|
||||||
|
use retriever::{retrieve_async_track, retrieve_async_tracks, retrieve_track, retrieve_tracks};
|
||||||
|
|
||||||
|
pub fn retrieve_url(url: &str) -> Result<Vec<String>, ParseError> {
|
||||||
|
let spotify_regex: Regex = Regex::new(r"https?:\/\/(?:embed\.|open\.)spotify\.com\/(track|album|playlist)\/([a-zA-Z0-9]+)(?:\?si=[\w-]+)?").unwrap();
|
||||||
|
|
||||||
|
if let Some(captures) = spotify_regex.captures(url) {
|
||||||
|
let category = captures.get(1).unwrap().as_str();
|
||||||
|
let id = captures.get(2).unwrap().as_str();
|
||||||
|
|
||||||
|
match category {
|
||||||
|
"track" => {
|
||||||
|
let track = retrieve_track(category, id).unwrap();
|
||||||
|
Ok(vec![track])
|
||||||
|
}
|
||||||
|
"playlist" | "album" => {
|
||||||
|
let tracks = retrieve_tracks(category, id).unwrap();
|
||||||
|
Ok(tracks)
|
||||||
|
}
|
||||||
|
_ => Err(ParseError::InvalidUrl),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Err(ParseError::InvalidUrl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn retrieve_async_url(url: &str) -> Result<Vec<String>, ParseError> {
|
||||||
|
let spotify_regex: Regex = Regex::new(r"https?:\/\/(?:embed\.|open\.)spotify\.com\/(track|album|playlist)\/([a-zA-Z0-9]+)(?:\?si=[\w-]+)?").unwrap();
|
||||||
|
|
||||||
|
if let Some(captures) = spotify_regex.captures(url) {
|
||||||
|
let category = captures.get(1).unwrap().as_str();
|
||||||
|
let id = captures.get(2).unwrap().as_str();
|
||||||
|
|
||||||
|
match category {
|
||||||
|
"track" => {
|
||||||
|
let track = retrieve_async_track(category, id).await.unwrap();
|
||||||
|
Ok(vec![track])
|
||||||
|
}
|
||||||
|
"playlist" | "album" => {
|
||||||
|
let tracks = retrieve_async_tracks(category, id).await.unwrap();
|
||||||
|
Ok(tracks)
|
||||||
|
}
|
||||||
|
_ => Err(ParseError::InvalidUrl),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Err(ParseError::InvalidUrl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
const TRACK: &str = "https://open.spotify.com/track/4PTG3Z6ehGkBFwjybzWkR8?si=e0a8c8ada8284e43";
|
||||||
|
const MULTIPLE_ARTISTS_TRACK: &str =
|
||||||
|
"https://open.spotify.com/track/1O0SdrryPeGp6eSSUibdgo?si=4ae58febe9e74eae";
|
||||||
|
const PLAYLIST: &str =
|
||||||
|
"https://open.spotify.com/playlist/37i9dQZF1DZ06evO05tE88?si=e0c6f44d176f44e6";
|
||||||
|
const ALBUM: &str =
|
||||||
|
"https://open.spotify.com/album/6eUW0wxWtzkFdaEFsTJto6?si=_grLtlNySNyfJTZr8tP44Q";
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn check_track() {
|
||||||
|
let track: Vec<&str> = vec!["Rick Astley - Never Gonna Give You Up"];
|
||||||
|
assert_eq!(retrieve_url(TRACK).unwrap(), track);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn check_multiple_artists_track() {
|
||||||
|
let track: Vec<&str> = vec!["Will o' the wisp, Rick Astley - Blood on My Tie"];
|
||||||
|
assert_eq!(retrieve_url(MULTIPLE_ARTISTS_TRACK).unwrap(), track);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn check_playlist() {
|
||||||
|
let playlist: Vec<&str> = vec![
|
||||||
|
"Rick Astley - Never Gonna Give You Up",
|
||||||
|
"Rick Astley - Take Me to Your Heart (2023 Remaster)",
|
||||||
|
"Rick Astley - Cry for Help - Single Edit",
|
||||||
|
"Rick Astley - Never Gonna Stop",
|
||||||
|
"Rick Astley - Together Forever",
|
||||||
|
"Rick Astley - Hold Me in Your Arms (7\" Version)",
|
||||||
|
"Rick Astley - Angels on My Side",
|
||||||
|
"New Kids On The Block, Salt-N-Pepa, Rick Astley, En Vogue - Bring Back The Time",
|
||||||
|
"Rick Astley - Whenever You Need Somebody",
|
||||||
|
"Rick Astley - She Wants to Dance with Me (2023 Remaster)",
|
||||||
|
"Rick Astley - Dippin My Feet",
|
||||||
|
"Rick Astley - My Arms Keep Missing You",
|
||||||
|
"Rick Astley - Don't Say Goodbye",
|
||||||
|
"Rick Astley - Dance",
|
||||||
|
"Rick Astley - Giving Up On Love (7'' Pop Version)",
|
||||||
|
"Rick Astley - Never Gonna Give You Up (Cake Mix)",
|
||||||
|
"Rick Astley - It Would Take a Strong Strong Man",
|
||||||
|
"Rick Astley - Driving Me Crazy",
|
||||||
|
"Rick Astley - Beautiful Life",
|
||||||
|
"Rick Astley - I Don't Want to Lose Her",
|
||||||
|
"Rick Astley - Keep Singing",
|
||||||
|
"Rick Astley - Forever and More",
|
||||||
|
"Rick Astley - Hopelessly",
|
||||||
|
"Rick Astley - When I Fall in Love",
|
||||||
|
"Rick Astley - Every One of Us",
|
||||||
|
"Rick Astley - High Enough",
|
||||||
|
"Rick Astley - Ain't Too Proud to Beg (2023 Remaster)",
|
||||||
|
"Rick Astley - I'll Never Let You Down",
|
||||||
|
"Trevor Horn, Rick Astley - Owner Of A Lonely Heart",
|
||||||
|
"Rick Astley - Letting Go",
|
||||||
|
"Rick Astley - Never Knew Love",
|
||||||
|
"Rick Astley - Lights Out - Radio Edit",
|
||||||
|
"Rick Astley - Try",
|
||||||
|
"Rick Astley - Dial My Number (2023 Remaster)",
|
||||||
|
"Rick Astley - Wish Away",
|
||||||
|
"Rick Astley - Giant",
|
||||||
|
"Rick Astley - Move Right Out",
|
||||||
|
"Rick Astley - Till Then (Time Stands Still) (2023 Remaster)",
|
||||||
|
"Rick Astley - Pray with Me",
|
||||||
|
"Rick Astley - I Don't Want to Be Your Lover",
|
||||||
|
"Will o' the wisp, Rick Astley - Blood on My Tie",
|
||||||
|
"Rick Astley - Can't Help Falling in Love",
|
||||||
|
"Rick Astley - I Like the Sun",
|
||||||
|
"Rick Astley - She Makes Me",
|
||||||
|
"Rick Astley - Body and Soul",
|
||||||
|
"Rick Astley - (They Long to Be) Close to You",
|
||||||
|
"Rick Astley - Unwanted (Official Song from the Podcast)",
|
||||||
|
"Rick Astley - Last Night on Earth",
|
||||||
|
"Rick Astley - Everlong - Acoustic Version",
|
||||||
|
"Rick Astley - Superman",
|
||||||
|
];
|
||||||
|
assert_eq!(retrieve_url(PLAYLIST).unwrap(), playlist);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn check_album() {
|
||||||
|
let album: Vec<&str> = vec![
|
||||||
|
"Rick Astley - Never Gonna Give You Up",
|
||||||
|
"Rick Astley - Whenever You Need Somebody",
|
||||||
|
"Rick Astley - Together Forever",
|
||||||
|
"Rick Astley - It Would Take a Strong Strong Man",
|
||||||
|
"Rick Astley - The Love Has Gone",
|
||||||
|
"Rick Astley - Don't Say Goodbye",
|
||||||
|
"Rick Astley - Slipping Away",
|
||||||
|
"Rick Astley - No More Looking for Love",
|
||||||
|
"Rick Astley - You Move Me",
|
||||||
|
"Rick Astley - When I Fall in Love",
|
||||||
|
];
|
||||||
|
assert_eq!(retrieve_url(ALBUM).unwrap(), album);
|
||||||
|
}
|
||||||
|
}
|
||||||
70
libs/spotify-parser/src/parser.rs
Normal file
70
libs/spotify-parser/src/parser.rs
Normal file
@@ -0,0 +1,70 @@
|
|||||||
|
use scraper::{Html, Selector};
|
||||||
|
use serde_json::Value;
|
||||||
|
use std::error::Error;
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub(crate) struct SpotifyTrack {
|
||||||
|
pub title: String,
|
||||||
|
pub artist: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) const USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36";
|
||||||
|
|
||||||
|
pub(crate) fn parse_single(content: String) -> Result<SpotifyTrack, Box<dyn Error>> {
|
||||||
|
let document = Html::parse_document(&content);
|
||||||
|
let selector = Selector::parse("#__NEXT_DATA__").unwrap();
|
||||||
|
|
||||||
|
if let Some(script_element) = document.select(&selector).next() {
|
||||||
|
let json_str = script_element.inner_html();
|
||||||
|
let json_value: Value = serde_json::from_str(&json_str)?;
|
||||||
|
let metadata = &json_value["props"]["pageProps"]["state"]["data"]["entity"];
|
||||||
|
|
||||||
|
// println!("{metadata:?}");
|
||||||
|
|
||||||
|
let title = metadata["title"].as_str().unwrap().to_string();
|
||||||
|
|
||||||
|
let artists = metadata["artists"].as_array().unwrap();
|
||||||
|
let artists_list: Vec<String> = artists
|
||||||
|
.iter()
|
||||||
|
.map(|artist| artist["name"].as_str().unwrap().to_string())
|
||||||
|
.collect();
|
||||||
|
let artist: String = artists_list.join(", ").to_string();
|
||||||
|
|
||||||
|
let track = SpotifyTrack { title, artist };
|
||||||
|
|
||||||
|
Ok(track)
|
||||||
|
} else {
|
||||||
|
Err("Could not find element".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn parse_list(content: String) -> Result<Vec<SpotifyTrack>, Box<dyn Error>> {
|
||||||
|
let document = Html::parse_document(&content);
|
||||||
|
let selector = Selector::parse("#__NEXT_DATA__").unwrap();
|
||||||
|
|
||||||
|
if let Some(script_element) = document.select(&selector).next() {
|
||||||
|
let json_str = script_element.inner_html();
|
||||||
|
let json_value: Value = serde_json::from_str(&json_str)?;
|
||||||
|
let metadata = &json_value["props"]["pageProps"]["state"]["data"]["entity"]["trackList"]
|
||||||
|
.as_array()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
// println!("{metadata:?}");
|
||||||
|
|
||||||
|
let tracks: Vec<SpotifyTrack> = metadata
|
||||||
|
.iter()
|
||||||
|
.map(|track| {
|
||||||
|
let title = track["title"].as_str().unwrap().to_string();
|
||||||
|
let artist = track["subtitle"].as_str().unwrap().to_string();
|
||||||
|
|
||||||
|
SpotifyTrack { title, artist }
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
// println!("{tracks:?}");
|
||||||
|
|
||||||
|
Ok(tracks)
|
||||||
|
} else {
|
||||||
|
Err("Could not find element".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
85
libs/spotify-parser/src/retriever.rs
Normal file
85
libs/spotify-parser/src/retriever.rs
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
use crate::*;
|
||||||
|
|
||||||
|
pub fn retrieve_track(category: &str, id: &str) -> Result<String, String> {
|
||||||
|
let embed_url = format!("https://embed.spotify.com/?uri=spotify:{}:{}", category, id);
|
||||||
|
|
||||||
|
let client = reqwest::blocking::Client::builder()
|
||||||
|
.use_rustls_tls()
|
||||||
|
.user_agent(USER_AGENT)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let response = client.get(&embed_url).send().unwrap();
|
||||||
|
let content = response.text().unwrap();
|
||||||
|
|
||||||
|
let parsed_content = parse_single(content).unwrap();
|
||||||
|
|
||||||
|
Ok(format!(
|
||||||
|
"{} - {}",
|
||||||
|
parsed_content.artist, parsed_content.title
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn retrieve_tracks(category: &str, id: &str) -> Result<Vec<String>, String> {
|
||||||
|
let embed_url = format!("https://embed.spotify.com/?uri=spotify:{}:{}", category, id);
|
||||||
|
|
||||||
|
let client = reqwest::blocking::Client::builder()
|
||||||
|
.use_rustls_tls()
|
||||||
|
.user_agent(USER_AGENT)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let response = client.get(&embed_url).send().unwrap();
|
||||||
|
let content = response.text().unwrap();
|
||||||
|
|
||||||
|
let parsed_content = parse_list(content).unwrap();
|
||||||
|
|
||||||
|
let tracks: Vec<String> = parsed_content
|
||||||
|
.iter()
|
||||||
|
.map(|track| format!("{} - {}", track.artist, track.title))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(tracks)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn retrieve_async_track(category: &str, id: &str) -> Result<String, String> {
|
||||||
|
let embed_url = format!("https://embed.spotify.com/?uri=spotify:{}:{}", category, id);
|
||||||
|
|
||||||
|
let client = reqwest::Client::builder()
|
||||||
|
.use_rustls_tls()
|
||||||
|
.user_agent(USER_AGENT)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let response = client.get(&embed_url).send().await.unwrap();
|
||||||
|
let content = response.text().await.unwrap();
|
||||||
|
|
||||||
|
let parsed_content = parse_single(content).unwrap();
|
||||||
|
|
||||||
|
Ok(format!(
|
||||||
|
"{} - {}",
|
||||||
|
parsed_content.artist, parsed_content.title
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn retrieve_async_tracks(category: &str, id: &str) -> Result<Vec<String>, String> {
|
||||||
|
let embed_url = format!("https://embed.spotify.com/?uri=spotify:{}:{}", category, id);
|
||||||
|
|
||||||
|
let client = reqwest::Client::builder()
|
||||||
|
.use_rustls_tls()
|
||||||
|
.user_agent(USER_AGENT)
|
||||||
|
.build()
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let response = client.get(&embed_url).send().await.unwrap();
|
||||||
|
let content = response.text().await.unwrap();
|
||||||
|
|
||||||
|
let parsed_content = parse_list(content).unwrap();
|
||||||
|
|
||||||
|
let tracks: Vec<String> = parsed_content
|
||||||
|
.iter()
|
||||||
|
.map(|track| format!("{} - {}", track.artist, track.title))
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
Ok(tracks)
|
||||||
|
}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
nohup ../lyra > lyra.log 2> lyra.err < /dev/null &
|
nohup ./lyra > lyra.log 2> lyra.err < /dev/null &
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
use crate::{Context, Error};
|
use crate::{Context, Error};
|
||||||
|
|
||||||
use poise::serenity_prelude::CreateEmbed;
|
use poise::serenity_prelude::{
|
||||||
use poise::CreateReply;
|
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||||
use serenity::{
|
|
||||||
builder::{CreateEmbedAuthor, CreateEmbedFooter},
|
|
||||||
model::{Colour, Timestamp},
|
|
||||||
};
|
};
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
pub async fn fail(ctx: Context<'_>, err: String) -> Result<(), Error> {
|
pub async fn fail(ctx: Context<'_>, err: String) -> Result<(), Error> {
|
||||||
ctx.send(
|
ctx.send(
|
||||||
@@ -25,7 +23,7 @@ pub async fn error_embed(ctx: Context<'_>, msg: &str) -> Result<CreateEmbed, Err
|
|||||||
.author(
|
.author(
|
||||||
CreateEmbedAuthor::new("Something went wrong!").icon_url(ctx.author().clone().face()),
|
CreateEmbedAuthor::new("Something went wrong!").icon_url(ctx.author().clone().face()),
|
||||||
)
|
)
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
.title("Oopsie, Doopsie!")
|
.title("Oopsie, Doopsie!")
|
||||||
.description(msg)
|
.description(msg)
|
||||||
.timestamp(Timestamp::now())
|
.timestamp(Timestamp::now())
|
||||||
@@ -45,7 +43,7 @@ pub async fn embed(
|
|||||||
) -> Result<CreateEmbed, Error> {
|
) -> Result<CreateEmbed, Error> {
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new(author).icon_url(ctx.author().clone().face()))
|
.author(CreateEmbedAuthor::new(author).icon_url(ctx.author().clone().face()))
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
.title(title)
|
.title(title)
|
||||||
.description(description)
|
.description(description)
|
||||||
.timestamp(Timestamp::now())
|
.timestamp(Timestamp::now())
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ pub mod queue;
|
|||||||
pub mod repeat;
|
pub mod repeat;
|
||||||
pub mod resume;
|
pub mod resume;
|
||||||
pub mod seek;
|
pub mod seek;
|
||||||
pub mod shuffle;
|
|
||||||
pub mod skip;
|
pub mod skip;
|
||||||
pub mod soundboard;
|
pub mod soundboard;
|
||||||
pub mod stop;
|
pub mod stop;
|
||||||
@@ -26,7 +25,6 @@ pub use queue::queue;
|
|||||||
pub use repeat::repeat;
|
pub use repeat::repeat;
|
||||||
pub use resume::resume;
|
pub use resume::resume;
|
||||||
pub use seek::seek;
|
pub use seek::seek;
|
||||||
pub use shuffle::shuffle;
|
|
||||||
pub use skip::skip;
|
pub use skip::skip;
|
||||||
pub use stop::stop;
|
pub use stop::stop;
|
||||||
pub use volume::volume;
|
pub use volume::volume;
|
||||||
|
|||||||
@@ -2,13 +2,12 @@ use crate::commands::music::metadata::Metadata;
|
|||||||
use crate::{commands::embeds::error_embed, Context, Error};
|
use crate::{commands::embeds::error_embed, Context, Error};
|
||||||
|
|
||||||
use fancy_regex::Regex;
|
use fancy_regex::Regex;
|
||||||
use poise::serenity_prelude::model::Timestamp;
|
use lib_spotify_parser;
|
||||||
use poise::serenity_prelude::Colour;
|
use poise::serenity_prelude::{
|
||||||
use poise::serenity_prelude::CreateEmbed;
|
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
use regex::Regex as Regex_Classic;
|
use regex::Regex as Regex_Classic;
|
||||||
use serenity::builder::CreateEmbedAuthor;
|
|
||||||
use serenity::builder::CreateEmbedFooter;
|
|
||||||
use songbird::events::TrackEvent;
|
use songbird::events::TrackEvent;
|
||||||
use songbird::input::AuxMetadata;
|
use songbird::input::AuxMetadata;
|
||||||
use songbird::input::{Compose, YoutubeDl};
|
use songbird::input::{Compose, YoutubeDl};
|
||||||
@@ -87,14 +86,7 @@ pub async fn play(
|
|||||||
handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
|
handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
|
||||||
|
|
||||||
if is_playlist && is_spotify {
|
if is_playlist && is_spotify {
|
||||||
let raw_list = Command::new("node")
|
let tracks: Vec<String> = lib_spotify_parser::retrieve_async_url(&song).await.unwrap();
|
||||||
.args(["./src/spotify-parser", &song])
|
|
||||||
.output()
|
|
||||||
.expect("failed to execute process")
|
|
||||||
.stdout;
|
|
||||||
let list = String::from_utf8(raw_list.clone()).expect("Invalid UTF-8");
|
|
||||||
|
|
||||||
let tracks: Vec<String> = list.split("\n").map(str::to_string).collect();
|
|
||||||
|
|
||||||
for (index, url) in tracks.clone().iter().enumerate() {
|
for (index, url) in tracks.clone().iter().enumerate() {
|
||||||
if url.is_empty() {
|
if url.is_empty() {
|
||||||
@@ -161,13 +153,14 @@ pub async fn play(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if is_spotify {
|
if is_spotify {
|
||||||
let query = Command::new("node")
|
song = format!(
|
||||||
.args(["./src/spotify-parser", &song])
|
"ytsearch:{}",
|
||||||
.output()
|
lib_spotify_parser::retrieve_async_url(&song)
|
||||||
.expect("failed to execute process")
|
.await
|
||||||
.stdout;
|
.unwrap()
|
||||||
let query_str = String::from_utf8(query.clone()).expect("Invalid UTF-8");
|
.first()
|
||||||
song = format!("ytsearch:{}", query_str.to_string());
|
.unwrap()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if is_query {
|
if is_query {
|
||||||
@@ -217,7 +210,7 @@ async fn generate_embed(
|
|||||||
|
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new("Track enqueued").icon_url(ctx.author().clone().face()))
|
.author(CreateEmbedAuthor::new("Track enqueued").icon_url(ctx.author().clone().face()))
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
.title(title.unwrap())
|
.title(title.unwrap())
|
||||||
.url(source_url.unwrap())
|
.url(source_url.unwrap())
|
||||||
.thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
|
.thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
|
||||||
@@ -265,7 +258,7 @@ async fn generate_playlist_embed(
|
|||||||
|
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new("Playlist enqueued").icon_url(ctx.author().clone().face()))
|
.author(CreateEmbedAuthor::new("Playlist enqueued").icon_url(ctx.author().clone().face()))
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
.title(title.as_ref().unwrap())
|
.title(title.as_ref().unwrap())
|
||||||
.url(source_url.as_ref().unwrap())
|
.url(source_url.as_ref().unwrap())
|
||||||
.thumbnail(
|
.thumbnail(
|
||||||
|
|||||||
@@ -2,12 +2,10 @@ use std::time::Duration;
|
|||||||
|
|
||||||
use crate::commands::music::metadata::Metadata;
|
use crate::commands::music::metadata::Metadata;
|
||||||
use crate::{commands::embeds::error_embed, Context, Error};
|
use crate::{commands::embeds::error_embed, Context, Error};
|
||||||
use poise::serenity_prelude::CreateEmbed;
|
use poise::serenity_prelude::{
|
||||||
use poise::CreateReply;
|
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||||
use serenity::{
|
|
||||||
builder::{CreateEmbedAuthor, CreateEmbedFooter},
|
|
||||||
model::{Colour, Timestamp},
|
|
||||||
};
|
};
|
||||||
|
use poise::CreateReply;
|
||||||
use songbird::input::AuxMetadata;
|
use songbird::input::AuxMetadata;
|
||||||
|
|
||||||
const QUEUE_DISPLAY_LENGTH: usize = 10;
|
const QUEUE_DISPLAY_LENGTH: usize = 10;
|
||||||
@@ -80,7 +78,7 @@ async fn embed(ctx: Context<'_>, queue: String) -> Result<CreateEmbed, Error> {
|
|||||||
|
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new("Queue").icon_url(ctx.author().clone().face()))
|
.author(CreateEmbedAuthor::new("Queue").icon_url(ctx.author().clone().face()))
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
.title(title)
|
.title(title)
|
||||||
.description(queue)
|
.description(queue)
|
||||||
.timestamp(timestamp)
|
.timestamp(timestamp)
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ pub async fn resume(ctx: Context<'_>) -> Result<(), Error> {
|
|||||||
let queue = handler.queue();
|
let queue = handler.queue();
|
||||||
let _ = queue.resume();
|
let _ = queue.resume();
|
||||||
|
|
||||||
ctx.say(format!("Song resumed.")).await?;
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(
|
CreateReply::default().embed(
|
||||||
embed(ctx, "Resumed!", "Currently paused song is now resumed!", "")
|
embed(ctx, "Resumed!", "Currently paused song is now resumed!", "")
|
||||||
|
|||||||
@@ -1,11 +1,51 @@
|
|||||||
use crate::{commands::embeds::embed, Context, Error};
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Seeks a track by provided seconds
|
/// Seeks a track by provided seconds
|
||||||
#[poise::command(prefix_command, slash_command, category = "Music")]
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
pub async fn seek(ctx: Context<'_>) -> Result<(), Error> {
|
pub async fn seek(
|
||||||
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
ctx: Context<'_>,
|
||||||
|
#[description = "How many seconds shall I seek"] seek: u64,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
|
.await
|
||||||
|
.expect("Songbird client placed at init")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
if let Some(handler_lock) = manager.get(guild_id) {
|
||||||
|
let handler = handler_lock.lock().await;
|
||||||
|
let queue = handler.queue();
|
||||||
|
|
||||||
|
let seek_duration = Duration::from_secs(seek);
|
||||||
|
|
||||||
|
let track = queue.current().unwrap();
|
||||||
|
let _ = track.seek(seek_duration);
|
||||||
|
|
||||||
|
ctx.send(
|
||||||
|
CreateReply::default().embed(
|
||||||
|
embed(
|
||||||
|
ctx,
|
||||||
|
"Track seeked!",
|
||||||
|
&format!("Track seeked by: {} seconds", seek),
|
||||||
|
"",
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
} else {
|
||||||
|
let msg = "I am not in a voice channel!";
|
||||||
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
use crate::{commands::embeds::embed, Context, Error};
|
|
||||||
use poise::CreateReply;
|
|
||||||
|
|
||||||
/// Shuffles the playlist
|
|
||||||
#[poise::command(prefix_command, slash_command, category = "Music")]
|
|
||||||
pub async fn shuffle(ctx: Context<'_>) -> Result<(), Error> {
|
|
||||||
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
@@ -5,15 +5,15 @@ use crate::{
|
|||||||
commands::embeds::{embed, error_embed},
|
commands::embeds::{embed, error_embed},
|
||||||
Context, Error,
|
Context, Error,
|
||||||
};
|
};
|
||||||
use poise::CreateReply;
|
use poise::serenity_prelude::{
|
||||||
use serenity::{
|
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||||
builder::{CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter},
|
|
||||||
model::{Colour, Timestamp},
|
|
||||||
};
|
};
|
||||||
|
use poise::CreateReply;
|
||||||
use songbird::{input::AuxMetadata, tracks::TrackHandle};
|
use songbird::{input::AuxMetadata, tracks::TrackHandle};
|
||||||
|
|
||||||
/// Skips the currently playing song
|
/// Skips the currently playing song; \
|
||||||
#[poise::command(prefix_command, slash_command, category = "Music")]
|
/// aliases: skip, :skipper:
|
||||||
|
#[poise::command(prefix_command, slash_command, aliases("skipper:"), category = "Music")]
|
||||||
pub async fn skip(ctx: Context<'_>) -> Result<(), Error> {
|
pub async fn skip(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
let guild_id = ctx.guild_id().unwrap();
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ async fn generate_embed(
|
|||||||
|
|
||||||
let embed = CreateEmbed::default()
|
let embed = CreateEmbed::default()
|
||||||
.author(CreateEmbedAuthor::new("Skipped!").icon_url(ctx.author().clone().face()))
|
.author(CreateEmbedAuthor::new("Skipped!").icon_url(ctx.author().clone().face()))
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
.title(title.as_ref().unwrap())
|
.title(title.as_ref().unwrap())
|
||||||
.url(source_url.as_ref().unwrap())
|
.url(source_url.as_ref().unwrap())
|
||||||
.thumbnail(
|
.thumbnail(
|
||||||
|
|||||||
@@ -1,11 +1,115 @@
|
|||||||
use crate::{commands::embeds::embed, Context, Error};
|
use crate::{commands::embeds::error_embed, Context, Error};
|
||||||
|
|
||||||
|
use poise::serenity_prelude::{
|
||||||
|
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
use songbird::events::TrackEvent;
|
||||||
|
use songbird::input::AuxMetadata;
|
||||||
|
use songbird::input::{Compose, YoutubeDl};
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use crate::commands::music::notifier::TrackErrorNotifier;
|
||||||
|
use crate::http::HttpKey;
|
||||||
|
|
||||||
/// Plays one of available audio effects
|
/// Plays one of available audio effects
|
||||||
#[poise::command(prefix_command, slash_command, category = "Music")]
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
pub async fn effect(ctx: Context<'_>) -> Result<(), Error> {
|
pub async fn effect(
|
||||||
ctx.send(CreateReply::default().embed(embed(ctx, "Playing an effect", "", "").await.unwrap()))
|
ctx: Context<'_>,
|
||||||
.await?;
|
#[description = "Shall output pause?"]
|
||||||
|
#[flag]
|
||||||
|
pause: bool,
|
||||||
|
#[description = "Provide a query or an url"]
|
||||||
|
#[rest]
|
||||||
|
mut song: String,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let is_query = !song.starts_with("http");
|
||||||
|
|
||||||
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
|
let http_client = {
|
||||||
|
let data = ctx.serenity_context().data.read().await;
|
||||||
|
data.get::<HttpKey>()
|
||||||
|
.cloned()
|
||||||
|
.expect("Guaranteed to exist in the typemap.")
|
||||||
|
};
|
||||||
|
|
||||||
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
|
.await
|
||||||
|
.expect("Songbird Voice placed at init")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
if pause {
|
||||||
|
if let Some(handler_lock) = manager.get(guild_id) {
|
||||||
|
let handler = handler_lock.lock().await;
|
||||||
|
let queue = handler.queue();
|
||||||
|
let _ = queue.pause();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(handler_lock) = manager.get(guild_id) {
|
||||||
|
let mut handler = handler_lock.lock().await;
|
||||||
|
|
||||||
|
handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
|
||||||
|
|
||||||
|
if is_query {
|
||||||
|
song = format!("ytsearch:{}", song);
|
||||||
|
}
|
||||||
|
|
||||||
|
let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client, song);
|
||||||
|
let embed = generate_embed(ctx, src.clone()).await;
|
||||||
|
let response = CreateReply::default().embed(embed.unwrap());
|
||||||
|
ctx.send(response).await?;
|
||||||
|
|
||||||
|
let _ = handler.play_input(src.clone().into());
|
||||||
|
} else {
|
||||||
|
let msg = "I am not in a voice channel!";
|
||||||
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn generate_embed(ctx: Context<'_>, src: YoutubeDl) -> Result<CreateEmbed, Error> {
|
||||||
|
let metadata = src.clone().aux_metadata().await.unwrap();
|
||||||
|
let AuxMetadata {
|
||||||
|
title,
|
||||||
|
thumbnail,
|
||||||
|
source_url,
|
||||||
|
artist,
|
||||||
|
duration,
|
||||||
|
..
|
||||||
|
} = metadata;
|
||||||
|
let timestamp = Timestamp::now();
|
||||||
|
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
||||||
|
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
||||||
|
|
||||||
|
let description = format!("Playing now!");
|
||||||
|
|
||||||
|
let embed = CreateEmbed::default()
|
||||||
|
.author(CreateEmbedAuthor::new("Playing an effect!").icon_url(ctx.author().clone().face()))
|
||||||
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
|
.title(title.unwrap())
|
||||||
|
.url(source_url.unwrap())
|
||||||
|
.thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
|
||||||
|
.field(
|
||||||
|
"Artist",
|
||||||
|
artist.unwrap_or("Unknown Artist".to_string()),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.field(
|
||||||
|
"Duration",
|
||||||
|
format!("{:02}:{:02}", duration_minutes, duration_seconds),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.field("DJ", ctx.author().name.clone(), true)
|
||||||
|
.description(description)
|
||||||
|
.timestamp(timestamp)
|
||||||
|
.footer(
|
||||||
|
CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
|
||||||
|
.icon_url(ctx.cache().current_user().face()),
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(embed)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,11 +1,124 @@
|
|||||||
use crate::{commands::embeds::embed, Context, Error};
|
use crate::{commands::embeds::error_embed, Context, Error};
|
||||||
use poise::CreateReply;
|
|
||||||
|
|
||||||
/// Hijacks current audio output and plays selected audio
|
use poise::serenity_prelude::{
|
||||||
#[poise::command(prefix_command, slash_command, aliases("override"), category = "Music")]
|
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||||
pub async fn stream(ctx: Context<'_>) -> Result<(), Error> {
|
};
|
||||||
ctx.send(CreateReply::default().embed(embed(ctx, "Playing audio", "", "").await.unwrap()))
|
use poise::CreateReply;
|
||||||
.await?;
|
use songbird::events::TrackEvent;
|
||||||
|
use songbird::input::AuxMetadata;
|
||||||
|
use songbird::input::{Compose, YoutubeDl};
|
||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use crate::commands::music::notifier::TrackErrorNotifier;
|
||||||
|
use crate::http::HttpKey;
|
||||||
|
|
||||||
|
/// Hijacks output and plays audio; \
|
||||||
|
/// search by query or paste an url; \
|
||||||
|
/// aliases: stream, override, hijack
|
||||||
|
#[poise::command(
|
||||||
|
prefix_command,
|
||||||
|
slash_command,
|
||||||
|
aliases("override", "hijack"),
|
||||||
|
category = "Music"
|
||||||
|
)]
|
||||||
|
pub async fn stream(
|
||||||
|
ctx: Context<'_>,
|
||||||
|
#[description = "Shall output pause?"]
|
||||||
|
#[flag]
|
||||||
|
pause: bool,
|
||||||
|
#[description = "Provide a query or an url"]
|
||||||
|
#[rest]
|
||||||
|
mut song: String,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let is_query = !song.starts_with("http");
|
||||||
|
|
||||||
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
|
let http_client = {
|
||||||
|
let data = ctx.serenity_context().data.read().await;
|
||||||
|
data.get::<HttpKey>()
|
||||||
|
.cloned()
|
||||||
|
.expect("Guaranteed to exist in the typemap.")
|
||||||
|
};
|
||||||
|
|
||||||
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
|
.await
|
||||||
|
.expect("Songbird Voice placed at init")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
if pause {
|
||||||
|
if let Some(handler_lock) = manager.get(guild_id) {
|
||||||
|
let handler = handler_lock.lock().await;
|
||||||
|
let queue = handler.queue();
|
||||||
|
let _ = queue.pause();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(handler_lock) = manager.get(guild_id) {
|
||||||
|
let mut handler = handler_lock.lock().await;
|
||||||
|
|
||||||
|
handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
|
||||||
|
|
||||||
|
if is_query {
|
||||||
|
song = format!("ytsearch:{}", song);
|
||||||
|
}
|
||||||
|
|
||||||
|
let src = YoutubeDl::new_ytdl_like("yt-dlp", http_client, song);
|
||||||
|
let embed = generate_embed(ctx, src.clone()).await;
|
||||||
|
let response = CreateReply::default().embed(embed.unwrap());
|
||||||
|
ctx.send(response).await?;
|
||||||
|
|
||||||
|
let _ = handler.play_input(src.clone().into());
|
||||||
|
} else {
|
||||||
|
let msg = "I am not in a voice channel!";
|
||||||
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn generate_embed(ctx: Context<'_>, src: YoutubeDl) -> Result<CreateEmbed, Error> {
|
||||||
|
let metadata = src.clone().aux_metadata().await.unwrap();
|
||||||
|
let AuxMetadata {
|
||||||
|
title,
|
||||||
|
thumbnail,
|
||||||
|
source_url,
|
||||||
|
artist,
|
||||||
|
duration,
|
||||||
|
..
|
||||||
|
} = metadata;
|
||||||
|
let timestamp = Timestamp::now();
|
||||||
|
let duration_minutes = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() / 60;
|
||||||
|
let duration_seconds = duration.unwrap_or(Duration::new(0, 0)).clone().as_secs() % 60;
|
||||||
|
|
||||||
|
let description = format!("Playing now!");
|
||||||
|
|
||||||
|
let embed = CreateEmbed::default()
|
||||||
|
.author(
|
||||||
|
CreateEmbedAuthor::new("Audio output hijacked!").icon_url(ctx.author().clone().face()),
|
||||||
|
)
|
||||||
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
|
.title(title.unwrap())
|
||||||
|
.url(source_url.unwrap())
|
||||||
|
.thumbnail(thumbnail.unwrap_or(ctx.cache().current_user().face()))
|
||||||
|
.field(
|
||||||
|
"Artist",
|
||||||
|
artist.unwrap_or("Unknown Artist".to_string()),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.field(
|
||||||
|
"Duration",
|
||||||
|
format!("{:02}:{:02}", duration_minutes, duration_seconds),
|
||||||
|
true,
|
||||||
|
)
|
||||||
|
.field("DJ", ctx.author().name.clone(), true)
|
||||||
|
.description(description)
|
||||||
|
.timestamp(timestamp)
|
||||||
|
.footer(
|
||||||
|
CreateEmbedFooter::new(ctx.cache().current_user().name.to_string())
|
||||||
|
.icon_url(ctx.cache().current_user().face()),
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(embed)
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,11 +1,44 @@
|
|||||||
use crate::{commands::embeds::embed, Context, Error};
|
use crate::{
|
||||||
|
commands::embeds::{embed, error_embed},
|
||||||
|
Context, Error,
|
||||||
|
};
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
/// Changes output volume
|
/// Changes output volume
|
||||||
#[poise::command(prefix_command, slash_command, category = "Music")]
|
#[poise::command(prefix_command, slash_command, category = "Music")]
|
||||||
pub async fn volume(ctx: Context<'_>) -> Result<(), Error> {
|
pub async fn volume(ctx: Context<'_>, #[description = "Volume"] volume: f32) -> Result<(), Error> {
|
||||||
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
let guild_id = ctx.guild_id().unwrap();
|
||||||
|
|
||||||
|
let manager = songbird::get(&ctx.serenity_context())
|
||||||
|
.await
|
||||||
|
.expect("Songbird client placed at init")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
if let Some(handler_lock) = manager.get(guild_id) {
|
||||||
|
let handler = handler_lock.lock().await;
|
||||||
|
let queue = handler.queue();
|
||||||
|
|
||||||
|
let track = queue.current().unwrap();
|
||||||
|
let _ = track.set_volume(volume / 100.0);
|
||||||
|
|
||||||
|
ctx.send(
|
||||||
|
CreateReply::default().embed(
|
||||||
|
embed(
|
||||||
|
ctx,
|
||||||
|
"Volume changed",
|
||||||
|
"",
|
||||||
|
&format!("Set volume to {}%", volume),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.unwrap(),
|
||||||
|
),
|
||||||
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
} else {
|
||||||
|
let msg = "I am not in a voice channel!";
|
||||||
|
ctx.send(CreateReply::default().embed(error_embed(ctx, msg).await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ pub mod posix;
|
|||||||
pub mod qr;
|
pub mod qr;
|
||||||
pub mod register;
|
pub mod register;
|
||||||
pub mod taf;
|
pub mod taf;
|
||||||
// pub mod uptime;
|
pub mod uptime;
|
||||||
pub mod verse;
|
pub mod verse;
|
||||||
pub mod weather;
|
pub mod weather;
|
||||||
|
|
||||||
@@ -26,6 +26,6 @@ pub use posix::posix;
|
|||||||
pub use qr::qr;
|
pub use qr::qr;
|
||||||
pub use register::register;
|
pub use register::register;
|
||||||
pub use taf::taf;
|
pub use taf::taf;
|
||||||
// pub use uptime::uptime;
|
pub use uptime::uptime;
|
||||||
pub use verse::verse;
|
pub use verse::verse;
|
||||||
pub use weather::weather;
|
pub use weather::weather;
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ pub async fn ai(
|
|||||||
response = rng.gen_range(0..iamsorry.len());
|
response = rng.gen_range(0..iamsorry.len());
|
||||||
};
|
};
|
||||||
|
|
||||||
sleep(Duration::from_secs(3));
|
sleep(Duration::from_secs(1));
|
||||||
|
|
||||||
ctx.send(
|
ctx.send(
|
||||||
CreateReply::default().embed(
|
CreateReply::default().embed(
|
||||||
|
|||||||
@@ -1,12 +1,72 @@
|
|||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use url::form_urlencoded;
|
||||||
|
|
||||||
use crate::{commands::embeds::embed, Context, Error};
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
/// Explains provided query
|
/// Explains provided query
|
||||||
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
#[poise::command(prefix_command, slash_command, aliases("dict"), category = "Tools")]
|
||||||
pub async fn dictionary(ctx: Context<'_>) -> Result<(), Error> {
|
pub async fn dictionary(
|
||||||
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
ctx: Context<'_>,
|
||||||
.await?;
|
#[description = "Word you're looking for"]
|
||||||
|
#[rest]
|
||||||
|
word: String,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let data: String = form_urlencoded::byte_serialize(word.as_bytes()).collect();
|
||||||
|
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
let response = client
|
||||||
|
.get(format!(
|
||||||
|
"https://api.dictionaryapi.dev/api/v2/entries/en/{}",
|
||||||
|
data
|
||||||
|
))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
match response.status() {
|
||||||
|
reqwest::StatusCode::OK => match response.json::<Vec<Word>>().await {
|
||||||
|
Ok(parsed) => {
|
||||||
|
println!("{:?}", parsed);
|
||||||
|
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
Err(err) => println!("Something is messed up! {:?}", err),
|
||||||
|
},
|
||||||
|
reqwest::StatusCode::UNAUTHORIZED => {
|
||||||
|
println!("Unauthorized.. Uoops!!");
|
||||||
|
}
|
||||||
|
error => {
|
||||||
|
println!("Something went wrong: {:?}", error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
struct Definition {
|
||||||
|
definition: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(non_snake_case)]
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
struct Meaning {
|
||||||
|
partOfSpeech: String,
|
||||||
|
definitions: Vec<Definition>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(non_snake_case)]
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
struct Phonetic {
|
||||||
|
text: Option<String>,
|
||||||
|
audio: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Debug)]
|
||||||
|
struct Word {
|
||||||
|
word: String,
|
||||||
|
phonetics: Vec<Phonetic>,
|
||||||
|
meanings: Vec<Meaning>,
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
|
use owoify::OwOifiable;
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
|
||||||
use crate::{commands::embeds::embed, Context, Error};
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
/// Owoifies whatever you want uwu
|
/// Owoifies whatever you want uwu
|
||||||
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
pub async fn owoify(ctx: Context<'_>) -> Result<(), Error> {
|
pub async fn owoify(
|
||||||
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap()))
|
ctx: Context<'_>,
|
||||||
|
#[description = "Text to owoify w-woify OwO"]
|
||||||
|
#[rest]
|
||||||
|
text: String,
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "OwO", &text.owoify(), "").await.unwrap()))
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
use poise::CreateReply;
|
use poise::serenity_prelude::{
|
||||||
use serenity::{
|
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||||
builder::{CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter},
|
|
||||||
model::{Colour, Timestamp},
|
|
||||||
};
|
};
|
||||||
|
use poise::CreateReply;
|
||||||
|
|
||||||
use crate::{Context, Error};
|
use crate::{Context, Error};
|
||||||
use url::form_urlencoded;
|
use url::form_urlencoded;
|
||||||
@@ -34,7 +33,7 @@ async fn generate_embed(ctx: Context<'_>, message: String) -> Result<CreateEmbed
|
|||||||
CreateEmbedAuthor::new("Your message as a QR Code!")
|
CreateEmbedAuthor::new("Your message as a QR Code!")
|
||||||
.icon_url(ctx.author().clone().face()),
|
.icon_url(ctx.author().clone().face()),
|
||||||
)
|
)
|
||||||
.colour(Colour::from_rgb(255, 58, 97))
|
.colour(Color::from_rgb(255, 58, 97))
|
||||||
.title("Your QR Code:")
|
.title("Your QR Code:")
|
||||||
.url(url.clone())
|
.url(url.clone())
|
||||||
.image(url)
|
.image(url)
|
||||||
|
|||||||
@@ -1,35 +1,48 @@
|
|||||||
|
use once_cell::sync::Lazy;
|
||||||
use poise::CreateReply;
|
use poise::CreateReply;
|
||||||
|
use std::sync::Mutex;
|
||||||
|
|
||||||
use crate::{commands::embeds::embed, Context, Error};
|
use crate::{commands::embeds::embed, Context, Error};
|
||||||
|
|
||||||
// Currently unable to get information on how long the thread was running.
|
pub static PROCESS_UPTIME: Lazy<Mutex<std::time::SystemTime>> =
|
||||||
const PROCESS_UPTIME: i64 = 1000;
|
Lazy::new(|| Mutex::new(std::time::SystemTime::now()));
|
||||||
|
|
||||||
/// Checks how long the bot has been running
|
/// Checks how long the bot has been running
|
||||||
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
#[poise::command(prefix_command, slash_command, category = "Tools")]
|
||||||
pub async fn uptime(ctx: Context<'_>) -> Result<(), Error> {
|
pub async fn uptime(ctx: Context<'_>) -> Result<(), Error> {
|
||||||
let uptime = PROCESS_UPTIME;
|
let start = *PROCESS_UPTIME.lock().unwrap();
|
||||||
let days = uptime / (24 * 60 * 60);
|
let uptime = std::time::SystemTime::now().duration_since(start).unwrap();
|
||||||
let hours = (uptime % (24 * 60 * 60)) / 3600;
|
|
||||||
let minutes = (uptime % 60 * 60) / 60;
|
|
||||||
let seconds = uptime % 60;
|
|
||||||
|
|
||||||
ctx.send(
|
let (days, hours, minutes, seconds) = (
|
||||||
CreateReply::default().embed(
|
uptime.as_secs() / 86400,
|
||||||
embed(
|
(uptime.as_secs() / 3600) % 24,
|
||||||
ctx,
|
(uptime.as_secs() / 60) % 60,
|
||||||
"I have been up and awake for",
|
uptime.as_secs() % 60,
|
||||||
&format!("{} seconds", uptime),
|
);
|
||||||
&format!(
|
|
||||||
"{} days, {} hours, {} minutes and {} seconds",
|
let mut message = format!(
|
||||||
days, hours, minutes, seconds
|
"I have been awake for {} days, {} hours, {} minutes and {} seconds!",
|
||||||
),
|
days, hours, minutes, seconds
|
||||||
)
|
);
|
||||||
.await
|
|
||||||
.unwrap(),
|
if days != 0 {
|
||||||
),
|
message = format!("I have been awake for {} days!", days);
|
||||||
)
|
}
|
||||||
.await?;
|
|
||||||
|
if days == 0 && hours != 0 {
|
||||||
|
message = format!("I have been awake for {} hours!", hours);
|
||||||
|
}
|
||||||
|
|
||||||
|
if days == 0 && hours == 0 && minutes != 0 {
|
||||||
|
message = format!("I have been awake for {} minutes!", minutes);
|
||||||
|
}
|
||||||
|
|
||||||
|
if days == 0 && hours == 0 && minutes == 0 && seconds != 0 {
|
||||||
|
message = format!("I have been awake for {} seconds!", seconds);
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.send(CreateReply::default().embed(embed(ctx, "Uptime", "", &message).await.unwrap()))
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
16
src/main.rs
16
src/main.rs
@@ -1,3 +1,4 @@
|
|||||||
|
use commands::tools::uptime::PROCESS_UPTIME;
|
||||||
use poise::serenity_prelude::{self as serenity, ActivityData};
|
use poise::serenity_prelude::{self as serenity, ActivityData};
|
||||||
use reqwest::Client as HttpClient;
|
use reqwest::Client as HttpClient;
|
||||||
use songbird::SerenityInit;
|
use songbird::SerenityInit;
|
||||||
@@ -37,6 +38,8 @@ async fn main() {
|
|||||||
tracing_subscriber::fmt::init();
|
tracing_subscriber::fmt::init();
|
||||||
dotenv::dotenv().expect("Failed to load .env file.");
|
dotenv::dotenv().expect("Failed to load .env file.");
|
||||||
|
|
||||||
|
let _ = *PROCESS_UPTIME.lock().unwrap();
|
||||||
|
|
||||||
let token =
|
let token =
|
||||||
std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
|
std::env::var("DISCORD_TOKEN").expect("Environment variable `DISCORD_TOKEN` not found!");
|
||||||
let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
|
let prefix = std::env::var("PREFIX").expect("Environment variable `PREFIX` not found!");
|
||||||
@@ -53,7 +56,6 @@ async fn main() {
|
|||||||
music::repeat(),
|
music::repeat(),
|
||||||
music::resume(),
|
music::resume(),
|
||||||
music::seek(),
|
music::seek(),
|
||||||
music::shuffle(),
|
|
||||||
music::skip(),
|
music::skip(),
|
||||||
music::stop(),
|
music::stop(),
|
||||||
music::volume(),
|
music::volume(),
|
||||||
@@ -71,7 +73,7 @@ async fn main() {
|
|||||||
tools::qr(),
|
tools::qr(),
|
||||||
tools::register(),
|
tools::register(),
|
||||||
tools::taf(),
|
tools::taf(),
|
||||||
// tools::uptime(),
|
tools::uptime(),
|
||||||
tools::verse(),
|
tools::verse(),
|
||||||
tools::weather(),
|
tools::weather(),
|
||||||
];
|
];
|
||||||
@@ -79,7 +81,7 @@ async fn main() {
|
|||||||
let options = poise::FrameworkOptions {
|
let options = poise::FrameworkOptions {
|
||||||
commands,
|
commands,
|
||||||
prefix_options: poise::PrefixFrameworkOptions {
|
prefix_options: poise::PrefixFrameworkOptions {
|
||||||
prefix: Some(prefix.to_string().into()),
|
prefix: Some(prefix.to_string()),
|
||||||
edit_tracker: Some(Arc::new(poise::EditTracker::for_timespan(
|
edit_tracker: Some(Arc::new(poise::EditTracker::for_timespan(
|
||||||
Duration::from_secs(3600),
|
Duration::from_secs(3600),
|
||||||
))),
|
))),
|
||||||
@@ -124,7 +126,7 @@ async fn main() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let framework = poise::Framework::builder()
|
let framework = poise::Framework::builder()
|
||||||
.setup(move |ctx, ready, _framework| {
|
.setup(move |ctx, ready, framework| {
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
info!(
|
info!(
|
||||||
"{} [{}] connected successfully!",
|
"{} [{}] connected successfully!",
|
||||||
@@ -132,6 +134,12 @@ async fn main() {
|
|||||||
);
|
);
|
||||||
ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
|
ctx.set_activity(Some(ActivityData::listening(prefix + "help")));
|
||||||
// poise::builtins::register_globally(ctx, &framework.options().commands).await?;
|
// poise::builtins::register_globally(ctx, &framework.options().commands).await?;
|
||||||
|
poise::builtins::register_in_guild(
|
||||||
|
ctx,
|
||||||
|
&framework.options().commands,
|
||||||
|
512680330495524873.into(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(Data {})
|
Ok(Data {})
|
||||||
})
|
})
|
||||||
|
|||||||
Submodule src/spotify-parser deleted from e3b3c0fb6e
Reference in New Issue
Block a user