Commit 6b32b9e3 authored by lain's avatar lain

Notifications: Use all recipients, not just "to".

parent 01faa7c5
Pipeline #759 failed with stage
in 2 minutes and 47 seconds
......@@ -304,7 +304,7 @@ def update_follower_count(%User{} = user) do
update_and_set_cache(cs)
end
def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
def get_notified_from_activity(%Activity{recipients: to}) do
query = from u in User,
where: u.ap_id in ^to,
where: u.local == true
......@@ -312,7 +312,7 @@ def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
Repo.all(query)
end
def get_recipients_from_activity(%Activity{data: %{"to" => to}}) do
def get_recipients_from_activity(%Activity{recipients: to}) do
query = from u in User,
where: u.ap_id in ^to,
or_where: fragment("? \\\?| ?", u.following, ^to)
......
......@@ -25,6 +25,7 @@ def object(conn, %{"uuid" => uuid}) do
# TODO: Ensure that this inbox is a recipient of the message
def inbox(%{assigns: %{valid_signature: true}} = conn, params) do
# File.write("/tmp/incoming.json", Poison.encode!(params))
Logger.info(Poison.encode!(params, [pretty: 2]))
with {:ok, _user} <- ap_enabled_actor(params["actor"]),
nil <- Activity.get_by_ap_id(params["id"]),
{:ok, activity} <- Transmogrifier.handle_incoming(params) do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment