commit: f205d3da1d70cf6541221b390fa3b2443cdf9a31
parent: 89ab673d00b4dd96fd29f35d7c355b777b9ec0c7
Author: kaniini <ariadne@dereferenced.org>
Date: Wed, 2 Oct 2019 10:44:51 +0000
Merge branch 'get_announce_visibility-name' into 'develop'
Rename misleading `get_announce_visibility` to `public_announce?`
See merge request pleroma/pleroma!1768
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
@@ -80,7 +80,7 @@ defmodule Pleroma.Web.CommonAPI do
with %Activity{} = activity <- get_by_id_or_ap_id(id_or_ap_id),
object <- Object.normalize(activity),
nil <- Utils.get_existing_announce(user.ap_id, object),
- public <- get_announce_visibility(object, params) do
+ public <- public_announce?(object, params) do
ActivityPub.announce(user, object, nil, true, public)
else
_ -> {:error, dgettext("errors", "Could not repeat")}
@@ -170,11 +170,11 @@ defmodule Pleroma.Web.CommonAPI do
end
end
- def get_announce_visibility(_, %{"visibility" => visibility})
+ def public_announce?(_, %{"visibility" => visibility})
when visibility in ~w{public unlisted private direct},
do: visibility in ~w(public unlisted)
- def get_announce_visibility(object, _) do
+ def public_announce?(object, _) do
Visibility.is_public?(object)
end