diff options
| author | Dessalines <tyhou13@gmx.com> | 2020-04-28 10:12:07 -0400 |
|---|---|---|
| committer | Dessalines <tyhou13@gmx.com> | 2020-04-28 10:12:07 -0400 |
| commit | 59bba148ff3b43cd269d95189d0553f211a2f79a (patch) | |
| tree | 4e4dfd4bb3d0816ca4df40727ee59568384e5d23 | |
| parent | 3b62f58dd2ee8dc9e3d5fec15a48df052f164deb (diff) | |
| parent | b60c7bbae7e605d43c93cb7b153d96982d97765b (diff) | |
Merge branch 'federation' into add_federated_post_likes
| -rw-r--r-- | server/src/apub/comment.rs | 3 | ||||
| -rw-r--r-- | server/src/apub/mod.rs | 4 | ||||
| -rw-r--r-- | ui/src/api_tests/api.spec.ts | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/server/src/apub/comment.rs b/server/src/apub/comment.rs index db47106e..6cede17b 100644 --- a/server/src/apub/comment.rs +++ b/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)? diff --git a/server/src/apub/mod.rs b/server/src/apub/mod.rs index 14f3e798..4b08c53a 100644 --- a/server/src/apub/mod.rs +++ b/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. diff --git a/ui/src/api_tests/api.spec.ts b/ui/src/api_tests/api.spec.ts index 8a3e94f2..ffc33888 100644 --- a/ui/src/api_tests/api.spec.ts +++ b/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, |