projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
common_fixes.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
b/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
index b3638cfc7542bec650288c0482efbbae908f17d4..950eb14945628256f171fa338078e9325c215d5f 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
@@
-1,28
+1,46
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes do
+ alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object.Containment
alias Pleroma.Object.Containment
+ alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Utils
- # based on Pleroma.Web.ActivityPub.Utils.lazy_put_objects_defaults
- def fix_defaults(data) do
+ def fix_object_defaults(data) do
%{data: %{"id" => context}, id: context_id} =
Utils.create_context(data["context"] || data["conversation"])
%{data: %{"id" => context}, id: context_id} =
Utils.create_context(data["context"] || data["conversation"])
+ %User{follower_address: follower_collection} = User.get_cached_by_ap_id(data["attributedTo"])
+ {:ok, to} = ObjectValidators.Recipients.cast(data["to"] || [])
+ {:ok, cc} = ObjectValidators.Recipients.cast(data["cc"] || [])
+
data
|> Map.put("context", context)
|> Map.put("context_id", context_id)
data
|> Map.put("context", context)
|> Map.put("context_id", context_id)
+ |> Map.put("to", to)
+ |> Map.put("cc", cc)
+ |> Transmogrifier.fix_explicit_addressing(follower_collection)
+ |> Transmogrifier.fix_implicit_addressing(follower_collection)
end
end
- def fix_attribution(data) do
+ def fix_activity_defaults(data, meta) do
+ object = meta[:object_data] || %{}
+
data
data
- |> Map.put_new("actor", data["attributedTo"])
+ |> Map.put_new("to", object["to"] || [])
+ |> Map.put_new("cc", object["cc"] || [])
+ |> Map.put_new("bto", object["bto"] || [])
+ |> Map.put_new("bcc", object["bcc"] || [])
end
def fix_actor(data) do
end
def fix_actor(data) do
- actor = Containment.get_actor(data)
+ actor =
+ data
+ |> Map.put_new("actor", data["attributedTo"])
+ |> Containment.get_actor()
data
|> Map.put("actor", actor)
data
|> Map.put("actor", actor)