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

Use correct logic to determine "attentions" list

Browse source
This commit is contained in:
Maxim Filippov 2019-01-24 23:30:43 +03:00
commit 9274cabe01
5 changed files with 56 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -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

4
lib/pleroma/web/twitter_api/views/activity_view.ex
View file

@ -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)