Ensure we capture the application details into the object
This commit is contained in:
parent
de8b8e9cf1
commit
3dc7e89c54
|
@ -190,6 +190,7 @@ defp object(draft) do
|
|||
Utils.make_note_data(draft)
|
||||
|> Map.put("emoji", emoji)
|
||||
|> Map.put("source", draft.status)
|
||||
|> Map.put("application", draft.params[:application])
|
||||
|
||||
%__MODULE__{draft | object: object}
|
||||
end
|
||||
|
|
|
@ -132,13 +132,15 @@ def index(%{assigns: %{user: user}} = conn, %{ids: ids} = params) do
|
|||
# Creates a scheduled status when `scheduled_at` param is present and it's far enough
|
||||
def create(
|
||||
%{
|
||||
assigns: %{user: user},
|
||||
assigns: %{user: user, token: %{app_id: app_id}},
|
||||
body_params: %{status: _, scheduled_at: scheduled_at} = params
|
||||
} = conn,
|
||||
_
|
||||
)
|
||||
when not is_nil(scheduled_at) do
|
||||
params = Map.put(params, :in_reply_to_status_id, params[:in_reply_to_id])
|
||||
params =
|
||||
Map.put(params, :in_reply_to_status_id, params[:in_reply_to_id])
|
||||
|> add_application(app_id)
|
||||
|
||||
attrs = %{
|
||||
params: Map.new(params, fn {key, value} -> {to_string(key), value} end),
|
||||
|
@ -161,8 +163,14 @@ def create(
|
|||
end
|
||||
|
||||
# Creates a regular status
|
||||
def create(%{assigns: %{user: user}, body_params: %{status: _} = params} = conn, _) do
|
||||
params = Map.put(params, :in_reply_to_status_id, params[:in_reply_to_id])
|
||||
def create(
|
||||
%{assigns: %{user: user, token: %{app_id: app_id}}, body_params: %{status: _} = params} =
|
||||
conn,
|
||||
_
|
||||
) do
|
||||
params =
|
||||
Map.put(params, :in_reply_to_status_id, params[:in_reply_to_id])
|
||||
|> add_application(app_id)
|
||||
|
||||
with {:ok, activity} <- CommonAPI.post(user, params) do
|
||||
try_render(conn, "show.json",
|
||||
|
@ -414,4 +422,8 @@ def bookmarks(%{assigns: %{user: user}} = conn, params) do
|
|||
as: :activity
|
||||
)
|
||||
end
|
||||
|
||||
defp add_application(params, app_id) do
|
||||
params |> Map.put(:application, Pleroma.Web.OAuth.App.get_app_by_id(app_id))
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue