pyrite/torn-api.rs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

adjust visibility of inner response

Browse source
This commit is contained in:
TotallyNot 2024-04-04 16:27:00 +02:00
parent eeba5647f9
commit f1d8ddc9b8
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
torn-api-macros/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "torn-api-macros" name = "torn-api-macros"
version = "0.3.0" version = "0.3.1"
edition = "2021" edition = "2021"
authors = ["Pyrit [2111649]"] authors = ["Pyrit [2111649]"]
license = "MIT" license = "MIT"

2
torn-api-macros/src/lib.rs
View file

@ -141,7 +141,7 @@ fn impl_api_category(ast: &syn::DeriveInput) -> TokenStream {
); );
let gen = quote! { let gen = quote! {
pub struct Response(crate::ApiResponse); pub struct Response(pub crate::ApiResponse);
impl Response { impl Response {
#(#accessors)* #(#accessors)*

4
torn-api/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "torn-api" name = "torn-api"
version = "0.7.0" version = "0.7.1"
edition = "2021" edition = "2021"
rust-version = "1.75.0" rust-version = "1.75.0"
authors = ["Pyrit [2111649]"] authors = ["Pyrit [2111649]"]
@ -39,7 +39,7 @@ reqwest = { version = "0.11", default-features = false, features = [ "json" ], o
awc = { version = "3", default-features = false, optional = true } awc = { version = "3", default-features = false, optional = true }
rust_decimal = { version = "1", default-features = false, optional = true, features = [ "serde" ] } rust_decimal = { version = "1", default-features = false, optional = true, features = [ "serde" ] }
torn-api-macros = { path = "../torn-api-macros", version = "0.3" } torn-api-macros = { path = "../torn-api-macros", version = "0.3.1" }
[dev-dependencies] [dev-dependencies]
actix-rt = { version = "2.7.0" } actix-rt = { version = "2.7.0" }

2
torn-key-pool/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "torn-key-pool" name = "torn-key-pool"
version = "0.8.1" version = "0.8.2"
edition = "2021" edition = "2021"
authors = ["Pyrit [2111649]"] authors = ["Pyrit [2111649]"]
license = "MIT" license = "MIT"

8
torn-key-pool/src/send.rs
View file

@ -29,7 +29,9 @@ where
where where
A: ApiSelection, A: ApiSelection,
{ {
request.comment = self.options.comment.clone(); if request.comment.is_none() {
request.comment = self.options.comment.clone();
}
if let Some(hook) = self.options.hooks_before.get(&std::any::TypeId::of::<A>()) { if let Some(hook) = self.options.hooks_before.get(&std::any::TypeId::of::<A>()) {
let concrete = hook let concrete = hook
.downcast_ref::<BeforeHook<A, S::Key, S::Domain>>() .downcast_ref::<BeforeHook<A, S::Key, S::Domain>>()
@ -113,7 +115,9 @@ where
} }
}; };
request.comment = self.options.comment.clone(); if request.comment.is_none() {
request.comment = self.options.comment.clone();
}
let request_ref = &request; let request_ref = &request;
let tuples = let tuples =