logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 730378616071fd35a70b722fdcd8b35070b0b330
parent e49770ee88c335f5f2f9889aee0f8e8d48a73686
Author: Roger Braun <roger@rogerbraun.net>
Date:   Sun,  7 May 2017 20:20:53 +0200

Add some twapi fixes.

Diffstat:

Mlib/pleroma/web/twitter_api/representers/activity_representer.ex6+++++-
Mtest/web/twitter_api/representers/activity_representer_test.exs4+++-
2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -29,7 +29,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do "uri" => "tag:#{activity.data["id"]}:objectType=note", "created_at" => created_at, "retweeted_status" => retweeted_status, - "statusnet_conversation_id" => conversation_id(announced_activity) + "statusnet_conversation_id" => conversation_id(announced_activity), + "external_url" => activity.data["id"] } end @@ -49,6 +50,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do "uri" => "tag:#{activity.data["id"]}:objectType=Favourite", "created_at" => created_at, "in_reply_to_status_id" => liked_activity.id, + "external_url" => activity.data["id"] } end @@ -67,6 +69,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do "is_post_verb" => false, "created_at" => created_at, "in_reply_to_status_id" => nil, + "external_url" => activity.data["id"] } end @@ -103,6 +106,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do "repeat_num" => announcement_count, "favorited" => to_boolean(favorited), "repeated" => to_boolean(repeated), + "external_url" => activity.data["id"] } end diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs @@ -77,6 +77,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do id: 1, data: %{ "type" => "Create", + "id" => "id", "to" => [ User.ap_followers(user), "https://www.w3.org/ns/activitystreams#Public", @@ -121,7 +122,8 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "fave_num" => 5, "repeat_num" => 3, "favorited" => false, - "repeated" => false + "repeated" => false, + "external_url" => activity.data["id"] } assert ActivityRepresenter.to_map(activity, %{user: user, for: follower, mentioned: [mentioned_user]}) == expected_status