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
7e0f62ac
Commit
7e0f62ac
authored
Jun 18, 2018
by
kaniini
Browse files
object: add helper functions to handle various forms of a given object and return a normalized one
parent
6f384d35
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/object.ex
View file @
7e0f62ac
...
...
@@ -27,6 +27,10 @@ def get_by_ap_id(ap_id) do
Repo
.
one
(
from
(
object
in
Object
,
where:
fragment
(
"(?)->>'id' = ?"
,
object
.
data
,
^
ap_id
)))
end
def
normalize
(
obj
)
when
is_map
(
obj
),
do
:
Object
.
get_by_ap_id
(
obj
[
"id"
])
def
normalize
(
ap_id
)
when
is_binary
(
ap_id
),
do
:
Object
.
get_by_ap_id
(
ap_id
)
def
normalize
(
_
),
do
:
nil
def
get_cached_by_ap_id
(
ap_id
)
do
if
Mix
.
env
()
==
:test
do
get_by_ap_id
(
ap_id
)
...
...
lib/pleroma/user.ex
View file @
7e0f62ac
...
...
@@ -458,7 +458,7 @@ def get_notified_from_activity_query(to) do
end
def
get_notified_from_activity
(%
Activity
{
recipients:
to
,
data:
%{
"type"
=>
"Announce"
}
=
data
})
do
object
=
Object
.
get_by_ap_id
(
data
[
"object"
])
object
=
Object
.
normalize
(
data
[
"object"
])
# ensure that the actor who published the announced object appears only once
to
=
...
...
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