ops: default branch yeet

.github/workflows/ci.yml

@@ -1,46 +1,22 @@
-name: ci
+name: Rust
 
 on:
   push:
-    branches: [senpai]
+    branches: [ "senpai" ]
   pull_request:
-    branches: [senpai]
+    branches: [ "senpai" ]
 
 env:
-  RUST_BACKTRACE: 1
-  RUST_LOG: trace
+  CARGO_TERM_COLOR: always
 
 jobs:
-  test:
-    name: test
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+  build:
+
+    runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-
-      - 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
+    - uses: actions/checkout@v4
+    - name: Build
       run: cargo build --verbose
-
     - name: Run tests
       run: cargo test --verbose

.github/workflows/release-phase.yml

@@ -0,0 +1,47 @@
+name: Release Please
+
+on:
+  push:
+    branches:
+      - senpai
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v4
+        id: release
+        with:
+          # this assumes that you have created a personal access token
+          # (PAT) and configured it as a GitHub action secret named
+          # `MY_RELEASE_PLEASE_TOKEN` (this secret name is not important).
+          token: ${{ secrets.GITHUB_TOKEN }}
+          # this is a built-in strategy in release-please, see "Action Inputs"
+          # for more options
+          release-type: rust
+
+  release-rust:
+    if: ${{needs.release-please.outputs.rust--release_created}}
+    runs-on: ubuntu-latest
+    needs: release-please
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - name: Test
+        uses: clechasseur/rs-cargo@v2
+        with:
+          command: test
+          args: --verbose --manifest-path hello-rust/Cargo.toml
+      - name: Build
+        uses: clechasseur/rs-cargo@v2
+        with:
+          command: build
+          args: --verbose --release --manifest-path hello-rust/Cargo.toml --target x86_64-unknown-linux-gnu
+      - name: Upload Release Artifact
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh release upload ${{ needs.release-please.outputs.hello-rust--tag_name }} hello-rust/target/x86_64-unknown-linux-gnu/release/hello_rust

.github/workflows/release.yml

@@ -1,119 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
-
-permissions: write-all
-
-jobs:
-  # Creates a release and outputs the url
-  create-release:
-    name: create-release
-    runs-on: ubuntu-latest
-    outputs:
-      upload_url: ${{ env.RELEASE_UPLOAD_URL }}
-      version: ${{ env.VERSION }}
-    steps:
-      - name: Get the release version from the tag
-        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:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          script: |
-            try {
-              const response = await github.rest.repos.createRelease({
-                draft: false,
-                generate_release_notes: true,
-                name: process.env.VERSION,
-                owner: context.repo.owner,
-                prerelease: false,
-                repo: context.repo.repo,
-                tag_name: process.env.VERSION,
-              });
-
-              core.exportVariable('RELEASE_ID', response.data.id);
-              core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url);
-            } catch (error) {
-              core.setFailed(error.message);
-            }
-
-  build-and-upload:
-    name: Build and upload
-    needs: create-release
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        build: [linux-gnu, linux-aarch64-gnu]
-        include:
-          - build: linux-gnu
-            os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-            use-cross: true
-
-          - build: linux-aarch64-gnu
-            os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-            use-cross: true
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          target: ${{ matrix.target }}
-
-      - name: Build
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.use-cross }}
-          command: build
-          args: --verbose --release --target ${{ matrix.target }}
-
-      - name: Strip release binary (linux and macos)
-        if: matrix.build == 'linux-gnu' || matrix.build == 'linux-musl' || matrix.build == 'macos' || matrix.build == 'linux-aarch64-gnu'
-        run: strip "target/${{ matrix.target }}/release/lyra"
-
-      - name: Build archive
-        shell: bash
-        run: |
-          dirname="lyra-${{ needs.create-release.outputs.version }}-${{ matrix.target }}"
-          mkdir "$dirname"
-          if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            mv "target/${{ matrix.target }}/release/lyra.exe" "$dirname"
-          else
-            mv "target/${{ matrix.target }}/release/lyra" "$dirname"
-          fi
-          mv LICENSE.md "$dirname"
-
-          if [ "${{ matrix.os }}" = "windows-latest" ]; then
-            7z a "$dirname.zip" "$dirname"
-            echo "ASSET=$dirname.zip" >> $GITHUB_ENV
-          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:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: ${{ env.ASSET }}
-          asset_name: ${{ env.ASSET }}
-          asset_content_type: application/octet-stream

.gitmodules

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

CHANGELOG.md

@@ -0,0 +1 @@
+# Changelog

Cargo.lock

@@ -1266,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"
@@ -1323,11 +1311,10 @@ dependencies = [
 
 [[package]]
 name = "lyra"
-version = "0.10.0"
+version = "0.10.2"
 dependencies = [
  "dotenv",
  "json",
- "lib-spotify-parser",
  "once_cell",
  "openssl",
  "owoify",
@@ -1339,6 +1326,7 @@ dependencies = [
  "serde_json",
  "serenity",
  "songbird",
+ "spotify-parser",
  "symphonia",
  "tokio",
  "tracing",
@@ -2859,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"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lyra"
-version = "0.10.1"
+version = "0.10.2"
 authors = ["Michał Czyż <mike@c2yz.com>"]
 edition = "2021"
 description = "A featureful Discord bot written in Rust."
@@ -11,7 +11,7 @@ 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"] }

src/commands/music/play.rs

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