WIP notification settings

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2021-06-01 18:08:03 +02:00
parent 6adbbc6a1d
commit 58bffc5c66
34 changed files with 1127 additions and 136 deletions

View File

@@ -5,7 +5,7 @@ defmodule Mobilizon.Service.Notifier.Email do
alias Mobilizon.Activities.Activity
alias Mobilizon.{Config, Users}
alias Mobilizon.Service.Notifier
alias Mobilizon.Service.Notifier.Email
alias Mobilizon.Service.Notifier.{Email, Filter}
alias Mobilizon.Users.{NotificationPendingNotificationDelay, Setting, User}
alias Mobilizon.Web.Email.Activity, as: EmailActivity
alias Mobilizon.Web.Email.Mailer
@@ -17,6 +17,8 @@ defmodule Mobilizon.Service.Notifier.Email do
Config.get(__MODULE__, :enabled)
end
def send(user, activity, options \\ [])
@impl Notifier
def send(%User{} = user, %Activity{} = activity, options) do
Email.send(user, [activity], options)
@@ -25,7 +27,9 @@ defmodule Mobilizon.Service.Notifier.Email do
@impl Notifier
def send(%User{email: email, locale: locale} = user, activities, options)
when is_list(activities) do
if can_send?(user) do
activities = Enum.filter(activities, &can_send_activity?(&1, user))
if can_send?(user) && length(activities) > 0 do
email
|> EmailActivity.direct_activity(activities, Keyword.put(options, :locale, locale))
|> Mailer.send_email()
@@ -37,6 +41,34 @@ defmodule Mobilizon.Service.Notifier.Email do
end
end
@spec can_send_activity?(Activity.t(), User.t()) :: boolean()
defp can_send_activity?(%Activity{} = activity, %User{} = user) do
Filter.can_send_activity?(activity, "email", user, &default_activity_behavior/1)
end
@spec default_activity_behavior(String.t()) :: boolean()
defp default_activity_behavior(activity_setting) do
case activity_setting do
"participation_event_updated" -> true
"participation_event_comment" -> true
"event_new_pending_participation" -> true
"event_new_participation" -> false
"event_created" -> false
"event_updated" -> false
"discussion_updated" -> false
"post_published" -> false
"post_updated" -> false
"resource_updated" -> false
"member_request" -> true
"member_updated" -> false
"user_email_password_updated" -> true
"event_comment_mention" -> true
"discussion_mention" -> true
"event_new_comment" -> true
_ -> false
end
end
@type notification_type ::
:group_notifications
| :notification_pending_participation

View File

@@ -0,0 +1,60 @@
defmodule Mobilizon.Service.Notifier.Filter do
alias Mobilizon.Users
alias Mobilizon.Activities.Activity
alias Mobilizon.Users.{ActivitySetting, User}
@type method :: String.t()
@spec can_send_activity?(Activity.t(), method(), User.t(), function()) :: boolean()
def can_send_activity?(%Activity{} = activity, method, %User{} = user, get_default) do
case map_activity_to_activity_setting(activity) do
false -> false
key -> user |> Users.activity_setting(key, method) |> enabled?(key, get_default)
end
end
@spec enabled?(ActivitySetting.t() | nil, String.t(), function()) :: boolean()
defp enabled?(nil, activity_setting, get_default), do: get_default.(activity_setting)
defp enabled?(%ActivitySetting{enabled: enabled}, _activity_setting, _get_default), do: enabled
# Comment mention
defp map_activity_to_activity_setting(%Activity{subject: :event_comment_mention}),
do: "event_comment_mention"
# Participation
@spec map_activity_to_activity_setting(Activity.t()) :: String.t() | false
defp map_activity_to_activity_setting(%Activity{subject: :participation_event_updated}),
do: "participation_event_updated"
defp map_activity_to_activity_setting(%Activity{subject: :participation_event_comment}),
do: "participation_event_comment"
# Organizers
defp map_activity_to_activity_setting(%Activity{subject: :event_new_pending_participation}),
do: "event_new_pending_participation"
defp map_activity_to_activity_setting(%Activity{subject: :event_new_participation}),
do: "event_new_participation"
# Event
defp map_activity_to_activity_setting(%Activity{subject: :event_created}), do: "event_created"
defp map_activity_to_activity_setting(%Activity{type: :event}), do: "event_updated"
# Post
defp map_activity_to_activity_setting(%Activity{subject: :post_created}), do: "post_published"
defp map_activity_to_activity_setting(%Activity{type: :post}), do: "post_updated"
# Discussion
defp map_activity_to_activity_setting(%Activity{type: :discussion}), do: "discussion_updated"
# Resource
defp map_activity_to_activity_setting(%Activity{type: :resource}), do: "resource_updated"
# Member
defp map_activity_to_activity_setting(%Activity{subject: :member_request}),
do: "member_request"
defp map_activity_to_activity_setting(%Activity{type: :member}), do: "member"
defp map_activity_to_activity_setting(_), do: false
end

View File

@@ -6,7 +6,7 @@ defmodule Mobilizon.Service.Notifier.Push do
alias Mobilizon.{Config, Users}
alias Mobilizon.Service.Activity.{Renderer, Utils}
alias Mobilizon.Service.Notifier
alias Mobilizon.Service.Notifier.Push
alias Mobilizon.Service.Notifier.{Filter, Push}
alias Mobilizon.Storage.Page
alias Mobilizon.Users.{PushSubscription, User}
@@ -20,11 +20,16 @@ defmodule Mobilizon.Service.Notifier.Push do
@impl Notifier
def send(user, activity, options \\ [])
def send(%User{id: user_id, locale: locale} = _user, %Activity{} = activity, options) do
options = Keyword.put_new(options, :locale, locale)
def send(%User{id: user_id, locale: locale} = user, %Activity{} = activity, options) do
if can_send_activity?(activity, user) do
options = Keyword.put_new(options, :locale, locale)
%Page{elements: subscriptions} = Users.list_user_push_subscriptions(user_id, 1, 100)
Enum.map(subscriptions, &send_subscription(activity, convert_subscription(&1), options))
%Page{elements: subscriptions} = Users.list_user_push_subscriptions(user_id, 1, 100)
Enum.each(subscriptions, &send_subscription(activity, convert_subscription(&1), options))
{:ok, :sent}
else
{:ok, :skipped}
end
end
@impl Notifier
@@ -32,6 +37,34 @@ defmodule Mobilizon.Service.Notifier.Push do
Enum.map(activities, &Push.send(user, &1, options))
end
@spec can_send_activity?(Activity.t(), User.t()) :: boolean()
defp can_send_activity?(%Activity{} = activity, %User{} = user) do
Filter.can_send_activity?(activity, "push", user, &default_activity_behavior/1)
end
@spec default_activity_behavior(String.t()) :: boolean()
defp default_activity_behavior(activity_setting) do
case activity_setting do
"participation_event_updated" -> true
"participation_event_comment" -> true
"event_new_pending_participation" -> true
"event_new_participation" -> false
"event_created" -> false
"event_updated" -> false
"discussion_updated" -> false
"post_published" -> false
"post_updated" -> false
"resource_updated" -> false
"member_request" -> true
"member_updated" -> false
"user_email_password_updated" -> false
"event_comment_mention" -> true
"discussion_mention" -> false
"event_new_comment" -> false
_ -> false
end
end
defp send_subscription(activity, subscription, options) do
activity
|> payload(options)