diff options
| author | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
|---|---|---|
| committer | Rin Toshaka <rinpatch@sdf.org> | 2018-12-06 18:11:22 +0100 |
| commit | 88f92693f25c34f8ab82d4ed809b266bf5fb9ff8 (patch) | |
| tree | d6115e451d0cd98672669c6ba93921f75f21e16a /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | ca7b46fb3ba576fb7e67eba02654e6df9299392a (diff) | |
| parent | 1d531fd2f32a7f8fff562a3122b30b8ccdccead0 (diff) | |
| download | pleroma-88f92693f25c34f8ab82d4ed809b266bf5fb9ff8.tar.gz | |
Merge develop
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index c19a4f084..9c485d965 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -93,8 +93,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do end end - def upload(%Plug.Upload{} = file, format \\ "xml") do - {:ok, object} = ActivityPub.upload(file) + def upload(%Plug.Upload{} = file, %User{} = user, format \\ "xml") do + {:ok, object} = ActivityPub.upload(file, actor: User.ap_id(user)) url = List.first(object.data["url"]) href = url["href"] |