hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No-op for Salmons without body, fail fast if Webfinger does not contain 

all required resource links (profile page, salmon, atom feed, magic key)
signup-info-prompt
Eugen Rochko 2016-10-13 13:41:06 +02:00
parent 36e7eeb6b9
commit 157f03f8bd
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/api/salmon_controller.rb
View File

@ -3,9 +3,15 @@ class Api::SalmonController < ApiController
respond_to :txt respond_to :txt
def update def update
ProcessInteractionService.new.call(request.body.read, @account) body = request.body.read
if body.nil?
head 200
else
ProcessInteractionService.new.call(body, @account)
head 201 head 201
end end
end
private private

2
app/services/follow_remote_account_service.rb
View File

@ -23,6 +23,8 @@ class FollowRemoteAccountService < BaseService
data = Goldfinger.finger("acct:#{uri}") data = Goldfinger.finger("acct:#{uri}")
raise Goldfinger::Error, 'Missing resource links' if data.link('http://schemas.google.com/g/2010#updates-from').nil? || data.link('salmon').nil? || data.link('http://webfinger.net/rel/profile-page').nil? || data.link('magic-public-key').nil?
account.remote_url = data.link('http://schemas.google.com/g/2010#updates-from').href account.remote_url = data.link('http://schemas.google.com/g/2010#updates-from').href
account.salmon_url = data.link('salmon').href account.salmon_url = data.link('salmon').href
account.url = data.link('http://webfinger.net/rel/profile-page').href account.url = data.link('http://webfinger.net/rel/profile-page').href