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>

CHANGELOG.md

@@ -9,6 +9,29 @@ 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)
 
@@ -139,8 +162,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - upload image
 
 <!-- next-url -->
-[Unreleased]: https://github.com/MedzikUser/imgurs/compare/v0.8.0...HEAD
-[0.7.4]: https://github.com/MedzikUser/imgurs/commits/v0.8.0
+[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

Cargo.toml

@@ -4,12 +4,12 @@ resolver = "2"
 
 [package]
 name = "imgurs"
-version = "0.10.0"
+version = "0.11.3"
 description = "API for Imgur"
 license = "BSD-3-Clause"
-authors = ["MedzikUser <medzik@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"]
 edition = "2021"
 
@@ -27,10 +27,10 @@ codegen-units = 1
 
 [dependencies]
 # HTTP
-reqwest = { version = "0.11", default-features = false, features = ["json", "multipart"] }
+reqwest = { version = "0.12", default-features = false, features = ["json", "multipart"] }
 # Request
-base64 = "0.13"
-validator = "0.16" # validate url address
+base64 = "0.22"
+url = "2.5.0" # validate url address
 # Response
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -40,4 +40,4 @@ thiserror = "1.0"
 
 [dev-dependencies]
 # Async tests
-tokio = { version = "1.21", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] }

README.md

@@ -1,16 +1,10 @@
-[total-lines]: https://img.shields.io/tokei/lines/github/MedzikUser/HomeDisk?style=for-the-badge&logo=github&color=fede00
-[code-size]: https://img.shields.io/github/languages/code-size/MedzikUser/HomeDisk?style=for-the-badge&color=c8df52&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
-[ci]: https://img.shields.io/github/workflow/status/MedzikUser/rust-crypto-utils/Rust/main?style=for-the-badge&logo=github
 
 # Imgurs - CLI and Library for Imgur API
 
-[![total-lines]](https://github.com/MedzikUser/HomeDisk)
-[![code-size]](https://github.com/MedzikUser/HomeDisk)
 [![crates-io]](https://crates.io/crates/imgurs)
 [![docs-rs]](https://docs.rs/imgurs)
-[![ci]](https://github.com/MedzikUser/imgurs/actions/workflows/rust.yml)
 
 ## Screenshots
 
@@ -74,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

imgurs-cli/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "imgurs-cli"
-version = "0.10.0"
+version = "0.11.3"
 description = "CLI for Imgur"
 license = "BSD-3-Clause"
-authors = ["MedzikUser <medzik@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"]
 edition = "2021"
@@ -16,11 +16,11 @@ path = "src/main.rs"
 
 [dependencies]
 # Async runtime
-tokio = { version = "1.21", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.37", features = ["macros", "rt-multi-thread"] }
 
 # CLI
-clap = { version = "4.0", features = ["derive"] }
-clap_complete = "4.0"
+clap = { version = "4.5", features = ["derive"] }
+clap_complete = "4.5"
 clap_mangen = "0.2"
 
 # Errors
@@ -28,19 +28,19 @@ anyhow = "1.0"
 
 # Logger
 log = { version = "0.4", features = ["release_max_level_info"] }
-simple_logger = "2.3"
-colored = "2.0"
+simple_logger = "4.3"
+colored = "2.1"
 
 # Config
-toml = "0.5"
+toml = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 
 # Other
 chrono = "0.4" # parse upload date
-notify-rust = "4.5" # send notification after upload
-dirs = "4.0" # get system configuration directory
+notify-rust = "4.11" # send notification after upload
+dirs = "5.0" # get system configuration directory
 
-imgurs = { path = "..", version = "0.10.0", features = ["full"] }
+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 = "2.1" # copy url to clipboard
+arboard = "3.3" # copy url to clipboard

src/imgur/album_type.rs

@@ -18,7 +18,7 @@ pub struct AlbumInfoData {
     /// Album ID
     pub id: String,
     /// Title of the album
-    pub title: String,
+    pub title: Option<String>,
     /// Description of the album
     pub description: Option<String>,
     pub datetime: i64,
@@ -27,7 +27,7 @@ pub struct AlbumInfoData {
     pub cover_width: i64,
     pub cover_height: i64,
     pub account_url: Option<String>,
-    pub account_id: Option<String>,
+    pub account_id: Option<AccountId>,
     pub privacy: String,
     pub layout: String,
     pub views: i64,
@@ -45,6 +45,13 @@ pub struct AlbumInfoData {
     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")]

src/imgur/mod.rs

@@ -9,6 +9,7 @@ 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};
 
@@ -25,6 +26,25 @@ impl ImgurClient {
         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;
@@ -40,15 +60,17 @@ impl ImgurClient {
     /// }
     /// ```
     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::encode(bytes)
+            image = BASE64_STANDARD.encode(bytes)
         }
         // validate url adress
-        else if !validator::validate_url(path) {
+        else if Url::parse(path).is_err() {
             Err(Error::InvalidUrlOrFile(path.to_string()))?;
         }
 

src/lib.rs

@@ -1,4 +1,4 @@
-//! [![github]](https://github.com/MedzikUser/imgurs)
+//! [![github]](https://github.com/M3DZIK/imgurs)
 //! [![crates-io]](https://crates.io/crates/imgurs)
 //! [![docs-rs]](https://docs.rs/imgurs)
 //!
@@ -19,7 +19,7 @@
 //! your application, simply add it to your project's `Cargo.toml`.
 //! ```toml
 //! [dependencies]
-//! imgurs = "0.8.0"
+//! imgurs = "0.11.3"
 //! ```
 //!
 //! # Example Usage