16 Commits

Author SHA1 Message Date
5bc86aca2b Merge pull request #15 from eRgo35/release-plz-2024-08-13T13-12-37Z
Some checks failed
Rust / build (push) Has been cancelled
Release Plz / Release-plz (push) Has been cancelled
chore: release v0.10.4
2024-08-13 15:25:20 +02:00
Michał Czyż
57a281a1d3 chore: release 2024-08-13 15:21:37 +02:00
2f4045d4a9 fix: added wip info for some commands 2024-08-13 15:20:54 +02:00
aa215daf28 chore: cargo-dist action setup 2024-08-13 15:11:07 +02:00
7fde11f615 chore: repo added to Cargo.toml 2024-08-13 15:07:50 +02:00
c8f86a2f9c chore: using cargo-dist for package building 2024-08-13 15:06:32 +02:00
d9b6c8fc4b Merge pull request #14 from eRgo35/release-plz-2024-08-13T12-51-00Z
chore: release v0.10.3
2024-08-13 14:56:39 +02:00
Michał Czyż
051ae857a7 chore: release 2024-08-13 14:51:01 +02:00
08fbdc828c ci: release-plz 2024-08-13 14:50:20 +02:00
aeb10d9baf ops: default branch yeet 2024-08-12 20:58:01 +02:00
af247aa6d5 ci: release please setup 2024-08-12 20:01:06 +02:00
eae957c6d7 Create ci.yml 2024-08-12 19:33:07 +02:00
5399f3ba6d oop 2024-08-12 19:31:51 +02:00
076dfd0a93 fixed release to build arm64 2024-08-12 19:08:59 +02:00
212abd9bdd chore: release 0.10.2 2024-08-12 18:46:53 +02:00
8d787f2a11 fix: crates bumped 2024-08-12 18:46:21 +02:00
16 changed files with 382 additions and 179 deletions

View File

@@ -1,46 +1,22 @@
name: ci name: Rust
on: on:
push: push:
branches: [senpai] branches: [ "senpai" ]
pull_request: pull_request:
branches: [senpai] branches: [ "senpai" ]
env: env:
RUST_BACKTRACE: 1 CARGO_TERM_COLOR: always
RUST_LOG: trace
jobs: jobs:
test: build:
name: test
strategy: runs-on: ubuntu-latest
matrix:
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Build
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
override: true
- name: Set up cache
uses: actions/cache@v3
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
target/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Build projectable
run: cargo build --verbose run: cargo build --verbose
- name: Run tests - name: Run tests
run: cargo test --verbose run: cargo test --verbose

27
.github/workflows/release-plz.yml vendored Normal file
View 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 }}

View File

