mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-05-17 01:02:38 +00:00
Code Issues Projects Releases Wiki Activity

AnnounceValidator: self-generate the context id

Browse source
This commit is contained in:
Alex Gleason 2021-06-07 19:48:55 -05:00
parent 5667c02fce
commit 90303f3bd6
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/activity_pub/object_validators/announce_validator.ex
View file

@ -5,11 +5,13 @@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
use Ecto.Schema
alias Ecto.UUID
alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.Endpoint
import Ecto.Changeset
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@ -18,12 +20,16 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidator do
@primary_key false
def generate_context_id do
"#{Endpoint.url()}/contexts/#{UUID.generate()}"
end
embedded_schema do
field(:id, ObjectValidators.ObjectID, primary_key: true)
field(:type, :string)
field(:object, ObjectValidators.ObjectID)
field(:actor, ObjectValidators.ObjectID)
field(:context, :string, autogenerate: {Utils, :generate_context_id, []})
field(:context, :string, autogenerate: {__MODULE__, :generate_context_id, []})
field(:to, ObjectValidators.Recipients, default: [])
field(:cc, ObjectValidators.Recipients, default: [])
field(:published, ObjectValidators.DateTime)

7
test/pleroma/web/activity_pub/object_validators/announce_validation_test.exs
View file

@ -33,6 +33,13 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnnounceValidationTest do
assert {:ok, _object, _meta} = ObjectValidator.validate(valid_announce, [])
end
test "autogenerates a context ID", %{valid_announce: valid_announce} do
{:ok, %{"context" => context}, _} = ObjectValidator.validate(valid_announce, [])
assert String.starts_with?(context, "http://localhost:4001/contexts/")
assert String.length(context) == 67
end
test "returns an error if the object can't be found", %{valid_announce: valid_announce} do
without_object =
valid_announce