diff --git a/src/server/auth/mod.rs b/src/server/auth/mod.rs index bf77148..9921424 100644 --- a/src/server/auth/mod.rs +++ b/src/server/auth/mod.rs @@ -3,10 +3,10 @@ pub mod status; pub mod token; pub mod user; -pub use pubkey::{AuthPubkeyContext, AuthPubkeyRoute, RSAKey}; -pub use status::{AuthStatusContext, AuthStatusRoute}; -pub use token::{revoke_expired_tokens, AuthTokenContext, AuthTokenRoute}; -pub use user::{AuthUserContext, AuthUserRoute}; +pub use pubkey::{AuthPubkeyRoute, RSAKey}; +pub use status::AuthStatusRoute; +pub use token::{revoke_expired_tokens, AuthTokenRoute}; +pub use user::AuthUserRoute; const PASSWORD_SALT: [u8; 64] = [ 14, 169, 19, 53, 220, 112, 183, 235, 112, 165, 131, 132, 68, 29, 167, 65, 150, 219, 121, 212, diff --git a/src/server/preclude.rs b/src/server/preclude.rs index 7ef367a..df4967f 100644 --- a/src/server/preclude.rs +++ b/src/server/preclude.rs @@ -1,7 +1,6 @@ pub use super::body::hyper::HyperBody; pub use super::body::response::ResponseBody; pub use super::context::ServerContext; -pub use super::params::RequestParams; pub use super::result::{JSONResult, SerdeJSONResult}; pub use super::route::ResponseForType; pub use super::traits::{GetRequestParams, MatchRoute, ResponseFor, ResponseJsonFor}; diff --git a/src/server/push/mod.rs b/src/server/push/mod.rs index 1d74b52..3c84f78 100644 --- a/src/server/push/mod.rs +++ b/src/server/push/mod.rs @@ -1,4 +1,4 @@ pub mod index; pub mod task; -pub use index::{PushContext, PushRoute}; +pub use index::PushRoute; diff --git a/src/server/push/task/pixiv_follow.rs b/src/server/push/task/pixiv_follow.rs index c3c11b2..dac2a3a 100644 --- a/src/server/push/task/pixiv_follow.rs +++ b/src/server/push/task/pixiv_follow.rs @@ -80,7 +80,7 @@ impl<'a> RunContext<'a> { first_run: AtomicBool::new(false), push_manager: TaskManagerWithId::new( Arc::new(Mutex::new(0)), - MaxCount::new(helper.push_task_max_count()), + MaxCount::new(helper.push_task_max_push_count()), ), } } @@ -212,10 +212,15 @@ impl<'a> RunContext<'a> { Some(d) => d, None => { let pw = self.ctx.pixiv_web_client().await; - let wdata = pw - .get_artwork_ajax(id) - .await - .ok_or("Failed to get artwork ajax.")?; + let wdata = if self.use_webpage { + pw.get_artwork(id).await.ok_or("Failed to get artwork.")?["illust"] + [format!("{}", id)] + .clone() + } else { + pw.get_artwork_ajax(id) + .await + .ok_or("Failed to get artwork ajax.")? + }; self.data.set_web_data(id, wdata.clone()); wdata }