Browse Source

Allow users to announce privately, including own private notes

object-id-column
Thibaut Girka 4 years ago
parent
commit
4c1f158f5d
2 changed files with 14 additions and 5 deletions
  1. +12
    -3
      lib/pleroma/web/common_api/common_api.ex
  2. +2
    -2
      lib/pleroma/web/mastodon_api/controllers/status_controller.ex

+ 12
- 3
lib/pleroma/web/common_api/common_api.ex View File

@@ -76,11 +76,12 @@ defmodule Pleroma.Web.CommonAPI do
end
end

def repeat(id_or_ap_id, user) do
def repeat(id_or_ap_id, user, params \\ %{}) 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) do
ActivityPub.announce(user, object)
nil <- Utils.get_existing_announce(user.ap_id, object),
public <- get_announce_visibility(object, params) do
ActivityPub.announce(user, object, nil, true, public)
else
_ -> {:error, dgettext("errors", "Could not repeat")}
end
@@ -169,6 +170,14 @@ defmodule Pleroma.Web.CommonAPI do
end
end

def get_announce_visibility(_, %{"visibility" => visibility})
when visibility in ~w{public unlisted private direct},
do: visibility in ~w(public unlisted)

def get_announce_visibility(object, _) do
Visibility.is_public?(object)
end

def get_visibility(_, _, %Participation{}), do: {"direct", "direct"}

def get_visibility(%{"visibility" => visibility}, in_reply_to, _)


+ 2
- 2
lib/pleroma/web/mastodon_api/controllers/status_controller.ex View File

@@ -125,8 +125,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
end

@doc "POST /api/v1/statuses/:id/reblog"
def reblog(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do
with {:ok, announce, _activity} <- CommonAPI.repeat(ap_id_or_id, user),
def reblog(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id} = params) do
with {:ok, announce, _activity} <- CommonAPI.repeat(ap_id_or_id, user, params),
%Activity{} = announce <- Activity.normalize(announce.data) do
try_render(conn, "show.json", %{activity: announce, for: user, as: :activity})
end


Loading…
Cancel
Save