sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Do not send non-follow undos over ostatus for now

This commit is contained in:
Francis Dinh 2018-05-11 01:45:10 -04:00
parent 900c735467
commit 07fdc07238
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,23 +250,30 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
mentions = (activity.recipients || []) |> get_mentions mentions = (activity.recipients || []) |> get_mentions
[ case follow_activity.data["type"] do
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']}, "Follow" ->
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']}, [
{:id, h.(activity.data["id"])}, {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
{:title, ['#{user.nickname} stopped following #{follow_activity.data["object"]}']}, {:"activity:verb", ['http://activitystrea.ms/schema/1.0/unfollow']},
{:content, [type: 'html'], {:id, h.(activity.data["id"])},
['#{user.nickname} stopped following #{follow_activity.data["object"]}']}, {:title, ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
{:published, h.(inserted_at)}, {:content, [type: 'html'],
{:updated, h.(updated_at)}, ['#{user.nickname} stopped following #{follow_activity.data["object"]}']},
{:"activity:object", {:published, h.(inserted_at)},
[ {:updated, h.(updated_at)},
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/person']}, {:"activity:object",
{:id, h.(follow_activity.data["object"])}, [
{:uri, h.(follow_activity.data["object"])} {:"activity:object-type", ['http://activitystrea.ms/schema/1.0/person']},
]}, {:id, h.(follow_activity.data["object"])},
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []} {:uri, h.(follow_activity.data["object"])}
] ++ mentions ++ author ]},
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])],
[]}
] ++ 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