diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2019-05-26 00:05:47 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2019-05-26 00:05:47 +0000 |
| commit | 750ede5764d30063587182696f7ebc50c05f8278 (patch) | |
| tree | 2a913f9d3d348355de375d5dee781d2b870a44bd /lib | |
| parent | 5fbbc57c1b497f8d194f3bbdefd889f0a943525a (diff) | |
| download | pleroma-750ede5764d30063587182696f7ebc50c05f8278.tar.gz | |
notification: remove local/remote match rules (too complicated)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/notification.ex | 7 | ||||
| -rw-r--r-- | lib/pleroma/user/info.ex | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index 4095e0474..35beffb87 100644 --- 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 b0bfdf4f4..74573ba83 100644 --- 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} |