Merge branch 'feature/funkwhale-audio' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sun, 29 Mar 2020 19:18:22 +0000 (19:18 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 2 Apr 2020 20:00:23 +0000 (23:00 +0300)
commitb0a9a02af3edb28002b633030b3f6d63ae2309bf
tree452ae123ec98fc3360e6bea336e230c75af58978
parent01a3f145d51fe7aeb9050c89e03bebf10793aba3
Merge branch 'feature/funkwhale-audio' into 'develop'

Add support for funkwhale Audio activity

Closes #764 and #1624

See merge request pleroma/pleroma!2287
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
test/fixtures/tesla_mock/funkwhale_audio.json [new file with mode: 0644]
test/fixtures/tesla_mock/funkwhale_channel.json [new file with mode: 0644]
test/support/http_request_mock.ex
test/web/mastodon_api/views/status_view_test.exs
test/web/oauth/oauth_controller_test.exs