moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Do not send non-follow undos over ostatus for now" 

This reverts commit 07fdc07238.
This commit is contained in:
Francis Dinh 2018-05-11 11:53:28 -04:00
parent 0b527b5528
commit 4151cbe6b2
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pleroma/web/ostatus/activity_representer.ex
View File

@ -250,8 +250,6 @@ def to_simple_form(%{data: %{"type" => "Undo"}} = activity, user, with_author) d
mentions = (activity.recipients || []) |> get_mentions mentions = (activity.recipients || []) |> get_mentions
case follow_activity.data["type"] do
"Follow" ->
[ [
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']}, {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']}, {:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']},
@ -267,13 +265,8 @@ def to_simple_form(%{data: %{"type" => "Undo"}} = activity, user, with_author) d
{:id, h.(follow_activity.data["object"])}, {:id, h.(follow_activity.data["object"])},
{:uri, h.(follow_activity.data["object"])} {:uri, h.(follow_activity.data["object"])}
]}, ]},
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], {:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []}
[]}
] ++ mentions ++ author ] ++ mentions ++ author
_ ->
nil
end
end end
def to_simple_form(%{data: %{"type" => "Delete"}} = activity, user, with_author) do def to_simple_form(%{data: %{"type" => "Delete"}} = activity, user, with_author) do