Merge branch '743-unfollow-notification' into 'master'

Fix #743: Do not send notification when rejecting a follow on a local library

See merge request funkwhale/funkwhale!649
merge-requests/671/head
Eliot Berriot 2019-03-07 12:16:40 +01:00
commit 15eac69d41
3 zmienionych plików z 9 dodań i 4 usunięć

Wyświetl plik

@ -25,7 +25,8 @@ from . import utils
def update_follow(follow, approved):
follow.approved = approved
follow.save(update_fields=["approved"])
routes.outbox.dispatch({"type": "Accept"}, context={"follow": follow})
if approved:
routes.outbox.dispatch({"type": "Accept"}, context={"follow": follow})
class LibraryFollowViewSet(

Wyświetl plik

@ -123,9 +123,12 @@ def test_user_can_accept_or_reject_own_follows(
assert follow.approved is expected
mocked_dispatch.assert_called_once_with(
{"type": "Accept"}, context={"follow": follow}
)
if action == "accept":
mocked_dispatch.assert_called_once_with(
{"type": "Accept"}, context={"follow": follow}
)
if action == "reject":
mocked_dispatch.assert_not_called()
def test_user_can_list_inbox_items(factories, logged_in_api_client):

Wyświetl plik

@ -0,0 +1 @@
Do not send notification when rejecting a follow on a local library (#743)