Use enum_delegate crate (#2554)

diff --git a/Cargo.lock b/Cargo.lock
index 870584995fdf1868abaea9c4d714eada13adcaf9..1fd37a930e5cef93a115b325edeadc33c423d1b2 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,11 +4,10 @@ version = 3
 
 [[package]]
 name = "activitypub_federation"
-version = "0.2.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd9ae511df7135c271dca3ef3751f5528891c965e47d8d7a70fed9d2f1e5b6b1"
+checksum = "85eee18b953107c2ce1f9e217b533464b061c4416179aa65c6adb102379fbaff"
 dependencies = [
- "activitypub_federation_derive",
  "actix-web",
  "anyhow",
  "async-trait",
@@ -17,6 +16,7 @@ dependencies = [
  "chrono",
  "derive_builder 0.11.2",
  "dyn-clone",
+ "enum_delegate",
  "http",
  "http-signature-normalization-actix",
  "http-signature-normalization-reqwest",
@@ -33,17 +33,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "activitypub_federation_derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07520b54fc0f22ad30b90399b2a2689c6e5c113df0642ca3fa2f7ee823e54126"
-dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
-]
-
 [[package]]
 name = "activitystreams-kinds"
 version = "0.2.1"
@@ -665,9 +654,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.22"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
 dependencies = [
  "iana-time-zone",
  "js-sys",
@@ -1348,6 +1337,30 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca"
 
+[[package]]
+name = "enum_delegate"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8ea75f31022cba043afe037940d73684327e915f88f62478e778c3de914cd0a"
+dependencies = [
+ "enum_delegate_lib",
+ "proc-macro2 1.0.47",
+ "quote 1.0.21",
+ "syn 1.0.103",
+]
+
+[[package]]
+name = "enum_delegate_lib"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e1f6c3800b304a6be0012039e2a45a322a093539c45ab818d9e6895a39c90fe"
+dependencies = [
+ "proc-macro2 1.0.47",
+ "quote 1.0.21",
+ "rand 0.8.5",
+ "syn 1.0.103",
+]
+
 [[package]]
 name = "event-listener"
 version = "2.5.3"
@@ -2107,6 +2120,7 @@ dependencies = [
  "async-trait",
  "chrono",
  "diesel",
+ "enum_delegate",
  "futures",
  "html2md",
  "http",
@@ -2715,9 +2729,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
 
 [[package]]
 name = "openssl"

diff --git a/Cargo.toml b/Cargo.toml
index a888514f27f5b599a703483b5700f1cfac86e292..d39f244c3556f59a212e24800c93e77247ba7ff9 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,7 @@ lemmy_db_schema = { version = "=0.16.5", path = "./crates/db_schema" }
 lemmy_api_common = { version = "=0.16.5", path = "crates/api_common" }
 lemmy_websocket = { version = "=0.16.5", path = "./crates/websocket" }
 lemmy_routes = { version = "=0.16.5", path = "./crates/routes" }
-activitypub_federation = "0.2.3"
+activitypub_federation = "0.3.2"
 diesel = "2.0.2"
 diesel_migrations = "2.0.0"
 diesel-async = "0.1.1"

diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
index 51c8808c013666a44df69e1c0b24f7b892417cc6..a1e5049dd2035adb2ed49cea7c6269ed2f8f9d4d 100644 (file)
--- a/crates/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -22,7 +22,7 @@ lemmy_db_views_moderator = { version = "=0.16.5", path = "../db_views_moderator"
 lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor", features = ["full"] }
 lemmy_api_common = { version = "=0.16.5", path = "../api_common", features = ["full"] }
 lemmy_websocket = { version = "=0.16.5", path = "../websocket" }
-activitypub_federation = "0.2.3"
+activitypub_federation = "0.3.2"
 diesel = "2.0.2"
 bcrypt = "0.13.0"
 chrono = { version = "0.4.22", features = ["serde"], default-features = false }

diff --git a/crates/api_crud/Cargo.toml b/crates/api_crud/Cargo.toml
index aa1ec1a07737d34d83869f254ea398a03d9da8b2..4bcaead4fc40637e81f659ec0bf700077521aeed 100644 (file)
--- a/crates/api_crud/Cargo.toml
+++ b/crates/api_crud/Cargo.toml
@@ -16,7 +16,7 @@ lemmy_db_views = { version = "=0.16.5", path = "../db_views", features = ["full"
 lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor", features = ["full"] }
 lemmy_api_common = { version = "=0.16.5", path = "../api_common", features = ["full"] }
 lemmy_websocket = { version = "=0.16.5", path = "../websocket" }
-activitypub_federation = "0.2.3"
+activitypub_federation = "0.3.2"
 bcrypt = "0.13.0"
 serde_json = { version = "1.0.87", features = ["preserve_order"] }
 serde = { version = "1.0.147", features = ["derive"] }

diff --git a/crates/api_crud/src/user/create.rs b/crates/api_crud/src/user/create.rs
index 7cd34fc485f14cb887c50c36ea6e960896f2264e..eb7f96e131f5cc7e64689b3708516dcdf4c2b354 100644 (file)
--- a/crates/api_crud/src/user/create.rs
+++ b/crates/api_crud/src/user/create.rs
@@ -77,14 +77,8 @@ impl PerformCrud for Register {
       let check = context
         .chat_server()
         .send(CheckCaptcha {
-          uuid: data
-            .captcha_uuid
-            .to_owned()
-            .unwrap_or_else(|| "".to_string()),
-          answer: data
-            .captcha_answer
-            .to_owned()
-            .unwrap_or_else(|| "".to_string()),
+          uuid: data.captcha_uuid.to_owned().unwrap_or_default(),
+          answer: data.captcha_answer.to_owned().unwrap_or_default(),
         })
         .await?;
       if !check {

diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml
index 3fdd062aa472a8d0e231a94692404fe4906b0967..19744b3cd85382290fcf8e64c769568663052144 100644 (file)
--- a/crates/apub/Cargo.toml
+++ b/crates/apub/Cargo.toml
@@ -20,7 +20,7 @@ lemmy_db_views = { version = "=0.16.5", path = "../db_views", features = ["full"
 lemmy_db_views_actor = { version = "=0.16.5", path = "../db_views_actor", features = ["full"] }
 lemmy_api_common = { version = "=0.16.5", path = "../api_common", features = ["full"] }
 lemmy_websocket = { version = "=0.16.5", path = "../websocket" }
-activitypub_federation = "0.2.3"
+activitypub_federation = "0.3.2"
 diesel = "2.0.2"
 activitystreams-kinds = "0.2.1"
 chrono = { version = "0.4.22", features = ["serde"], default-features = false }
@@ -45,6 +45,7 @@ reqwest = { version = "0.11.12", features = ["json"] }
 html2md = "0.2.13"
 once_cell = "1.15.0"
 tokio = "1.21.2"
+enum_delegate = "0.2.0"
 
 [dev-dependencies]
 serial_test = "0.9.0"

diff --git a/crates/apub/src/activities/create_or_update/mod.rs b/crates/apub/src/activities/create_or_update/mod.rs
index a41912da39193ef43d6a9611822bfb0b432565b6..2c68ad80f25274b2f7b2eed5e9a3fc07cec0f29c 100644 (file)
--- a/crates/apub/src/activities/create_or_update/mod.rs
+++ b/crates/apub/src/activities/create_or_update/mod.rs
@@ -32,5 +32,5 @@ async fn get_comment_notif_recipients(
   // anyway.
   // TODO: for compatibility with other projects, it would be much better to read this from cc or tags
   let mentions = scrape_text_for_mentions(&comment.content);
-  send_local_notifs(mentions, comment, &*actor, &post, do_send_email, context).await
+  send_local_notifs(mentions, comment, &actor, &post, do_send_email, context).await
 }

diff --git a/crates/apub/src/activities/create_or_update/post.rs b/crates/apub/src/activities/create_or_update/post.rs
index 4470f3b3ae2b315bcfe16ea9961843e8c48a4d5c..4f28fad226d4ba6424a89663c98421c42f065a67 100644 (file)
--- a/crates/apub/src/activities/create_or_update/post.rs
+++ b/crates/apub/src/activities/create_or_update/post.rs
@@ -63,7 +63,7 @@ impl CreateOrUpdatePost {
     let community: ApubCommunity = Community::read(context.pool(), community_id).await?.into();
 
     let create_or_update = CreateOrUpdatePost::new(post, actor, &community, kind, context).await?;
-    let activity = AnnouncableActivities::CreateOrUpdatePost(Box::new(create_or_update));
+    let activity = AnnouncableActivities::CreateOrUpdatePost(create_or_update);
     send_activity_in_community(activity, actor, &community, vec![], context).await?;
     Ok(())
   }

diff --git a/crates/apub/src/activity_lists.rs b/crates/apub/src/activity_lists.rs
index c7fb51859d1cdeb0e262847a409ac5ddf900c4b2..49fa4413462c4d092dac67356995442cd9c33a0c 100644 (file)
--- a/crates/apub/src/activity_lists.rs
+++ b/crates/apub/src/activity_lists.rs
@@ -27,7 +27,7 @@ use crate::{
     objects::page::Page,
   },
 };
-use activitypub_federation::{deser::context::WithContext, traits::activity_handler};
+use activitypub_federation::{data::Data, deser::context::WithContext, traits::ActivityHandler};
 use lemmy_utils::error::LemmyError;
 use lemmy_websocket::LemmyContext;
 use serde::{Deserialize, Serialize};
@@ -35,7 +35,7 @@ use url::Url;
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum SharedInboxActivities {
   PersonInboxActivities(Box<WithContext<PersonInboxActivities>>),
   GroupInboxActivities(Box<WithContext<GroupInboxActivities>>),
@@ -43,7 +43,7 @@ pub enum SharedInboxActivities {
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum GroupInboxActivities {
   FollowCommunity(FollowCommunity),
   UndoFollowCommunity(UndoFollowCommunity),
@@ -54,7 +54,7 @@ pub enum GroupInboxActivities {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum PersonInboxActivities {
   AcceptFollowCommunity(AcceptFollowCommunity),
   CreateOrUpdatePrivateMessage(CreateOrUpdatePrivateMessage),
@@ -68,18 +68,18 @@ pub enum PersonInboxActivities {
 /// inbox can fall through to be parsed as GroupInboxActivities::AnnouncableActivities.
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum PersonInboxActivitiesWithAnnouncable {
-  PersonInboxActivities(PersonInboxActivities),
-  AnnouncableActivities(AnnouncableActivities),
+  PersonInboxActivities(Box<PersonInboxActivities>),
+  AnnouncableActivities(Box<AnnouncableActivities>),
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 pub enum AnnouncableActivities {
   CreateOrUpdateComment(CreateOrUpdateComment),
-  CreateOrUpdatePost(Box<CreateOrUpdatePost>),
+  CreateOrUpdatePost(CreateOrUpdatePost),
   Vote(Vote),
   UndoVote(UndoVote),
   Delete(Delete),
@@ -95,7 +95,7 @@ pub enum AnnouncableActivities {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(untagged)]
-#[activity_handler(LemmyContext, LemmyError)]
+#[enum_delegate::implement(ActivityHandler)]
 #[allow(clippy::enum_variant_names)]
 pub enum SiteInboxActivities {
   BlockUser(BlockUser),

diff --git a/crates/apub/src/collections/community_outbox.rs b/crates/apub/src/collections/community_outbox.rs
index 57fc48be6ae729d7b098a754ae9bd4038f33fee8..bc0a224c6497520069dbe1512757c3224075af1b 100644 (file)
--- a/crates/apub/src/collections/community_outbox.rs
+++ b/crates/apub/src/collections/community_outbox.rs
@@ -72,7 +72,7 @@ impl ApubObject for ApubCommunityOutbox {
       let create =
         CreateOrUpdatePost::new(post, &person, &data.0, CreateOrUpdateType::Create, &data.1)
           .await?;
-      let announcable = AnnouncableActivities::CreateOrUpdatePost(Box::new(create));
+      let announcable = AnnouncableActivities::CreateOrUpdatePost(create);
       let announce = AnnounceActivity::new(announcable.try_into()?, &data.0, &data.1)?;
       ordered_items.push(announce);
     }

diff --git a/crates/apub/src/http/comment.rs b/crates/apub/src/http/comment.rs
index e2d0fb779b9509f349efff609fa43e9b5052be56..498a23c8ab82ce47b189cdf6896bd862ee32b3a0 100644 (file)
--- a/crates/apub/src/http/comment.rs
+++ b/crates/apub/src/http/comment.rs
@@ -28,7 +28,7 @@ pub(crate) async fn get_apub_comment(
   }
 
   if !comment.deleted && !comment.removed {
-    Ok(create_apub_response(&comment.into_apub(&**context).await?))
+    Ok(create_apub_response(&comment.into_apub(&context).await?))
   } else {
     Ok(create_apub_tombstone_response(comment.ap_id.clone()))
   }

diff --git a/crates/apub/src/http/community.rs b/crates/apub/src/http/community.rs
index 87a0f1b4762394e71372f68a1ab74780096310e5..8b860f5738f21d66b39f2b20f80eca2acc5c00c9 100644 (file)
--- a/crates/apub/src/http/community.rs
+++ b/crates/apub/src/http/community.rs
@@ -39,7 +39,7 @@ pub(crate) async fn get_apub_community_http(
       .into();
 
   if !community.deleted && !community.removed {
-    let apub = community.into_apub(&**context).await?;
+    let apub = community.into_apub(&context).await?;
 
     Ok(create_apub_response(&apub))
   } else {

diff --git a/crates/apub/src/http/mod.rs b/crates/apub/src/http/mod.rs
index 05837f93cc47a669ba8fb41cfc5c6cb66266ee5c..defdec2a2883c59358af45d7bc4371dc83237143 100644 (file)
--- a/crates/apub/src/http/mod.rs
+++ b/crates/apub/src/http/mod.rs
@@ -32,7 +32,6 @@ mod post;
 pub mod routes;
 pub mod site;
 
-#[tracing::instrument(skip_all)]
 pub async fn shared_inbox(
   request: HttpRequest,
   payload: String,
@@ -55,7 +54,7 @@ where
   for<'de2> <ActorT as ApubObject>::ApubType: serde::Deserialize<'de2>,
 {
   let activity_value: Value = serde_json::from_str(&payload)?;
-  debug!("Received activity {:#}", payload.as_str());
+  debug!("Parsing activity {}", payload);
   let activity: Activity = serde_json::from_value(activity_value.clone())?;
   // Log the activity, so we avoid receiving and parsing it twice.
   let insert = insert_activity(activity.id(), activity_value, false, true, context.pool()).await?;

diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml
index da508b29f3dbe2cd98abc9d1584cec4d4d254fa5..8c8acf6bc5b06dc568459e5b5a5fed9ea7c90c61 100644 (file)
--- a/crates/db_schema/Cargo.toml
+++ b/crates/db_schema/Cargo.toml
@@ -24,7 +24,7 @@ url = { version = "2.3.1", features = ["serde"] }
 strum = "0.24.1"
 strum_macros = "0.24.3"
 serde_json = { version = "1.0.87", features = ["preserve_order"], optional = true }
-activitypub_federation = { version = "0.2.3", optional = true }
+activitypub_federation = {version = "0.3.2", optional = true }
 lemmy_utils = { version = "=0.16.5", path = "../utils", optional = true }
 bcrypt = { version = "0.13.0", optional = true }
 diesel = { version = "2.0.2", features = ["postgres","chrono", "serde_json"], optional = true }

diff --git a/crates/utils/src/utils.rs b/crates/utils/src/utils.rs
index 9d481de1906586be155faf47d9564bfd9fd4acc2..275b085a3058f606396d9ca7ef27384bc00a51dd 100644 (file)
--- a/crates/utils/src/utils.rs
+++ b/crates/utils/src/utils.rs
@@ -25,11 +25,14 @@ static CLEAN_URL_PARAMS_REGEX: Lazy<Regex> = Lazy::new(|| {
 });
 
 pub fn naive_from_unix(time: i64) -> NaiveDateTime {
-  NaiveDateTime::from_timestamp(time, 0)
+  NaiveDateTime::from_timestamp_opt(time, 0).expect("convert datetime")
 }
 
 pub fn convert_datetime(datetime: NaiveDateTime) -> DateTime<FixedOffset> {
-  DateTime::<FixedOffset>::from_utc(datetime, FixedOffset::east(0))
+  DateTime::<FixedOffset>::from_utc(
+    datetime,
+    FixedOffset::east_opt(0).expect("create fixed offset"),
+  )
 }
 
 pub fn remove_slurs(test: &str, slur_regex: &Option<Regex>) -> String {

diff --git a/src/root_span_builder.rs b/src/root_span_builder.rs
index 84a7817cb5dee682a93c99dd6468b2cb013fd9c5..477ac9eddcad9201b9f0da314264e2cb3de47333 100644 (file)
--- a/src/root_span_builder.rs
+++ b/src/root_span_builder.rs
@@ -41,8 +41,8 @@ impl RootSpanBuilder for QuieterRootSpanBuilder {
           handle_error(span, response.status(), error.as_response_error());
         } else {
           let code: i32 = response.response().status().as_u16().into();
-          span.record("http.status_code", &code);
-          span.record("otel.status_code", &"OK");
+          span.record("http.status_code", code);
+          span.record("otel.status_code", "OK");
         }
       }
       Err(error) => {
@@ -56,12 +56,12 @@ impl RootSpanBuilder for QuieterRootSpanBuilder {
 fn handle_error(span: Span, status_code: StatusCode, response_error: &dyn ResponseError) {
   let code: i32 = status_code.as_u16().into();
 
-  span.record("http.status_code", &code);
+  span.record("http.status_code", code);
 
   if status_code.is_client_error() {
-    span.record("otel.status_code", &"OK");
+    span.record("otel.status_code", "OK");
   } else {
-    span.record("otel.status_code", &"ERROR");
+    span.record("otel.status_code", "ERROR");
   }
 
   // pre-formatting errors is a workaround for https://github.com/tokio-rs/tracing/issues/1565