mirror of
https://github.com/eRgo35/lyra.git
synced 2026-02-04 20:36:10 +01:00
Compare commits
12 Commits
c607aaf403
...
release-pl
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
051ae857a7 | ||
|
08fbdc828c
|
|||
|
aeb10d9baf
|
|||
|
af247aa6d5
|
|||
| eae957c6d7 | |||
|
5399f3ba6d
|
|||
|
076dfd0a93
|
|||
|
212abd9bdd
|
|||
|
8d787f2a11
|
|||
|
486f403d10
|
|||
|
bfd301c9c2
|
|||
|
670b8dd30e
|
1
.github/FUNDING.yml
vendored
Normal file
1
.github/FUNDING.yml
vendored
Normal file
@@ -0,0 +1 @@
|
||||
github: eRgo35
|
||||
22
.github/workflows/ci.yml
vendored
Normal file
22
.github/workflows/ci.yml
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
name: Rust
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "senpai" ]
|
||||
pull_request:
|
||||
branches: [ "senpai" ]
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Build
|
||||
run: cargo build --verbose
|
||||
- name: Run tests
|
||||
run: cargo test --verbose
|
||||
27
.github/workflows/release-plz.yml
vendored
Normal file
27
.github/workflows/release-plz.yml
vendored
Normal file
@@ -0,0 +1,27 @@
|
||||
name: Release Plz
|
||||
|
||||
permissions:
|
||||
pull-requests: write
|
||||
contents: write
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- senpai
|
||||
|
||||
jobs:
|
||||
release-plz:
|
||||
name: Release-plz
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Install Rust toolchain
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
- name: Run release-plz
|
||||
uses: MarcoIeni/release-plz-action@v0.5
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.RELEASE_PLZ_TOKEN }}
|
||||
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
|
||||
12
.gitmodules
vendored
12
.gitmodules
vendored
@@ -1,12 +0,0 @@
|
||||
[submodule "libs/songbird"]
|
||||
path = libs/songbird
|
||||
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
|
||||
[submodule "libs/spotify-parser"]
|
||||
path = libs/spotify-parser
|
||||
url = git@github.com:eRgo35/spotify-parser.git
|
||||
13
CHANGELOG.md
Normal file
13
CHANGELOG.md
Normal file
@@ -0,0 +1,13 @@
|
||||
# Changelog
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [0.10.3](https://github.com/eRgo35/lyra/compare/v0.10.2...v0.10.3) - 2024-08-13
|
||||
|
||||
### Other
|
||||
- release-plz
|
||||
# Changelog
|
||||
54
Cargo.lock
generated
54
Cargo.lock
generated
@@ -90,32 +90,13 @@ version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
||||
|
||||
[[package]]
|
||||
name = "audiopus"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3743519567e9135cf6f9f1a509851cb0c8e4cb9d66feb286668afb1923bec458"
|
||||
dependencies = [
|
||||
"audiopus_sys 0.1.8",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "audiopus"
|
||||
version = "0.3.0-rc.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ab55eb0e56d7c6de3d59f544e5db122d7725ec33be6a276ee8241f3be6473955"
|
||||
dependencies = [
|
||||
"audiopus_sys 0.2.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "audiopus_sys"
|
||||
version = "0.1.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "927791de46f70facea982dbfaf19719a41ce6064443403be631a85de6a58fff9"
|
||||
dependencies = [
|
||||
"log",
|
||||
"pkg-config",
|
||||
"audiopus_sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1285,18 +1266,6 @@ version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
|
||||
|
||||
[[package]]
|
||||
name = "lib-spotify-parser"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"regex",
|
||||
"reqwest 0.12.5",
|
||||
"scraper",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.155"
|
||||
@@ -1342,12 +1311,10 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "lyra"
|
||||
version = "0.10.0"
|
||||
version = "0.10.3"
|
||||
dependencies = [
|
||||
"audiopus 0.2.0",
|
||||
"dotenv",
|
||||
"json",
|
||||
"lib-spotify-parser",
|
||||
"once_cell",
|
||||
"openssl",
|
||||
"owoify",
|
||||
@@ -1359,6 +1326,7 @@ dependencies = [
|
||||
"serde_json",
|
||||
"serenity",
|
||||
"songbird",
|
||||
"spotify-parser",
|
||||
"symphonia",
|
||||
"tokio",
|
||||
"tracing",
|
||||
@@ -2825,7 +2793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "338dd182f9f084f583c4c0db38588e28a34778ecec288208cf0b61c378ac90d1"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"audiopus 0.3.0-rc.0",
|
||||
"audiopus",
|
||||
"byteorder",
|
||||
"bytes",
|
||||
"crypto_secretbox",
|
||||
@@ -2879,6 +2847,20 @@ dependencies = [
|
||||
"lock_api",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "spotify-parser"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e7b9d1d990125af02c6f611f2e8e34fd979310d43ae7ac5bd2cd357b87b13352"
|
||||
dependencies = [
|
||||
"regex",
|
||||
"reqwest 0.12.5",
|
||||
"scraper",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "stable-vec"
|
||||
version = "0.4.1"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "lyra"
|
||||
version = "0.10.0"
|
||||
version = "0.10.3"
|
||||
authors = ["Michał Czyż <mike@c2yz.com>"]
|
||||
edition = "2021"
|
||||
description = "A featureful Discord bot written in Rust."
|
||||
@@ -11,9 +11,10 @@ license-file = "LICENSE.md"
|
||||
keywords = ["discord", "bot", "rust", "music", "featureful"]
|
||||
|
||||
[dependencies]
|
||||
lib-spotify-parser = { path = "./libs/spotify-parser" }
|
||||
spotify-parser = "1.0.1"
|
||||
dotenv = "0.15.0"
|
||||
json = "0.12.4"
|
||||
openssl = { version = "0.10.66", features = ["vendored"] }
|
||||
owoify = "0.1.5"
|
||||
poise = { default-features = true, version = "0.6.1" }
|
||||
rand = "0.8.5"
|
||||
@@ -32,7 +33,6 @@ serenity = { default-features = true, features = [
|
||||
"http",
|
||||
"rustls_backend",
|
||||
], version = "0.12" }
|
||||
|
||||
symphonia = { version = "0.5.4", features = [
|
||||
"aac",
|
||||
"adpcm",
|
||||
@@ -47,8 +47,6 @@ tracing-futures = "0.2.5"
|
||||
tracing-subscriber = "0.3.18"
|
||||
url = "2.5.2"
|
||||
once_cell = "1.19.0"
|
||||
openssl = { version = "0.10.66", features = ["vendored"] }
|
||||
audiopus = "0.2.0"
|
||||
|
||||
[patch.crates-io.serenity-voice-model]
|
||||
git = "https://github.com/serenity-rs/serenity"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<img height="256" alt="Lyra" src="assets/lyra-256.png" />
|
||||
</a>
|
||||
<br />
|
||||
Lyra: a discord music bot written in Rust :crab:
|
||||
Lyra: a discord music bot written in rust :crab:
|
||||
</h2>
|
||||
|
||||
Lyra is an open source, discord music bot written in Rust.
|
||||
|
||||
Submodule libs/poise deleted from 575025909b
Submodule libs/serenity deleted from 658b6a7261
Submodule libs/songbird deleted from 2d7dc29fd6
Submodule libs/spotify-parser deleted from 4398512b5c
@@ -2,7 +2,6 @@ use crate::commands::music::metadata::Metadata;
|
||||
use crate::commands::music::notifier::TrackErrorNotifier;
|
||||
use crate::{commands::embeds::error_embed, Context, Error};
|
||||
|
||||
use lib_spotify_parser;
|
||||
use poise::serenity_prelude::{
|
||||
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
|
||||
};
|
||||
@@ -15,6 +14,7 @@ use songbird::input::AuxMetadata;
|
||||
use songbird::input::{Compose, YoutubeDl};
|
||||
use songbird::tracks::TrackQueue;
|
||||
use songbird::Call;
|
||||
use spotify_parser;
|
||||
use std::collections::VecDeque;
|
||||
use std::process::Command;
|
||||
use std::time::Duration;
|
||||
@@ -120,7 +120,7 @@ async fn handle_play<'a>(
|
||||
}
|
||||
|
||||
async fn parse_data(data: String) -> VecDeque<String> {
|
||||
let tracks = lib_spotify_parser::retrieve_async_url(&data)
|
||||
let tracks = spotify_parser::retrieve_async_url(&data)
|
||||
.await
|
||||
.unwrap_or(vec![data])
|
||||
.iter()
|
||||
|
||||
Reference in New Issue
Block a user