Browse Source

Merge branch 'federation' into add_federated_post_likes

add_federated_post_likes
Dessalines 2 years ago
parent
commit
59bba148ff
  1. 3
      server/src/apub/comment.rs
  2. 4
      server/src/apub/mod.rs
  3. 2
      ui/src/api_tests/api.spec.ts

3
server/src/apub/comment.rs

@ -23,9 +23,6 @@ impl ToApub for Comment {
// Not needed when the Post is embedded in a collection (like for community outbox)
.set_context_xsd_any_uri(context())?
.set_id(self.ap_id.to_owned())?
// Use summary field to be consistent with mastodon content warning.
// https://mastodon.xyz/@Louisa/103987265222901387.json
// .set_summary_xsd_string(self.name.to_owned())?
.set_published(convert_datetime(self.published))?
.set_to_xsd_any_uri(community.actor_id)?
.set_many_in_reply_to_xsd_any_uris(in_reply_to_vec)?

4
server/src/apub/mod.rs

@ -184,12 +184,12 @@ pub trait ActorType {
// and a user can't be followed (yet)
#[allow(unused_variables)]
fn send_follow(&self, follow_actor_id: &str, conn: &PgConnection) -> Result<(), Error> {
Ok(())
Err(format_err!("Follow not implemented."))
}
#[allow(unused_variables)]
fn send_accept_follow(&self, follow: &Follow, conn: &PgConnection) -> Result<(), Error> {
Ok(())
Err(format_err!("Accept not implemented."))
}
// TODO default because there is no user following yet.

2
ui/src/api_tests/api.spec.ts

@ -102,8 +102,6 @@ describe('main', () => {
expect(searchResponse.communities[0].name).toBe('main');
// TODO
// Unfortunately the search is correctly
let followForm: FollowCommunityForm = {
community_id: searchResponse.communities[0].id,
follow: true,

Loading…
Cancel
Save