From 9b2df05977d092b8151c951f76d08788da399239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=97=8D+85CD?= <50108258+kwaa@users.noreply.github.com> Date: Fri, 26 Jul 2024 20:51:48 +0800 Subject: [PATCH] fix: lint code --- examples/live_federation/activities/create_post.rs | 2 +- examples/live_federation/error.rs | 2 +- examples/live_federation/objects/person.rs | 6 +++--- examples/live_federation/objects/post.rs | 2 +- examples/live_federation/utils.rs | 2 +- examples/local_federation/activities/accept.rs | 4 ++-- examples/local_federation/activities/create_post.rs | 4 ++-- examples/local_federation/activities/follow.rs | 4 ++-- examples/local_federation/error.rs | 2 +- examples/local_federation/instance.rs | 4 ++-- examples/local_federation/main.rs | 3 +-- examples/local_federation/objects/person.rs | 10 +++++----- examples/local_federation/objects/post.rs | 6 +++--- examples/local_federation/utils.rs | 2 +- 14 files changed, 26 insertions(+), 27 deletions(-) diff --git a/examples/live_federation/activities/create_post.rs b/examples/live_federation/activities/create_post.rs index 51ee5e5..ada4d3b 100644 --- a/examples/live_federation/activities/create_post.rs +++ b/examples/live_federation/activities/create_post.rs @@ -31,7 +31,7 @@ pub struct CreatePost { impl CreatePost { pub async fn send(note: Note, inbox: Url, data: &Data) -> Result<(), Error> { print!("Sending reply to {}", ¬e.attributed_to); - let create = CreatePost { + let create = Self { actor: note.attributed_to.clone(), to: note.to.clone(), object: note, diff --git a/examples/live_federation/error.rs b/examples/live_federation/error.rs index 3ef1819..a1e4e0e 100644 --- a/examples/live_federation/error.rs +++ b/examples/live_federation/error.rs @@ -15,6 +15,6 @@ where T: Into, { fn from(t: T) -> Self { - Error(t.into()) + Self(t.into()) } } diff --git a/examples/live_federation/objects/person.rs b/examples/live_federation/objects/person.rs index d9439ea..8f87a1b 100644 --- a/examples/live_federation/objects/person.rs +++ b/examples/live_federation/objects/person.rs @@ -35,11 +35,11 @@ pub enum PersonAcceptedActivities { } impl DbUser { - pub fn new(hostname: &str, name: &str) -> Result { + pub fn new(hostname: &str, name: &str) -> Result { let ap_id = Url::parse(&format!("https://{}/{}", hostname, &name))?.into(); let inbox = Url::parse(&format!("https://{}/{}/inbox", hostname, &name))?; let keypair = generate_actor_keypair()?; - Ok(DbUser { + Ok(Self { name: name.to_string(), ap_id, inbox, @@ -108,7 +108,7 @@ impl Object for DbUser { json: Self::Kind, _data: &Data, ) -> Result { - Ok(DbUser { + Ok(Self { name: json.preferred_username, ap_id: json.id, inbox: json.inbox, diff --git a/examples/live_federation/objects/post.rs b/examples/live_federation/objects/post.rs index 1b19fac..db1ba43 100644 --- a/examples/live_federation/objects/post.rs +++ b/examples/live_federation/objects/post.rs @@ -84,7 +84,7 @@ impl Object for DbPost { &json.content, &json.id ); let creator = json.attributed_to.dereference(data).await?; - let post = DbPost { + let post = Self { text: json.content, ap_id: json.id.clone(), creator: json.attributed_to.clone(), diff --git a/examples/live_federation/utils.rs b/examples/live_federation/utils.rs index 0b2b098..23b5dac 100644 --- a/examples/live_federation/utils.rs +++ b/examples/live_federation/utils.rs @@ -9,5 +9,5 @@ pub fn generate_object_id(domain: &str) -> Result { .take(7) .map(char::from) .collect(); - Url::parse(&format!("https://{}/objects/{}", domain, id)) + Url::parse(&format!("https://{domain}/objects/{id}")) } diff --git a/examples/local_federation/activities/accept.rs b/examples/local_federation/activities/accept.rs index c18945f..87e8428 100644 --- a/examples/local_federation/activities/accept.rs +++ b/examples/local_federation/activities/accept.rs @@ -19,8 +19,8 @@ pub struct Accept { } impl Accept { - pub fn new(actor: ObjectId, object: Follow, id: Url) -> Accept { - Accept { + pub fn new(actor: ObjectId, object: Follow, id: Url) -> Self { + Self { actor, object, kind: Default::default(), diff --git a/examples/local_federation/activities/create_post.rs b/examples/local_federation/activities/create_post.rs index 6f85e2d..1d0967b 100644 --- a/examples/local_federation/activities/create_post.rs +++ b/examples/local_federation/activities/create_post.rs @@ -26,8 +26,8 @@ pub struct CreatePost { } impl CreatePost { - pub fn new(note: Note, id: Url) -> CreatePost { - CreatePost { + pub fn new(note: Note, id: Url) -> Self { + Self { actor: note.attributed_to.clone(), to: note.to.clone(), object: note, diff --git a/examples/local_federation/activities/follow.rs b/examples/local_federation/activities/follow.rs index 02879d4..d1d6893 100644 --- a/examples/local_federation/activities/follow.rs +++ b/examples/local_federation/activities/follow.rs @@ -24,8 +24,8 @@ pub struct Follow { } impl Follow { - pub fn new(actor: ObjectId, object: ObjectId, id: Url) -> Follow { - Follow { + pub fn new(actor: ObjectId, object: ObjectId, id: Url) -> Self { + Self { actor, object, kind: Default::default(), diff --git a/examples/local_federation/error.rs b/examples/local_federation/error.rs index 3ef1819..a1e4e0e 100644 --- a/examples/local_federation/error.rs +++ b/examples/local_federation/error.rs @@ -15,6 +15,6 @@ where T: Into, { fn from(t: T) -> Self { - Error(t.into()) + Self(t.into()) } } diff --git a/examples/local_federation/instance.rs b/examples/local_federation/instance.rs index efe33c3..5362b4e 100644 --- a/examples/local_federation/instance.rs +++ b/examples/local_federation/instance.rs @@ -16,7 +16,7 @@ pub async fn new_instance( name: String, ) -> Result, Error> { let mut system_user = DbUser::new(hostname, "system".into())?; - system_user.ap_id = Url::parse(&format!("http://{}/", hostname))?.into(); + system_user.ap_id = Url::parse(&format!("http://{hostname}/"))?.into(); let local_user = DbUser::new(hostname, name)?; let database = Arc::new(Database { @@ -70,7 +70,7 @@ impl FromStr for Webserver { fn from_str(s: &str) -> Result { Ok(match s { - "axum" => Webserver::Axum, + "axum" => Self::Axum, _ => panic!("Invalid webserver parameter, must be either `axum` or `actix-web`"), }) } diff --git a/examples/local_federation/main.rs b/examples/local_federation/main.rs index a683b4c..8891256 100644 --- a/examples/local_federation/main.rs +++ b/examples/local_federation/main.rs @@ -29,8 +29,7 @@ async fn main() -> Result<(), Error> { info!("Start with parameter `axum` or `actix-web` to select the webserver"); let webserver = args() .nth(1) - .map(|arg| Webserver::from_str(&arg).unwrap()) - .unwrap_or(Webserver::Axum); + .map_or(Webserver::Axum, |arg| Webserver::from_str(&arg).unwrap()); let alpha = new_instance("localhost:8001", "alpha".to_string()).await?; let beta = new_instance("localhost:8002", "beta".to_string()).await?; diff --git a/examples/local_federation/objects/person.rs b/examples/local_federation/objects/person.rs index 0ae402f..24d6a0e 100644 --- a/examples/local_federation/objects/person.rs +++ b/examples/local_federation/objects/person.rs @@ -45,11 +45,11 @@ pub enum PersonAcceptedActivities { } impl DbUser { - pub fn new(hostname: &str, name: String) -> Result { + pub fn new(hostname: &str, name: String) -> Result { let ap_id = Url::parse(&format!("http://{}/{}", hostname, &name))?.into(); let inbox = Url::parse(&format!("http://{}/{}/inbox", hostname, &name))?; let keypair = generate_actor_keypair()?; - Ok(DbUser { + Ok(Self { name, ap_id, inbox, @@ -83,7 +83,7 @@ impl DbUser { } pub async fn follow(&self, other: &str, data: &Data) -> Result<(), Error> { - let other: DbUser = webfinger_resolve_actor(other, data).await?; + let other: Self = webfinger_resolve_actor(other, data).await?; let id = generate_object_id(data.domain())?; let follow = Follow::new(self.ap_id.clone(), other.ap_id.clone(), id.clone()); self.send(follow, vec![other.shared_inbox_or_inbox()], false, data) @@ -96,7 +96,7 @@ impl DbUser { let create = CreatePost::new(post.into_json(data).await?, id.clone()); let mut inboxes = vec![]; for f in self.followers.clone() { - let user: DbUser = ObjectId::from(f).dereference(data).await?; + let user: Self = ObjectId::from(f).dereference(data).await?; inboxes.push(user.shared_inbox_or_inbox()); } self.send(create, inboxes, true, data).await?; @@ -170,7 +170,7 @@ impl Object for DbUser { } async fn from_json(json: Self::Kind, data: &Data) -> Result { - let user = DbUser { + let user = Self { name: json.preferred_username, ap_id: json.id, inbox: json.inbox, diff --git a/examples/local_federation/objects/post.rs b/examples/local_federation/objects/post.rs index cbdf8e8..d38d872 100644 --- a/examples/local_federation/objects/post.rs +++ b/examples/local_federation/objects/post.rs @@ -18,9 +18,9 @@ pub struct DbPost { } impl DbPost { - pub fn new(text: String, creator: ObjectId) -> Result { + pub fn new(text: String, creator: ObjectId) -> Result { let ap_id = generate_object_id(creator.inner().domain().unwrap())?.into(); - Ok(DbPost { + Ok(Self { text, ap_id, creator, @@ -80,7 +80,7 @@ impl Object for DbPost { } async fn from_json(json: Self::Kind, data: &Data) -> Result { - let post = DbPost { + let post = Self { text: json.content, ap_id: json.id, creator: json.attributed_to, diff --git a/examples/local_federation/utils.rs b/examples/local_federation/utils.rs index 6b5f9d0..e3099ec 100644 --- a/examples/local_federation/utils.rs +++ b/examples/local_federation/utils.rs @@ -9,5 +9,5 @@ pub fn generate_object_id(domain: &str) -> Result { .take(7) .map(char::from) .collect(); - Url::parse(&format!("http://{}/objects/{}", domain, id)) + Url::parse(&format!("http://{domain}/objects/{id}")) }