Browse Source

Twitter Representers: Handle Mastodon attachments.

tags/v0.9.9
lain 6 years ago
parent
commit
ce31f3a922
2 changed files with 34 additions and 2 deletions
  1. +14
    -2
      lib/pleroma/web/twitter_api/representers/object_representer.ex
  2. +20
    -0
      test/web/twitter_api/representers/object_representer_test.exs

+ 14
- 2
lib/pleroma/web/twitter_api/representers/object_representer.ex View File

@@ -2,9 +2,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Object

def to_map(%Object{} = object, _opts) do
def to_map(%Object{data: %{"url" => [url | _]}} = object, _opts) do
data = object.data
url = List.first(data["url"])
%{
url: url["href"] |> Pleroma.Web.MediaProxy.url(),
mimetype: url["mediaType"],
@@ -13,6 +12,19 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
}
end

def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
%{
url: url |> Pleroma.Web.MediaProxy.url(),
mimetype: data["mediaType"],
id: data["uuid"],
oembed: false
}
end

def to_map(%Object{}, _opts) do
%{}
end

# If we only get the naked data, wrap in an object
def to_map(%{} = data, opts) do
to_map(%Object{data: data}, opts)


+ 20
- 0
test/web/twitter_api/representers/object_representer_test.exs View File

@@ -28,4 +28,24 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectReprenterTest do

assert expected_object == ObjectRepresenter.to_map(object)
end

test "represents mastodon-style attachments" do
object = %Object{
id: nil,
data: %{
"mediaType" => "image/png",
"name" => "blabla", "type" => "Document",
"url" => "http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png"
}
}

expected_object = %{
url: "http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png",
mimetype: "image/png",
oembed: false,
id: nil
}

assert expected_object == ObjectRepresenter.to_map(object)
end
end

Loading…
Cancel
Save