diff options
| author | Fuwn <[email protected]> | 2023-04-06 00:02:11 -0700 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2023-04-06 00:02:11 -0700 |
| commit | 039acf58ac5a4b16fdb896634affb637b1bdeaad (patch) | |
| tree | 46caa813e140c5baae75a48268f6a997a5e9951c /src/modules/router | |
| parent | fix(docker): copy syntax warning (diff) | |
| download | locus-039acf58ac5a4b16fdb896634affb637b1bdeaad.tar.xz locus-039acf58ac5a4b16fdb896634affb637b1bdeaad.zip | |
deps(windmark): bump 0.2.5 -> 0.3.1
Diffstat (limited to 'src/modules/router')
| -rw-r--r-- | src/modules/router/module.rs | 12 | ||||
| -rw-r--r-- | src/modules/router/ticker.rs | 2 | ||||
| -rw-r--r-- | src/modules/router/translate/module.rs | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/modules/router/module.rs b/src/modules/router/module.rs index dc9dae8..34d20db 100644 --- a/src/modules/router/module.rs +++ b/src/modules/router/module.rs @@ -16,8 +16,10 @@ // Copyright (C) 2022-2022 Fuwn <[email protected]> // SPDX-License-Identifier: GPL-3.0-only +use windmark::context::HookContext; + pub fn module(router: &mut windmark::Router) { - router.set_pre_route_callback(Box::new(|context| { + router.set_pre_route_callback(move |context: HookContext<'_>| { info!( "accepted connection from {} to {}", context.tcp.peer_addr().unwrap().ip(), @@ -25,9 +27,9 @@ pub fn module(router: &mut windmark::Router) { ); super::ticker::module(&context); - })); - router.set_post_route_callback(Box::new({ - |context, response| { + }); + router.set_post_route_callback({ + |context: HookContext<'_>, response: &mut windmark::Response| { info!( "closed connection from {} to {}", context.tcp.peer_addr().unwrap().ip(), @@ -50,5 +52,5 @@ pub fn module(router: &mut windmark::Router) { } } } - })); + }); } diff --git a/src/modules/router/ticker.rs b/src/modules/router/ticker.rs index 4297086..d193c9b 100644 --- a/src/modules/router/ticker.rs +++ b/src/modules/router/ticker.rs @@ -18,7 +18,7 @@ use crate::DATABASE; -pub fn module(context: &windmark::returnable::CallbackContext<'_>) { +pub fn module(context: &windmark::context::HookContext<'_>) { let url_path = if context.url.path().is_empty() { "/" } else { diff --git a/src/modules/router/translate/module.rs b/src/modules/router/translate/module.rs index 0c997d3..4c105e1 100644 --- a/src/modules/router/translate/module.rs +++ b/src/modules/router/translate/module.rs @@ -20,7 +20,7 @@ use super::deepl::translate; use crate::modules::router::translate::deepl::language_code_to_language_name; pub fn module<S>( - cc: &windmark::returnable::CallbackContext<'_>, + context: &windmark::context::HookContext<'_>, response: &mut windmark::Response, language: S, ) -> Result<(), serde_json::Error> @@ -90,12 +90,13 @@ where &translated.detected_source_language().to_lowercase() ), language_code_to_language_name(&language.as_ref().to_lowercase()), - cc.url + context + .url .to_string() .replace(&format!("translate={}", language.as_ref()), ""), fully_translated.join("\n") ); - response.language = Some(language.into()); + response.languages = Some(vec![language.into()]); response.character_set = Some({ let mut encoding_detector = chardetng::EncodingDetector::new(); |