mirror of
https://github.com/eRgo35/lyra.git
synced 2026-02-04 12:26:10 +01:00
Compare commits
21 Commits
0.10.0
...
5bc86aca2b
| Author | SHA1 | Date | |
|---|---|---|---|
| 5bc86aca2b | |||
|
|
57a281a1d3 | ||
|
2f4045d4a9
|
|||
|
aa215daf28
|
|||
|
7fde11f615
|
|||
|
c8f86a2f9c
|
|||
| d9b6c8fc4b | |||
|
|
051ae857a7 | ||
|
08fbdc828c
|
|||
|
aeb10d9baf
|
|||
|
af247aa6d5
|
|||
| eae957c6d7 | |||
|
5399f3ba6d
|
|||
|
076dfd0a93
|
|||
|
212abd9bdd
|
|||
|
8d787f2a11
|
|||
|
486f403d10
|
|||
|
bfd301c9c2
|
|||
|
670b8dd30e
|
|||
|
c607aaf403
|
|||
|
f41fa7e09b
|
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 }}
|
||||||
281
.github/workflows/release.yml
vendored
Normal file
281
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,281 @@
|
|||||||
|
# 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:
|
||||||
|
pull_request:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- '**[0-9]+.[0-9]+.[0-9]+*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
# Run 'cargo dist plan' (or host) to determine what tasks we need to do
|
||||||
|
plan:
|
||||||
|
runs-on: "ubuntu-20.04"
|
||||||
|
outputs:
|
||||||
|
val: ${{ steps.plan.outputs.manifest }}
|
||||||
|
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
|
||||||
|
tag-flag: ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }}
|
||||||
|
publishing: ${{ !github.event.pull_request }}
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
- name: Install cargo-dist
|
||||||
|
# we specify bash to get pipefail; it guards against the `curl` command
|
||||||
|
# failing. otherwise `sh` won't catch that `curl` returned non-0
|
||||||
|
shell: bash
|
||||||
|
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.20.0/cargo-dist-installer.sh | sh"
|
||||||
|
- name: Cache cargo-dist
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: cargo-dist-cache
|
||||||
|
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
|
||||||
|
# functionality based on whether this is a pull_request, and whether it's from a fork.
|
||||||
|
# (PRs run on the *source* but secrets are usually on the *target* -- that's *good*
|
||||||
|
# but also really annoying to build CI around when it needs secrets to work right.)
|
||||||
|
- 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
|
||||||
|
echo "cargo dist ran successfully"
|
||||||
|
cat plan-dist-manifest.json
|
||||||
|
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
|
||||||
|
- 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:
|
||||||
|
fail-fast: false
|
||||||
|
# Target platforms/runners are computed by cargo-dist in create-release.
|
||||||
|
# Each member of the matrix has the following arguments:
|
||||||
|
#
|
||||||
|
# - runner: the github runner
|
||||||
|
# - dist-args: cli flags to pass to cargo dist
|
||||||
|
# - install-dist: expression to run to install cargo-dist on the runner
|
||||||
|
#
|
||||||
|
# Typically there will be:
|
||||||
|
# - 1 "global" task that builds universal installers
|
||||||
|
# - N "local" tasks that build each platform's binaries and platform-specific installers
|
||||||
|
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:
|
||||||
|
- name: enable windows longpaths
|
||||||
|
run: |
|
||||||
|
git config --global core.longpaths true
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
- name: Install cargo-dist
|
||||||
|
run: ${{ matrix.install_dist }}
|
||||||
|
# Get the dist-manifest
|
||||||
|
- name: Fetch local artifacts
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
pattern: artifacts-*
|
||||||
|
path: target/distrib/
|
||||||
|
merge-multiple: true
|
||||||
|
- name: Install dependencies
|
||||||
|
run: |
|
||||||
|
${{ matrix.packages_install }}
|
||||||
|
- name: Build artifacts
|
||||||
|
run: |
|
||||||
|
# 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
|
||||||
|
run: |
|
||||||
|
# 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-local-${{ join(matrix.targets, '_') }}
|
||||||
|
path: |
|
||||||
|
${{ steps.cargo-dist.outputs.paths }}
|
||||||
|
${{ 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
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
|
|
||||||
23
CHANGELOG.md
Normal file
23
CHANGELOG.md
Normal 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
|
||||||
57
Cargo.lock
generated
57
Cargo.lock
generated
@@ -149,21 +149,6 @@ version = "0.22.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bit-set"
|
|
||||||
version = "0.5.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
|
|
||||||
dependencies = [
|
|
||||||
"bit-vec",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "bit-vec"
|
|
||||||
version = "0.6.3"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "1.3.2"
|
version = "1.3.2"
|
||||||
@@ -642,17 +627,6 @@ version = "0.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
|
checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fancy-regex"
|
|
||||||
version = "0.13.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2"
|
|
||||||
dependencies = [
|
|
||||||
"bit-set",
|
|
||||||
"regex-automata 0.4.7",
|
|
||||||
"regex-syntax 0.8.4",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fastrand"
|
name = "fastrand"
|
||||||
version = "2.1.0"
|
version = "2.1.0"
|
||||||
@@ -1292,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"
|
||||||
@@ -1349,12 +1311,10 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lyra"
|
name = "lyra"
|
||||||
version = "0.10.0"
|
version = "0.10.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dotenv",
|
"dotenv",
|
||||||
"fancy-regex",
|
|
||||||
"json",
|
"json",
|
||||||
"lib-spotify-parser",
|
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"openssl",
|
"openssl",
|
||||||
"owoify",
|
"owoify",
|
||||||
@@ -1366,6 +1326,7 @@ dependencies = [
|
|||||||
"serde_json",
|
"serde_json",
|
||||||
"serenity",
|
"serenity",
|
||||||
"songbird",
|
"songbird",
|
||||||
|
"spotify-parser",
|
||||||
"symphonia",
|
"symphonia",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tracing",
|
"tracing",
|
||||||
@@ -2886,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"
|
||||||
|
|||||||
29
Cargo.toml
29
Cargo.toml
@@ -1,19 +1,19 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "lyra"
|
name = "lyra"
|
||||||
version = "0.10.0"
|
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://lyra.c2yz.com/docs"
|
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"
|
||||||
fancy-regex = "0.13.0"
|
|
||||||
json = "0.12.4"
|
json = "0.12.4"
|
||||||
openssl = { version = "0.10.66", features = ["vendored"] }
|
openssl = { version = "0.10.66", features = ["vendored"] }
|
||||||
owoify = "0.1.5"
|
owoify = "0.1.5"
|
||||||
@@ -34,7 +34,6 @@ serenity = { default-features = true, features = [
|
|||||||
"http",
|
"http",
|
||||||
"rustls_backend",
|
"rustls_backend",
|
||||||
], version = "0.12" }
|
], version = "0.12" }
|
||||||
|
|
||||||
symphonia = { version = "0.5.4", features = [
|
symphonia = { version = "0.5.4", features = [
|
||||||
"aac",
|
"aac",
|
||||||
"adpcm",
|
"adpcm",
|
||||||
@@ -53,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
|
||||||
|
|||||||
75
README.md
75
README.md
@@ -1,52 +1,82 @@
|
|||||||
# Lyra
|
<h2 align="center">
|
||||||
|
<a href="https://lyra.c2yz.com" target="blank_">
|
||||||

|
<img height="256" alt="Lyra" src="assets/lyra-256.png" />
|
||||||
|
</a>
|
||||||
Lyra is a music bot written in Rust.
|
<br />
|
||||||
|
Lyra: a discord music bot written in rust :crab:
|
||||||
## Getting Started
|
</h2>
|
||||||
|
|
||||||
Lyra is an open source, discord music bot written in Rust.
|
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.
|
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 a service.
|
||||||
|
The bot can be run on a desktop, a vps or a phone as it's just a simple binary.
|
||||||
|
|
||||||
User no longer has to rely on 3rd parties to provide them an invite link.
|
Currently bot is still heavily in development!
|
||||||
|
|
||||||
The bot can be run even on a desktop or a phone because after compilation, it's just a simple binary.
|
## Getting started
|
||||||
|
|
||||||
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.
|
Before you start, you need to create a discord bot and get a token.
|
||||||
|
You can do it [here](https://discord.com/developers/applications).
|
||||||
|
|
||||||
Slash commands are still work in progress! Currently bot is still heavily in development!
|
After you create a bot, you need to invite it to your server.
|
||||||
|
|
||||||
## Setting up
|
Then, head to download section and download the latest release (or compile it yourself).
|
||||||
|
|
||||||
|
After you download the binary, you need to create a `.env` file in the same directory as the binary.
|
||||||
|
Example can be found in `.env.example` file.
|
||||||
|
|
||||||
|
```
|
||||||
|
DISCORD_TOKEN=<YOUR_DISCORD_TOKEN>
|
||||||
|
PREFIX=<YOUR_PREFIX>
|
||||||
|
```
|
||||||
|
|
||||||
|
DISCORD_TOKEN is the token you got from discord developers page and PREFIX is the prefix you want to use for your bot.
|
||||||
|
|
||||||
|
Bot by default reacts only to the prefix. To enable slash commands, while the bot is running type `:register` in the chat (where `:` is your bot prefix).
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
- Music playback
|
||||||
|
- Audio effects (soon)
|
||||||
|
- Some multipurpose commands
|
||||||
|
- Slash commands
|
||||||
|
- Self-hosted
|
||||||
|
|
||||||
|
## Compilation
|
||||||
|
|
||||||
To compile the source code on your own, you need `rust` and `cargo`
|
To compile the source code on your own, you need `rust` and `cargo`
|
||||||
|
|
||||||
To run a dev version use
|
To run a dev version, `cd` into the project directory and type
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ cargo run
|
$ cargo run
|
||||||
```
|
```
|
||||||
|
|
||||||
To build a production version use
|
To build a production version use
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ cargo build --release
|
$ cargo build --release
|
||||||
```
|
```
|
||||||
|
|
||||||
If you need an ARM version and just don't want to wait for ages for the program to compile, use
|
If you need a version for a different system or architecture, you can use `cross` crate
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ cross build -r --target aarch64-unknown-linux-gnu
|
$ cross build -r --target aarch64-unknown-linux-gnu
|
||||||
```
|
```
|
||||||
|
|
||||||
To run a program, just type
|
To run a program, just type
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ ./lyra
|
$ ./lyra
|
||||||
```
|
```
|
||||||
|
|
||||||
if you want to disown it from the shell, I recommend using the script I provided in `scripts` folder
|
Remember to provide a `.env` file in the same directory as the binary.
|
||||||
|
|
||||||
|
If you want to disown the bot from the shell, I recommend using the script I provided in `scripts` folder
|
||||||
|
|
||||||
## Commands
|
## Commands
|
||||||
|
|
||||||
As of now, working commands are:
|
As of now, the commands are:
|
||||||
|
|
||||||
```
|
```
|
||||||
Music:
|
Music:
|
||||||
@@ -60,7 +90,7 @@ Music:
|
|||||||
/repeat Loops currently playing song provided amount of times; aliases: repeat, loop, while, for
|
/repeat Loops currently playing song provided amount of times; aliases: repeat, loop, while, for
|
||||||
/resume Resumes currently paused song
|
/resume Resumes currently paused song
|
||||||
/seek Seeks a track by provided seconds
|
/seek Seeks a track by provided seconds
|
||||||
/skip Skips the currently playing song
|
/skip Skips the currently playing song; aliases: skip, :skipper:
|
||||||
/stop Stops playback and destroys the queue; aliases: stop, end
|
/stop Stops playback and destroys the queue; aliases: stop, end
|
||||||
/volume Changes output volume
|
/volume Changes output volume
|
||||||
/effect Plays one of available audio effects
|
/effect Plays one of available audio effects
|
||||||
@@ -69,13 +99,22 @@ Music:
|
|||||||
Tools:
|
Tools:
|
||||||
/ai Asks AI
|
/ai Asks AI
|
||||||
/dice Rolls a dice
|
/dice Rolls a dice
|
||||||
|
/dictionary Explains provided query
|
||||||
|
/ip Shows IP information
|
||||||
|
/metar Prints metar for provided airport
|
||||||
/owoify Owoifies whatever you want uwu
|
/owoify Owoifies whatever you want uwu
|
||||||
/ping Pings you backs with a response time
|
/ping Pings you backs with a response time
|
||||||
/posix Prints current time in POSIX format
|
/posix Prints current time in POSIX format
|
||||||
/qr Creates a qr code from text
|
/qr Creates a qr code from text
|
||||||
|
/taf Returns taf for provided airport
|
||||||
|
/uptime Checks how long the bot has been running
|
||||||
/verse Reference Bible by verse
|
/verse Reference Bible by verse
|
||||||
|
/weather Shows weather for provided location
|
||||||
|
|
||||||
Help:
|
Help:
|
||||||
/help Prints this help message; aliases: help, huh, welp
|
/help Prints this help message; aliases: help, huh, welp
|
||||||
|
|
||||||
|
Use /help command for more info on a command.
|
||||||
|
You can edit you message to the bot and the bot will edit its response.
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
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::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()
|
||||||
|
|||||||
@@ -5,8 +5,10 @@ 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(
|
||||||
.await?;
|
CreateReply::default().embed(embed(ctx, "IP Info", "Work in progress", "").await.unwrap()),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,10 @@ 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(
|
||||||
.await?;
|
CreateReply::default().embed(embed(ctx, "Metar", "Work in progress", "").await.unwrap()),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,10 @@ 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(
|
||||||
.await?;
|
CreateReply::default().embed(embed(ctx, "Taf", "Work in progress", "").await.unwrap()),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,8 +10,10 @@ 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(
|
||||||
.await?;
|
CreateReply::default().embed(embed(ctx, "Weather", "Work in progress", "").await.unwrap()),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user