hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'

Browse source 
Feature/807 bookmark endpoint extension

Closes #807

See merge request pleroma/pleroma!1059
This commit is contained in:
lambda 2019-04-26 11:59:47 +00:00
commit 4de5fef1f8
10 changed files with 182 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/web/mastodon_api/mastodon_api_controller_test.exs
View file

@ -1022,7 +1022,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
user2 = insert(:user)
user3 = insert(:user)
CommonAPI.favorite(activity.id, user2)
{:ok, user2} = User.bookmark(user2, activity.data["object"]["id"])
{:ok, _bookmark} = Pleroma.Bookmark.create(user2.id, activity.id)
{:ok, reblog_activity1, _object} = CommonAPI.repeat(activity.id, user1)
{:ok, _, _object} = CommonAPI.repeat(activity.id, user2)