diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2018-08-06 11:20:41 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2018-08-27 10:46:01 +0000 |
| commit | 1089d3658e30dc9beabd3d6985712ab3837fe41a (patch) | |
| tree | 0506042ed69fdee80437325716cab30e8f0c34e0 /lib | |
| parent | 46c7c2380c9f923b6c9e1521b025fd45aed0ae37 (diff) | |
| download | pleroma-1089d3658e30dc9beabd3d6985712ab3837fe41a.tar.gz | |
user: fix up notification last calculation [NOT related to upstream]
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 88293a4f3..6f8e39f74 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -467,10 +467,15 @@ defmodule Pleroma.User do def get_notified_from_activity(%Activity{recipients: to, data: %{"type" => "Announce"} = data}) do object = Object.normalize(data["object"]) + actor = User.get_cached_by_ap_id(data["actor"]) # ensure that the actor who published the announced object appears only once to = - (to ++ [object.data["actor"]]) + if actor.nickname != nil do + (to ++ [object.data["actor"]]) + else + to + end |> Enum.uniq() query = get_notified_from_activity_query(to) |