Return quote_url through the API, don't render quotes more than 1 level deep
This commit is contained in:
parent
2f9a098dd5
commit
4bcdf0cf4f
4 changed files with 41 additions and 4 deletions
|
|
@ -198,6 +198,12 @@ defmodule Pleroma.Web.ApiSpec.Schemas.Status do
|
|||
nullable: true,
|
||||
description: "Quoted status (if any)"
|
||||
},
|
||||
quote_url: %Schema{
|
||||
type: :string,
|
||||
format: :uri,
|
||||
nullable: true,
|
||||
description: "URL of the quoted status"
|
||||
},
|
||||
local: %Schema{
|
||||
type: :boolean,
|
||||
description: "`true` if the post was made on the local instance"
|
||||
|
|
|
|||
|
|
@ -316,7 +316,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|||
|
||||
quote_post =
|
||||
if quote_activity do
|
||||
quote_rendering_opts = Map.put(opts, :activity, quote_activity)
|
||||
quote_rendering_opts = Map.merge(opts, %{activity: quote_activity, show_quote: false})
|
||||
render("show.json", quote_rendering_opts)
|
||||
else
|
||||
nil
|
||||
|
|
@ -431,6 +431,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|||
context: object.data["context"],
|
||||
in_reply_to_account_acct: reply_to_user && reply_to_user.nickname,
|
||||
quote: quote_post,
|
||||
quote_url: object.data["quoteUrl"],
|
||||
content: %{"text/plain" => content_plaintext},
|
||||
spoiler_text: %{"text/plain" => summary},
|
||||
expires_at: expires_at,
|
||||
|
|
@ -666,6 +667,10 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
|||
end
|
||||
end
|
||||
|
||||
def get_quote(_activity, %{show_quote: false}) do
|
||||
nil
|
||||
end
|
||||
|
||||
def get_quote(activity, %{quoted_activities: quoted_activities}) do
|
||||
object = Object.normalize(activity, fetch: false)
|
||||
quoted_activities[object.data["quoteUrl"]]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue