bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/message-summary' into 'develop' 

message summary

See merge request pleroma/pleroma!249
This commit is contained in:
lambda 2018-07-12 16:45:57 +00:00
parent fe4387077a b832df1e15
commit cbef1030b7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View File

@ -191,7 +191,8 @@ def to_map(
"tags" => tags, "tags" => tags,
"activity_type" => "post", "activity_type" => "post",
"possibly_sensitive" => possibly_sensitive, "possibly_sensitive" => possibly_sensitive,
"visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object) "visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object),
"summary" => object["summary"]
} }
end end

3
lib/pleroma/web/twitter_api/views/activity_view.ex
View File

@ -255,7 +255,8 @@ def render(
"tags" => tags, "tags" => tags,
"activity_type" => "post", "activity_type" => "post",
"possibly_sensitive" => possibly_sensitive, "possibly_sensitive" => possibly_sensitive,
"visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object) "visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object),
"summary" => summary
} }
end end

3
test/web/twitter_api/representers/activity_representer_test.exs
View File

@ -155,7 +155,8 @@ test "an activity" do
"activity_type" => "post", "activity_type" => "post",
"possibly_sensitive" => true, "possibly_sensitive" => true,
"uri" => activity.data["object"]["id"], "uri" => activity.data["object"]["id"],
"visibility" => "direct" "visibility" => "direct",
"summary" => "2hu"
} }
assert ActivityRepresenter.to_map(activity, %{ assert ActivityRepresenter.to_map(activity, %{

3
test/web/twitter_api/views/activity_view_test.exs
View File

@ -48,7 +48,8 @@ test "a create activity with a note" do
"text" => "Hey @shp!", "text" => "Hey @shp!",
"uri" => activity.data["object"]["id"], "uri" => activity.data["object"]["id"],
"user" => UserView.render("show.json", %{user: user}), "user" => UserView.render("show.json", %{user: user}),
"visibility" => "direct" "visibility" => "direct",
"summary" => nil
} }
assert result == expected assert result == expected