projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Migrations: generate unset user keys
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
object_validators
/
add_remove_validator.ex
diff --git
a/lib/pleroma/web/activity_pub/object_validators/add_remove_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/add_remove_validator.ex
index c38f86a0ef22cdda5368832721e49a0276c23f65..fc482c9c021fc7fed1b2bafa2da5c9a8ce64ec84 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/add_remove_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/add_remove_validator.ex
@@
-10,29
+10,34
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator do
require Pleroma.Constants
require Pleroma.Constants
- alias Pleroma.
EctoType.ActivityPub.ObjectValidators
+ alias Pleroma.
User
@primary_key false
embedded_schema do
@primary_key false
embedded_schema do
- field(:id, ObjectValidators.ObjectID, primary_key: true)
field(:target)
field(:target)
- field(:object, ObjectValidators.ObjectID)
- field(:actor, ObjectValidators.ObjectID)
- field(:type)
- field(:to, ObjectValidators.Recipients, default: [])
- field(:cc, ObjectValidators.Recipients, default: [])
+
+ quote do
+ unquote do
+ import Elixir.Pleroma.Web.ActivityPub.ObjectValidators.CommonFields
+ message_fields()
+ activity_fields()
+ end
+ end
end
def cast_and_validate(data) do
end
def cast_and_validate(data) do
+ {:ok, actor} = User.get_or_fetch_by_ap_id(data["actor"])
+
+ {:ok, actor} = maybe_refetch_user(actor)
+
data
data
- |> maybe_fix_data_for_mastodon()
+ |> maybe_fix_data_for_mastodon(
actor
)
|> cast_data()
|> cast_data()
- |> validate_data()
+ |> validate_data(
actor
)
end
end
- defp maybe_fix_data_for_mastodon(data) do
- {:ok, actor} = Pleroma.User.get_or_fetch_by_ap_id(data["actor"])
+ defp maybe_fix_data_for_mastodon(data, actor) do
# Mastodon sends pin/unpin objects without id, to, cc fields
data
|> Map.put_new("id", Pleroma.Web.ActivityPub.Utils.generate_activity_id())
# Mastodon sends pin/unpin objects without id, to, cc fields
data
|> Map.put_new("id", Pleroma.Web.ActivityPub.Utils.generate_activity_id())
@@
-44,18
+49,16
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator do
cast(%__MODULE__{}, data, __schema__(:fields))
end
cast(%__MODULE__{}, data, __schema__(:fields))
end
- defp validate_data(changeset) do
+ defp validate_data(changeset
, actor
) do
changeset
|> validate_required([:id, :target, :object, :actor, :type, :to, :cc])
|> validate_inclusion(:type, ~w(Add Remove))
|> validate_actor_presence()
changeset
|> validate_required([:id, :target, :object, :actor, :type, :to, :cc])
|> validate_inclusion(:type, ~w(Add Remove))
|> validate_actor_presence()
- |> validate_collection_belongs_to_actor()
+ |> validate_collection_belongs_to_actor(
actor
)
|> validate_object_presence()
end
|> validate_object_presence()
end
- defp validate_collection_belongs_to_actor(changeset) do
- {:ok, actor} = Pleroma.User.get_or_fetch_by_ap_id(changeset.changes[:actor])
-
+ defp validate_collection_belongs_to_actor(changeset, actor) do
validate_change(changeset, :target, fn :target, target ->
if target == actor.featured_address do
[]
validate_change(changeset, :target, fn :target, target ->
if target == actor.featured_address do
[]
@@
-64,4
+67,12
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AddRemoveValidator do
end
end)
end
end
end)
end
+
+ defp maybe_refetch_user(%User{featured_address: address} = user) when is_binary(address) do
+ {:ok, user}
+ end
+
+ defp maybe_refetch_user(%User{ap_id: ap_id}) do
+ Pleroma.Web.ActivityPub.Transmogrifier.upgrade_user_from_ap_id(ap_id)
+ end
end
end