Making public key required. Fixes #1934

[lemmy.git] / crates / apub / src / protocol / objects / group.rs

diff --git a/crates/apub/src/protocol/objects/group.rs b/crates/apub/src/protocol/objects/group.rs
index 8a6e672037eca15b26b589aa86ed521568bb50dd..fa225398fc649b27594989622094d1e27c292408 100644 (file)
--- a/crates/apub/src/protocol/objects/group.rs
+++ b/crates/apub/src/protocol/objects/group.rs
@@ -5,9 +5,9 @@ use crate::{
     community_outbox::ApubCommunityOutbox,
   },
   objects::{community::ApubCommunity, get_summary_from_string_or_source},
-  protocol::{objects::Endpoints, ImageObject, Source},
+  protocol::{objects::Endpoints, ImageObject, Source, Unparsed},
 };
-use activitystreams::{actor::kind::GroupType, unparsed::Unparsed};
+use activitystreams_kinds::actor::GroupType;
 use chrono::{DateTime, FixedOffset};
 use lemmy_apub_lib::{object_id::ObjectId, signatures::PublicKey, verify::verify_domains_match};
 use lemmy_db_schema::{naive_now, source::community::CommunityForm};
@@ -68,8 +68,8 @@ impl Group {
     Ok(())
   }
 
-  pub(crate) fn into_form(self) -> Result<CommunityForm, LemmyError> {
-    Ok(CommunityForm {
+  pub(crate) fn into_form(self) -> CommunityForm {
+    CommunityForm {
       name: self.preferred_username,
       title: self.name,
       description: get_summary_from_string_or_source(&self.summary, &self.source),
@@ -81,13 +81,13 @@ impl Group {
       actor_id: Some(self.id.into()),
       local: Some(false),
       private_key: None,
-      public_key: Some(self.public_key.public_key_pem),
+      public_key: self.public_key.public_key_pem,
       last_refreshed_at: Some(naive_now()),
       icon: Some(self.icon.map(|i| i.url.into())),
       banner: Some(self.image.map(|i| i.url.into())),
       followers_url: Some(self.followers.into()),
       inbox_url: Some(self.inbox.into()),
       shared_inbox_url: Some(self.endpoints.shared_inbox.map(|s| s.into())),
-    })
+    }
   }
 }