From d36014200549cf73a7f22c6f94fb15bec17823e8 Mon Sep 17 00:00:00 2001 From: Vika Date: Mon, 29 Jan 2024 07:08:21 +0300 Subject: lint: no extra whitespace on line endings --- src/bin/kittybox-check-webmention.rs | 6 +++--- src/bin/kittybox-indieauth-helper.rs | 14 +++++++------- src/bin/kittybox-mf2.rs | 2 +- src/database/postgres/mod.rs | 6 +++--- src/indieauth/backend/fs.rs | 6 +++--- src/indieauth/mod.rs | 2 +- src/media/storage/file.rs | 6 +++--- src/micropub/util.rs | 2 +- src/webmentions/check.rs | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/bin/kittybox-check-webmention.rs b/src/bin/kittybox-check-webmention.rs index f02032c..820e7c4 100644 --- a/src/bin/kittybox-check-webmention.rs +++ b/src/bin/kittybox-check-webmention.rs @@ -104,7 +104,7 @@ fn check_mention(document: impl AsRef, base_url: &url::Url, link: &url::Url } } } - + } } @@ -128,7 +128,7 @@ struct Args { #[tokio::main] async fn main() -> Result<(), self::Error> { let args = Args::parse(); - + let http: reqwest::Client = { #[allow(unused_mut)] let mut builder = reqwest::Client::builder() @@ -141,7 +141,7 @@ async fn main() -> Result<(), self::Error> { let response = http.get(args.url.clone()).send().await?; let text = response.text().await?; - + if let Some(mention_type) = check_mention(text, &args.url, &args.link)? { println!("{:?}", mention_type); diff --git a/src/bin/kittybox-indieauth-helper.rs b/src/bin/kittybox-indieauth-helper.rs index 3377ec3..4e82f8b 100644 --- a/src/bin/kittybox-indieauth-helper.rs +++ b/src/bin/kittybox-indieauth-helper.rs @@ -80,7 +80,7 @@ async fn main() -> Result<(), Error> { let redirect_uri: url::Url = args.redirect_uri .clone() .unwrap_or_else(|| DEFAULT_REDIRECT_URI.parse().unwrap()); - + eprintln!("Checking .well-known for metadata..."); let metadata = http.get(args.me.join("/.well-known/oauth-authorization-server")?) .header("Accept", "application/json") @@ -90,7 +90,7 @@ async fn main() -> Result<(), Error> { .await?; let verifier = PKCEVerifier::new(); - + let authorization_request = AuthorizationRequest { response_type: kittybox_indieauth::ResponseType::Code, client_id: args.client_id.clone(), @@ -112,21 +112,21 @@ async fn main() -> Result<(), Error> { eprintln!("Custom redirect URI specified, won't be able to catch authorization response."); std::process::exit(0); } - + // Prepare a callback let (tx, rx) = tokio::sync::oneshot::channel::(); let server = { use axum::{routing::get, extract::Query, response::IntoResponse}; let tx = std::sync::Arc::new(tokio::sync::Mutex::new(Some(tx))); - + let router = axum::Router::new() .route("/callback", axum::routing::get( move |query: Option>| async move { if let Some(Query(response)) = query { if let Some(tx) = tx.lock_owned().await.take() { tx.send(response).unwrap(); - + (axum::http::StatusCode::OK, [("Content-Type", "text/plain")], "Thank you! This window can now be closed.") @@ -152,7 +152,7 @@ async fn main() -> Result<(), Error> { tokio::task::spawn(server) }; - + let authorization_response = rx.await.unwrap(); // Clean up after the server @@ -166,7 +166,7 @@ async fn main() -> Result<(), Error> { eprintln!("Got authorization response: {:#?}", authorization_response); eprint!("Checking issuer field..."); std::io::stderr().lock().flush()?; - + if dbg!(authorization_response.iss.as_str()) == dbg!(metadata.issuer.as_str()) { eprintln!(" Done"); } else { diff --git a/src/bin/kittybox-mf2.rs b/src/bin/kittybox-mf2.rs index 4366cb8..85ebc6f 100644 --- a/src/bin/kittybox-mf2.rs +++ b/src/bin/kittybox-mf2.rs @@ -27,7 +27,7 @@ enum Error { #[tokio::main] async fn main() -> Result<(), Error> { let args = Args::parse(); - + let http: reqwest::Client = { #[allow(unused_mut)] let mut builder = reqwest::Client::builder() diff --git a/src/database/postgres/mod.rs b/src/database/postgres/mod.rs index 9176d12..ee7dd1c 100644 --- a/src/database/postgres/mod.rs +++ b/src/database/postgres/mod.rs @@ -60,7 +60,7 @@ impl PostgresStorage { .connect_with(options) .await? ).await - + } /// Construct a [`PostgresStorage`] from a [`sqlx::PgPool`], @@ -227,7 +227,7 @@ impl Storage for PostgresStorage { .bind(post) .execute(&mut *txn) .await?; - + txn.commit().await.map_err(Into::into) } @@ -307,7 +307,7 @@ ORDER BY mf2 #>> '{properties,published,0}' DESC ); Ok(Some(feed)) - + } #[tracing::instrument(skip(self))] diff --git a/src/indieauth/backend/fs.rs b/src/indieauth/backend/fs.rs index 600e901..80c3703 100644 --- a/src/indieauth/backend/fs.rs +++ b/src/indieauth/backend/fs.rs @@ -25,7 +25,7 @@ impl FileBackend { path: path.into() } } - + /// Sanitize a filename, leaving only alphanumeric characters. /// /// Doesn't allocate a new string unless non-alphanumeric @@ -71,7 +71,7 @@ impl FileBackend { (if has_ext { filename .extension() - + } else { filename .file_name() @@ -337,7 +337,7 @@ impl AuthBackend for FileBackend { let password_filename = self.path .join(FileBackend::url_to_dir(website)) .join("password"); - + let salt = SaltString::generate(&mut OsRng); let argon2 = Argon2::default(); let password_hash = argon2.hash_password(password.as_bytes(), &salt) diff --git a/src/indieauth/mod.rs b/src/indieauth/mod.rs index 0ad2702..def9dfc 100644 --- a/src/indieauth/mod.rs +++ b/src/indieauth/mod.rs @@ -89,7 +89,7 @@ impl axum::extract::FromRequestParts for Use let Host(host) = Host::from_request_parts(req, state) .await .map_err(|_| IndieAuthResourceError::InvalidRequest)?; - + auth.get_token( &format!("https://{host}/").parse().unwrap(), token.token() diff --git a/src/media/storage/file.rs b/src/media/storage/file.rs index 0aaaa3b..a910eca 100644 --- a/src/media/storage/file.rs +++ b/src/media/storage/file.rs @@ -122,7 +122,7 @@ impl MediaStore for FileStore { debug!("File path: {}, metadata: {}", filepath.display(), metapath.display()); { let parent = filepath.parent().unwrap(); - tokio::fs::create_dir_all(parent).await?; + tokio::fs::create_dir_all(parent).await?; } let mut meta = OpenOptions::new() .create_new(true) @@ -178,7 +178,7 @@ impl MediaStore for FileStore { Ok(meta) } - + #[tracing::instrument(skip(self))] async fn stream_range( &self, @@ -367,7 +367,7 @@ mod tests { assert_eq!(range.as_slice(), file); } - + #[tokio::test] #[tracing_test::traced_test] async fn test_streaming_read_write() { diff --git a/src/micropub/util.rs b/src/micropub/util.rs index 940d7c3..b6a045d 100644 --- a/src/micropub/util.rs +++ b/src/micropub/util.rs @@ -26,7 +26,7 @@ fn get_folder_from_type(post_type: &str) -> String { /// Reset the datetime to a proper datetime. /// Do not attempt to recover the information. -/// Do not pass GO. Do not collect $200. +/// Do not pass GO. Do not collect $200. fn reset_dt(post: &mut serde_json::Value) -> DateTime { let curtime: DateTime = Local::now(); post["properties"]["published"] = json!([curtime.to_rfc3339()]); diff --git a/src/webmentions/check.rs b/src/webmentions/check.rs index f7322f7..6dc6a25 100644 --- a/src/webmentions/check.rs +++ b/src/webmentions/check.rs @@ -90,7 +90,7 @@ pub fn check_mention(document: impl AsRef + std::fmt::Debug, base_url: &url continue 'nodes_loop; } } - // if it's not ``, skip it + // if it's not ``, skip it if attr.name.local != *"href" { continue; } // Be forgiving in parsing URLs, and resolve them against the base URL if let Ok(url) = base_url.join(attr.value.as_ref()) { @@ -105,7 +105,7 @@ pub fn check_mention(document: impl AsRef + std::fmt::Debug, base_url: &url } } } - + } } -- cgit 1.4.1