diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-25 05:19:32 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-25 05:19:32 +0000 |
| commit | 4c99b6d35abe2beb184a12f7cba6f84a0fc6a27a (patch) | |
| tree | ea0088876ab982a270a286048316e0eed6c18af7 /lib/pleroma/web/twitter_api | |
| parent | 4df71cd88b2725f1838c2899b3078a74dbb0c33f (diff) | |
| parent | 9274cabe01977a3c2d35059d7889c63e2bd54de1 (diff) | |
| download | pleroma-4c99b6d35abe2beb184a12f7cba6f84a0fc6a27a.tar.gz | |
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
Diffstat (limited to 'lib/pleroma/web/twitter_api')
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index 4f8f228ab..19b723586 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -158,7 +158,9 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do mentions = opts[:mentioned] || [] attentions = - activity.recipients + [] + |> Utils.maybe_notify_to_recipients(activity) + |> Utils.maybe_notify_mentioned_recipients(activity) |> Enum.map(fn ap_id -> Enum.find(mentions, fn user -> ap_id == user.ap_id end) end) |> Enum.filter(& &1) |> Enum.map(fn user -> UserView.render("show.json", %{user: user, for: opts[:for]}) end) diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 5eb06a26e..e0a52d94a 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -236,7 +236,9 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do pinned = activity.id in user.info.pinned_activities attentions = - activity.recipients + [] + |> Utils.maybe_notify_to_recipients(activity) + |> Utils.maybe_notify_mentioned_recipients(activity) |> Enum.map(fn ap_id -> get_user(ap_id, opts) end) |> Enum.filter(& &1) |> Enum.map(fn user -> UserView.render("show.json", %{user: user, for: opts[:for]}) end) |