Commit 81d6ca17 authored by kaniini's avatar kaniini
Browse files

user: implement AS2 mention extraction + unify Announce handling

parent 6b4064fa
...@@ -482,28 +482,37 @@ def get_notified_from_activity_query(to, true) do ...@@ -482,28 +482,37 @@ def get_notified_from_activity_query(to, true) do
def get_notified_from_activity(activity, local_only \\ true) def get_notified_from_activity(activity, local_only \\ true)
def get_notified_from_activity( def get_notified_from_activity(%Activity{data: %{"to" => to} = data}, local_only) do
%Activity{data: %{"type" => "Announce", "to" => to} = data},
local_only
) do
object = Object.normalize(data["object"]) 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 # somehow, get an AS2 object, preferring the normalized object if we have one
to = object_data =
if actor.nickname != nil do if object do
to ++ [object.data["actor"]] object.data
else else
to if is_map(data["object"]) do
data["object"]
else
%{}
end
end end
|> Enum.uniq()
query = get_notified_from_activity_query(to, local_only) # finally extract AS2 mentions from this object
tagged_mentions =
if object_data["tag"] do
object_data["tag"]
|> Enum.filter(fn x -> is_map(x) end)
|> Enum.filter(fn x -> x["type"] == "Mention" end)
|> Enum.map(fn x -> x["href"] end)
else
[]
end
Repo.all(query) # ensure all mentioned users are unique
end to =
(to ++ tagged_mentions)
|> Enum.uniq()
def get_notified_from_activity(%Activity{data: %{"to" => to}}, local_only) do
query = get_notified_from_activity_query(to, local_only) query = get_notified_from_activity_query(to, local_only)
Repo.all(query) Repo.all(query)
......
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