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
9a4d400f
Commit
9a4d400f
authored
Feb 24, 2018
by
lain
Browse files
Fix remote following.
parent
06b512ac
Pipeline
#822
failed with stage
in 2 minutes and 16 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/activity_pub/activity_pub_controller.ex
View file @
9a4d400f
...
...
@@ -12,14 +12,18 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
def
user
(
conn
,
%{
"nickname"
=>
nickname
})
do
with
%
User
{}
=
user
<-
User
.
get_cached_by_nickname
(
nickname
),
{
:ok
,
user
}
<-
Pleroma
.
Web
.
WebFinger
.
ensure_keys_present
(
user
)
do
json
(
conn
,
UserView
.
render
(
"user.json"
,
%{
user:
user
}))
conn
|>
put_resp_header
(
"content-type"
,
"application/activity+json"
)
|>
json
(
UserView
.
render
(
"user.json"
,
%{
user:
user
}))
end
end
def
object
(
conn
,
%{
"uuid"
=>
uuid
})
do
with
ap_id
<-
o_status_url
(
conn
,
:object
,
uuid
),
%
Object
{}
=
object
<-
Object
.
get_cached_by_ap_id
(
ap_id
)
do
json
(
conn
,
ObjectView
.
render
(
"object.json"
,
%{
object:
object
}))
conn
|>
put_resp_header
(
"content-type"
,
"application/activity+json"
)
|>
json
(
ObjectView
.
render
(
"object.json"
,
%{
object:
object
}))
end
end
...
...
Write
Preview
Markdown
is supported
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