diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-01-24 23:30:43 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-01-24 23:30:43 +0300 |
| commit | 9274cabe01977a3c2d35059d7889c63e2bd54de1 (patch) | |
| tree | ecae741986073357bfececcea46e689b7c8a1340 /lib/pleroma/web/twitter_api | |
| parent | 0a97baddddbb8bf89c806f7e5b7cd754c88f4fe5 (diff) | |
| download | pleroma-9274cabe01977a3c2d35059d7889c63e2bd54de1.tar.gz | |
Use correct logic to determine "attentions" list
Diffstat (limited to 'lib/pleroma/web/twitter_api')
| -rw-r--r-- | lib/pleroma/web/twitter_api/representers/activity_representer.ex | 10 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex index 0ddbef634..19b723586 100644 --- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex +++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex @@ -155,10 +155,12 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do repeated = opts[:for] && opts[:for].ap_id in (object["announcements"] || []) pinned = activity.id in user.info.pinned_activities - mentions = get_mentioned_users(opts[:mentioned] || [], user) + 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) @@ -224,10 +226,6 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do end end - defp get_mentioned_users(mentioned, user) do - mentioned ++ [user] - end - defp to_boolean(false) do false end diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 108e7bfc5..9ae7846c0 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -246,7 +246,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) |