aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-08-26 22:39:15 +0000
committerkaniini <nenolod@gmail.com>2018-08-26 22:39:15 +0000
commit1ad5cbed51831f4fad81aa9d8c0a3c6d8b200724 (patch)
tree96acd96a649bca31c92d7387e6317592bb9cebcc /lib
parentc9e4c45e0e381eb0293588f65c49212e3573161a (diff)
parent741c6ad671e45ea101046a34a802f94c9d21e8bf (diff)
downloadpleroma-1ad5cbed51831f4fad81aa9d8c0a3c6d8b200724.tar.gz
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
common api: properly handle replying to orphaned threads See merge request pleroma/pleroma!299
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 3f18a68e8..475c180a1 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -61,8 +61,13 @@ defmodule Pleroma.Web.CommonAPI do
do: visibility
def get_visibility(%{"in_reply_to_status_id" => status_id}) when not is_nil(status_id) do
- inReplyTo = get_replied_to_activity(status_id)
- Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"])
+ case get_replied_to_activity(status_id) do
+ nil ->
+ "public"
+
+ inReplyTo ->
+ Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"])
+ end
end
def get_visibility(_), do: "public"