Fix tests

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2021-06-03 17:17:13 +02:00
parent c0ab3d9905
commit d3164899f3
10 changed files with 224 additions and 24 deletions

View File

@@ -10,7 +10,7 @@ defmodule Mobilizon.Users.User do
alias Mobilizon.Actors.Actor
alias Mobilizon.Crypto
alias Mobilizon.Events.FeedToken
alias Mobilizon.Users.{Setting, UserRole}
alias Mobilizon.Users.{ActivitySetting, Setting, UserRole}
alias Mobilizon.Web.Email.Checker
import Mobilizon.Web.Gettext
@@ -90,6 +90,7 @@ defmodule Mobilizon.Users.User do
has_many(:actors, Actor)
has_many(:feed_tokens, FeedToken, foreign_key: :user_id)
has_one(:settings, Setting)
has_many(:activity_settings, ActivitySetting)
timestamps()
end

View File

@@ -14,7 +14,7 @@ defmodule Mobilizon.Service.Notifier.Email do
@impl Notifier
def ready? do
Config.get(__MODULE__, :enabled)
Config.get([__MODULE__, :enabled])
end
def send(user, activity, options \\ [])

View File

@@ -11,8 +11,11 @@ defmodule Mobilizon.Service.Notifier.Filter do
@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)
false ->
false
key when is_binary(key) ->
user |> Users.activity_setting(key, method) |> enabled?(key, get_default)
end
end

View File

@@ -14,7 +14,7 @@ defmodule Mobilizon.Service.Notifier.Push do
@impl Notifier
def ready? do
Config.get(__MODULE__, :enabled)
Config.get([__MODULE__, :enabled])
end
@impl Notifier