server/src/apub/community.rs

@@ -10,12 +10,10 @@ use crate::{
   routes::DbPoolParam,
   DbPool, LemmyError,
 };
-use activitystreams::{activity::Announce, BaseBox};
-use activitystreams::{Activity, Base};
+use activitystreams::{activity::Announce, Activity, Base, BaseBox};
 use activitystreams_ext::Ext2;
 use activitystreams_new::{
-  activity::Follow,
-  activity::{Accept, Delete, Remove, Undo},
+  activity::{Accept, Delete, Follow, Remove, Undo},
   actor::{kind::GroupType, ApActor, Endpoints, Group},
   base::BaseExt,
   collection::UnorderedCollection,

server/src/apub/community_inbox.rs

@@ -8,8 +8,10 @@ use crate::{
   routes::{ChatServerParam, DbPoolParam},
   LemmyError,
 };
-use activitystreams::activity::Undo;
-use activitystreams_new::activity::Follow;
+use activitystreams_new::{
+  activity::{Follow, Undo},
+  prelude::*,
+};
 use actix_web::{client::Client, web, HttpRequest, HttpResponse};
 use lemmy_db::{
   community::{Community, CommunityFollower, CommunityFollowerForm},
@@ -31,14 +33,9 @@ impl CommunityAcceptedObjects {
   fn follow(&self) -> Result<Follow, LemmyError> {
     match self {
       CommunityAcceptedObjects::Follow(f) => Ok(f.to_owned()),
-      CommunityAcceptedObjects::Undo(u) => Ok(
-        u.undo_props
-          .get_object_base_box()
-          .to_owned()
-          .unwrap()
-          .to_owned()
-          .into_concrete::<Follow>()?,
-      ),
+      CommunityAcceptedObjects::Undo(u) => {
+        Ok(Follow::from_any_base(u.object.as_one().unwrap().to_owned())?.unwrap())
+      }
     }
   }
 }

server/src/apub/private_message.rs

@@ -5,13 +5,12 @@ use crate::{
   },
   blocking, DbPool, LemmyError,
 };
-use activitystreams_new::object::kind::NoteType;
-use activitystreams_new::object::{Note, Tombstone};
-use activitystreams_new::primitives::{XsdAnyUri, XsdDateTime};
 use activitystreams_new::{
   activity::{Create, Delete, Undo, Update},
   context,
+  object::{kind::NoteType, Note, Tombstone},
   prelude::*,
+  primitives::{XsdAnyUri, XsdDateTime},
 };
 use actix_web::client::Client;
 use lemmy_db::{

server/src/apub/user_inbox.rs

@@ -10,8 +10,11 @@ use crate::{
   websocket::{server::SendUserRoomMessage, UserOperation},
   DbPool, LemmyError,
 };
-use activitystreams::activity::{Accept, Create, Delete, Undo, Update};
-use activitystreams_new::object::Note;
+use activitystreams_new::{
+  activity::{Accept, Create, Delete, Undo, Update},
+  object::Note,
+  prelude::*,
+};
 use actix_web::{client::Client, web, HttpRequest, HttpResponse};
 use lemmy_db::{
   community::{CommunityFollower, CommunityFollowerForm},
@@ -75,8 +78,9 @@ async fn receive_accept(
   pool: &DbPool,
 ) -> Result<HttpResponse, LemmyError> {
   let community_uri = accept
-    .accept_props
-    .get_actor_xsd_any_uri()
+    .actor()
+    .to_owned()
+    .single_xsd_any_uri()
     .unwrap()
     .to_string();
 
@@ -111,17 +115,10 @@ async fn receive_create_private_message(
   pool: &DbPool,
   chat_server: ChatServerParam,
 ) -> Result<HttpResponse, LemmyError> {
-  let note = create
-    .create_props
-    .get_object_base_box()
-    .to_owned()
-    .unwrap()
-    .to_owned()
-    .into_concrete::<Note>()?;
+  let user_uri = &create.actor().to_owned().single_xsd_any_uri().unwrap();
+  let note = Note::from_any_base(create.object.as_one().unwrap().to_owned())?.unwrap();
 
-  let user_uri = create.create_props.get_actor_xsd_any_uri().unwrap();
-
-  let user = get_or_fetch_and_upsert_remote_user(&user_uri, client, pool).await?;
+  let user = get_or_fetch_and_upsert_remote_user(user_uri, client, pool).await?;
   verify(request, &user)?;
 
   insert_activity(user.id, create, false, pool).await?;
@@ -159,15 +156,8 @@ async fn receive_update_private_message(
   pool: &DbPool,
   chat_server: ChatServerParam,
 ) -> Result<HttpResponse, LemmyError> {
-  let note = update
-    .update_props
-    .get_object_base_box()
-    .to_owned()
-    .unwrap()
-    .to_owned()
-    .into_concrete::<Note>()?;
-
-  let user_uri = update.update_props.get_actor_xsd_any_uri().unwrap();
+  let user_uri = update.actor().to_owned().single_xsd_any_uri().unwrap();
+  let note = Note::from_any_base(update.object.as_one().unwrap().to_owned())?.unwrap();
 
   let user = get_or_fetch_and_upsert_remote_user(&user_uri, client, pool).await?;
   verify(request, &user)?;
@@ -215,15 +205,8 @@ async fn receive_delete_private_message(
   pool: &DbPool,
   chat_server: ChatServerParam,
 ) -> Result<HttpResponse, LemmyError> {
-  let note = delete
-    .delete_props
-    .get_object_base_box()
-    .to_owned()
-    .unwrap()
-    .to_owned()
-    .into_concrete::<Note>()?;
-
-  let user_uri = delete.delete_props.get_actor_xsd_any_uri().unwrap();
+  let user_uri = delete.actor().to_owned().single_xsd_any_uri().unwrap();
+  let note = Note::from_any_base(delete.object.as_one().unwrap().to_owned())?.unwrap();
 
   let user = get_or_fetch_and_upsert_remote_user(&user_uri, client, pool).await?;
   verify(request, &user)?;
@@ -283,23 +266,9 @@ async fn receive_undo_delete_private_message(
   pool: &DbPool,
   chat_server: ChatServerParam,
 ) -> Result<HttpResponse, LemmyError> {
-  let delete = undo
-    .undo_props
-    .get_object_base_box()
-    .to_owned()
-    .unwrap()
-    .to_owned()
-    .into_concrete::<Delete>()?;
-
-  let note = delete
-    .delete_props
-    .get_object_base_box()
-    .to_owned()
-    .unwrap()
-    .to_owned()
-    .into_concrete::<Note>()?;
-
-  let user_uri = delete.delete_props.get_actor_xsd_any_uri().unwrap();
+  let delete = Delete::from_any_base(undo.object.as_one().unwrap().to_owned())?.unwrap();
+  let note = Note::from_any_base(delete.object.as_one().unwrap().to_owned())?.unwrap();
+  let user_uri = delete.actor().to_owned().single_xsd_any_uri().unwrap();
 
   let user = get_or_fetch_and_upsert_remote_user(&user_uri, client, pool).await?;
   verify(request, &user)?;