Add Push notifications backend support
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -3,10 +3,10 @@ defmodule Mobilizon.Service.Notifier.Email do
|
||||
Email notifier
|
||||
"""
|
||||
alias Mobilizon.Activities.Activity
|
||||
alias Mobilizon.Config
|
||||
alias Mobilizon.{Config, Users}
|
||||
alias Mobilizon.Service.Notifier
|
||||
alias Mobilizon.Service.Notifier.Email
|
||||
alias Mobilizon.Users.User
|
||||
alias Mobilizon.Users.{NotificationPendingNotificationDelay, Setting, User}
|
||||
alias Mobilizon.Web.Email.Activity, as: EmailActivity
|
||||
alias Mobilizon.Web.Email.Mailer
|
||||
|
||||
@@ -18,14 +18,61 @@ defmodule Mobilizon.Service.Notifier.Email do
|
||||
end
|
||||
|
||||
@impl Notifier
|
||||
def send(%User{} = user, %Activity{} = activity) do
|
||||
Email.send(user, [activity])
|
||||
def send(%User{} = user, %Activity{} = activity, options) do
|
||||
Email.send(user, [activity], options)
|
||||
end
|
||||
|
||||
@impl Notifier
|
||||
def send(%User{email: email, locale: locale}, activities) when is_list(activities) do
|
||||
email
|
||||
|> EmailActivity.direct_activity(activities, locale)
|
||||
|> Mailer.send_email()
|
||||
def send(%User{email: email, locale: locale} = user, activities, options)
|
||||
when is_list(activities) do
|
||||
if can_send?(user) do
|
||||
email
|
||||
|> EmailActivity.direct_activity(activities, Keyword.put(options, :locale, locale))
|
||||
|> Mailer.send_email()
|
||||
|
||||
save_last_notification_time(user)
|
||||
{:ok, :sent}
|
||||
else
|
||||
{:ok, :skipped}
|
||||
end
|
||||
end
|
||||
|
||||
@type notification_type ::
|
||||
:group_notifications
|
||||
| :notification_pending_participation
|
||||
| :notification_pending_membership
|
||||
|
||||
@spec user_notification_delay(User.t(), notification_type()) ::
|
||||
NotificationPendingNotificationDelay.t()
|
||||
defp user_notification_delay(%User{} = user, type \\ :group_notifications) do
|
||||
Map.from_struct(user.settings)[type]
|
||||
end
|
||||
|
||||
@spec can_send?(User.t()) :: boolean()
|
||||
defp can_send?(%User{settings: %Setting{last_notification_sent: last_notification_sent}} = user) do
|
||||
last_notification_sent_or_default = last_notification_sent || DateTime.utc_now()
|
||||
notification_delay = user_notification_delay(user)
|
||||
diff = DateTime.diff(DateTime.utc_now(), last_notification_sent_or_default)
|
||||
|
||||
cond do
|
||||
notification_delay == :none -> false
|
||||
is_nil(last_notification_sent) -> true
|
||||
notification_delay == :direct -> true
|
||||
notification_delay == :one_hour -> diff >= 60 * 60
|
||||
notification_delay == :one_day -> diff >= 24 * 60 * 60
|
||||
end
|
||||
end
|
||||
|
||||
@spec save_last_notification_time(User.t()) :: {:ok, Setting.t()} | {:error, Ecto.Changeset.t()}
|
||||
defp save_last_notification_time(%User{id: user_id}) do
|
||||
attrs = %{user_id: user_id, last_notification_sent: DateTime.utc_now()}
|
||||
|
||||
case Users.get_setting(user_id) do
|
||||
nil ->
|
||||
Users.create_setting(attrs)
|
||||
|
||||
%Setting{} = setting ->
|
||||
Users.update_setting(setting, attrs)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -14,12 +14,12 @@ defmodule Mobilizon.Service.Notifier do
|
||||
@doc """
|
||||
Sends one or multiple notifications from an activity
|
||||
"""
|
||||
@callback send(User.t(), Activity.t()) :: {:ok, any()} | {:error, String.t()}
|
||||
@callback send(User.t(), Activity.t(), Keyword.t()) :: {:ok, any()} | {:error, String.t()}
|
||||
|
||||
@callback send(User.t(), list(Activity.t())) :: {:ok, any()} | {:error, String.t()}
|
||||
@callback send(User.t(), list(Activity.t()), Keyword.t()) :: {:ok, any()} | {:error, String.t()}
|
||||
|
||||
def notify(%User{} = user, %Activity{} = activity, opts \\ []) do
|
||||
Enum.each(providers(opts), & &1.send(user, activity))
|
||||
Enum.each(providers(opts), & &1.send(user, activity, opts))
|
||||
end
|
||||
|
||||
@spec providers(Keyword.t()) :: list()
|
||||
|
||||
@@ -3,9 +3,10 @@ defmodule Mobilizon.Service.Notifier.Push do
|
||||
WebPush notifier
|
||||
"""
|
||||
alias Mobilizon.Activities.Activity
|
||||
alias Mobilizon.Config
|
||||
alias Mobilizon.{Config, Users}
|
||||
alias Mobilizon.Service.Notifier
|
||||
alias Mobilizon.Service.Notifier.Push
|
||||
alias Mobilizon.Storage.Page
|
||||
alias Mobilizon.Users.User
|
||||
|
||||
@behaviour Notifier
|
||||
@@ -16,17 +17,14 @@ defmodule Mobilizon.Service.Notifier.Push do
|
||||
end
|
||||
|
||||
@impl Notifier
|
||||
def send(%User{} = _user, %Activity{} = activity) do
|
||||
# Get user's subscriptions
|
||||
activity
|
||||
|> payload()
|
||||
|
||||
# |> WebPushEncryption.send_web_push()
|
||||
def send(%User{id: user_id} = _user, %Activity{} = activity, _opts) do
|
||||
%Page{elements: subscriptions} = Users.list_user_push_subscriptions(user_id, 1, 100)
|
||||
Enum.each(subscriptions, &send_subscription(activity, &1))
|
||||
end
|
||||
|
||||
@impl Notifier
|
||||
def send(%User{} = user, activities) when is_list(activities) do
|
||||
Enum.each(activities, &Push.send(user, &1))
|
||||
def send(%User{} = user, activities, opts) when is_list(activities) do
|
||||
Enum.each(activities, &Push.send(user, &1, opts))
|
||||
end
|
||||
|
||||
defp payload(%Activity{subject: subject}) do
|
||||
@@ -35,4 +33,10 @@ defmodule Mobilizon.Service.Notifier.Push do
|
||||
}
|
||||
|> Jason.encode!()
|
||||
end
|
||||
|
||||
defp send_subscription(activity, subscription) do
|
||||
activity
|
||||
|> payload()
|
||||
|> WebPushEncryption.send_web_push(subscription)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -29,7 +29,7 @@ defmodule Mobilizon.Service.Workers.ActivityBuilder do
|
||||
def notify_activity(%Activity{} = activity) do
|
||||
activity
|
||||
|> users_to_notify()
|
||||
|> Enum.each(&Notifier.notify(&1, activity))
|
||||
|> Enum.each(&Notifier.notify(&1, activity, single_activity: true))
|
||||
end
|
||||
|
||||
@spec users_to_notify(Activity.t()) :: list(User.t())
|
||||
@@ -45,6 +45,6 @@ defmodule Mobilizon.Service.Workers.ActivityBuilder do
|
||||
|> Enum.map(& &1.user_id)
|
||||
|> Enum.filter(& &1)
|
||||
|> Enum.uniq()
|
||||
|> Enum.map(&Users.get_user!/1)
|
||||
|> Enum.map(&Users.get_user_with_settings!/1)
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user