diff options
author | Roger Braun <roger@rogerbraun.net> | 2017-03-30 16:08:23 +0200 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2017-03-30 16:08:23 +0200 |
commit | 4a6d48b0fe991b68b555c75faca095725aff487b (patch) | |
tree | 733ad06bccca2f13e68e515db741d4999e485255 /lib/pleroma/web/twitter_api/twitter_api.ex | |
parent | 32aa83f3a2a6ab14e36a3452708ea3be94ad4c43 (diff) | |
download | pleroma-4a6d48b0fe991b68b555c75faca095725aff487b.tar.gz |
Return mimetype with attachment.
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index b6e7d5cc6..0624e73aa 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -99,6 +99,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do def upload(%Plug.Upload{} = file) do {:ok, object} = ActivityPub.upload(file) + url = List.first(object.data["url"]) + href = url["href"] + type = url["mediaType"] + # Fake this as good as possible... """ <?xml version="1.0" encoding="UTF-8"?> @@ -106,9 +110,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do <mediaid>#{object.id}</mediaid> <media_id>#{object.id}</media_id> <media_id_string>#{object.id}</media_id_string> - <media_url>#{object.data["href"]}</media_url> - <mediaurl>#{object.data["href"]}</mediaurl> - <atom:link rel="enclosure" href="#{object.data["href"]}" type="image"></atom:link> + <media_url>#{href}</media_url> + <mediaurl>#{href}</mediaurl> + <atom:link rel="enclosure" href="#{href}" type="#{type}"></atom:link> </rsp> """ end |