Release v0.11.3

Bumps [enumflags2](https://github.com/meithecatte/enumflags2) from 0.7.5 to 0.7.7.
- [Release notes](https://github.com/meithecatte/enumflags2/releases)
- [Commits](https://github.com/meithecatte/enumflags2/compare/v0.7.5...v0.7.7)

---
updated-dependencies:
- dependency-name: enumflags2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

.editorconfig

@@ -1,20 +0,0 @@
-# EditorConfig is awesome: https://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = false
-
-[*.yml]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = false

.github/workflows/build-release-binaries.yml

@@ -5,10 +5,11 @@ on:
     paths-ignore:
       - '*.md'
 
-  pull_request:
-
   workflow_dispatch:
 
+env:
+  CARGO_TERM_COLOR: always
+
 jobs:
   binaries:
     strategy:
@@ -85,7 +86,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          args: --release --target=${{ matrix.target }} ${{ matrix.cargo_flags }}
+          args: --all --release --target=${{ matrix.target }} ${{ matrix.cargo_flags }}
           use-cross: ${{ matrix.cross }}
 
       - name: Compress binaries
@@ -130,25 +131,3 @@ jobs:
           asset_name: imgurs-$tag-${{ matrix.release_name }}
           body: ${{ steps.changelog_reader.outputs.log_entry }}
         if: startsWith(github.ref, 'refs/tags/v')
-
-  crates:
-    name: Publish to crates.io
-    runs-on: ubuntu-latest
-
-    if: startsWith(github.ref, 'refs/tags/v')
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-
-      - name: Publish to crates.io
-        uses: actions-rs/cargo@v1
-        with:
-          command: publish
-          args: --token ${{ secrets.CARGO_REGISTRY_TOKEN }}

.github/workflows/build.yml

@@ -40,15 +40,16 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
+          args: --all
+
+      - name: cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features
 
       - name: cargo clippy
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: -- -D warnings
-
-      - name: rustfmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all --check
+          args: -- -D warnings --no-deps

.gitignore

@@ -1,4 +1,7 @@
 # Generated by Cargo
 # will have compiled files and executables
-/debug
 /target
+
+# IDE configs
+.vscode
+.idea

CHANGELOG.md

@@ -9,6 +9,85 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [0.11.3] - 2024-04-11
+- Updated dependencies
+- Replaced url validation with url crate in imgurs-cli
+
+## [0.11.2] - 2023-06-22
+- Updated dependencies
+- Fix deprecation warning of base64 crate.
+
+## [0.11.1] - 2022-12-11
+### Fixed
+- `album_title` can be null, `account_id` can be null, string or number #92, thanks to @NotNorom
+
+### Changed
+- Updated dependencies
+
+## [0.11.0] - 2022-11-07
+### Added
+- Added `with_http_client` method to ImgurClient #87, thanks to @NotNorom
+
+### Changed
+- Updated crate arboard to v3
+- Updated crate simple_logger to v4
+
+## [0.10.0] - 2022-10-01
+- add configuration for tls (rustls-tls or native-tls)
+
+## [0.9.1] - 2022-09-22
+- delete debug info from cli in release build
+
+## [0.9.0] - 2022-09-05
+- moved cli to other crate
+- added get_album function
+
+## [0.8.1] - 2022-06-18
+- fix tests
+- add missing doc
+- use `serde` instead of `serde_derive`
+
+## [0.8.0] - 2022-06-13
+- add custom `Error` type
+- move api requests to `requests/` mod
+- comment code
+
+## [0.7.4] - 2022-05-18
+### HOTFIX
+- fixed built on macos and windows
+
+## [0.7.3] - 2022-05-18
+### Library
+- add code comments and tests
+- change `String` to `&str` in ImgurClient functions
+
+### Other
+- bump deps
+- use `anyhow::Result<...>` instead `Result<..., Error>`
+
+## [0.7.2] - 2022-04-05
+### HotFix
+- fix upload image from file
+
+## [0.7.1] - 2022-04-04
+- fix build on what is not linux
+
+## [0.7.0] - 2022-04-03
+### CLI
+- completions: changed type from String to Shell
+- removed `&` from `cli.commands` (line 54 in [parse.rs](./src/cli/parse.rs))
+
+### Library
+- removed `.map_err(anyhow::Error::new)` when function returns error
+
+### Added
+- commands in the code
+- api functions to `impl` in `ImgurClient`
+- documentation (example usage)
+
+### Breaking Changes
+- lib: moved everything to the main package with api submodules (before `imgurs::api::ImgurClient`, after `imgurs::api::ImgurClient`)
+
 ## [0.6.0] - 2022-03-14
 ### CLI
 - webhook: added url in title
@@ -83,7 +162,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - upload image
 
 <!-- next-url -->
-[Unreleased]: https://github.com/MedzikUser/imgurs/compare/v0.6.0...HEAD
+[Unreleased]: https://github.com/MedzikUser/imgurs/compare/v0.11.3...HEAD
+[0.11.3]: https://github.com/MedzikUser/imgurs/commits/v0.11.3
+[0.11.2]: https://github.com/MedzikUser/imgurs/commits/v0.11.2
+[0.11.1]: https://github.com/MedzikUser/imgurs/commits/v0.11.1
+[0.11.0]: https://github.com/MedzikUser/imgurs/commits/v0.11.0
+[0.10.0]: https://github.com/MedzikUser/imgurs/commits/v0.10.0
+[0.9.1]: https://github.com/MedzikUser/imgurs/commits/v0.9.1
+[0.9.0]: https://github.com/MedzikUser/imgurs/commits/v0.9.0
+[0.8.1]: https://github.com/MedzikUser/imgurs/commits/v0.8.1
+[0.8.0]: https://github.com/MedzikUser/imgurs/commits/v0.8.0
+[0.7.4]: https://github.com/MedzikUser/imgurs/commits/v0.7.4
+[0.7.3]: https://github.com/MedzikUser/imgurs/commits/v0.7.3
+[0.7.2]: https://github.com/MedzikUser/imgurs/commits/v0.7.2
+[0.7.1]: https://github.com/MedzikUser/imgurs/commits/v0.7.1
+[0.7.0]: https://github.com/MedzikUser/imgurs/commits/v0.7.0
 [0.6.0]: https://github.com/MedzikUser/imgurs/commits/v0.6.0
 [0.5.1]: https://github.com/MedzikUser/imgurs/commits/v0.5.1
 [0.5.0]: https://github.com/MedzikUser/imgurs/commits/v0.5.0

Cargo.toml

@@ -1,61 +1,43 @@
+[workspace]
+members = ["imgurs-cli"]
+resolver = "2"
+
 [package]
 name = "imgurs"
-description = "API and CLI for Imgur"
+version = "0.11.3"
+description = "API for Imgur"
 license = "BSD-3-Clause"
-readme = "README.md"
-authors = ["MedzikUser <nivua1fn@duck.com>"]
-homepage = "https://github.com/MedzikUser/imgurs"
-repository = "https://github.com/MedzikUser/imgurs.git"
+authors = ["M3DZIK <me@medzik.dev>"]
+homepage = "https://github.com/M3DZIK/imgurs"
+repository = "https://github.com/M3DZIK/imgurs.git"
 keywords = ["imgur", "imgur-api", "image", "image-upload"]
-categories = ["command-line-utilities"]
-rust-version = "1.58"
-version = "0.6.0"
 edition = "2021"
 
+[features]
+default = ["imgur", "rustls-tls"]
+full = ["imgur"]
+rustls-tls = ["reqwest/rustls-tls"]
+native-tls = ["reqwest/native-tls"]
+imgur = []
+
 [profile.release]
 lto = true
-panic = 'abort'
 opt-level = 'z'
 codegen-units = 1
 
 [dependencies]
-dirs = "4.0.0"
-serde = "1.0.136"
-serde_derive = "1.0.136"
-toml = "0.5.8"
-serde_json = "1.0.79"
-chrono = "0.4.19"
-base64 = "0.13.0"
-notify-rust = "4.5.6"
-clap_complete = "3.1.1"
-anyhow = "1.0.56"
-better-panic = "0.3.0"
-validator = "0.14.0"
-colored = "2.0.0"
-clap_mangen = "0.1.2"
-discord-webhook = "0.1.0"
+# HTTP
+reqwest = { version = "0.12", default-features = false, features = ["json", "multipart"] }
+# Request
+base64 = "0.22"
+url = "2.5.0" # validate url address
+# Response
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 
-[target.'cfg(not(all(unix, not(any(target_os="macos", target_os="android", target_os="emscripten")))))'.dependencies]
-arboard = "2.1.0"
+# Errors
+thiserror = "1.0"
 
-[dependencies.clap]
-version = "3.1.6"
-features = ["derive", "cargo", "std"]
-
-[dependencies.log]
-version = "0.4.14"
-features = ["release_max_level_info", "max_level_debug"]
-
-[dependencies.simple_logger]
-version = "2.1.0"
-default-features = false
-features = ["colors"]
-
-[dependencies.reqwest]
-version = "0.11.9"
-default-features = false
-features = ["json", "rustls-tls"]
-
-[dependencies.tokio]
-version = "1.17.0"
-features = ["macros", "rt-multi-thread"]
+[dev-dependencies]
+# Async tests
+tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] }

README.md

@@ -1,10 +1,16 @@
+[crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
+[docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs
+
 # Imgurs - CLI and Library for Imgur API
 
+[![crates-io]](https://crates.io/crates/imgurs)
+[![docs-rs]](https://docs.rs/imgurs)
+
 ## Screenshots
 
-![upload](https://i.imgur.com/MG35kvf.png)
+![](https://i.imgur.com/MG35kvf.png)
 
-![delete](https://cdn.magicuser.cf/TSxBrhO.png)
+![](https://i.imgur.com/TSxBrhO.png)
 
 ## Shell completions
 
@@ -62,4 +68,4 @@ Download imgurs-windows.exe from [the releases page](https://github.com/MedzikUs
 ### **Compile with Cargo**
 Make sure you have a recent version of Rust. Then you can run
 
-    cargo install imgurs
+    cargo install imgurs-cli

config.toml

@@ -7,7 +7,3 @@ enabled = true
 
 [clipboard]
 enabled = true
-
-[discord_webhook]
-enabled = false
-uri = ''

imgurs-cli/Cargo.toml

@@ -0,0 +1,46 @@
+[package]
+name = "imgurs-cli"
+version = "0.11.3"
+description = "CLI for Imgur"
+license = "BSD-3-Clause"
+authors = ["M3DZIK <me@medzik.dev>"]
+homepage = "https://github.com/M3DZIK/imgurs"
+repository = "https://github.com/M3DZIK/imgurs.git"
+keywords = ["imgur", "imgur-api", "image", "image-upload"]
+categories = ["command-line-utilities"]
+edition = "2021"
+
+[[bin]]
+name = "imgurs"
+path = "src/main.rs"
+
+[dependencies]
+# Async runtime
+tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] }
+
+# CLI
+clap = { version = "4.5", features = ["derive"] }
+clap_complete = "4.5"
+clap_mangen = "0.2"
+
+# Errors
+anyhow = "1.0"
+
+# Logger
+log = { version = "0.4", features = ["release_max_level_info"] }
+simple_logger = "4.3"
+colored = "2.1"
+
+# Config
+toml = "0.8"
+serde = { version = "1.0", features = ["derive"] }
+
+# Other
+chrono = "0.4" # parse upload date
+notify-rust = "4.11" # send notification after upload
+dirs = "5.0" # get system configuration directory
+
+imgurs = { path = "..", version = "0.11.0", features = ["full"] }
+
+[target.'cfg(not(all(unix, not(any(target_os="macos", target_os="android", target_os="emscripten")))))'.dependencies]
+arboard = "3.3" # copy url to clipboard

imgurs-cli/config.toml

@@ -0,0 +1 @@
+../config.toml

imgurs-cli/src/config/mod.rs

@@ -0,0 +1,37 @@
+use serde::{Deserialize, Serialize};
+
+pub mod toml;
+
+/// Configuration schema
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Config {
+    /// Imgur API configuration options
+    pub imgur: ConfigImgur,
+    /// Notification options
+    pub notification: ConfigNotification,
+    /// Clipboard options
+    pub clipboard: ConfigClipboard,
+}
+
+/// Imgur API configuration options
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ConfigImgur {
+    /// Imgur Client ID
+    pub id: String,
+    /// Imgur Domain (e.g. if you have a imgur proxy)
+    pub image_cdn: String,
+}
+
+/// Notification options
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ConfigNotification {
+    /// Send notification
+    pub enabled: bool,
+}
+
+/// Clipboard options
+#[derive(Debug, Serialize, Deserialize)]
+pub struct ConfigClipboard {
+    /// Copy image url to clipboard
+    pub enabled: bool,
+}

imgurs-cli/src/config/toml.rs

@@ -1,19 +1,22 @@
-use super::Config;
-
-use anyhow::Error;
-use colored::Colorize;
-use dirs::config_dir;
-use log::warn;
 use std::{
     fs::{create_dir_all, read_to_string, File},
     io::{self, Write as _},
     path::Path,
 };
+
+use colored::Colorize;
+use dirs::config_dir;
+use log::warn;
 use toml::from_str as toml_from_str;
 
+use super::Config;
+
+/// Configuration file path (in system config directory).
 const CONFIG_DIR: &str = "/imgurs/config.toml";
 
+/// Parse configuration file
 pub fn parse() -> Config {
+    // parse config or use default
     toml().unwrap_or_else(|err| {
         let mut stdout = std::io::stdout();
 
@@ -26,7 +29,7 @@ pub fn parse() -> Config {
             .expect("failed to read line");
 
         if value.to_lowercase() != "n\n" {
-            warn!("Parse toml config: {err}! Creating config file...");
+            warn!("Parse toml config error: {err}! Creating config file...");
 
             let default_config = include_str!(concat!("../../config.toml"));
 
@@ -45,16 +48,16 @@ pub fn parse() -> Config {
 
             toml().expect("parse toml config")
         } else {
-            panic!("New config creation cancelled!")
+            panic!("Configuration file creation cancelled!")
         }
     })
 }
 
-fn toml() -> Result<Config, Error> {
+fn toml() -> anyhow::Result<Config> {
     let config_dir = config_dir().unwrap();
     let file_dir = format!("{}{CONFIG_DIR}", config_dir.to_string_lossy());
-    let toml_str = read_to_string(file_dir).map_err(Error::new)?;
-    let decode = toml_from_str(&toml_str).map_err(Error::new)?;
+    let toml_str = read_to_string(file_dir)?;
+    let decode = toml_from_str(&toml_str)?;
 
     Ok(decode)
 }

imgurs-cli/src/imgur/clipboard.rs

@@ -2,25 +2,20 @@
     unix,
     not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
 ))]
-fn is_program_in_path(program: &str) -> bool {
-    use std::{env, fs};
-
-    if let Ok(path) = env::var("PATH") {
-        for p in path.split(':') {
-            let p_str = format!("{}/{}", p, program);
-            if fs::metadata(p_str).is_ok() {
-                return true;
+// use xclip (or a similar program that is installed) because the kernel deletes the clipboard after the process ends
+pub fn set_clipboard(content: &str) {
+    fn is_program_in_path(program: &str) -> bool {
+        if let Ok(path) = std::env::var("PATH") {
+            for p in path.split(':') {
+                let p_str = format!("{}/{}", p, program);
+                if std::fs::metadata(p_str).is_ok() {
+                    return true;
+                }
             }
         }
+        false
     }
-    false
-}
 
-#[cfg(all(
-    unix,
-    not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
-))]
-pub fn set_clipboard(content: String) {
     use std::{
         io::Write,
         process::{Command, Stdio},
@@ -38,6 +33,7 @@ pub fn set_clipboard(content: String) {
             .stdin(Stdio::piped())
             .spawn()
             .expect("execute command xsel")
+
     // xclip
     } else if is_program_in_path("xclip") {
         child = Command::new("xclip")
@@ -47,41 +43,43 @@ pub fn set_clipboard(content: String) {
             .stdin(Stdio::piped())
             .spawn()
             .expect("execute command xclip")
+
     // termux
     } else if is_program_in_path("termux-clipboard-set") {
         child = Command::new("termux-clipboard-set")
             .stdin(Stdio::piped())
             .spawn()
             .expect("execute command termux-clipboard-set")
+
+    // the above programs responsible for the clipboard were not found
     } else {
         println!(
             "{} {}",
             "WARN".yellow(),
             "command for clipboard not found".magenta()
         );
+
         return;
     }
 
+    // copy the content (send it to stdin command)
     child
         .stdin
         .as_mut()
         .unwrap()
         .write_all(content.as_bytes())
         .expect("execute command");
-    child.wait_with_output().unwrap();
+
+    child
+        .wait_with_output()
+        .expect("wait for clipboard command output");
 }
 
 #[cfg(not(all(
     unix,
     not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
 )))]
-use arboard::Clipboard;
-
-#[cfg(not(all(
-    unix,
-    not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))
-)))]
-pub fn set_clipboard(content: String) {
-    let mut clipboard = Clipboard::new().unwrap();
-    clipboard.set_text(content).unwrap();
+pub fn set_clipboard(content: &str) {
+    let mut clipboard = arboard::Clipboard::new().unwrap();
+    clipboard.set_text(content.to_string()).unwrap();
 }

imgurs-cli/src/imgur/credits.rs

@@ -1,11 +1,17 @@
-use chrono::{prelude::DateTime, Utc};
-use colored::Colorize;
-use imgurs::api::{rate_limit::rate_limit, ImgurClient};
 use std::time::{Duration, UNIX_EPOCH};
 
-pub async fn credits(client: ImgurClient) {
-    let i = rate_limit(client).await.expect("send api request");
+use chrono::{prelude::DateTime, Utc};
+use colored::Colorize;
+use imgurs::ImgurClient;
 
+pub async fn credits(client: ImgurClient) {
+    // get client ratelimit from imgur api
+    let i = client
+        .rate_limit()
+        .await
+        .expect("send request to imgur api");
+
+    // format image upload date
     let date = UNIX_EPOCH + Duration::from_secs(i.data.user_reset.try_into().unwrap());
     let datetime = DateTime::<Utc>::from(date);
     let timestamp_str = datetime.format("%Y-%m-%d %H:%M:%S").to_string();

imgurs-cli/src/imgur/delete_image.rs

@@ -0,0 +1,15 @@
+use colored::Colorize;
+use imgurs::ImgurClient;
+
+pub async fn delete_image(client: ImgurClient, delete_hash: String) {
+    // delete image from imgur
+    client
+        .delete_image(&delete_hash)
+        .await
+        .expect("send api request");
+
+    println!(
+        "{}",
+        "If Delete Hash was correct the image was deleted!".magenta()
+    );
+}

imgurs-cli/src/imgur/info_image.rs

@@ -0,0 +1,14 @@
+use imgurs::ImgurClient;
+
+use super::print_image_info;
+
+pub async fn image_info(client: ImgurClient, id: String) {
+    // get a image info from imgur
+    let info = client
+        .image_info(&id)
+        .await
+        .expect("send request to imfur api");
+
+    // print image information from imgur
+    print_image_info(&info);
+}

imgurs-cli/src/imgur/mod.rs

@@ -1,49 +1,54 @@
-pub mod clipboard;
-pub mod credits;
-pub mod delete_image;
-pub mod info_image;
-pub mod parse;
-pub mod upload_image;
-pub mod webhook;
+mod clipboard;
+mod credits;
+mod delete_image;
+mod info_image;
+mod upload_image;
+
+use std::time::{Duration, UNIX_EPOCH};
 
 use chrono::{prelude::DateTime, Utc};
 use colored::Colorize;
-use imgurs::api::ImageInfo;
-use std::time::{Duration, UNIX_EPOCH};
+use imgurs::ImageInfo;
 
-pub fn print_image_info(i: ImageInfo) {
+pub use self::{clipboard::*, credits::*, delete_image::*, info_image::*, upload_image::*};
+
+// print image information from imgur
+pub fn print_image_info(i: &ImageInfo) {
+    // format image upload date
     let d = UNIX_EPOCH + Duration::from_secs(i.data.datetime.try_into().unwrap());
     let datetime = DateTime::<Utc>::from(d);
     let timestamp_str = datetime.format("%Y-%m-%d %H:%M:%S").to_string();
 
+    // image title
     if i.data.title != None {
+        let title = i.data.title.clone();
+
         println!(
             "{} {}",
             "title".green(),
-            i.data
-                .title
-                .unwrap_or_else(|| "unknown".to_string())
-                .magenta()
+            title.unwrap_or_else(|| "unknown".to_string()).magenta()
         );
     }
+
+    // image description
     if i.data.description != None {
+        let desc = i.data.description.clone();
+
         println!(
             "{} {}",
             "description".green(),
-            i.data
-                .description
-                .unwrap_or_else(|| "unknown".to_string())
-                .magenta()
+            desc.unwrap_or_else(|| "unknown".to_string()).magenta()
         );
     }
+
+    // image deletehas
     if i.data.deletehash != None {
+        let delhash = i.data.deletehash.clone();
+
         println!(
             "{} {}",
             "deletehash".green(),
-            i.data
-                .deletehash
-                .unwrap_or_else(|| "unknown".to_string())
-                .magenta()
+            delhash.unwrap_or_else(|| "unknown".to_string()).magenta()
         );
     }
 

imgurs-cli/src/imgur/upload_image.rs

@@ -0,0 +1,49 @@
+use imgurs::ImgurClient;
+use notify_rust::Notification;
+
+use crate::{
+    config::toml,
+    imgur::{clipboard::set_clipboard, print_image_info},
+};
+
+// show notification
+macro_rules! notify (
+    ($notification: expr) => (
+        if toml::parse().notification.enabled {
+            $notification.show().expect("send notification");
+        }
+    );
+);
+
+pub async fn upload_image(client: ImgurClient, path: String) {
+    // parse configuration file
+    let config = toml::parse();
+
+    // upload a image to imgur
+    let mut i = client.upload_image(&path).await.unwrap_or_else(|err| {
+        notify!(Notification::new()
+            .summary("Error!")
+            .body(&format!("Error: {}", err))
+            .appname("Imgurs")); // I don't think you can set it to error
+
+        panic!("send request to imgur api: {}", err)
+    });
+
+    // change domain to proxy (to be set in config)
+    if config.imgur.image_cdn != "i.imgur.com" {
+        i.data.link = i.data.link.replace("i.imgur.com", &config.imgur.image_cdn)
+    }
+
+    // print image information from imgur
+    print_image_info(&i);
+
+    // send notification that the image has been uploaded
+    notify!(Notification::new()
+        .summary("Imgurs")
+        .body(&format!("Uploaded {}", i.data.link)));
+
+    // if enabled copy link to clipboard
+    if config.clipboard.enabled {
+        set_clipboard(&i.data.link)
+    }
+}

imgurs-cli/src/main.rs

@@ -0,0 +1,82 @@
+use std::io::stdout;
+
+use clap::{Command, CommandFactory, Parser};
+use clap_complete::{generate, Generator, Shell};
+use imgurs::ImgurClient;
+use simple_logger::SimpleLogger;
+
+use crate::imgur::*;
+
+mod config;
+mod imgur;
+
+#[derive(Parser, Debug)]
+#[clap(
+    name = "imgurs",
+    about = "Imgur API CLI",
+    long_about = env!("CARGO_PKG_DESCRIPTION"),
+    version = env!("CARGO_PKG_VERSION"),
+)]
+enum Cli {
+    #[clap(about = "Print Client Rate Limit", display_order = 1)]
+    Credits,
+
+    #[clap(about = "Upload image to Imgur", display_order = 2)]
+    Upload { path: String },
+
+    #[clap(about = "Delete image from Imgur", display_order = 3)]
+    Delete { delete_hash: String },
+
+    #[clap(about = "Print image info", display_order = 4)]
+    Info { id: String },
+
+    #[clap(
+        about = "Generate completion file for a shell [bash, elvish, fish, powershell, zsh]",
+        display_order = 5
+    )]
+    Completions { shell: Shell },
+
+    #[clap(about = "Generate man page", display_order = 6)]
+    Manpage,
+}
+
+#[tokio::main]
+async fn main() {
+    SimpleLogger::new().init().unwrap();
+
+    // parse config file
+    let config = config::toml::parse();
+
+    // create imgur client
+    let client = ImgurClient::new(&config.imgur.id);
+
+    let args = Cli::parse();
+
+    match args {
+        Cli::Credits => credits(client).await,
+
+        Cli::Upload { path } => upload_image(client, path).await,
+
+        Cli::Delete { delete_hash } => delete_image(client, delete_hash.to_string()).await,
+
+        Cli::Info { id } => image_info(client, id.to_string()).await,
+
+        Cli::Completions { shell } => {
+            let mut app = Cli::command();
+
+            fn print_completions<G: Generator>(gen: G, app: &mut Command) {
+                generate(gen, app, app.get_name().to_string(), &mut stdout())
+            }
+
+            print_completions(shell, &mut app)
+        },
+
+        Cli::Manpage => {
+            let clap_app = Cli::command();
+            let man = clap_mangen::Man::new(clap_app);
+
+            man.render(&mut stdout())
+                .expect("Failed to generate man page");
+        },
+    }
+}

renovate.json

@@ -1,8 +1,14 @@
 {
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
     "extends": [
-        "config:base"
+        "config:base",
+        "schedule:weekly",
+        "group:allNonMajor",
+        ":semanticCommits"
+    ],
+    "labels": [
+        "dependencies"
     ],
-    "prHourlyLimit": 0,
     "automergeType": "pr",
     "prCreation": "immediate",
     "packageRules": [

rustfmt.toml

@@ -0,0 +1,11 @@
+# https://rust-lang.github.io/rustfmt
+
+# stable
+edition = "2021"
+newline_style = "Unix"
+match_block_trailing_comma = true
+
+# nightly
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
+format_code_in_doc_comments = true

src/api/delete_image.rs

@@ -1,29 +0,0 @@
-use super::send_api_request;
-use crate::api::configuration::{api_url, ImgurClient};
-
-use reqwest::Method;
-use std::io::{Error, ErrorKind};
-
-pub async fn delete_image(c: ImgurClient, delete_hash: String) -> Result<String, anyhow::Error> {
-    let uri = api_url!(format!("image/{delete_hash}"));
-    let res = send_api_request(&c, Method::DELETE, uri, None).await?;
-
-    let status = res.status();
-
-    if status.is_client_error() || status.is_server_error() {
-        let mut body = res.text().await.map_err(anyhow::Error::new)?;
-
-        if body.chars().count() > 30 {
-            body = "body is too length".to_string()
-        }
-
-        let err = Error::new(
-            ErrorKind::Other,
-            format!("server returned non-successful status code = {status}, body = {body}"),
-        );
-
-        Err(anyhow::Error::from(err))
-    } else {
-        Ok("If the delete hash was correct the image was deleted!".to_string())
-    }
-}

src/api/get_image.rs

@@ -1,25 +0,0 @@
-use super::send_api_request;
-use crate::api::configuration::{api_url, ImgurClient};
-use crate::api::ImageInfo;
-
-use reqwest::Method;
-use std::io::{Error, ErrorKind};
-
-pub async fn get_image(c: ImgurClient, image: &str) -> Result<ImageInfo, anyhow::Error> {
-    let uri = api_url!(format!("image/{image}"));
-    let res = send_api_request(&c, Method::GET, uri, None).await?;
-
-    let status = res.status();
-
-    if status.is_client_error() || status.is_server_error() {
-        let err = Error::new(
-            ErrorKind::Other,
-            format!("server returned non-successful status code = {status}"),
-        );
-
-        Err(anyhow::Error::from(err))
-    } else {
-        let content: ImageInfo = res.json().await.map_err(anyhow::Error::new)?;
-        Ok(content)
-    }
-}

src/api/image_type.rs

@@ -1,27 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct ImageInfo {
-    pub data: ImageInfoData,
-    pub success: bool,
-    pub status: i32,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct ImageInfoData {
-    pub id: String,
-    pub title: Option<String>,
-    pub description: Option<String>,
-    pub datetime: i32,
-    #[serde(rename = "type")]
-    pub img_type: String,
-    pub animated: bool,
-    pub width: i32,
-    pub height: i32,
-    pub size: i32,
-    pub views: i32,
-    pub bandwidth: i64,
-    pub favorite: bool,
-    pub deletehash: Option<String>,
-    pub link: String,
-}

src/api/upload_image.rs

@@ -1,40 +0,0 @@
-use super::send_api_request;
-use crate::api::{
-    configuration::{api_url, ImgurClient},
-    ImageInfo,
-};
-
-use reqwest::Method;
-use std::{
-    collections::HashMap,
-    io::{Error, ErrorKind},
-};
-
-pub async fn upload_image(c: ImgurClient, image: &str) -> Result<ImageInfo, anyhow::Error> {
-    let mut form = HashMap::new();
-
-    form.insert("image", image.to_string());
-
-    let uri = api_url!("image");
-    let res = send_api_request(&c, Method::POST, uri, Some(form)).await?;
-
-    let status = res.status();
-
-    if status.is_client_error() || status.is_server_error() {
-        let mut body = res.text().await.map_err(anyhow::Error::new)?;
-
-        if body.chars().count() > 30 {
-            body = "body is too length".to_string()
-        }
-
-        let err = Error::new(
-            ErrorKind::Other,
-            format!("server returned non-successful status code = {status}, body = {body}"),
-        );
-
-        Err(anyhow::Error::from(err))
-    } else {
-        let content: ImageInfo = res.json().await.map_err(anyhow::Error::new)?;
-        Ok(content)
-    }
-}

src/cli/delete_image.rs

@@ -1,11 +0,0 @@
-use colored::Colorize;
-
-use imgurs::api::{delete_image::delete_image as del_img, ImgurClient};
-
-pub async fn delete_image(client: ImgurClient, delete_hash: String) {
-    let i = del_img(client, delete_hash)
-        .await
-        .expect("send api request");
-
-    println!("{}", i.magenta());
-}

src/cli/info_image.rs

@@ -1,8 +0,0 @@
-use imgurs::api::{get_image::get_image, ImgurClient};
-
-use super::print_image_info;
-
-pub async fn image_info(client: ImgurClient, id: &str) {
-    let info = get_image(client, id).await.expect("send api request");
-    print_image_info(info);
-}

src/cli/parse.rs

@@ -1,90 +0,0 @@
-use clap::{Command, IntoApp, Parser, Subcommand};
-use clap_complete::{generate, Generator, Shell};
-use imgurs::api::ImgurClient;
-use std::io::{self, stdout};
-
-use crate::cli::{credits::*, delete_image::*, info_image::*, upload_image::*};
-
-const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
-const NAME: Option<&str> = option_env!("CARGO_PKG_NAME");
-
-#[derive(Parser, Debug)]
-#[clap(
-    name = NAME.unwrap_or("unknown"),
-    about = "Imgur API CLI", long_about = None,
-    version = VERSION.unwrap_or("unknown")
-)]
-struct Cli {
-    #[clap(subcommand)]
-    command: Commands,
-}
-
-#[derive(Subcommand, Debug)]
-enum Commands {
-    #[clap(about = "Print API Rate Limit", display_order = 1)]
-    Credits,
-
-    #[clap(about = "Upload image to Imgur", display_order = 2)]
-    Upload { path: String },
-
-    #[clap(about = "Delete image from Imgur", display_order = 3)]
-    Delete { delete_hash: String },
-
-    #[clap(about = "Print image info", display_order = 4)]
-    Info { id: String },
-
-    #[clap(
-        about = "Generate completion file for a shell [bash, elvish, fish, powershell, zsh]",
-        display_order = 5
-    )]
-    Completions { shell: String },
-
-    #[clap(about = "Generate man page", display_order = 6)]
-    Manpage,
-}
-
-fn print_completions<G: Generator>(gen: G, app: &mut Command) {
-    generate(gen, app, app.get_name().to_string(), &mut stdout())
-}
-
-pub async fn parse(client: ImgurClient) {
-    let args = Cli::parse();
-
-    match &args.command {
-        Commands::Credits => {
-            credits(client).await;
-        }
-
-        Commands::Upload { path } => {
-            upload_image(client, path).await;
-        }
-
-        Commands::Delete { delete_hash } => {
-            delete_image(client, delete_hash.to_string()).await;
-        }
-
-        Commands::Info { id } => {
-            image_info(client, id).await;
-        }
-
-        Commands::Completions { shell } => {
-            let mut app = Cli::command();
-
-            match shell.as_str() {
-                "bash" => print_completions(Shell::Bash, &mut app),
-                "elvish" => print_completions(Shell::Elvish, &mut app),
-                "fish" => print_completions(Shell::Fish, &mut app),
-                "powershell" => print_completions(Shell::PowerShell, &mut app),
-                "zsh" => print_completions(Shell::Zsh, &mut app),
-
-                _ => panic!("Completions to shell `{shell}`, not found!"),
-            }
-        }
-
-        Commands::Manpage => {
-            let clap_app = Cli::command();
-            let man = clap_mangen::Man::new(clap_app);
-            man.render(&mut io::stdout()).unwrap();
-        }
-    }
-}

src/cli/upload_image.rs

@@ -1,62 +0,0 @@
-use super::clipboard::set_clipboard;
-use imgurs::api::{upload_image::upload_image as upload_img, ImgurClient};
-use notify_rust::Notification;
-
-use crate::{cli::webhook::send_discord_webhook, config::toml};
-
-use super::print_image_info;
-
-use base64::encode as base64_encode;
-use std::{fs::read as fs_read, path::Path};
-
-macro_rules! notify (
-    ($notification: expr) => (
-        if toml::parse().notification.enabled {
-            $notification.show().expect("send notification");
-        }
-    );
-);
-
-pub async fn upload_image(client: ImgurClient, path: &str) {
-    let mut image: String = path.to_string();
-
-    let config = toml::parse();
-
-    if Path::new(path).exists() {
-        let bytes = fs_read(path)
-            .map_err(|err| err.to_string())
-            .expect("read file");
-        image = base64_encode(bytes);
-    } else if !validator::validate_url(path) {
-        panic!("{path} is not a url")
-    }
-
-    let mut i = upload_img(client, &image).await.unwrap_or_else(|err| {
-        notify!(Notification::new()
-            .summary("Error!")
-            .body(&format!("Error: {}", &err.to_string()))
-            .appname("Imgurs")); // I don't think you can set it to error
-
-        panic!("{}", err)
-    });
-
-    if config.imgur.image_cdn != "i.imgur.com" {
-        i.data.link = i.data.link.replace("i.imgur.com", "cdn.magicuser.cf")
-    }
-
-    print_image_info(i.clone());
-
-    let body = format!("Uploaded {}", i.data.link);
-
-    notify!(Notification::new().summary("Imgurs").body(&body));
-
-    if config.clipboard.enabled {
-        set_clipboard(i.data.link.clone())
-    }
-
-    if config.discord_webhook.enabled {
-        send_discord_webhook(i.data.link, i.data.deletehash.unwrap())
-            .await
-            .expect("send discord webhook");
-    }
-}

src/cli/webhook.rs

@@ -1,30 +0,0 @@
-use discord_webhook::client::WebhookClient;
-use std::error::Error;
-
-use crate::config::toml;
-
-pub async fn send_discord_webhook(
-    link: String,
-    deletehash: String,
-) -> Result<bool, Box<dyn Error + Send + Sync>> {
-    let url = toml::parse().discord_webhook.uri;
-    let client: WebhookClient = WebhookClient::new(&url);
-
-    client
-        .send(|message| {
-            message.username("Imgurs").embed(|embed| {
-                embed
-                    .title(&link)
-                    .description(&format!("Delete Hash ||{deletehash}||"))
-                    .image(&link)
-                    .footer(
-                        &format!(
-                            "Imgurs v{}",
-                            option_env!("CARGO_PKG_VERSION").unwrap_or("unknown")
-                        ),
-                        None,
-                    )
-            })
-        })
-        .await
-}

src/config/mod.rs

@@ -1,33 +0,0 @@
-use serde_derive::Deserialize;
-
-pub mod toml;
-
-#[derive(Debug, Deserialize)]
-pub struct Config {
-    pub imgur: ConfigImgur,
-    pub notification: ConfigNotification,
-    pub clipboard: ConfigClipboard,
-    pub discord_webhook: ConfigDiscordWebhook,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ConfigImgur {
-    pub id: String,
-    pub image_cdn: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ConfigNotification {
-    pub enabled: bool,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ConfigClipboard {
-    pub enabled: bool,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ConfigDiscordWebhook {
-    pub enabled: bool,
-    pub uri: String,
-}

src/error.rs

@@ -0,0 +1,36 @@
+use thiserror::Error;
+
+/// Client Errors
+#[derive(Debug, Error)]
+pub enum Error {
+    /// Imgur API returned non-successful status code
+    #[error("server reponse non-successful status code - {0}, body = `{1}`")]
+    ApiError(u16, String),
+    /// Imgur API returned non-successful status code (body is too long)
+    #[error("server reponse non-successful status code - {0}, (response body is too long)")]
+    ApiErrorBodyTooLong(u16),
+    /// Invalid file path or URL adress
+    #[error("{0} is not url or file path")]
+    InvalidUrlOrFile(String),
+    /// Imgur API error or reqwest::Error
+    #[error("send request to imgur api: {0}")]
+    SendApiRequest(reqwest::Error),
+    /// std::io::Error
+    #[error("io error - {0}")]
+    IoError(std::io::Error),
+}
+
+impl From<reqwest::Error> for Error {
+    fn from(err: reqwest::Error) -> Self {
+        Error::SendApiRequest(err)
+    }
+}
+
+impl From<std::io::Error> for Error {
+    fn from(err: std::io::Error) -> Self {
+        Error::IoError(err)
+    }
+}
+
+/// A `Result` alias where the `Err` case is `imgurs::Error`
+pub type Result<T> = std::result::Result<T, Error>;

src/imgur/album_type.rs

@@ -0,0 +1,69 @@
+use serde::{Deserialize, Serialize};
+
+use crate::ImageInfoData;
+
+/// Album Info Response
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+pub struct AlbumInfo {
+    /// Image Data
+    pub data: AlbumInfoData,
+    /// Request processed success or not.
+    pub success: bool,
+    /// HTTP status code from API request.
+    pub status: i32,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+pub struct AlbumInfoData {
+    /// Album ID
+    pub id: String,
+    /// Title of the album
+    pub title: Option<String>,
+    /// Description of the album
+    pub description: Option<String>,
+    pub datetime: i64,
+    pub cover: String,
+    pub cover_edited: Option<String>,
+    pub cover_width: i64,
+    pub cover_height: i64,
+    pub account_url: Option<String>,
+    pub account_id: Option<AccountId>,
+    pub privacy: String,
+    pub layout: String,
+    pub views: i64,
+    /// Album link
+    pub link: String,
+    pub favorite: bool,
+    pub nsfw: bool,
+    pub section: Option<String>,
+    pub images_count: i64,
+    pub in_gallery: bool,
+    pub is_ad: bool,
+    pub include_album_ads: bool,
+    pub is_album: bool,
+    pub images: Vec<ImageInfoData>,
+    pub ad_config: AdConfig,
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+#[serde(untagged)]
+pub enum AccountId {
+    String(String),
+    Int(i64),
+}
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+pub struct AdConfig {
+    #[serde(rename = "safeFlags")]
+    pub safe_flags: Vec<String>,
+    #[serde(rename = "highRiskFlags")]
+    pub high_risk_flags: Vec<String>,
+    #[serde(rename = "unsafeFlags")]
+    pub unsafe_flags: Vec<String>,
+    #[serde(rename = "wallUnsafeFlags")]
+    pub wall_unsafe_flags: Vec<String>,
+    #[serde(rename = "showsAds")]
+    pub shows_ads: bool,
+    #[serde(rename = "showAdLevel")]
+    pub show_ad_level: i64,
+}

src/imgur/client.rs

@@ -1,16 +1,20 @@
-use reqwest::Client;
-use std::fmt;
-
 macro_rules! api_url (
     ($path: expr) => (
         format!("{}{}", "https://api.imgur.com/3/", $path)
     );
 );
 
-pub(crate) use api_url;
+use std::fmt;
 
+pub(crate) use api_url;
+use reqwest::Client;
+
+/// Imgur Client
+#[derive(Clone)]
 pub struct ImgurClient {
+    /// Imgur API Client ID
     pub client_id: String,
+    /// HTTP Client
     pub client: Client,
 }
 
@@ -19,10 +23,3 @@ impl fmt::Debug for ImgurClient {
         write!(f, "ImgurClient - client_id: {}", self.client_id)
     }
 }
-
-impl ImgurClient {
-    pub fn new(client_id: String) -> Self {
-        let client = Client::new();
-        ImgurClient { client_id, client }
-    }
-}

src/imgur/image_type.rs

@@ -0,0 +1,48 @@
+use serde::{Deserialize, Serialize};
+
+/// Image Info Response
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+pub struct ImageInfo {
+    /// Image Data
+    pub data: ImageInfoData,
+    /// Request processed success or not.
+    pub success: bool,
+    /// HTTP status code from API request.
+    pub status: i32,
+}
+
+/// Image Info Reponse (`data` json)
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+pub struct ImageInfoData {
+    /// Image ID
+    /// e.g. `iDYNKJq`
+    pub id: String,
+    /// Image title
+    pub title: Option<String>,
+    /// Description of this image
+    pub description: Option<String>,
+    /// Image uploaded time
+    pub datetime: i32,
+    /// Image type
+    /// e.g. `image/png`
+    #[serde(rename = "type")]
+    pub img_type: String,
+    /// If image if animated (gif, etc)
+    pub animated: bool,
+    /// Width of this image
+    pub width: i32,
+    /// Height of this image
+    pub height: i32,
+    /// Image size in bytes
+    pub size: i32,
+    /// Unique image views
+    pub views: i32,
+    /// Bandwidth used by this image
+    pub bandwidth: i64,
+    /// If image is added to favorite
+    pub favorite: bool,
+    /// Delete hash (only show after image upload)
+    pub deletehash: Option<String>,
+    /// Link of this image
+    pub link: String,
+}

src/imgur/mod.rs

@@ -0,0 +1,148 @@
+mod album_type;
+mod client;
+mod image_type;
+mod requests;
+mod send_api_request;
+
+pub use album_type::*;
+pub(crate) use client::api_url;
+pub use client::ImgurClient;
+pub use image_type::*;
+pub use send_api_request::*;
+use url::Url;
+
+use crate::{Error, Result};
+
+impl ImgurClient {
+    /// Create a new Imgur Client
+    /// ```
+    /// use imgurs::ImgurClient;
+    ///
+    /// let client = ImgurClient::new("3e3ce0d7ac14d56");
+    /// ```
+    pub fn new(client_id: &str) -> Self {
+        let client_id = client_id.to_string();
+        let client = reqwest::Client::new();
+        ImgurClient { client_id, client }
+    }
+
+    /// Create a new Imgur Client with the provided `reqwest::Client`
+    ///
+    /// This allows for customization of the http client settings like timeout or the user agent.
+    /// ```
+    /// use imgurs::ImgurClient;
+    /// use reqwest::Client;
+    ///
+    /// let http_client = Client::builder().build().unwrap();
+    ///
+    /// let client = ImgurClient::with_http_client("3e3ce0d7ac14d56", http_client);
+    /// ```
+    pub fn with_http_client(client_id: &str, http_client: reqwest::Client) -> Self {
+        let client_id = client_id.to_string();
+        ImgurClient {
+            client_id,
+            client: http_client,
+        }
+    }
+
+    /// Upload image to Imgur
+    /// ```
+    /// use imgurs::ImgurClient;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let client = ImgurClient::new("3e3ce0d7ac14d56");
+    ///
+    ///     client
+    ///         .upload_image("https://i.imgur.com/lFaGr1x.png")
+    ///         .await
+    ///         .expect("upload image");
+    /// }
+    /// ```
+    pub async fn upload_image(&self, path: &str) -> Result<ImageInfo> {
+        use base64::prelude::{Engine, BASE64_STANDARD};
+
+        let mut image = path.to_string();
+
+        // check if the specified file exists if not then check if it is a url
+        if std::path::Path::new(path).exists() {
+            let bytes = std::fs::read(path)?;
+            image = BASE64_STANDARD.encode(bytes)
+        }
+        // validate url adress
+        else if Url::parse(path).is_err() {
+            Err(Error::InvalidUrlOrFile(path.to_string()))?;
+        }
+
+        requests::upload_image(self, image).await
+    }
+
+    /// Delete image from Imgur
+    /// ```
+    /// use imgurs::ImgurClient;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let client = ImgurClient::new("3e3ce0d7ac14d56");
+    ///
+    ///     let image = client
+    ///         .upload_image("https://i.imgur.com/lFaGr1x.png")
+    ///         .await
+    ///         .expect("upload image");
+    ///     let deletehash = image.data.deletehash.unwrap();
+    ///
+    ///     client
+    ///         .delete_image(&deletehash)
+    ///         .await
+    ///         .expect("delete image");
+    /// }
+    /// ```
+    pub async fn delete_image(&self, delete_hash: &str) -> Result<()> {
+        requests::delete_image(self, delete_hash).await
+    }
+
+    /// Get Rame Limit of this Imgur Client
+    /// ```
+    /// use imgurs::ImgurClient;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let client = ImgurClient::new("3e3ce0d7ac14d56");
+    ///
+    ///     client.rate_limit().await.expect("get rate limit");
+    /// }
+    /// ```
+    pub async fn rate_limit(&self) -> Result<requests::RateLimitInfo> {
+        requests::rate_limit(self).await
+    }
+
+    /// Get image info from a Imgur
+    /// ```
+    /// use imgurs::ImgurClient;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let client = ImgurClient::new("3e3ce0d7ac14d56");
+    ///
+    ///     client.image_info("lFaGr1x").await.expect("delete image");
+    /// }
+    /// ```
+    pub async fn image_info(&self, id: &str) -> Result<ImageInfo> {
+        requests::get_image(self, id).await
+    }
+
+    /// Get album info from a Imgur
+    /// ```no_run
+    /// use imgurs::ImgurClient;
+    ///
+    /// #[tokio::main]
+    /// async fn main() {
+    ///     let client = ImgurClient::new("3e3ce0d7ac14d56");
+    ///
+    ///     client.album_info("id").await.expect("get album info");
+    /// }
+    /// ```
+    pub async fn album_info(&self, id: &str) -> Result<AlbumInfo> {
+        requests::get_album(self, id).await
+    }
+}

src/imgur/requests/delete_image.rs

@@ -0,0 +1,23 @@
+use reqwest::Method;
+
+use crate::{api_url, send_api_request, Error, ImgurClient, Result};
+
+pub async fn delete_image(client: &ImgurClient, delete_hash: &str) -> Result<()> {
+    // get imgur api url
+    let uri = api_url!(format!("image/{delete_hash}"));
+
+    // send request to imgur api
+    let res = send_api_request(client, Method::DELETE, uri, None).await?;
+
+    // get response http code
+    let status = res.status();
+
+    // check if an error has occurred
+    if status.is_client_error() || status.is_server_error() {
+        let body = res.text().await?;
+
+        Err(Error::ApiError(status.as_u16(), body))?;
+    }
+
+    Ok(())
+}

src/imgur/requests/get_album.rs

@@ -0,0 +1,24 @@
+use reqwest::Method;
+
+use crate::{api_url, send_api_request, AlbumInfo, Error, ImgurClient, Result};
+
+pub async fn get_album(client: &ImgurClient, album: &str) -> Result<AlbumInfo> {
+    // get imgur api url
+    let uri = api_url!(format!("album/{album}"));
+
+    // send request to imgur api
+    let res = send_api_request(client, Method::GET, uri, None).await?;
+
+    // get response http code
+    let status = res.status();
+
+    // check if an error has occurred
+    if status.is_client_error() || status.is_server_error() {
+        let body = res.text().await?;
+
+        return Err(Error::ApiError(status.as_u16(), body));
+    }
+
+    // return `ImageInfo`
+    Ok(res.json().await?)
+}

src/imgur/requests/get_image.rs

@@ -0,0 +1,24 @@
+use reqwest::Method;
+
+use crate::{api_url, send_api_request, Error, ImageInfo, ImgurClient, Result};
+
+pub async fn get_image(client: &ImgurClient, image: &str) -> Result<ImageInfo> {
+    // get imgur api url
+    let uri = api_url!(format!("image/{image}"));
+
+    // send request to imgur api
+    let res = send_api_request(client, Method::GET, uri, None).await?;
+
+    // get response http code
+    let status = res.status();
+
+    // check if an error has occurred
+    if status.is_client_error() || status.is_server_error() {
+        let body = res.text().await?;
+
+        return Err(Error::ApiError(status.as_u16(), body));
+    }
+
+    // return `ImageInfo`
+    Ok(res.json().await?)
+}

src/imgur/requests/mod.rs

@@ -0,0 +1,11 @@
+mod delete_image;
+mod get_album;
+mod get_image;
+mod rate_limit;
+mod upload_image;
+
+pub use delete_image::*;
+pub use get_album::*;
+pub use get_image::*;
+pub use rate_limit::*;
+pub use upload_image::*;

src/imgur/requests/rate_limit.rs

@@ -1,9 +1,7 @@
-use super::send_api_request;
-use crate::api::configuration::{api_url, ImgurClient};
-
 use reqwest::Method;
-use serde_derive::{Deserialize, Serialize};
-use std::io::{Error, ErrorKind};
+use serde::{Deserialize, Serialize};
+
+use crate::{api_url, send_api_request, Error, ImgurClient, Result};
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct RateLimitInfo {
@@ -26,22 +24,23 @@ pub struct RateLimitData {
     pub client_remaining: i32,
 }
 
-pub async fn rate_limit(c: ImgurClient) -> Result<RateLimitInfo, anyhow::Error> {
+pub async fn rate_limit(client: &ImgurClient) -> Result<RateLimitInfo> {
+    // get imgur api url
     let uri = api_url!("credits");
-    let res = send_api_request(&c, Method::GET, uri, None).await?;
 
+    // send request to imgur api
+    let res = send_api_request(client, Method::GET, uri, None).await?;
+
+    // get response http code
     let status = res.status();
 
+    // check if an error has occurred
     if status.is_client_error() || status.is_server_error() {
-        let body = res.text().await.map_err(anyhow::Error::new)?;
-        let err = Error::new(
-            ErrorKind::Other,
-            format!("server returned non-successful status code = {status}, body = {body}"),
-        );
+        let body = res.text().await?;
 
-        Err(anyhow::Error::from(err))
-    } else {
-        let content: RateLimitInfo = res.json().await.map_err(anyhow::Error::new)?;
-        Ok(content)
+        return Err(Error::ApiError(status.as_u16(), body));
     }
+
+    // return `RateLimitInfo`
+    Ok(res.json().await?)
 }

src/imgur/requests/upload_image.rs

@@ -0,0 +1,36 @@
+use std::collections::HashMap;
+
+use reqwest::Method;
+
+use crate::{api_url, send_api_request, Error, ImageInfo, ImgurClient, Result};
+
+pub async fn upload_image(client: &ImgurClient, image: String) -> Result<ImageInfo> {
+    // create http form (hashmap)
+    let mut form = HashMap::new();
+    // insert image to form
+    form.insert("image", image);
+
+    // get imgur api url
+    let uri = api_url!("image");
+
+    // send request to imgur api
+    let res = send_api_request(client, Method::POST, uri, Some(form)).await?;
+
+    // get response http code
+    let status = res.status();
+
+    // check if an error has occurred
+    if status.is_client_error() || status.is_server_error() {
+        let body = res.text().await?;
+
+        // if body is too long do not return it (imgur sometimes returns whole Request)
+        if body.chars().count() > 50 {
+            Err(Error::ApiErrorBodyTooLong(status.as_u16()))?;
+        }
+
+        return Err(Error::ApiError(status.as_u16(), body));
+    }
+
+    // return `ImageInfo`
+    Ok(res.json().await?)
+}

src/imgur/send_api_request.rs

@@ -1,41 +1,38 @@
-mod image_type;
-
-pub mod configuration;
-pub mod delete_image;
-pub mod get_image;
-pub mod rate_limit;
-pub mod upload_image;
-
-pub use configuration::ImgurClient;
-pub use image_type::*;
-
-use reqwest::Method;
 use std::collections::HashMap;
 
+use reqwest::{Method, Response};
+
+use crate::{ImgurClient, Result};
+
+/// Send request to a Imgur API
 pub async fn send_api_request(
     config: &ImgurClient,
     method: Method,
     uri: String,
     form: Option<HashMap<&str, String>>,
-) -> Result<reqwest::Response, anyhow::Error> {
+) -> Result<Response> {
+    // get http client
     let client = &config.client;
 
+    // create Request buidler
     let mut req = client.request(method, uri.as_str());
 
-    const VERSION: Option<&str> = option_env!("CARGO_PKG_VERSION");
-
+    // add `Authorization` and `User-Agent` to Request
     req = req
         .header("Authorization", format!("Client-ID {}", config.client_id))
         .header(
             "User-Agent",
-            format!("Imgur/{:?}", VERSION.unwrap_or("unknown")),
+            format!("Imgur/{:?}", env!("CARGO_PKG_VERSION")),
         );
 
-    if form != None {
+    // if exists add HashMap to Request
+    if form.is_some() {
         req = req.form(&form.unwrap())
     }
 
+    // build Request
     let req = req.build()?;
 
-    client.execute(req).await.map_err(anyhow::Error::from)
+    // send Request
+    Ok(client.execute(req).await?)
 }

src/lib.rs

@@ -1 +1,102 @@
-pub mod api;
+//! [![github]](https://github.com/M3DZIK/imgurs)
+//! [![crates-io]](https://crates.io/crates/imgurs)
+//! [![docs-rs]](https://docs.rs/imgurs)
+//!
+//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
+//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
+//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs
+//!
+//! This crate is an unofficial implementation of the [Imgur API](https://imgur.com) in Rust.
+//!
+//! # Installation
+//!
+//! ## Requirements
+//! - Rust 1.58 (earlier versions are not tested (only the latest stable version is tested!))
+//! - Network connection
+//!
+//! ## Importing
+//! The driver is available on [crates.io](https://crates.io/crates/imgurs). To use the driver in
+//! your application, simply add it to your project's `Cargo.toml`.
+//! ```toml
+//! [dependencies]
+//! imgurs = "0.11.3"
+//! ```
+//!
+//! # Example Usage
+//!
+//! ## Create new ImgurClient
+//! ```
+//! use imgurs::ImgurClient;
+//!
+//! let client = ImgurClient::new("client_id");
+//! ```
+//!
+//! ## Image Upload
+//! ```no_run
+//! use imgurs::ImgurClient;
+//!
+//! #[tokio::main]
+//! async fn main() {
+//!     let client = ImgurClient::new("client_id");
+//!
+//!     // From URL
+//!     let info = client
+//!         .upload_image("https://i.imgur.com/lFaGr1x.png")
+//!         .await
+//!         .unwrap();
+//!     println!("{:?}", info);
+//!
+//!     // From File
+//!     let info = client.upload_image("path/to/file.png").await.unwrap();
+//!     println!("{:?}", info);
+//! }
+//! ```
+//!
+//! ## Delete Image
+//! ```no_run
+//! use imgurs::ImgurClient;
+//!
+//! #[tokio::main]
+//! async fn main() {
+//!     let client = ImgurClient::new("client_id");
+//!
+//!     client.delete_image("delete_hash").await.unwrap(); // delete hash
+//! }
+//! ```
+//!
+//! ## Get Image Info
+//! ```no_run
+//! use imgurs::ImgurClient;
+//!
+//! #[tokio::main]
+//! async fn main() {
+//!     let client = ImgurClient::new("client_id");
+//!
+//!     let info = client.image_info("lFaGr1x").await.unwrap(); // image id
+//!
+//!     println!("{:?}", info);
+//! }
+//! ```
+//!
+//! ## Get Client RateLimit
+//! ```no_run
+//! use imgurs::ImgurClient;
+//!
+//! #[tokio::main]
+//! async fn main() {
+//!     let client = ImgurClient::new("client_id");
+//!
+//!     let info = client.rate_limit().await.unwrap();
+//!
+//!     println!("{:?}", info);
+//! }
+//! ```
+
+mod error;
+pub use error::*;
+
+#[cfg(feature = "imgur")]
+mod imgur;
+
+#[cfg(feature = "imgur")]
+pub use imgur::*;

src/main.rs

@@ -1,18 +0,0 @@
-mod cli;
-mod config;
-
-use cli::parse::parse;
-use imgurs::api::ImgurClient;
-
-use simple_logger::SimpleLogger;
-
-#[tokio::main]
-async fn main() {
-    SimpleLogger::new().init().expect("init SimpleLogger");
-    better_panic::install();
-
-    let config = config::toml::parse();
-    let client = ImgurClient::new((&config.imgur.id).to_string());
-
-    parse(client).await
-}