logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: ffa552f1a41c530a7eff25d27cf0a82e710067b6
parent: 66bc37925e8896d156bbbb4a89a73cf8d9c88d56
Author: kaniini <nenolod@gmail.com>
Date:   Sat, 25 Aug 2018 00:20:25 +0000

Merge branch 'feature/twitterapi-object-description' into 'develop'

twitter api: provide object descriptions as attachment description field

See merge request pleroma/pleroma!293

Diffstat:

Mlib/pleroma/web/twitter_api/representers/object_representer.ex6++++--
Mtest/web/twitter_api/representers/object_representer_test.exs6++++--
2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/twitter_api/representers/object_representer.ex b/lib/pleroma/web/twitter_api/representers/object_representer.ex @@ -9,7 +9,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do url: url["href"] |> Pleroma.Web.MediaProxy.url(), mimetype: url["mediaType"] || url["mimeType"], id: data["uuid"], - oembed: false + oembed: false, + description: data["name"] } end @@ -18,7 +19,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do url: url |> Pleroma.Web.MediaProxy.url(), mimetype: data["mediaType"] || url["mimeType"], id: data["uuid"], - oembed: false + oembed: false, + description: data["name"] } end diff --git a/test/web/twitter_api/representers/object_representer_test.exs b/test/web/twitter_api/representers/object_representer_test.exs @@ -23,7 +23,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectReprenterTest do id: 6, url: "someurl", mimetype: "sometype", - oembed: false + oembed: false, + description: nil } assert expected_object == ObjectRepresenter.to_map(object) @@ -46,7 +47,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ObjectReprenterTest do "http://mastodon.example.org/system/media_attachments/files/000/000/001/original/8619f31c6edec470.png", mimetype: "image/png", oembed: false, - id: nil + id: nil, + description: "blabla" } assert expected_object == ObjectRepresenter.to_map(object)