diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 5251d0f..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,11 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - -version: 2 -updates: - - package-ecosystem: "cargo" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index de196d3..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Rust - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -env: - CARGO_TERM_COLOR: always - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Build - run: cargo build --release --verbose - - name: Run tests - run: cargo test --verbose diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/ZMP-bot.iml b/.idea/ZMP-bot.iml deleted file mode 100644 index a1280b4..0000000 --- a/.idea/ZMP-bot.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 89a18de..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 30bab2a..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 831cc93..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index fe191a9..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/data/helpstart_api.rs b/src/data/helpstart_api.rs index 0ddd5d4..8c1a8f3 100644 --- a/src/data/helpstart_api.rs +++ b/src/data/helpstart_api.rs @@ -32,7 +32,7 @@ pub(crate) enum ListType { } pub(crate) async fn fetch_all(client: &Client) -> Result, Error> { - let url = "https://localhost:6969/list"; + let url = "http://localhost:6969/list"; let response: Vec = client .get(url) .send() diff --git a/src/error.rs b/src/error.rs index 96bf5c0..e86a7f8 100644 --- a/src/error.rs +++ b/src/error.rs @@ -13,9 +13,9 @@ macro_rules! reply_fail_handler { #[derive(Debug)] pub enum Error { - SqlxError(sqlx::Error), - ApiError(reqwest::Error), - SerenityError(serenity::Error), + Sqlx(sqlx::Error), + Api(reqwest::Error), + Serenity(serenity::Error), OnCooldown(std::time::Duration), Other(String), } @@ -23,9 +23,9 @@ pub enum Error { impl Display for Error { fn fmt(&self, f: &mut Formatter) -> FmtResult { match self { - Error::SqlxError(e) => write!(f, "SQLx Error: {}", e), - Error::ApiError(e) => write!(f, "HTTPS Error:\n{}", e), - Error::SerenityError(e) => write!(f, "Discord Error:\n {}", e), + Error::Sqlx(e) => write!(f, "SQLx Error: {}", e), + Error::Api(e) => write!(f, "HTTPS Error:\n{}", e), + Error::Serenity(e) => write!(f, "Discord Error:\n {}", e), Error::OnCooldown(d) => write!( f, "This command is on cooldown. {}s remaining.", @@ -38,23 +38,23 @@ impl Display for Error { impl From for Error { fn from(error: sqlx::Error) -> Self { - Error::SqlxError(error) + Error::Sqlx(error) } } impl From for Error { fn from(error: reqwest::Error) -> Self { - Error::ApiError(error) + Error::Api(error) } } impl From for Error { fn from(error: serenity::Error) -> Self { - Error::SerenityError(error) + Error::Serenity(error) } } -pub(crate) async fn handle_error<'a>(error: FrameworkError<'a, Data, Error>) { +pub(crate) async fn handle_error(error: FrameworkError<'_, Data, Error>) { match error { FrameworkError::Command { error, ctx, .. } => { reply_fail_handler!(ctx.send(