logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 90b38fd51b4d40b6240ff5e5e3bb852eb18f97df
parent: fa0c279139f384f6c97bce217be4131b255f00b1
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri, 14 Apr 2017 16:13:34 +0200

Fix uploads and favorites in twidere / twittnuker.

Diffstat:

Mlib/pleroma/web/router.ex2++
Mlib/pleroma/web/twitter_api/twitter_api.ex36+++++++++++++++++++++++-------------
Mlib/pleroma/web/twitter_api/twitter_api_controller.ex6++++++
3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex @@ -39,6 +39,8 @@ defmodule Pleroma.Web.Router do post "/friendships/create", TwitterAPI.Controller, :follow post "/friendships/destroy", TwitterAPI.Controller, :unfollow post "/statusnet/media/upload", TwitterAPI.Controller, :upload + post "/media/upload", TwitterAPI.Controller, :upload_json post "/favorites/create/:id", TwitterAPI.Controller, :favorite + post "/favorites/create", TwitterAPI.Controller, :favorite end end diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -137,25 +137,35 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do {:ok, status} end - def upload(%Plug.Upload{} = file) do + def upload(%Plug.Upload{} = file, format \\ "xml") 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"?> - <rsp stat="ok" xmlns:atom="http://www.w3.org/2005/Atom"> - <mediaid>#{object.id}</mediaid> - <media_id>#{object.id}</media_id> - <media_id_string>#{object.id}</media_id_string> - <media_url>#{href}</media_url> - <mediaurl>#{href}</mediaurl> - <atom:link rel="enclosure" href="#{href}" type="#{type}"></atom:link> - </rsp> - """ + case format do + "xml" -> + # Fake this as good as possible... + """ + <?xml version="1.0" encoding="UTF-8"?> + <rsp stat="ok" xmlns:atom="http://www.w3.org/2005/Atom"> + <mediaid>#{object.id}</mediaid> + <media_id>#{object.id}</media_id> + <media_id_string>#{object.id}</media_id_string> + <media_url>#{href}</media_url> + <mediaurl>#{href}</mediaurl> + <atom:link rel="enclosure" href="#{href}" type="#{type}"></atom:link> + </rsp> + """ + "json" -> + %{ + media_id: object.id, + media_id_string: "#{object.id}}", + media_url: href, + size: 0 + } |> Poison.encode! + end end def parse_mentions(text) do diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -84,6 +84,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do |> send_resp(200, response) end + def upload_json(conn, %{"media" => media}) do + response = TwitterAPI.upload(media, "json") + conn + |> json_reply(200, response) + end + def config(conn, _params) do response = %{ site: %{