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
fb5aa340
Commit
fb5aa340
authored
Jan 18, 2018
by
eal
Browse files
Revert "Add remote follow path to webfinger."
This reverts commit
bc689740
.
parent
47e8c8db
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/ostatus/ostatus.ex
View file @
fb5aa340
...
...
@@ -22,10 +22,6 @@ def salmon_path(user) do
"
#{
user
.
ap_id
}
/salmon"
end
def
remote_follow_path
do
"
#{
Web
.
base_url
}
/ostatus_subscribe?acct={uri}"
end
def
handle_incoming
(
xml_string
)
do
with
doc
when
doc
!=
:error
<-
parse_document
(
xml_string
)
do
entries
=
:xmerl_xpath
.
string
(
'//entry'
,
doc
)
...
...
lib/pleroma/web/web_finger/web_finger.ex
View file @
fb5aa340
...
...
@@ -44,8 +44,7 @@ def represent_user(user) do
{
:Link
,
%{
rel:
"http://schemas.google.com/g/2010#updates-from"
,
type:
"application/atom+xml"
,
href:
OStatus
.
feed_path
(
user
)}},
{
:Link
,
%{
rel:
"http://webfinger.net/rel/profile-page"
,
type:
"text/html"
,
href:
user
.
ap_id
}},
{
:Link
,
%{
rel:
"salmon"
,
href:
OStatus
.
salmon_path
(
user
)}},
{
:Link
,
%{
rel:
"magic-public-key"
,
href:
"data:application/magic-public-key,
#{
magic_key
}
"
}},
{
:Link
,
%{
rel:
"http://ostatus.org/schema/1.0/subscribe"
,
template:
OStatus
.
remote_follow_path
()}}
{
:Link
,
%{
rel:
"magic-public-key"
,
href:
"data:application/magic-public-key,
#{
magic_key
}
"
}}
]
}
|>
XmlBuilder
.
to_doc
...
...
eal
@eal
mentioned in commit
57d413e6
·
Jan 18, 2018
mentioned in commit
57d413e6
mentioned in commit 57d413e65541f47a3c303be88c0ac6d4bfed33a9
Toggle commit list
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