@@ -1,119 +1,281 @@
name: release # Copyright 2022-2024, axodotdev
# SPDX-License-Identifier: MIT or Apache-2.0
#
# CI that:
#
# * checks for a Git Tag that looks like a release
# * builds artifacts with cargo-dist (archives, installers, hashes)
# * uploads those artifacts to temporary workflow zip
# * on success, uploads the artifacts to a GitHub Release
#
# Note that the GitHub Release will be created with a generated
# title/body based on your changelogs.
name: Release
permissions:
"contents": "write"
# This task will run whenever you push a git tag that looks like a version
# like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc.
# Various formats will be parsed into a VERSION and an optional PACKAGE_NAME, where
# PACKAGE_NAME must be the name of a Cargo package in your workspace, and VERSION
# must be a Cargo-style SemVer Version (must have at least major.minor.patch).
#
# If PACKAGE_NAME is specified, then the announcement will be for that
# package (erroring out if it doesn't have the given version or isn't cargo-dist-able).
#
# If PACKAGE_NAME isn't specified, then the announcement will be for all
# (cargo-dist-able) packages in the workspace with that version (this mode is
# intended for workspaces with only one dist-able package, or with all dist-able
# packages versioned/released in lockstep).
#
# If you push multiple tags at once, separate instances of this workflow will
# spin up, creating an independent announcement for each one. However, GitHub
# will hard limit this to 3 tags per commit, as it will assume more tags is a
# mistake.
#
# If there's a prerelease-style suffix to the version, then the release(s)
# will be marked as a prerelease.
on: on:
pull_request:
push: push:
tags: tags:
- "[0-9]+.[0-9]+.[0-9]+" - '**[0-9]+.[0-9]+.[0-9]+*'
permissions: write-all
jobs: jobs:
# Creates a release and outputs the url # Run 'cargo dist plan' (or host) to determine what tasks we need to do
create-release: plan:
name: create-release runs-on: "ubuntu-20.04"
runs-on: ubuntu-latest
outputs: outputs:
upload_url: ${{ env.RELEASE_UPLOAD_URL }} val: ${{ steps.plan.outputs.manifest }}
version: ${{ env.VERSION }} tag: ${{ !github.event.pull_request && github.ref_name || '' }}
steps: tag-flag: ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }}
- name: Get the release version from the tag publishing: ${{ !github.event.pull_request }}
shell: bash
if: env.VERSION == ''
run: |
echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
echo "version is: ${{ env.VERSION }}"
- name: Create GitHub release
uses: actions/github-script@v6
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4
with: with:
github-token: "${{ secrets.GITHUB_TOKEN }}" submodules: recursive
script: | - name: Install cargo-dist
try { # we specify bash to get pipefail; it guards against the `curl` command
const response = await github.rest.repos.createRelease({ # failing. otherwise `sh` won't catch that `curl` returned non-0
draft: false, shell: bash
generate_release_notes: true, run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.20.0/cargo-dist-installer.sh | sh"
name: process.env.VERSION, - name: Cache cargo-dist
owner: context.repo.owner, uses: actions/upload-artifact@v4
prerelease: false, with:
repo: context.repo.repo, name: cargo-dist-cache
tag_name: process.env.VERSION, path: ~/.cargo/bin/cargo-dist
}); # sure would be cool if github gave us proper conditionals...
# so here's a doubly-nested ternary-via-truthiness to try to provide the best possible
core.exportVariable('RELEASE_ID', response.data.id); # functionality based on whether this is a pull_request, and whether it's from a fork.
core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url); # (PRs run on the *source* but secrets are usually on the *target* -- that's *good*
} catch (error) { # but also really annoying to build CI around when it needs secrets to work right.)
core.setFailed(error.message); - id: plan
} run: |
cargo dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json
build-and-upload: echo "cargo dist ran successfully"
name: Build and upload cat plan-dist-manifest.json
needs: create-release echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
runs-on: ${{ matrix.os }} - name: "Upload dist-manifest.json"
uses: actions/upload-artifact@v4
with:
name: artifacts-plan-dist-manifest
path: plan-dist-manifest.json
# Build and packages all the platform-specific things
build-local-artifacts:
name: build-local-artifacts (${{ join(matrix.targets, ', ') }})
# Let the initial task tell us to not run (currently very blunt)
needs:
- plan
if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }}
strategy: strategy:
matrix: fail-fast: false
build: [linux-gnu, linux-aarch64-gnu] # Target platforms/runners are computed by cargo-dist in create-release.
include: # Each member of the matrix has the following arguments:
- build: linux-gnu #
os: ubuntu-latest # - runner: the github runner
target: x86_64-unknown-linux-gnu # - dist-args: cli flags to pass to cargo dist
use-cross: true # - install-dist: expression to run to install cargo-dist on the runner
#
- build: linux-aarch64-gnu # Typically there will be:
os: ubuntu-latest # - 1 "global" task that builds universal installers
target: aarch64-unknown-linux-gnu # - N "local" tasks that build each platform's binaries and platform-specific installers
use-cross: true matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }}
runs-on: ${{ matrix.runner }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
steps: steps:
- name: Checkout - name: enable windows longpaths
uses: actions/checkout@v3 run: |
git config --global core.longpaths true
- name: Install Rust - uses: actions/checkout@v4
uses: actions-rs/toolchain@v1
with: with:
toolchain: stable submodules: recursive
profile: minimal - name: Install cargo-dist
override: true run: ${{ matrix.install_dist }}
target: ${{ matrix.target }} # Get the dist-manifest
- name: Fetch local artifacts
- name: Build uses: actions/download-artifact@v4
uses: actions-rs/cargo@v1
with: with:
use-cross: ${{ matrix.use-cross }} pattern: artifacts-*
command: build path: target/distrib/
args: --verbose --release --target ${{ matrix.target }} merge-multiple: true
- name: Install dependencies
- name: Strip release binary (linux and macos) run: |
if: matrix.build == 'linux-gnu' || matrix.build == 'linux-musl' || matrix.build == 'macos' || matrix.build == 'linux-aarch64-gnu' ${{ matrix.packages_install }}
run: strip "target/${{ matrix.target }}/release/lyra" - name: Build artifacts
run: |
- name: Build archive # Actually do builds and make zips and whatnot
cargo dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json
echo "cargo dist ran successfully"
- id: cargo-dist
name: Post-build
# We force bash here just because github makes it really hard to get values up
# to "real" actions without writing to env-vars, and writing to env-vars has
# inconsistent syntax between shell and powershell.
shell: bash shell: bash
run: | run: |
dirname="lyra-${{ needs.create-release.outputs.version }}-${{ matrix.target }}" # Parse out what we just built and upload it to scratch storage
mkdir "$dirname" echo "paths<<EOF" >> "$GITHUB_OUTPUT"
if [ "${{ matrix.os }}" = "windows-latest" ]; then jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
mv "target/${{ matrix.target }}/release/lyra.exe" "$dirname" echo "EOF" >> "$GITHUB_OUTPUT"
else
mv "target/${{ matrix.target }}/release/lyra" "$dirname"
fi
mv LICENSE.md "$dirname"
if [ "${{ matrix.os }}" = "windows-latest" ]; then cp dist-manifest.json "$BUILD_MANIFEST_NAME"
7z a "$dirname.zip" "$dirname" - name: "Upload artifacts"
echo "ASSET=$dirname.zip" >> $GITHUB_ENV uses: actions/upload-artifact@v4
else
tar -czf "$dirname.tar.gz" "$dirname"
echo "ASSET=$dirname.tar.gz" >> $GITHUB_ENV
fi
- name: Upload archive
uses: actions/upload-release-asset@v1.0.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.create-release.outputs.upload_url }} name: artifacts-build-local-${{ join(matrix.targets, '_') }}
asset_path: ${{ env.ASSET }} path: |
asset_name: ${{ env.ASSET }} ${{ steps.cargo-dist.outputs.paths }}
asset_content_type: application/octet-stream ${{ env.BUILD_MANIFEST_NAME }}
# Build and package all the platform-agnostic(ish) things
build-global-artifacts:
needs:
- plan
- build-local-artifacts
runs-on: "ubuntu-20.04"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Install cached cargo-dist
uses: actions/download-artifact@v4
with:
name: cargo-dist-cache
path: ~/.cargo/bin/
- run: chmod +x ~/.cargo/bin/cargo-dist
# Get all the local artifacts for the global tasks to use (for e.g. checksums)
- name: Fetch local artifacts
uses: actions/download-artifact@v4
with:
pattern: artifacts-*
path: target/distrib/
merge-multiple: true
- id: cargo-dist
shell: bash
run: |
cargo dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json
echo "cargo dist ran successfully"
# Parse out what we just built and upload it to scratch storage
echo "paths<<EOF" >> "$GITHUB_OUTPUT"
jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT"
echo "EOF" >> "$GITHUB_OUTPUT"
cp dist-manifest.json "$BUILD_MANIFEST_NAME"
- name: "Upload artifacts"
uses: actions/upload-artifact@v4
with:
name: artifacts-build-global
path: |
${{ steps.cargo-dist.outputs.paths }}
${{ env.BUILD_MANIFEST_NAME }}
# Determines if we should publish/announce
host:
needs:
- plan
- build-local-artifacts
- build-global-artifacts
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine)
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
runs-on: "ubuntu-20.04"
outputs:
val: ${{ steps.host.outputs.manifest }}
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Install cached cargo-dist
uses: actions/download-artifact@v4
with:
name: cargo-dist-cache
path: ~/.cargo/bin/
- run: chmod +x ~/.cargo/bin/cargo-dist
# Fetch artifacts from scratch-storage
- name: Fetch artifacts
uses: actions/download-artifact@v4
with:
pattern: artifacts-*
path: target/distrib/
merge-multiple: true
- id: host
shell: bash
run: |
cargo dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json
echo "artifacts uploaded and released successfully"
cat dist-manifest.json
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"
- name: "Upload dist-manifest.json"
uses: actions/upload-artifact@v4
with:
# Overwrite the previous copy
name: artifacts-dist-manifest
path: dist-manifest.json
# Create a GitHub Release while uploading all files to it
- name: "Download GitHub Artifacts"
uses: actions/download-artifact@v4
with:
pattern: artifacts-*
path: artifacts
merge-multiple: true
- name: Cleanup
run: |
# Remove the granular manifests
rm -f artifacts/*-dist-manifest.json
- name: Create GitHub Release
env:
PRERELEASE_FLAG: "${{ fromJson(steps.host.outputs.manifest).announcement_is_prerelease && '--prerelease' || '' }}"
ANNOUNCEMENT_TITLE: "${{ fromJson(steps.host.outputs.manifest).announcement_title }}"
ANNOUNCEMENT_BODY: "${{ fromJson(steps.host.outputs.manifest).announcement_github_body }}"
RELEASE_COMMIT: "${{ github.sha }}"
run: |
# Write and read notes from a file to avoid quoting breaking things
echo "$ANNOUNCEMENT_BODY" > $RUNNER_TEMP/notes.txt
gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/*
announce:
needs:
- plan
- host
# use "always() && ..." to allow us to wait for all publish jobs while
# still allowing individual publish jobs to skip themselves (for prereleases).
# "host" however must run to completion, no skipping allowed!
if: ${{ always() && needs.host.result == 'success' }}
runs-on: "ubuntu-20.04"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4
with:
submodules: recursive

12
.gitmodules vendored
View File

@@ -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

23
CHANGELOG.md Normal file
View File

@@ -0,0 +1,23 @@
# 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.4](https://github.com/eRgo35/lyra/compare/v0.10.3...v0.10.4) - 2024-08-13
### Fixed
- added wip info for some commands
### Other
- cargo-dist action setup
- repo added to Cargo.toml
- using cargo-dist for package building
## [0.10.3](https://github.com/eRgo35/lyra/compare/v0.10.2...v0.10.3) - 2024-08-13
### Other
- release-plz
# Changelog

30
Cargo.lock generated
View File

@@ -1266,18 +1266,6 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760" checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
[[package]]
name = "lib-spotify-parser"
version = "1.0.0"
dependencies = [
"regex",
"reqwest 0.12.5",
"scraper",
"serde",
"serde_json",
"tokio",
]
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.155" version = "0.2.155"
@@ -1323,11 +1311,10 @@ dependencies = [
[[package]] [[package]]
name = "lyra" name = "lyra"
version = "0.10.0" version = "0.10.4"
dependencies = [ dependencies = [
"dotenv", "dotenv",
"json", "json",
"lib-spotify-parser",
"once_cell", "once_cell",
"openssl", "openssl",
"owoify", "owoify",
@@ -1339,6 +1326,7 @@ dependencies = [
"serde_json", "serde_json",
"serenity", "serenity",
"songbird", "songbird",
"spotify-parser",
"symphonia", "symphonia",
"tokio", "tokio",
"tracing", "tracing",
@@ -2859,6 +2847,20 @@ dependencies = [
"lock_api", "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]] [[package]]
name = "stable-vec" name = "stable-vec"
version = "0.4.1" version = "0.4.1"

View File

@@ -1,17 +1,18 @@
[package] [package]
name = "lyra" name = "lyra"
version = "0.10.1" version = "0.10.4"
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."
documentation = "https://github.com/eRgo35/lyra" documentation = "https://github.com/eRgo35/lyra"
repository = "https://github.com/eRgo35/lyra"
readme = "README.md" readme = "README.md"
homepage = "https://lyra.c2yz.com" 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" } spotify-parser = "1.0.1"
dotenv = "0.15.0" dotenv = "0.15.0"
json = "0.12.4" json = "0.12.4"
openssl = { version = "0.10.66", features = ["vendored"] } openssl = { version = "0.10.66", features = ["vendored"] }
@@ -51,3 +52,23 @@ once_cell = "1.19.0"
[patch.crates-io.serenity-voice-model] [patch.crates-io.serenity-voice-model]
git = "https://github.com/serenity-rs/serenity" git = "https://github.com/serenity-rs/serenity"
branch = "current" branch = "current"
# The profile that 'cargo dist' will build with
[profile.dist]
inherits = "release"
lto = "thin"
# Config for 'cargo dist'
[workspace.metadata.dist]
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax)
cargo-dist-version = "0.20.0"
# CI backends to support
ci = "github"
# The installers to generate for each app
installers = ["shell"]
# Target platforms to build apps for (Rust target-triple syntax)
targets = ["x86_64-unknown-linux-gnu"]
# Path that installers should place binaries in
install-path = "CARGO_HOME"
# Whether to install an updater program
install-updater = false

Submodule libs/poise deleted from 575025909b

Submodule libs/serenity deleted from 658b6a7261

Submodule libs/songbird deleted from 2d7dc29fd6

View File

@@ -2,7 +2,6 @@ use crate::commands::music::metadata::Metadata;
use crate::commands::music::notifier::TrackErrorNotifier; use crate::commands::music::notifier::TrackErrorNotifier;
use crate::{commands::embeds::error_embed, Context, Error}; use crate::{commands::embeds::error_embed, Context, Error};
use lib_spotify_parser;
use poise::serenity_prelude::{ use poise::serenity_prelude::{
Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp, Color, CreateEmbed, CreateEmbedAuthor, CreateEmbedFooter, Timestamp,
}; };
@@ -15,6 +14,7 @@ use songbird::input::AuxMetadata;
use songbird::input::{Compose, YoutubeDl}; use songbird::input::{Compose, YoutubeDl};
use songbird::tracks::TrackQueue; use songbird::tracks::TrackQueue;
use songbird::Call; use songbird::Call;
use spotify_parser;
use std::collections::VecDeque; use std::collections::VecDeque;
use std::process::Command; use std::process::Command;
use std::time::Duration; use std::time::Duration;
@@ -120,7 +120,7 @@ async fn handle_play<'a>(
} }
async fn parse_data(data: String) -> VecDeque<String> { 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 .await
.unwrap_or(vec![data]) .unwrap_or(vec![data])
.iter() .iter()

View File

@@ -5,7 +5,9 @@ use crate::{commands::embeds::embed, Context, Error};
/// Shows IP information /// Shows IP information
#[poise::command(prefix_command, slash_command, category = "Tools")] #[poise::command(prefix_command, slash_command, category = "Tools")]
pub async fn ip(ctx: Context<'_>) -> Result<(), Error> { pub async fn ip(ctx: Context<'_>) -> Result<(), Error> {
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap())) ctx.send(
CreateReply::default().embed(embed(ctx, "IP Info", "Work in progress", "").await.unwrap()),
)
.await?; .await?;
Ok(()) Ok(())

View File

@@ -5,7 +5,9 @@ use crate::{commands::embeds::embed, Context, Error};
/// Prints metar for provided airport /// Prints metar for provided airport
#[poise::command(prefix_command, slash_command, category = "Tools")] #[poise::command(prefix_command, slash_command, category = "Tools")]
pub async fn metar(ctx: Context<'_>) -> Result<(), Error> { pub async fn metar(ctx: Context<'_>) -> Result<(), Error> {
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap())) ctx.send(
CreateReply::default().embed(embed(ctx, "Metar", "Work in progress", "").await.unwrap()),
)
.await?; .await?;
Ok(()) Ok(())

View File

@@ -5,7 +5,9 @@ use crate::{commands::embeds::embed, Context, Error};
/// Returns taf for provided airport /// Returns taf for provided airport
#[poise::command(prefix_command, slash_command, category = "Tools")] #[poise::command(prefix_command, slash_command, category = "Tools")]
pub async fn taf(ctx: Context<'_>) -> Result<(), Error> { pub async fn taf(ctx: Context<'_>) -> Result<(), Error> {
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap())) ctx.send(
CreateReply::default().embed(embed(ctx, "Taf", "Work in progress", "").await.unwrap()),
)
.await?; .await?;
Ok(()) Ok(())

View File

@@ -10,7 +10,9 @@ pub async fn weather(
#[rest] #[rest]
_location: String, _location: String,
) -> Result<(), Error> { ) -> Result<(), Error> {
ctx.send(CreateReply::default().embed(embed(ctx, "", "", "").await.unwrap())) ctx.send(
CreateReply::default().embed(embed(ctx, "Weather", "Work in progress", "").await.unwrap()),
)
.await?; .await?;
Ok(()) Ok(())