aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r--lib/pleroma/web/common_api/activity_draft.ex116
-rw-r--r--lib/pleroma/web/common_api/common_api.ex554
-rw-r--r--lib/pleroma/web/common_api/utils.ex164
3 files changed, 122 insertions, 712 deletions
diff --git a/lib/pleroma/web/common_api/activity_draft.ex b/lib/pleroma/web/common_api/activity_draft.ex
index f849b2e01..b4e3e37ae 100644
--- a/lib/pleroma/web/common_api/activity_draft.ex
+++ b/lib/pleroma/web/common_api/activity_draft.ex
@@ -1,10 +1,12 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.ActivityDraft do
alias Pleroma.Activity
alias Pleroma.Conversation.Participation
+ alias Pleroma.Object
+ alias Pleroma.Web.ActivityPub.Builder
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
@@ -22,7 +24,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
in_reply_to_conversation: nil,
visibility: nil,
expires_at: nil,
- poll: nil,
+ extra: nil,
emoji: %{},
content_html: nil,
mentions: [],
@@ -35,9 +37,14 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
preview?: false,
changes: %{}
- def create(user, params) do
+ def new(user, params) do
%__MODULE__{user: user}
|> put_params(params)
+ end
+
+ def create(user, params) do
+ user
+ |> new(params)
|> status()
|> summary()
|> with_valid(&attachments/1)
@@ -57,6 +64,30 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
|> validate()
end
+ def listen(user, params) do
+ user
+ |> new(params)
+ |> visibility()
+ |> to_and_cc()
+ |> context()
+ |> listen_object()
+ |> with_valid(&changes/1)
+ |> validate()
+ end
+
+ defp listen_object(draft) do
+ object =
+ draft.params
+ |> Map.take([:album, :artist, :title, :length])
+ |> Map.new(fn {key, value} -> {to_string(key), value} end)
+ |> Map.put("type", "Audio")
+ |> Map.put("to", draft.to)
+ |> Map.put("cc", draft.cc)
+ |> Map.put("actor", draft.user.ap_id)
+
+ %__MODULE__{draft | object: object}
+ end
+
defp put_params(draft, params) do
params = Map.put_new(params, :in_reply_to_status_id, params[:in_reply_to_id])
%__MODULE__{draft | params: params}
@@ -121,7 +152,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
defp poll(draft) do
case Utils.make_poll_data(draft.params) do
{:ok, {poll, poll_emoji}} ->
- %__MODULE__{draft | poll: poll, emoji: Map.merge(draft.emoji, poll_emoji)}
+ %__MODULE__{draft | extra: poll, emoji: Map.merge(draft.emoji, poll_emoji)}
{:error, message} ->
add_error(draft, message)
@@ -129,32 +160,18 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
end
defp content(draft) do
- {content_html, mentions, tags} =
- Utils.make_content_html(
- draft.status,
- draft.attachments,
- draft.params,
- draft.visibility
- )
-
- %__MODULE__{draft | content_html: content_html, mentions: mentions, tags: tags}
- end
+ {content_html, mentioned_users, tags} = Utils.make_content_html(draft)
- defp to_and_cc(draft) do
- addressed_users =
- draft.mentions
+ mentions =
+ mentioned_users
|> Enum.map(fn {_, mentioned_user} -> mentioned_user.ap_id end)
|> Utils.get_addressed_users(draft.params[:to])
- {to, cc} =
- Utils.get_to_and_cc(
- draft.user,
- addressed_users,
- draft.in_reply_to,
- draft.visibility,
- draft.in_reply_to_conversation
- )
+ %__MODULE__{draft | content_html: content_html, mentions: mentions, tags: tags}
+ end
+ defp to_and_cc(draft) do
+ {to, cc} = Utils.get_to_and_cc(draft)
%__MODULE__{draft | to: to, cc: cc}
end
@@ -164,35 +181,52 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
end
defp sensitive(draft) do
- sensitive = draft.params[:sensitive] || Enum.member?(draft.tags, {"#nsfw", "nsfw"})
+ sensitive = draft.params[:sensitive]
%__MODULE__{draft | sensitive: sensitive}
end
defp object(draft) do
emoji = Map.merge(Pleroma.Emoji.Formatter.get_emoji_map(draft.full_payload), draft.emoji)
+ # Sometimes people create posts with subject containing emoji,
+ # since subjects are usually copied this will result in a broken
+ # subject when someone replies from an instance that does not have
+ # the emoji or has it under different shortcode. This is an attempt
+ # to mitigate this by copying emoji from inReplyTo if they are present
+ # in the subject.
+ summary_emoji =
+ with %Activity{} <- draft.in_reply_to,
+ %Object{data: %{"tag" => [_ | _] = tag}} <- Object.normalize(draft.in_reply_to) do
+ Enum.reduce(tag, %{}, fn
+ %{"type" => "Emoji", "name" => name, "icon" => %{"url" => url}}, acc ->
+ if String.contains?(draft.summary, name) do
+ Map.put(acc, name, url)
+ else
+ acc
+ end
+
+ _, acc ->
+ acc
+ end)
+ else
+ _ -> %{}
+ end
+
+ emoji = Map.merge(emoji, summary_emoji)
+
+ {:ok, note_data, _meta} = Builder.note(draft)
+
object =
- Utils.make_note_data(
- draft.user.ap_id,
- draft.to,
- draft.context,
- draft.content_html,
- draft.attachments,
- draft.in_reply_to,
- draft.tags,
- draft.summary,
- draft.cc,
- draft.sensitive,
- draft.poll
- )
+ note_data
|> Map.put("emoji", emoji)
|> Map.put("source", draft.status)
+ |> Map.put("generator", draft.params[:generator])
%__MODULE__{draft | object: object}
end
defp preview?(draft) do
- preview? = Pleroma.Web.ControllerHelper.truthy_param?(draft.params[:preview])
+ preview? = Pleroma.Web.Utils.Params.truthy_param?(draft.params[:preview])
%__MODULE__{draft | preview?: preview?}
end
@@ -202,7 +236,7 @@ defmodule Pleroma.Web.CommonAPI.ActivityDraft do
additional =
case draft.expires_at do
- %NaiveDateTime{} = expires_at -> Map.put(additional, "expires_at", expires_at)
+ %DateTime{} = expires_at -> Map.put(additional, "expires_at", expires_at)
_ -> additional
end
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
deleted file mode 100644
index 4ab533658..000000000
--- a/lib/pleroma/web/common_api/common_api.ex
+++ /dev/null
@@ -1,554 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.CommonAPI do
- alias Pleroma.Activity
- alias Pleroma.ActivityExpiration
- alias Pleroma.Conversation.Participation
- alias Pleroma.Formatter
- alias Pleroma.Object
- alias Pleroma.ThreadMute
- alias Pleroma.User
- alias Pleroma.UserRelationship
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Builder
- alias Pleroma.Web.ActivityPub.Pipeline
- alias Pleroma.Web.ActivityPub.Utils
- alias Pleroma.Web.ActivityPub.Visibility
-
- import Pleroma.Web.Gettext
- import Pleroma.Web.CommonAPI.Utils
-
- 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),
- {_, {:ok, chat_message_data, _meta}} <-
- {:build_object,
- Builder.chat_message(
- user,
- recipient.ap_id,
- content |> format_chat_content,
- attachment: maybe_attachment
- )},
- {_, {:ok, create_activity_data, _meta}} <-
- {:build_create_activity, Builder.create(user, chat_message_data, [recipient.ap_id])},
- {_, {:ok, %Activity{} = activity, _meta}} <-
- {:common_pipeline,
- Pipeline.common_pipeline(create_activity_data,
- local: true
- )} do
- {:ok, activity}
- end
- end
-
- defp format_chat_content(nil), do: nil
-
- defp format_chat_content(content) do
- {text, _, _} =
- content
- |> Formatter.html_escape("text/plain")
- |> Formatter.linkify()
- |> (fn {text, mentions, tags} ->
- {String.replace(text, ~r/\r?\n/, "<br>"), mentions, tags}
- end).()
-
- text
- end
-
- defp validate_chat_content_length(_, true), do: :ok
- defp validate_chat_content_length(nil, false), do: {:error, :no_content}
-
- defp validate_chat_content_length(content, _) do
- if String.length(content) <= Pleroma.Config.get([:instance, :chat_limit]) do
- :ok
- else
- {:error, :content_too_long}
- end
- end
-
- def unblock(blocker, blocked) do
- with {_, %Activity{} = block} <- {:fetch_block, Utils.fetch_latest_block(blocker, blocked)},
- {:ok, unblock_data, _} <- Builder.undo(blocker, block),
- {:ok, unblock, _} <- Pipeline.common_pipeline(unblock_data, local: true) do
- {:ok, unblock}
- else
- {:fetch_block, nil} ->
- if User.blocks?(blocker, blocked) do
- User.unblock(blocker, blocked)
- {:ok, :no_activity}
- else
- {:error, :not_blocking}
- end
-
- e ->
- e
- end
- end
-
- def follow(follower, followed) do
- timeout = Pleroma.Config.get([:activitypub, :follow_handshake_timeout])
-
- with {:ok, follow_data, _} <- Builder.follow(follower, followed),
- {:ok, activity, _} <- Pipeline.common_pipeline(follow_data, local: true),
- {:ok, follower, followed} <- User.wait_and_refresh(timeout, follower, followed) do
- if activity.data["state"] == "reject" do
- {:error, :rejected}
- else
- {:ok, follower, followed, activity}
- end
- end
- end
-
- def unfollow(follower, unfollowed) do
- with {:ok, follower, _follow_activity} <- User.unfollow(follower, unfollowed),
- {:ok, _activity} <- ActivityPub.unfollow(follower, unfollowed),
- {:ok, _subscription} <- User.unsubscribe(follower, unfollowed) do
- {:ok, follower}
- end
- end
-
- def accept_follow_request(follower, followed) do
- with %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed),
- {:ok, accept_data, _} <- Builder.accept(followed, follow_activity),
- {:ok, _activity, _} <- Pipeline.common_pipeline(accept_data, local: true) do
- {:ok, follower}
- end
- end
-
- def reject_follow_request(follower, followed) do
- with %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed),
- {:ok, reject_data, _} <- Builder.reject(followed, follow_activity),
- {:ok, _activity, _} <- Pipeline.common_pipeline(reject_data, local: true) do
- {:ok, follower}
- end
- end
-
- def delete(activity_id, user) do
- with {_, %Activity{data: %{"object" => _, "type" => "Create"}} = activity} <-
- {:find_activity, Activity.get_by_id(activity_id)},
- {_, %Object{} = object, _} <-
- {:find_object, Object.normalize(activity, false), activity},
- true <- User.superuser?(user) || user.ap_id == object.data["actor"],
- {:ok, delete_data, _} <- Builder.delete(user, object.data["id"]),
- {:ok, delete, _} <- Pipeline.common_pipeline(delete_data, local: true) do
- {:ok, delete}
- else
- {:find_activity, _} ->
- {:error, :not_found}
-
- {:find_object, nil, %Activity{data: %{"actor" => actor, "object" => object}}} ->
- # We have the create activity, but not the object, it was probably pruned.
- # Insert a tombstone and try again
- with {:ok, tombstone_data, _} <- Builder.tombstone(actor, object),
- {:ok, _tombstone} <- Object.create(tombstone_data) do
- delete(activity_id, user)
- else
- _ ->
- Logger.error(
- "Could not insert tombstone for missing object on deletion. Object is #{object}."
- )
-
- {:error, dgettext("errors", "Could not delete")}
- end
-
- _ ->
- {:error, dgettext("errors", "Could not delete")}
- end
- end
-
- def repeat(id, user, params \\ %{}) do
- with %Activity{data: %{"type" => "Create"}} = activity <- Activity.get_by_id(id),
- object = %Object{} <- Object.normalize(activity, false),
- {_, nil} <- {:existing_announce, Utils.get_existing_announce(user.ap_id, object)},
- public = public_announce?(object, params),
- {:ok, announce, _} <- Builder.announce(user, object, public: public),
- {:ok, activity, _} <- Pipeline.common_pipeline(announce, local: true) do
- {:ok, activity}
- else
- {:existing_announce, %Activity{} = announce} ->
- {:ok, announce}
-
- _ ->
- {:error, :not_found}
- end
- end
-
- def unrepeat(id, user) do
- with {_, %Activity{data: %{"type" => "Create"}} = activity} <-
- {:find_activity, Activity.get_by_id(id)},
- %Object{} = note <- Object.normalize(activity, false),
- %Activity{} = announce <- Utils.get_existing_announce(user.ap_id, note),
- {:ok, undo, _} <- Builder.undo(user, announce),
- {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
- {:ok, activity}
- else
- {:find_activity, _} -> {:error, :not_found}
- _ -> {:error, dgettext("errors", "Could not unrepeat")}
- end
- end
-
- @spec favorite(User.t(), binary()) :: {:ok, Activity.t() | :already_liked} | {:error, any()}
- def favorite(%User{} = user, id) do
- case favorite_helper(user, id) do
- {:ok, _} = res ->
- res
-
- {:error, :not_found} = res ->
- res
-
- {:error, e} ->
- Logger.error("Could not favorite #{id}. Error: #{inspect(e, pretty: true)}")
- {:error, dgettext("errors", "Could not favorite")}
- end
- end
-
- def favorite_helper(user, id) do
- with {_, %Activity{object: object}} <- {:find_object, Activity.get_by_id_with_object(id)},
- {_, {:ok, like_object, meta}} <- {:build_object, Builder.like(user, object)},
- {_, {:ok, %Activity{} = activity, _meta}} <-
- {:common_pipeline,
- Pipeline.common_pipeline(like_object, Keyword.put(meta, :local, true))} do
- {:ok, activity}
- else
- {:find_object, _} ->
- {:error, :not_found}
-
- {:common_pipeline,
- {
- :error,
- {
- :validate_object,
- {
- :error,
- changeset
- }
- }
- }} = e ->
- if {:object, {"already liked by this actor", []}} in changeset.errors do
- {:ok, :already_liked}
- else
- {:error, e}
- end
-
- e ->
- {:error, e}
- end
- end
-
- def unfavorite(id, user) do
- with {_, %Activity{data: %{"type" => "Create"}} = activity} <-
- {:find_activity, Activity.get_by_id(id)},
- %Object{} = note <- Object.normalize(activity, false),
- %Activity{} = like <- Utils.get_existing_like(user.ap_id, note),
- {:ok, undo, _} <- Builder.undo(user, like),
- {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
- {:ok, activity}
- else
- {:find_activity, _} -> {:error, :not_found}
- _ -> {:error, dgettext("errors", "Could not unfavorite")}
- end
- end
-
- def react_with_emoji(id, user, emoji) do
- with %Activity{} = activity <- Activity.get_by_id(id),
- object <- Object.normalize(activity),
- {:ok, emoji_react, _} <- Builder.emoji_react(user, object, emoji),
- {:ok, activity, _} <- Pipeline.common_pipeline(emoji_react, local: true) do
- {:ok, activity}
- else
- _ ->
- {:error, dgettext("errors", "Could not add reaction emoji")}
- end
- end
-
- def unreact_with_emoji(id, user, emoji) do
- with %Activity{} = reaction_activity <- Utils.get_latest_reaction(id, user, emoji),
- {:ok, undo, _} <- Builder.undo(user, reaction_activity),
- {:ok, activity, _} <- Pipeline.common_pipeline(undo, local: true) do
- {:ok, activity}
- else
- _ ->
- {:error, dgettext("errors", "Could not remove reaction emoji")}
- end
- end
-
- def vote(user, %{data: %{"type" => "Question"}} = object, choices) do
- with :ok <- validate_not_author(object, user),
- :ok <- validate_existing_votes(user, object),
- {:ok, options, choices} <- normalize_and_validate_choices(choices, object) do
- answer_activities =
- Enum.map(choices, fn index ->
- {:ok, answer_object, _meta} =
- Builder.answer(user, object, Enum.at(options, index)["name"])
-
- {:ok, activity_data, _meta} = Builder.create(user, answer_object, [])
-
- {:ok, activity, _meta} =
- activity_data
- |> Map.put("cc", answer_object["cc"])
- |> Map.put("context", answer_object["context"])
- |> Pipeline.common_pipeline(local: true)
-
- # TODO: Do preload of Pleroma.Object in Pipeline
- Activity.normalize(activity.data)
- end)
-
- object = Object.get_cached_by_ap_id(object.data["id"])
- {:ok, answer_activities, object}
- end
- end
-
- defp validate_not_author(%{data: %{"actor" => ap_id}}, %{ap_id: ap_id}),
- do: {:error, dgettext("errors", "Poll's author can't vote")}
-
- defp validate_not_author(_, _), do: :ok
-
- defp validate_existing_votes(%{ap_id: ap_id}, object) do
- if Utils.get_existing_votes(ap_id, object) == [] do
- :ok
- else
- {:error, dgettext("errors", "Already voted")}
- end
- end
-
- defp get_options_and_max_count(%{data: %{"anyOf" => any_of}})
- when is_list(any_of) and any_of != [],
- do: {any_of, Enum.count(any_of)}
-
- defp get_options_and_max_count(%{data: %{"oneOf" => one_of}})
- when is_list(one_of) and one_of != [],
- do: {one_of, 1}
-
- defp normalize_and_validate_choices(choices, object) do
- choices = Enum.map(choices, fn i -> if is_binary(i), do: String.to_integer(i), else: i end)
- {options, max_count} = get_options_and_max_count(object)
- count = Enum.count(options)
-
- with {_, true} <- {:valid_choice, Enum.all?(choices, &(&1 < count))},
- {_, true} <- {:count_check, Enum.count(choices) <= max_count} do
- {:ok, options, choices}
- else
- {:valid_choice, _} -> {:error, dgettext("errors", "Invalid indices")}
- {:count_check, _} -> {:error, dgettext("errors", "Too many choices")}
- end
- end
-
- def public_announce?(_, %{visibility: visibility})
- when visibility in ~w{public unlisted private direct},
- do: visibility in ~w(public unlisted)
-
- def public_announce?(object, _) do
- Visibility.is_public?(object)
- end
-
- def get_visibility(_, _, %Participation{}), do: {"direct", "direct"}
-
- def get_visibility(%{visibility: visibility}, in_reply_to, _)
- when visibility in ~w{public unlisted private direct},
- do: {visibility, get_replied_to_visibility(in_reply_to)}
-
- def get_visibility(%{visibility: "list:" <> list_id}, in_reply_to, _) do
- visibility = {:list, String.to_integer(list_id)}
- {visibility, get_replied_to_visibility(in_reply_to)}
- end
-
- def get_visibility(_, in_reply_to, _) when not is_nil(in_reply_to) do
- visibility = get_replied_to_visibility(in_reply_to)
- {visibility, visibility}
- end
-
- def get_visibility(_, in_reply_to, _), do: {"public", get_replied_to_visibility(in_reply_to)}
-
- def get_replied_to_visibility(nil), do: nil
-
- def get_replied_to_visibility(activity) do
- with %Object{} = object <- Object.normalize(activity) do
- Visibility.get_visibility(object)
- end
- end
-
- def check_expiry_date({:ok, nil} = res), do: res
-
- def check_expiry_date({:ok, in_seconds}) do
- expiry = NaiveDateTime.utc_now() |> NaiveDateTime.add(in_seconds)
-
- if ActivityExpiration.expires_late_enough?(expiry) do
- {:ok, expiry}
- else
- {:error, "Expiry date is too soon"}
- end
- end
-
- def check_expiry_date(expiry_str) do
- Ecto.Type.cast(:integer, expiry_str)
- |> check_expiry_date()
- end
-
- def listen(user, data) do
- visibility = Map.get(data, :visibility, "public")
-
- with {to, cc} <- get_to_and_cc(user, [], nil, visibility, nil),
- listen_data <-
- data
- |> Map.take([:album, :artist, :title, :length])
- |> Map.new(fn {key, value} -> {to_string(key), value} end)
- |> Map.put("type", "Audio")
- |> Map.put("to", to)
- |> Map.put("cc", cc)
- |> Map.put("actor", user.ap_id),
- {:ok, activity} <-
- ActivityPub.listen(%{
- actor: user,
- to: to,
- object: listen_data,
- context: Utils.generate_context_id(),
- additional: %{"cc" => cc}
- }) do
- {:ok, activity}
- end
- end
-
- def post(user, %{status: _} = data) do
- with {:ok, draft} <- Pleroma.Web.CommonAPI.ActivityDraft.create(user, data) do
- ActivityPub.create(draft.changes, draft.preview?)
- end
- end
-
- def pin(id, %{ap_id: user_ap_id} = user) do
- with %Activity{
- actor: ^user_ap_id,
- data: %{"type" => "Create"},
- object: %Object{data: %{"type" => object_type}}
- } = activity <- Activity.get_by_id_with_object(id),
- true <- object_type in ["Note", "Article", "Question"],
- true <- Visibility.is_public?(activity),
- {:ok, _user} <- User.add_pinnned_activity(user, activity) do
- {:ok, activity}
- else
- {:error, %{errors: [pinned_activities: {err, _}]}} -> {:error, err}
- _ -> {:error, dgettext("errors", "Could not pin")}
- end
- end
-
- def unpin(id, user) do
- with %Activity{data: %{"type" => "Create"}} = activity <- Activity.get_by_id(id),
- {:ok, _user} <- User.remove_pinnned_activity(user, activity) do
- {:ok, activity}
- else
- {:error, %{errors: [pinned_activities: {err, _}]}} -> {:error, err}
- _ -> {:error, dgettext("errors", "Could not unpin")}
- end
- end
-
- def add_mute(user, activity) do
- with {:ok, _} <- ThreadMute.add_mute(user.id, activity.data["context"]),
- _ <- Pleroma.Notification.mark_context_as_read(user, activity.data["context"]) do
- {:ok, activity}
- else
- {:error, _} -> {:error, dgettext("errors", "conversation is already muted")}
- end
- end
-
- def remove_mute(user, activity) do
- ThreadMute.remove_mute(user.id, activity.data["context"])
- {:ok, activity}
- end
-
- def thread_muted?(%User{id: user_id}, %{data: %{"context" => context}})
- when is_binary(context) do
- ThreadMute.exists?(user_id, context)
- end
-
- def thread_muted?(_, _), do: false
-
- def report(user, data) do
- with {:ok, account} <- get_reported_account(data.account_id),
- {:ok, {content_html, _, _}} <- make_report_content_html(data[:comment]),
- {:ok, statuses} <- get_report_statuses(account, data) do
- ActivityPub.flag(%{
- context: Utils.generate_context_id(),
- actor: user,
- account: account,
- statuses: statuses,
- content: content_html,
- forward: Map.get(data, :forward, false)
- })
- end
- end
-
- defp get_reported_account(account_id) do
- case User.get_cached_by_id(account_id) do
- %User{} = account -> {:ok, account}
- _ -> {:error, dgettext("errors", "Account not found")}
- end
- end
-
- def update_report_state(activity_ids, state) when is_list(activity_ids) do
- case Utils.update_report_state(activity_ids, state) do
- :ok -> {:ok, activity_ids}
- _ -> {:error, dgettext("errors", "Could not update state")}
- end
- end
-
- def update_report_state(activity_id, state) do
- with %Activity{} = activity <- Activity.get_by_id(activity_id) do
- Utils.update_report_state(activity, state)
- else
- nil -> {:error, :not_found}
- _ -> {:error, dgettext("errors", "Could not update state")}
- end
- end
-
- def update_activity_scope(activity_id, opts \\ %{}) do
- with %Activity{} = activity <- Activity.get_by_id_with_object(activity_id),
- {:ok, activity} <- toggle_sensitive(activity, opts) do
- set_visibility(activity, opts)
- else
- nil -> {:error, :not_found}
- {:error, reason} -> {:error, reason}
- end
- end
-
- defp toggle_sensitive(activity, %{sensitive: sensitive}) when sensitive in ~w(true false) do
- toggle_sensitive(activity, %{sensitive: String.to_existing_atom(sensitive)})
- end
-
- defp toggle_sensitive(%Activity{object: object} = activity, %{sensitive: sensitive})
- when is_boolean(sensitive) do
- new_data = Map.put(object.data, "sensitive", sensitive)
-
- {:ok, object} =
- object
- |> Object.change(%{data: new_data})
- |> Object.update_and_set_cache()
-
- {:ok, Map.put(activity, :object, object)}
- end
-
- defp toggle_sensitive(activity, _), do: {:ok, activity}
-
- defp set_visibility(activity, %{visibility: visibility}) do
- Utils.update_activity_visibility(activity, visibility)
- end
-
- defp set_visibility(activity, _), do: {:ok, activity}
-
- def hide_reblogs(%User{} = user, %User{} = target) do
- UserRelationship.create_reblog_mute(user, target)
- end
-
- def show_reblogs(%User{} = user, %User{} = target) do
- UserRelationship.delete_reblog_mute(user, target)
- end
-end
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 9d7b24eb2..b6feaf32a 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,10 +1,9 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.Utils do
import Pleroma.Web.Gettext
- import Pleroma.Web.ControllerHelper, only: [truthy_param?: 1]
alias Calendar.Strftime
alias Pleroma.Activity
@@ -12,12 +11,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do
alias Pleroma.Conversation.Participation
alias Pleroma.Formatter
alias Pleroma.Object
- alias Pleroma.Plugs.AuthenticationPlug
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Visibility
+ alias Pleroma.Web.CommonAPI.ActivityDraft
alias Pleroma.Web.MediaProxy
+ alias Pleroma.Web.Plugs.AuthenticationPlug
+ alias Pleroma.Web.Utils.Params
require Logger
require Pleroma.Constants
@@ -50,67 +51,62 @@ defmodule Pleroma.Web.CommonAPI.Utils do
{_, descs} = Jason.decode(descs_str)
Enum.map(ids, fn media_id ->
- case Repo.get(Object, media_id) do
- %Object{data: data} ->
- Map.put(data, "name", descs[media_id])
-
- _ ->
- nil
+ with %Object{data: data} <- Repo.get(Object, media_id) do
+ Map.put(data, "name", descs[media_id])
end
end)
|> Enum.reject(&is_nil/1)
end
- @spec get_to_and_cc(
- User.t(),
- list(String.t()),
- Activity.t() | nil,
- String.t(),
- Participation.t() | nil
- ) :: {list(String.t()), list(String.t())}
+ @spec get_to_and_cc(ActivityDraft.t()) :: {list(String.t()), list(String.t())}
- def get_to_and_cc(_, _, _, _, %Participation{} = participation) do
+ def get_to_and_cc(%{in_reply_to_conversation: %Participation{} = participation}) do
participation = Repo.preload(participation, :recipients)
{Enum.map(participation.recipients, & &1.ap_id), []}
end
- def get_to_and_cc(user, mentioned_users, inReplyTo, "public", _) do
- to = [Pleroma.Constants.as_public() | mentioned_users]
- cc = [user.follower_address]
+ def get_to_and_cc(%{visibility: visibility} = draft) when visibility in ["public", "local"] do
+ to =
+ case visibility do
+ "public" -> [Pleroma.Constants.as_public() | draft.mentions]
+ "local" -> [Utils.as_local_public() | draft.mentions]
+ end
+
+ cc = [draft.user.follower_address]
- if inReplyTo do
- {Enum.uniq([inReplyTo.data["actor"] | to]), cc}
+ if draft.in_reply_to do
+ {Enum.uniq([draft.in_reply_to.data["actor"] | to]), cc}
else
{to, cc}
end
end
- def get_to_and_cc(user, mentioned_users, inReplyTo, "unlisted", _) do
- to = [user.follower_address | mentioned_users]
+ def get_to_and_cc(%{visibility: "unlisted"} = draft) do
+ to = [draft.user.follower_address | draft.mentions]
cc = [Pleroma.Constants.as_public()]
- if inReplyTo do
- {Enum.uniq([inReplyTo.data["actor"] | to]), cc}
+ if draft.in_reply_to do
+ {Enum.uniq([draft.in_reply_to.data["actor"] | to]), cc}
else
{to, cc}
end
end
- def get_to_and_cc(user, mentioned_users, inReplyTo, "private", _) do
- {to, cc} = get_to_and_cc(user, mentioned_users, inReplyTo, "direct", nil)
- {[user.follower_address | to], cc}
+ def get_to_and_cc(%{visibility: "private"} = draft) do
+ {to, cc} = get_to_and_cc(struct(draft, visibility: "direct"))
+ {[draft.user.follower_address | to], cc}
end
- def get_to_and_cc(_user, mentioned_users, inReplyTo, "direct", _) do
+ def get_to_and_cc(%{visibility: "direct"} = draft) do
# If the OP is a DM already, add the implicit actor.
- if inReplyTo && Visibility.is_direct?(inReplyTo) do
- {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
+ if draft.in_reply_to && Visibility.is_direct?(draft.in_reply_to) do
+ {Enum.uniq([draft.in_reply_to.data["actor"] | draft.mentions]), []}
else
- {mentioned_users, []}
+ {draft.mentions, []}
end
end
- def get_to_and_cc(_user, mentions, _inReplyTo, {:list, _}, _), do: {mentions, []}
+ def get_to_and_cc(%{visibility: {:list, _}, mentions: mentions}), do: {mentions, []}
def get_addressed_users(_, to) when is_list(to) do
User.get_ap_ids_by_nicknames(to)
@@ -164,7 +160,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> DateTime.add(expires_in)
|> DateTime.to_iso8601()
- key = if truthy_param?(data.poll[:multiple]), do: "anyOf", else: "oneOf"
+ key = if Params.truthy_param?(data.poll[:multiple]), do: "anyOf", else: "oneOf"
poll = %{"type" => "Question", key => option_notes, "closed" => end_time}
{:ok, {poll, emoji}}
@@ -203,30 +199,24 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end
end
- def make_content_html(
- status,
- attachments,
- data,
- visibility
- ) do
+ def make_content_html(%ActivityDraft{} = draft) do
attachment_links =
- data
+ draft.params
|> Map.get("attachment_links", Config.get([:instance, :attachment_links]))
- |> truthy_param?()
+ |> Params.truthy_param?()
- content_type = get_content_type(data[:content_type])
+ content_type = get_content_type(draft.params[:content_type])
options =
- if visibility == "direct" && Config.get([:instance, :safe_dm_mentions]) do
+ if draft.visibility == "direct" && Config.get([:instance, :safe_dm_mentions]) do
[safe_mention: true]
else
[]
end
- status
+ draft.status
|> format_input(content_type, options)
- |> maybe_add_attachments(attachments, attachment_links)
- |> maybe_add_nsfw_tag(data)
+ |> maybe_add_attachments(draft.attachments, attachment_links)
end
defp get_content_type(content_type) do
@@ -237,13 +227,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end
end
- defp maybe_add_nsfw_tag({text, mentions, tags}, %{"sensitive" => sensitive})
- when sensitive in [true, "True", "true", "1"] do
- {text, mentions, [{"#nsfw", "nsfw"} | tags]}
- end
-
- defp maybe_add_nsfw_tag(data, _), do: data
-
def make_context(_, %Participation{} = participation) do
Repo.preload(participation, :conversation).conversation.ap_id
end
@@ -274,7 +257,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def format_input(text, format, options \\ [])
@doc """
- Formatting text to plain text.
+ Formatting text to plain text, BBCode, HTML, or Markdown
"""
def format_input(text, "text/plain", options) do
text
@@ -285,9 +268,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end).()
end
- @doc """
- Formatting text as BBCode.
- """
def format_input(text, "text/bbcode", options) do
text
|> String.replace(~r/\r/, "")
@@ -297,65 +277,20 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> Formatter.linkify(options)
end
- @doc """
- Formatting text to html.
- """
def format_input(text, "text/html", options) do
text
|> Formatter.html_escape("text/html")
|> Formatter.linkify(options)
end
- @doc """
- Formatting text to markdown.
- """
def format_input(text, "text/markdown", options) do
text
|> Formatter.mentions_escape(options)
- |> Earmark.as_html!(%Earmark.Options{renderer: Pleroma.EarmarkRenderer})
+ |> Formatter.markdown_to_html()
|> Formatter.linkify(options)
|> Formatter.html_escape("text/html")
end
- def make_note_data(
- actor,
- to,
- context,
- content_html,
- attachments,
- in_reply_to,
- tags,
- summary \\ nil,
- cc \\ [],
- sensitive \\ false,
- extra_params \\ %{}
- ) do
- %{
- "type" => "Note",
- "to" => to,
- "cc" => cc,
- "content" => content_html,
- "summary" => summary,
- "sensitive" => truthy_param?(sensitive),
- "context" => context,
- "attachment" => attachments,
- "actor" => actor,
- "tag" => Keyword.values(tags) |> Enum.uniq()
- }
- |> add_in_reply_to(in_reply_to)
- |> Map.merge(extra_params)
- end
-
- defp add_in_reply_to(object, nil), do: object
-
- defp add_in_reply_to(object, in_reply_to) do
- with %Object{} = in_reply_to_object <- Object.normalize(in_reply_to) do
- Map.put(object, "inReplyTo", in_reply_to_object.data["id"])
- else
- _ -> object
- end
- end
-
def format_naive_asctime(date) do
date |> DateTime.from_naive!("Etc/UTC") |> format_asctime
end
@@ -429,7 +364,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
%Activity{data: %{"to" => _to, "type" => type} = data} = activity
)
when type == "Create" do
- object = Object.normalize(activity, false)
+ object = Object.normalize(activity, fetch: false)
object_data =
cond do
@@ -450,19 +385,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def maybe_notify_mentioned_recipients(recipients, _), do: recipients
- # Do not notify subscribers if author is making a reply
- def maybe_notify_subscribers(recipients, %Activity{
- object: %Object{data: %{"inReplyTo" => _ap_id}}
- }) do
- recipients
- end
-
def maybe_notify_subscribers(
recipients,
- %Activity{data: %{"actor" => actor, "type" => type}} = activity
- )
- when type == "Create" do
- with %User{} = user <- User.get_cached_by_ap_id(actor) do
+ %Activity{data: %{"actor" => actor, "type" => "Create"}} = activity
+ ) do
+ # Do not notify subscribers if author is making a reply
+ with %Object{data: object} <- Object.normalize(activity, fetch: false),
+ nil <- object["inReplyTo"],
+ %User{} = user <- User.get_cached_by_ap_id(actor) do
subscriber_ids =
user
|> User.subscriber_users()