diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-01 19:13:29 +0300 | 
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-01 19:13:29 +0300 | 
| commit | 1b83a0694a19e279d155dde2c915df3583f12170 (patch) | |
| tree | 61cb4107db2a53a0c15039aaa85f97f9adf70a9b /lib | |
| parent | 1a602150769ea33b8da302437f6722bc6d8c5cb3 (diff) | |
| download | pleroma-1b83a0694a19e279d155dde2c915df3583f12170.tar.gz pleroma-1b83a0694a19e279d155dde2c915df3583f12170.zip | |
Fix moderation log crash
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/moderation_log.ex | 76 | 
1 files changed, 76 insertions, 0 deletions
| diff --git a/lib/pleroma/moderation_log.ex b/lib/pleroma/moderation_log.ex index e8884e6e8..9dc4a94c9 100644 --- a/lib/pleroma/moderation_log.ex +++ b/lib/pleroma/moderation_log.ex @@ -374,6 +374,24 @@ defmodule Pleroma.ModerationLog do          data: %{            "actor" => %{"nickname" => actor_nickname},            "action" => "activate", +          "subject" => user +        } +      }) +      when is_map(user) do +    get_log_entry_message(%ModerationLog{ +      data: %{ +        "actor" => %{"nickname" => actor_nickname}, +        "action" => "activate", +        "subject" => [user] +      } +    }) +  end + +  @spec get_log_entry_message(ModerationLog) :: String.t() +  def get_log_entry_message(%ModerationLog{ +        data: %{ +          "actor" => %{"nickname" => actor_nickname}, +          "action" => "activate",            "subject" => users          }        }) do @@ -385,6 +403,24 @@ defmodule Pleroma.ModerationLog do          data: %{            "actor" => %{"nickname" => actor_nickname},            "action" => "deactivate", +          "subject" => user +        } +      }) +      when is_map(user) do +    get_log_entry_message(%ModerationLog{ +      data: %{ +        "actor" => %{"nickname" => actor_nickname}, +        "action" => "deactivate", +        "subject" => [user] +      } +    }) +  end + +  @spec get_log_entry_message(ModerationLog) :: String.t() +  def get_log_entry_message(%ModerationLog{ +        data: %{ +          "actor" => %{"nickname" => actor_nickname}, +          "action" => "deactivate",            "subject" => users          }        }) do @@ -424,6 +460,26 @@ defmodule Pleroma.ModerationLog do          data: %{            "actor" => %{"nickname" => actor_nickname},            "action" => "grant", +          "subject" => user, +          "permission" => permission +        } +      }) +      when is_map(user) do +    get_log_entry_message(%ModerationLog{ +      data: %{ +        "actor" => %{"nickname" => actor_nickname}, +        "action" => "grant", +        "subject" => [user], +        "permission" => permission +      } +    }) +  end + +  @spec get_log_entry_message(ModerationLog) :: String.t() +  def get_log_entry_message(%ModerationLog{ +        data: %{ +          "actor" => %{"nickname" => actor_nickname}, +          "action" => "grant",            "subject" => users,            "permission" => permission          } @@ -436,6 +492,26 @@ defmodule Pleroma.ModerationLog do          data: %{            "actor" => %{"nickname" => actor_nickname},            "action" => "revoke", +          "subject" => user, +          "permission" => permission +        } +      }) +      when is_map(user) do +    get_log_entry_message(%ModerationLog{ +      data: %{ +        "actor" => %{"nickname" => actor_nickname}, +        "action" => "revoke", +        "subject" => [user], +        "permission" => permission +      } +    }) +  end + +  @spec get_log_entry_message(ModerationLog) :: String.t() +  def get_log_entry_message(%ModerationLog{ +        data: %{ +          "actor" => %{"nickname" => actor_nickname}, +          "action" => "revoke",            "subject" => users,            "permission" => permission          } | 
