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
97d11dec
Commit
97d11dec
authored
May 01, 2017
by
lain
Browse files
Also accept user id as feed topic.
parent
92a8944d
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/websub/websub.ex
View file @
97d11dec
...
...
@@ -98,7 +98,7 @@ defp lease_time(_) do
end
defp
valid_topic
(%{
"hub.topic"
=>
topic
},
user
)
do
if
topic
==
OStatus
.
feed_path
(
user
)
do
if
topic
==
OStatus
.
feed_path
(
user
)
||
topic
==
Pleroma
.
Web
.
Router
.
Helpers
.
o_status_url
(
Pleroma
.
Web
.
Endpoint
,
:feed_redirect
,
user
.
nickname
)
do
{
:ok
,
OStatus
.
feed_path
(
user
)}
else
{
:error
,
"Wrong topic requested, expected
#{
OStatus
.
feed_path
(
user
)
}
, got
#{
topic
}
"
}
...
...
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