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

Merge branch 'bugfix/announce-timeline-flooding' into 'develop'

Browse source 
activitypub: filter destination list for announce activities differently than normal (closes #164)

Closes #164

See merge request pleroma/pleroma!227
This commit is contained in:
lambda 2018-08-27 08:25:27 +00:00
commit 440b459cd1
3 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/ostatus/activity_representer.ex
View file

@ -184,7 +184,10 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
retweeted_xml = to_simple_form(retweeted_activity, retweeted_user, true)
mentions = activity.recipients |> get_mentions
mentions =
([retweeted_user.ap_id] ++ activity.recipients)
|> Enum.uniq()
|> get_mentions()
[
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},