diff options
| author | lain <lain@soykaf.club> | 2020-07-06 12:07:56 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-06 12:07:56 +0200 |
| commit | ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548 (patch) | |
| tree | 82c5e8b4a40495485533b9c95668cef39ce909d2 /lib/pleroma/web/common_api/common_api.ex | |
| parent | a5bbfa21a1fabe97bfff1cc80348d2944319f3ad (diff) | |
| parent | 69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff) | |
| download | pleroma-ed4f9f6a29d8cf2dd31e41bae7e63aaa15bc9548.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
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), |