Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
6fd72e9e
Commit
6fd72e9e
authored
Nov 11, 2020
by
feld
Browse files
Ingest blurhash for attachments if they were federated
parent
911fc3c5
Pipeline
#32768
failed with stages
in 19 minutes and 41 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/object_validators/attachment_validator.ex
View file @
6fd72e9e
...
@@ -15,6 +15,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
...
@@ -15,6 +15,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.AttachmentValidator do
field
(
:type
,
:string
)
field
(
:type
,
:string
)
field
(
:mediaType
,
:string
,
default:
"application/octet-stream"
)
field
(
:mediaType
,
:string
,
default:
"application/octet-stream"
)
field
(
:name
,
:string
)
field
(
:name
,
:string
)
field
(
:blurhash
,
:string
)
embeds_many
:url
,
UrlObjectValidator
,
primary_key:
false
do
embeds_many
:url
,
UrlObjectValidator
,
primary_key:
false
do
field
(
:type
,
:string
)
field
(
:type
,
:string
)
...
@@ -41,7 +42,7 @@ def changeset(struct, data) do
...
@@ -41,7 +42,7 @@ def changeset(struct, data) do
|>
fix_url
()
|>
fix_url
()
struct
struct
|>
cast
(
data
,
[
:type
,
:mediaType
,
:name
])
|>
cast
(
data
,
[
:type
,
:mediaType
,
:name
,
:blurhash
])
|>
cast_embed
(
:url
,
with:
&
url_changeset
/
2
)
|>
cast_embed
(
:url
,
with:
&
url_changeset
/
2
)
|>
validate_inclusion
(
:type
,
~w[Link Document Audio Image Video]
)
|>
validate_inclusion
(
:type
,
~w[Link Document Audio Image Video]
)
|>
validate_required
([
:type
,
:mediaType
,
:url
])
|>
validate_required
([
:type
,
:mediaType
,
:url
])
...
...
test/pleroma/web/activity_pub/object_validators/attachment_validator_test.exs
View file @
6fd72e9e
...
@@ -33,7 +33,8 @@ test "it turns mastodon attachments into our attachments" do
...
@@ -33,7 +33,8 @@ test "it turns mastodon attachments into our attachments" do
"http://mastodon.example.org/system/media_attachments/files/000/000/002/original/334ce029e7bfb920.jpg"
,
"http://mastodon.example.org/system/media_attachments/files/000/000/002/original/334ce029e7bfb920.jpg"
,
"type"
=>
"Document"
,
"type"
=>
"Document"
,
"name"
=>
nil
,
"name"
=>
nil
,
"mediaType"
=>
"image/jpeg"
"mediaType"
=>
"image/jpeg"
,
"blurhash"
=>
"UD9jJz~VSbR#xT$~%KtQX9R,WAs9RjWBs:of"
}
}
{
:ok
,
attachment
}
=
{
:ok
,
attachment
}
=
...
@@ -50,6 +51,7 @@ test "it turns mastodon attachments into our attachments" do
...
@@ -50,6 +51,7 @@ test "it turns mastodon attachments into our attachments" do
]
=
attachment
.
url
]
=
attachment
.
url
assert
attachment
.
mediaType
==
"image/jpeg"
assert
attachment
.
mediaType
==
"image/jpeg"
assert
attachment
.
blurhash
==
"UD9jJz~VSbR#xT$~%KtQX9R,WAs9RjWBs:of"
end
end
test
"it handles our own uploads"
do
test
"it handles our own uploads"
do
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment