Merge branch 'develop' into feature/activitypub
This commit is contained in:
commit
b331cb449a
36 changed files with 139 additions and 115 deletions
|
|
@ -147,7 +147,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
|
|||
follower = insert(:user)
|
||||
followed = insert(:user)
|
||||
|
||||
{:ok, follow} = ActivityPub.follow(follower, followed)
|
||||
{:ok, _follow} = ActivityPub.follow(follower, followed)
|
||||
{:ok, unfollow} = ActivityPub.unfollow(follower, followed)
|
||||
|
||||
map = ActivityRepresenter.to_map(unfollow, %{user: follower})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue