projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
transmogrifier.ex
diff --git
a/lib/pleroma/web/activity_pub/transmogrifier.ex
b/lib/pleroma/web/activity_pub/transmogrifier.ex
index d72f4a39a8904ae03fbfb2d8d771482686bede54..6a0fdb433098484bca261e94fdb94fec5eed130a 100644
(file)
--- a/
lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/
lib/pleroma/web/activity_pub/transmogrifier.ex
@@
-604,7
+604,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
data =
data
|> Map.put("object", object)
data =
data
|> Map.put("object", object)
- |> Map.
put("@context", "https://www.w3.org/ns/activitystreams"
)
+ |> Map.
merge(Utils.make_json_ld_header()
)
{:ok, data}
end
{:ok, data}
end
@@
-623,7
+623,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
data =
data
|> Map.put("object", object)
data =
data
|> Map.put("object", object)
- |> Map.
put("@context", "https://www.w3.org/ns/activitystreams"
)
+ |> Map.
merge(Utils.make_json_ld_header()
)
{:ok, data}
end
{:ok, data}
end
@@
-641,7
+641,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
data =
data
|> Map.put("object", object)
data =
data
|> Map.put("object", object)
- |> Map.
put("@context", "https://www.w3.org/ns/activitystreams"
)
+ |> Map.
merge(Utils.make_json_ld_header()
)
{:ok, data}
end
{:ok, data}
end
@@
-651,7
+651,7
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
data =
data
|> maybe_fix_object_url
data =
data
|> maybe_fix_object_url
- |> Map.
put("@context", "https://www.w3.org/ns/activitystreams"
)
+ |> Map.
merge(Utils.make_json_ld_header()
)
{:ok, data}
end
{:ok, data}
end
@@
-693,12
+693,9
@@
defmodule Pleroma.Web.ActivityPub.Transmogrifier do
end
def add_mention_tags(object) do
end
def add_mention_tags(object) do
- recipients = object["to"] ++ (object["cc"] || [])
-
mentions =
mentions =
- recipients
- |> Enum.map(fn ap_id -> User.get_cached_by_ap_id(ap_id) end)
- |> Enum.filter(& &1)
+ object
+ |> Utils.get_notified_from_object()
|> Enum.map(fn user ->
%{"type" => "Mention", "href" => user.ap_id, "name" => "@#{user.nickname}"}
end)
|> Enum.map(fn user ->
%{"type" => "Mention", "href" => user.ap_id, "name" => "@#{user.nickname}"}
end)