hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check

Browse source 
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
This commit is contained in:
Ivan Tashkinov 2018-12-05 13:37:06 +03:00
commit 848151f7cb
8 changed files with 120 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -574,7 +574,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
def upload(file, opts \\ []) do
with {:ok, data} <- Upload.store(file, opts) do
Repo.insert(%Object{data: data})
obj_data = if opts[:actor], do: Map.put(data, "actor", opts[:actor]), else: data
Repo.insert(%Object{data: obj_data})
end
end