projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
435a65b
)
Fixup for EctoType module move
author
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Fri, 19 Jun 2020 22:23:04 +0000
(
00:23
+0200)
committer
Haelwenn (lanodan) Monnier
<contact@hacktivis.me>
Wed, 15 Jul 2020 09:40:24 +0000
(11:40 +0200)
lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
patch
|
blob
|
history
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
index 8d4c925206711a108a3c9fd054c1a415d1e5ed65..9861eec7f71ad03419e9a61f6136b70b13066f50 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/answer_validator.ex
@@
-5,8
+5,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnswerValidator do
use Ecto.Schema
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnswerValidator do
use Ecto.Schema
+ alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
alias Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
- alias Pleroma.Web.ActivityPub.ObjectValidators.Types
import Ecto.Changeset
import Ecto.Changeset
@@
-14,7
+14,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnswerValidator do
@derive Jason.Encoder
embedded_schema do
@derive Jason.Encoder
embedded_schema do
- field(:id,
Type
s.ObjectID, primary_key: true)
+ field(:id,
ObjectValidator
s.ObjectID, primary_key: true)
field(:to, {:array, :string}, default: [])
field(:cc, {:array, :string}, default: [])
field(:to, {:array, :string}, default: [])
field(:cc, {:array, :string}, default: [])
@@
-25,8
+25,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.AnswerValidator do
field(:type, :string)
field(:name, :string)
field(:inReplyTo, :string)
field(:type, :string)
field(:name, :string)
field(:inReplyTo, :string)
- field(:attributedTo,
Type
s.ObjectID)
- field(:actor,
Type
s.ObjectID)
+ field(:attributedTo,
ObjectValidator
s.ObjectID)
+ field(:actor,
ObjectValidator
s.ObjectID)
end
def cast_and_apply(data) do
end
def cast_and_apply(data) do
diff --git
a/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
index f467ccc7cfcece6710be8b390e43cef80052e3db..97e2def10aea1b815edc3f80fe01a2af02e29d6d 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/create_generic_validator.ex
@@
-8,8
+8,8
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
use Ecto.Schema
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
use Ecto.Schema
+ alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object
alias Pleroma.Object
- alias Pleroma.Web.ActivityPub.ObjectValidators.Types
import Ecto.Changeset
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
import Ecto.Changeset
import Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
@@
-17,13
+17,13
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.CreateGenericValidator do
@primary_key false
embedded_schema do
@primary_key false
embedded_schema do
- field(:id,
Type
s.ObjectID, primary_key: true)
- field(:actor,
Type
s.ObjectID)
+ field(:id,
ObjectValidator
s.ObjectID, primary_key: true)
+ field(:actor,
ObjectValidator
s.ObjectID)
field(:type, :string)
field(:type, :string)
- field(:to,
Type
s.Recipients, default: [])
- field(:cc,
Type
s.Recipients, default: [])
- field(:object,
Type
s.ObjectID)
- field(:expires_at,
Type
s.DateTime)
+ field(:to,
ObjectValidator
s.Recipients, default: [])
+ field(:cc,
ObjectValidator
s.Recipients, default: [])
+ field(:object,
ObjectValidator
s.ObjectID)
+ field(:expires_at,
ObjectValidator
s.DateTime)
end
def cast_data(data) do
end
def cast_data(data) do
diff --git
a/lib/pleroma/web/activity_pub/object_validators/question_validator.ex
b/lib/pleroma/web/activity_pub/object_validators/question_validator.ex
index 56f02777df7411e4b55b7d4796d223a6e54cb614..53cf35d40facea40e057b69c6a65a6a7d039f1e2 100644
(file)
--- a/
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
+++ b/
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
@@
-5,11
+5,11
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
use Ecto.Schema
defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
use Ecto.Schema
- alias Pleroma.
Web.ActivityPub.Util
s
+ alias Pleroma.
EctoType.ActivityPub.ObjectValidator
s
alias Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator
alias Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
alias Pleroma.Web.ActivityPub.ObjectValidators.QuestionOptionsValidator
alias Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator
alias Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
alias Pleroma.Web.ActivityPub.ObjectValidators.QuestionOptionsValidator
- alias Pleroma.Web.ActivityPub.
ObjectValidators.Type
s
+ alias Pleroma.Web.ActivityPub.
Util
s
import Ecto.Changeset
import Ecto.Changeset
@@
-18,7
+18,7
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
# Extends from NoteValidator
embedded_schema do
# Extends from NoteValidator
embedded_schema do
- field(:id,
Type
s.ObjectID, primary_key: true)
+ field(:id,
ObjectValidator
s.ObjectID, primary_key: true)
field(:to, {:array, :string}, default: [])
field(:cc, {:array, :string}, default: [])
field(:bto, {:array, :string}, default: [])
field(:to, {:array, :string}, default: [])
field(:cc, {:array, :string}, default: [])
field(:bto, {:array, :string}, default: [])
@@
-28,10
+28,10
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
field(:type, :string)
field(:content, :string)
field(:context, :string)
field(:type, :string)
field(:content, :string)
field(:context, :string)
- field(:actor,
Type
s.ObjectID)
- field(:attributedTo,
Type
s.ObjectID)
+ field(:actor,
ObjectValidator
s.ObjectID)
+ field(:attributedTo,
ObjectValidator
s.ObjectID)
field(:summary, :string)
field(:summary, :string)
- field(:published,
Type
s.DateTime)
+ field(:published,
ObjectValidator
s.DateTime)
# TODO: Write type
field(:emoji, :map, default: %{})
field(:sensitive, :boolean, default: false)
# TODO: Write type
field(:emoji, :map, default: %{})
field(:sensitive, :boolean, default: false)
@@
-40,15
+40,15
@@
defmodule Pleroma.Web.ActivityPub.ObjectValidators.QuestionValidator do
field(:like_count, :integer, default: 0)
field(:announcement_count, :integer, default: 0)
field(:inReplyTo, :string)
field(:like_count, :integer, default: 0)
field(:announcement_count, :integer, default: 0)
field(:inReplyTo, :string)
- field(:uri,
Type
s.Uri)
+ field(:uri,
ObjectValidator
s.Uri)
# short identifier for PleromaFE to group statuses by context
field(:context_id, :integer)
field(:likes, {:array, :string}, default: [])
field(:announcements, {:array, :string}, default: [])
# short identifier for PleromaFE to group statuses by context
field(:context_id, :integer)
field(:likes, {:array, :string}, default: [])
field(:announcements, {:array, :string}, default: [])
- field(:closed,
Type
s.DateTime)
- field(:voters, {:array,
Type
s.ObjectID}, default: [])
+ field(:closed,
ObjectValidator
s.DateTime)
+ field(:voters, {:array,
ObjectValidator
s.ObjectID}, default: [])
embeds_many(:anyOf, QuestionOptionsValidator)
embeds_many(:oneOf, QuestionOptionsValidator)
end
embeds_many(:anyOf, QuestionOptionsValidator)
embeds_many(:oneOf, QuestionOptionsValidator)
end