notification: remove local/remote match rules (too complicated)

diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index 4095e04745684a81d096ed860d5eaeb1446539ab..35beffb87ed2d6e44b7eafa8b252cf4c9bcb2a7e 100644 (file)
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -169,7 +169,6 @@ defmodule Pleroma.Notification do
     [
       :self,
       :blocked,
-      :local,
       :muted,
       :followers,
       :follows,
@@ -189,12 +188,6 @@ defmodule Pleroma.Notification do
     User.blocks?(user, %{ap_id: actor})
   end
 
-  def skip?(:local, %{local: true}, %{info: %{notification_settings: %{"local" => false}}}),
-    do: true
-
-  def skip?(:local, %{local: false}, %{info: %{notification_settings: %{"remote" => false}}}),
-    do: true
-
   def skip?(:muted, activity, user) do
     actor = activity.data["actor"]
 

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index b0bfdf4f4c0fbf70d253d680a561bded96997788..74573ba8340de32197505920e8f3b2df48e7a41c 100644 (file)
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -48,8 +48,6 @@ defmodule Pleroma.User.Info do
 
     field(:notification_settings, :map,
       default: %{
-        "remote" => true,
-        "local" => true,
         "followers" => true,
         "follows" => true,
         "non_follows" => true,
@@ -83,7 +81,7 @@ defmodule Pleroma.User.Info do
     notification_settings =
       info.notification_settings
       |> Map.merge(settings)
-      |> Map.take(["remote", "local", "followers", "follows", "non_follows", "non_followers"])
+      |> Map.take(["followers", "follows", "non_follows", "non_followers"])
 
     params = %{notification_settings: notification_settings}