grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unused fields on community/user json (#1178)

Browse source
This commit is contained in:
Nutomic 2020-10-07 18:19:12 +00:00 committed by GitHub
parent f00cfa005e
commit 299598f0c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lemmy_apub/src/community.rs
View file

@ -109,8 +109,6 @@ impl ToApub for Community {
.set_preferred_username(self.title.to_owned()) .set_preferred_username(self.title.to_owned())
.set_outbox(self.get_outbox_url()?) .set_outbox(self.get_outbox_url()?)
.set_followers(self.get_followers_url()?) .set_followers(self.get_followers_url()?)
.set_following(self.get_following_url().parse()?)
.set_liked(self.get_liked_url().parse()?)
.set_endpoints(Endpoints { .set_endpoints(Endpoints {
shared_inbox: Some(self.get_shared_inbox_url()?), shared_inbox: Some(self.get_shared_inbox_url()?),
..Default::default() ..Default::default()

8
lemmy_apub/src/lib.rs
View file

@ -292,14 +292,6 @@ pub trait ActorType {
Url::parse(&format!("{}/followers", &self.actor_id_str())) Url::parse(&format!("{}/followers", &self.actor_id_str()))
} }
fn get_following_url(&self) -> String {
format!("{}/following", &self.actor_id_str())
}
fn get_liked_url(&self) -> String {
format!("{}/liked", &self.actor_id_str())
}
fn get_public_key_ext(&self) -> Result<PublicKeyExtension, LemmyError> { fn get_public_key_ext(&self) -> Result<PublicKeyExtension, LemmyError> {
Ok( Ok(
PublicKey { PublicKey {

13
lemmy_apub/src/user.rs
View file

@ -78,15 +78,10 @@ impl ToApub for User_ {
} }
let mut ap_actor = ApActor::new(self.get_inbox_url()?, person); let mut ap_actor = ApActor::new(self.get_inbox_url()?, person);
ap_actor ap_actor.set_endpoints(Endpoints {
.set_outbox(self.get_outbox_url()?) shared_inbox: Some(self.get_shared_inbox_url()?),
.set_followers(self.get_followers_url()?) ..Default::default()
.set_following(self.get_following_url().parse()?) });
.set_liked(self.get_liked_url().parse()?)
.set_endpoints(Endpoints {
shared_inbox: Some(self.get_shared_inbox_url()?),
..Default::default()
});
if let Some(i) = &self.preferred_username { if let Some(i) = &self.preferred_username {
ap_actor.set_preferred_username(i.to_owned()); ap_actor.set_preferred_username(i.to_owned());