Simplify notification filtering settings further

CHANGELOG.md

@@ -17,9 +17,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   <summary>API Changes</summary>
 
 - **Breaking:** Emoji API: changed methods and renamed routes.
-- **Breaking:** Notification Settings API for suppressing notification
+- **Breaking:** Notification Settings API for suppressing notifications
-  now supports the following controls: `from_followers`, `from_following`,
+  has been simplified down to `block_from_strangers`.
-  and `from_strangers`.
 </details>
 
 <details>

docs/API/pleroma_api.md

@@ -287,9 +287,7 @@ See [Admin-API](admin_api.md)
 * Method `PUT`
 * Authentication: required
 * Params:
-    * `from_followers`: BOOLEAN field, receives notifications from followers
+    * `block_from_strangers`: BOOLEAN field, blocks notifications from accounts you do not follow
-    * `from_following`: BOOLEAN field, receives notifications from people the user follows
-    * `from_strangers`: BOOLEAN field, receives notifications from people without an established relationship
     * `privacy_option`: BOOLEAN field. When set to true, it removes the contents of a message from the push notification.
 * Response: JSON. Returns `{"status": "success"}` if the update was successful, otherwise returns `{"error": "error_msg"}`
 

lib/pleroma/notification.ex

@@ -550,9 +550,7 @@ defmodule Pleroma.Notification do
     [
       :self,
       :invisible,
-      :from_followers,
+      :block_from_strangers,
-      :from_following,
-      :from_strangers,
       :recently_followed
     ]
     |> Enum.find(&skip?(&1, activity, user))
@@ -572,35 +570,15 @@ defmodule Pleroma.Notification do
   end
 
   def skip?(
-        :from_followers,
+        :block_from_strangers,
         %Activity{} = activity,
-        %User{notification_settings: %{from_followers: false}} = user
+        %User{notification_settings: %{block_from_strangers: true}} = user
-      ) do
-    actor = activity.data["actor"]
-    follower = User.get_cached_by_ap_id(actor)
-    User.following?(follower, user)
-  end
-
-  def skip?(
-        :from_strangers,
-        %Activity{} = activity,
-        %User{notification_settings: %{from_strangers: false}} = user
       ) do
     actor = activity.data["actor"]
     follower = User.get_cached_by_ap_id(actor)
     !User.following?(follower, user)
   end
 
-  def skip?(
-        :from_following,
-        %Activity{} = activity,
-        %User{notification_settings: %{from_following: false}} = user
-      ) do
-    actor = activity.data["actor"]
-    followed = User.get_cached_by_ap_id(actor)
-    User.following?(user, followed)
-  end
-
   # To do: consider defining recency in hours and checking FollowingRelationship with a single SQL
   def skip?(:recently_followed, %Activity{data: %{"type" => "Follow"}} = activity, %User{} = user) do
     actor = activity.data["actor"]

lib/pleroma/user/notification_setting.ex

@@ -10,18 +10,14 @@ defmodule Pleroma.User.NotificationSetting do
   @primary_key false
 
   embedded_schema do
-    field(:from_followers, :boolean, default: true)
+    field(:block_from_strangers, :boolean, default: false)
-    field(:from_following, :boolean, default: true)
-    field(:from_strangers, :boolean, default: true)
     field(:privacy_option, :boolean, default: false)
   end
 
   def changeset(schema, params) do
     schema
     |> cast(prepare_attrs(params), [
-      :from_followers,
+      :block_from_strangers,
-      :from_following,
-      :from_strangers,
       :privacy_option
     ])
   end

lib/pleroma/web/api_spec/schemas/account.ex

@@ -57,9 +57,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
           notification_settings: %Schema{
             type: :object,
             properties: %{
-              from_followers: %Schema{type: :boolean},
+              block_from_strangers: %Schema{type: :boolean},
-              from_following: %Schema{type: :boolean},
-              from_strangers: %Schema{type: :boolean},
               privacy_option: %Schema{type: :boolean}
             }
           },
