Merge branch 'feature/notification-control-part-2' into 'develop'

notification controls, part 2 See merge request pleroma/pleroma!1204
2019-06-02 08:25:37 +00:00 · 2019-06-02 08:25:37 +00:00 · 5402d04e3c
commit 5402d04e3c
parent e706b42f51 45e4642a58
8 changed files with 84 additions and 42 deletions
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@ -78,10 +78,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
    user = insert(:user)

    notification_settings = %{
-      "remote" => true,
-      "local" => true,
      "followers" => true,
-      "follows" => true
+      "follows" => true,
+      "non_follows" => true,
+      "non_followers" => true
    }

    privacy = user.info.default_scope