sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Also accept user id as feed topic."

Browse Source 
This reverts commit 97d11dec0e.
This commit is contained in:
Roger Braun 2017-05-01 18:34:15 +02:00
parent 97d11dec0e
commit e88062494e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/websub/websub.ex
View File

@ -98,7 +98,7 @@ defp lease_time(_) do
end end
defp valid_topic(%{"hub.topic" => topic}, user) do defp valid_topic(%{"hub.topic" => topic}, user) do
if topic == OStatus.feed_path(user) || topic == Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :feed_redirect, user.nickname) do if topic == OStatus.feed_path(user) do
{:ok, OStatus.feed_path(user)} {:ok, OStatus.feed_path(user)}
else else
{:error, "Wrong topic requested, expected #{OStatus.feed_path(user)}, got #{topic}"} {:error, "Wrong topic requested, expected #{OStatus.feed_path(user)}, got #{topic}"}