@@ -122,9 +120,7 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Account do
         "unread_conversation_count" => 0,
         "tags" => [],
         "notification_settings" => %{
-          "from_followers" => true,
+          "block_from_strangers" => false,
-          "from_following" => true,
-          "from_strangers" => true,
           "privacy_option" => false
         },
         "relationship" => %{

priv/repo/migrations/20200528160439_users_update_notification_settings.exs

@@ -1,43 +0,0 @@
-defmodule Pleroma.Repo.Migrations.UsersUpdateNotificationSettings do
-  use Ecto.Migration
-
-  def up do
-    execute(
-      "UPDATE users SET notification_settings = notification_settings - 'followers' || jsonb_build_object('from_followers', notification_settings->'followers')
-where notification_settings ? 'followers'
-and local"
-    )
-
-    execute(
-      "UPDATE users SET notification_settings = notification_settings - 'follows' || jsonb_build_object('from_following', notification_settings->'follows')
-where notification_settings ? 'follows'
-and local"
-    )
-
-    execute(
-      "UPDATE users SET notification_settings = notification_settings - 'non_followers' || jsonb_build_object('from_strangers', notification_settings->'non_followers')
-where notification_settings ? 'non_followers'
-and local"
-    )
-  end
-
-  def down do
-    execute(
-      "UPDATE users SET notification_settings = notification_settings - 'from_followers' || jsonb_build_object('followers', notification_settings->'from_followers')
-where notification_settings ? 'from_followers'
-and local"
-    )
-
-    execute(
-      "UPDATE users SET notification_settings = notification_settings - 'from_following' || jsonb_build_object('follows', notification_settings->'from_following')
-where notification_settings ? 'from_following'
-and local"
-    )
-
-    execute(
-      "UPDATE users SET notification_settings = notification_settings - 'from_strangers' || jsonb_build_object('non_follows', notification_settings->'from_strangers')
-where notification_settings ? 'from_strangers'
-and local"
-    )
-  end
-end

test/notification_test.exs

@@ -236,44 +236,18 @@ defmodule Pleroma.NotificationTest do
       assert Notification.create_notification(activity, muter)
     end
 
-    test "it disables notifications from followers" do
-      follower = insert(:user)
-
-      followed =
-        insert(:user,
-          notification_settings: %Pleroma.User.NotificationSetting{from_followers: false}
-        )
-
-      User.follow(follower, followed)
-      {:ok, activity} = CommonAPI.post(follower, %{status: "hey @#{followed.nickname}"})
-      refute Notification.create_notification(activity, followed)
-    end
-
     test "it disables notifications from strangers" do
       follower = insert(:user)
 
       followed =
         insert(:user,
-          notification_settings: %Pleroma.User.NotificationSetting{from_strangers: false}
+          notification_settings: %Pleroma.User.NotificationSetting{block_from_strangers: true}
         )
 
       {:ok, activity} = CommonAPI.post(follower, %{status: "hey @#{followed.nickname}"})
       refute Notification.create_notification(activity, followed)
     end
 
-    test "it disables notifications from people the user follows" do
-      follower =
-        insert(:user,
-          notification_settings: %Pleroma.User.NotificationSetting{from_following: false}
-        )
-
-      followed = insert(:user)
-      User.follow(follower, followed)
-      follower = Repo.get(User, follower.id)
-      {:ok, activity} = CommonAPI.post(followed, %{status: "hey @#{follower.nickname}"})
-      refute Notification.create_notification(activity, follower)
-    end
-
     test "it doesn't create a notification for user if he is the activity author" do
       activity = insert(:note_activity)
       author = User.get_cached_by_ap_id(activity.data["actor"])

test/web/mastodon_api/views/account_view_test.exs

@@ -96,9 +96,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     user = insert(:user)
 
     notification_settings = %{
-      from_followers: true,
+      block_from_strangers: false,
-      from_following: true,
-      from_strangers: true,
       privacy_option: false
     }
 

test/web/twitter_api/util_controller_test.exs

@@ -191,7 +191,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
     test "it updates notification settings", %{user: user, conn: conn} do
       conn
       |> put("/api/pleroma/notification_settings", %{
-        "from_followers" => false,
+        "block_from_strangers" => true,
         "bar" => 1
       })
       |> json_response(:ok)
@@ -199,9 +199,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
       user = refresh_record(user)
 
       assert %Pleroma.User.NotificationSetting{
-               from_followers: false,
+               block_from_strangers: true,
-               from_following: true,
-               from_strangers: true,
                privacy_option: false
              } == user.notification_settings
     end
@@ -214,9 +212,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
       user = refresh_record(user)
 
       assert %Pleroma.User.NotificationSetting{
-               from_followers: true,
+               block_from_strangers: false,
-               from_following: true,
-               from_strangers: true,
                privacy_option: true
              } == user.notification_settings
     end