From d8a2e1925f63539dd32449c243e68b33ad6d1234 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 2 May 2022 16:07:08 +0900 Subject: [PATCH] Rename FromId07 -> FromId --- plume-common/src/activity_pub/inbox.rs | 12 ++++++------ plume-models/src/blogs.rs | 4 ++-- plume-models/src/comments.rs | 4 ++-- plume-models/src/follows.rs | 4 ++-- plume-models/src/likes.rs | 4 ++-- plume-models/src/medias.rs | 2 +- plume-models/src/posts.rs | 6 +++--- plume-models/src/remote_fetch_actor.rs | 2 +- plume-models/src/reshares.rs | 4 ++-- plume-models/src/users.rs | 4 ++-- src/inbox.rs | 2 +- src/routes/instance.rs | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/plume-common/src/activity_pub/inbox.rs b/plume-common/src/activity_pub/inbox.rs index 9dba803c..e08321a5 100644 --- a/plume-common/src/activity_pub/inbox.rs +++ b/plume-common/src/activity_pub/inbox.rs @@ -199,9 +199,9 @@ where /// Registers an handler on this Inbox. pub fn with07(self, proxy: Option<&reqwest::Proxy>) -> Self where - A: AsActor<&'a C> + FromId07, + A: AsActor<&'a C> + FromId, V: activitystreams::markers::Activity + serde::de::DeserializeOwned, - M: AsObject07 + FromId07, + M: AsObject07 + FromId, M::Output: Into, { if let Self::NotHandled(ctx, mut act, e) = self { @@ -328,7 +328,7 @@ fn get_id(json: serde_json::Value) -> Option { /// a full object, and if so, save it with `from_activity`. If it is only an ID, it will try to find /// it in the database with `from_db`, and otherwise dereference (fetch) the full object and parse it /// with `from_activity`. -pub trait FromId07: Sized { +pub trait FromId: Sized { /// The type representing a failure type Error: From> + Debug; @@ -742,7 +742,7 @@ mod tests { } struct MyActor; - impl FromId07<()> for MyActor { + impl FromId<()> for MyActor { type Error = (); type Object = Person07; @@ -811,7 +811,7 @@ mod tests { } struct MyObject07; - impl FromId07<()> for MyObject07 { + impl FromId<()> for MyObject07 { type Error = (); type Object = Note07; @@ -977,7 +977,7 @@ mod tests { } } - impl FromId07<()> for FailingActor { + impl FromId<()> for FailingActor { type Error = (); type Object = Person07; diff --git a/plume-models/src/blogs.rs b/plume-models/src/blogs.rs index 2de2e6ed..a48e9fbf 100644 --- a/plume-models/src/blogs.rs +++ b/plume-models/src/blogs.rs @@ -27,7 +27,7 @@ use openssl::{ sign::{Signer, Verifier}, }; use plume_common::activity_pub::{ - inbox::{AsActor, FromId07}, + inbox::{AsActor, FromId}, sign, ActivityStream, ApSignature, ApSignature07, CustomGroup as CustomGroup07, Id, IntoId, PublicKey, PublicKey07, Source, SourceProperty, ToAsString, ToAsUri, }; @@ -470,7 +470,7 @@ impl IntoId for Blog { } } -impl FromId07 for Blog { +impl FromId for Blog { type Error = Error; type Object = CustomGroup07; diff --git a/plume-models/src/comments.rs b/plume-models/src/comments.rs index 31df688b..cd28113e 100644 --- a/plume-models/src/comments.rs +++ b/plume-models/src/comments.rs @@ -30,7 +30,7 @@ use chrono::{self, NaiveDateTime, TimeZone, Utc}; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl}; use plume_common::{ activity_pub::{ - inbox::{AsActor, AsObject, AsObject07, FromId07}, + inbox::{AsActor, AsObject, AsObject07, FromId}, sign::Signer, Id, IntoId, ToAsString, ToAsUri, PUBLIC_VISIBILITY, }, @@ -294,7 +294,7 @@ impl Comment { } } -impl FromId07 for Comment { +impl FromId for Comment { type Error = Error; type Object = Note07; diff --git a/plume-models/src/follows.rs b/plume-models/src/follows.rs index 6a2f3a9a..36c24fa7 100644 --- a/plume-models/src/follows.rs +++ b/plume-models/src/follows.rs @@ -12,7 +12,7 @@ use activitystreams::{ use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl}; use plume_common::activity_pub::{ broadcast, broadcast07, - inbox::{AsActor, AsObject, AsObject07, FromId07}, + inbox::{AsActor, AsObject, AsObject07, FromId}, sign::Signer, Id, IntoId, PUBLIC_VISIBILITY, }; @@ -272,7 +272,7 @@ impl AsObject07 for User { } } -impl FromId07 for Follow { +impl FromId for Follow { type Error = Error; type Object = FollowAct07; diff --git a/plume-models/src/likes.rs b/plume-models/src/likes.rs index 8a7b0e23..a4959978 100644 --- a/plume-models/src/likes.rs +++ b/plume-models/src/likes.rs @@ -12,7 +12,7 @@ use activitystreams::{ use chrono::NaiveDateTime; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl}; use plume_common::activity_pub::{ - inbox::{AsActor, AsObject, AsObject07, FromId07}, + inbox::{AsActor, AsObject, AsObject07, FromId}, sign::Signer, Id, IntoId, PUBLIC_VISIBILITY, }; @@ -158,7 +158,7 @@ impl AsObject07 for Post { } } -impl FromId07 for Like { +impl FromId for Like { type Error = Error; type Object = Like07; diff --git a/plume-models/src/medias.rs b/plume-models/src/medias.rs index 13048292..2837a69f 100644 --- a/plume-models/src/medias.rs +++ b/plume-models/src/medias.rs @@ -7,7 +7,7 @@ use activitystreams::{object::Image as Image07, prelude::*}; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl}; use guid_create::GUID; use plume_common::{ - activity_pub::{inbox::FromId07, request, Id, ToAsString, ToAsUri}, + activity_pub::{inbox::FromId, request, Id, ToAsString, ToAsUri}, utils::{escape, MediaProcessor}, }; use std::{ diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs index ad5bbebe..1a2b5520 100644 --- a/plume-models/src/posts.rs +++ b/plume-models/src/posts.rs @@ -26,7 +26,7 @@ use diesel::{self, BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl}; use once_cell::sync::Lazy; use plume_common::{ activity_pub::{ - inbox::{AsActor, AsObject, AsObject07, FromId07}, + inbox::{AsActor, AsObject, AsObject07, FromId}, sign::Signer, Hashtag, Hashtag07, HashtagType07, Id, IntoId, Licensed, Licensed07, LicensedArticle as LicensedArticle07, Source, SourceProperty, ToAsString, ToAsUri, @@ -863,7 +863,7 @@ impl Post { } } -impl FromId07 for Post { +impl FromId for Post { type Error = Error; type Object = LicensedArticle07; @@ -1119,7 +1119,7 @@ pub struct PostUpdate { pub tags: Option, } -impl FromId07 for PostUpdate { +impl FromId for PostUpdate { type Error = Error; type Object = LicensedArticle07; diff --git a/plume-models/src/remote_fetch_actor.rs b/plume-models/src/remote_fetch_actor.rs index 89eabe71..b91be1bf 100644 --- a/plume-models/src/remote_fetch_actor.rs +++ b/plume-models/src/remote_fetch_actor.rs @@ -10,7 +10,7 @@ use activitystreams::{ base::AnyBase, object::kind::ArticleType, }; -use plume_common::activity_pub::{inbox::FromId07, LicensedArticle as LicensedArticle07}; +use plume_common::activity_pub::{inbox::FromId, LicensedArticle as LicensedArticle07}; use riker::actors::{Actor, ActorFactoryArgs, ActorRefFactory, Context, Sender, Subscribe, Tell}; use std::sync::Arc; use tracing::{error, info, warn}; diff --git a/plume-models/src/reshares.rs b/plume-models/src/reshares.rs index aa35aa27..bfd89575 100644 --- a/plume-models/src/reshares.rs +++ b/plume-models/src/reshares.rs @@ -12,7 +12,7 @@ use activitystreams::{ use chrono::NaiveDateTime; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl}; use plume_common::activity_pub::{ - inbox::{AsActor, AsObject, AsObject07, FromId07}, + inbox::{AsActor, AsObject, AsObject07, FromId}, sign::Signer, Id, IntoId, PUBLIC_VISIBILITY, }; @@ -186,7 +186,7 @@ impl AsObject07 for Post { } } -impl FromId07 for Reshare { +impl FromId for Reshare { type Error = Error; type Object = Announce07; diff --git a/plume-models/src/users.rs b/plume-models/src/users.rs index 3497aa99..fa20fb71 100644 --- a/plume-models/src/users.rs +++ b/plume-models/src/users.rs @@ -35,7 +35,7 @@ use openssl::{ }; use plume_common::{ activity_pub::{ - inbox::{AsActor, AsObject, AsObject07, FromId07}, + inbox::{AsActor, AsObject, AsObject07, FromId}, request::get, sign::{gen_keypair, Error as SignError, Result as SignResult, Signer}, ActivityStream, ApSignature, ApSignature07, CustomPerson as CustomPerson07, Id, IntoId, @@ -1127,7 +1127,7 @@ impl IntoId for User { impl Eq for User {} -impl FromId07 for User { +impl FromId for User { type Error = Error; type Object = CustomPerson07; diff --git a/src/inbox.rs b/src/inbox.rs index f4fbef47..d9498db8 100644 --- a/src/inbox.rs +++ b/src/inbox.rs @@ -1,5 +1,5 @@ use plume_common::activity_pub::{ - inbox::FromId07, + inbox::FromId, request::Digest, sign::{verify_http_headers, Signable}, }; diff --git a/src/routes/instance.rs b/src/routes/instance.rs index d0130610..5c980ea9 100644 --- a/src/routes/instance.rs +++ b/src/routes/instance.rs @@ -11,7 +11,7 @@ use validator::{Validate, ValidationErrors}; use crate::inbox; use crate::routes::{errors::ErrorPage, rocket_uri_macro_static_files, Page, RespondOrRedirect}; use crate::template_utils::{IntoContext, Ructe}; -use plume_common::activity_pub::{broadcast, inbox::FromId07}; +use plume_common::activity_pub::{broadcast, inbox::FromId}; use plume_models::{ admin::*, blocklisted_emails::*,