diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-30 23:59:35 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-06-30 23:59:35 +0300 |
| commit | 46235ac77d163c573cb6ff508771974b37a38a37 (patch) | |
| tree | fecae445bbc74656ea907916c8c08f594e44139b /lib/pleroma/web/common_api/common_api.ex | |
| parent | ccf5442d1467b080d1e52f5180b4e22db51caf12 (diff) | |
| parent | b9e6ad571ac5925431466d6e6b27c0b372bb7727 (diff) | |
| download | pleroma-46235ac77d163c573cb6ff508771974b37a38a37.tar.gz | |
Merge develop
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 04e081a8e..fd7149079 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -25,6 +25,13 @@ defmodule Pleroma.Web.CommonAPI do require Pleroma.Constants require Logger + def block(blocker, blocked) do + with {:ok, block_data, _} <- Builder.block(blocker, blocked), + {:ok, block, _} <- Pipeline.common_pipeline(block_data, local: true) do + {:ok, block} + end + end + def post_chat_message(%User{} = user, %User{} = recipient, content, opts \\ []) do with maybe_attachment <- opts[:media_id] && Object.get_by_id(opts[:media_id]), :ok <- validate_chat_content_length(content, !!maybe_attachment), |