diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-09 10:56:33 +0300 | 
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-09 10:56:33 +0300 | 
| commit | d9f8941dac983d89709645831b41e02adc454740 (patch) | |
| tree | ee97d49d60a176132bba6c14b4fdbef8ada5811d /lib | |
| parent | b2eb1124d115beda0907121c3c6f10783b34f352 (diff) | |
| parent | 5b74976c8d8b00b66ba8c5dff9e83fbe357b0ee7 (diff) | |
| download | pleroma-d9f8941dac983d89709645831b41e02adc454740.tar.gz pleroma-d9f8941dac983d89709645831b41e02adc454740.zip | |
Merge branch 'develop' into gun
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/moderation_log.ex | 76 | 
1 files changed, 0 insertions, 76 deletions
| diff --git a/lib/pleroma/moderation_log.ex b/lib/pleroma/moderation_log.ex index c81477f48..e32895f70 100644 --- a/lib/pleroma/moderation_log.ex +++ b/lib/pleroma/moderation_log.ex @@ -392,24 +392,6 @@ 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 @@ -421,24 +403,6 @@ 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 @@ -478,26 +442,6 @@ 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          } @@ -510,26 +454,6 @@ 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          } | 
