projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
46c7c23
)
user: fix up notification last calculation [NOT related to upstream]
author
William Pitcock
<nenolod@dereferenced.org>
Mon, 6 Aug 2018 11:20:41 +0000
(11:20 +0000)
committer
William Pitcock
<nenolod@dereferenced.org>
Mon, 27 Aug 2018 10:46:01 +0000
(10:46 +0000)
lib/pleroma/user.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 88293a4f396d7eb3551786b61a0fb80ffdeaf64f..6f8e39f74574e3a7f1b64ed341ceb68211a63cfc 100644
(file)
--- 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)