moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/common-api-visibility-orphan' into 'develop' 

common api: properly handle replying to orphaned threads

See merge request pleroma/pleroma!299
This commit is contained in:
kaniini 2018-08-26 22:39:15 +00:00
parent c9e4c45e0e 741c6ad671
commit 1ad5cbed51
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/common_api/common_api.ex
View File

@ -61,9 +61,14 @@ def get_visibility(%{"visibility" => visibility})
do: visibility do: visibility
def get_visibility(%{"in_reply_to_status_id" => status_id}) when not is_nil(status_id) do def get_visibility(%{"in_reply_to_status_id" => status_id}) when not is_nil(status_id) do
inReplyTo = get_replied_to_activity(status_id) case get_replied_to_activity(status_id) do
nil ->
"public"
inReplyTo ->
Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"]) Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"])
end end
end
def get_visibility(_), do: "public" def get_visibility(_), do: "public"