Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fixing some bugs, adding pending test examples

Browse source
This commit is contained in:
Eugen Rochko 2016-03-05 12:50:59 +01:00
parent 23d08c6749
commit 3b4e04dc32
16 changed files with 83 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/accounts_controller.rb
View file

@ -1,5 +1,6 @@
class AccountsController < ApplicationController
before_action :set_account
before_action :set_webfinger_header
def show
respond_to do |format|
@ -13,4 +14,12 @@ class AccountsController < ApplicationController
def set_account
@account = Account.find_by!(username: params[:username], domain: nil)
end
def set_webfinger_header
response.headers['Link'] = "<#{webfinger_account_url}>; rel=\"lrdd\"; type=\"application/xrd+xml\""
end
def webfinger_account_url
webfinger_url(resource: "acct:#{@account.acct}@#{Rails.configuration.x.local_domain}")
end
end

2
app/controllers/api/salmon_controller.rb
View file

@ -1,4 +1,4 @@
class Api::SalmonController < ApplicationController
class Api::SalmonController < ApiController
before_action :set_account
def update

2
app/controllers/api/subscriptions_controller.rb
View file

@ -1,4 +1,4 @@
class Api::SubscriptionsController < ApplicationController
class Api::SubscriptionsController < ApiController
before_action :set_account
def show

3
app/controllers/api_controller.rb Normal file
View file

@ -0,0 +1,3 @@
class ApiController < ApplicationController
protect_from_forgery with: :null_session
end

2
app/views/accounts/show.atom.ruby
View file

@ -4,7 +4,7 @@ Nokogiri::XML::Builder.new do |xml|
title xml, @account.display_name
subtitle xml, @account.note
updated_at xml, stream_updated_at
logo xml, asset_url(@account.avatar.url(:medium))
logo xml, asset_url(@account.avatar.url(:medium, false))
author(xml) do
include_author xml, @account

2
app/views/xrd/webfinger.xml.ruby
View file

@ -3,7 +3,7 @@ Nokogiri::XML::Builder.new do |xml|
xml.Subject @canonical_account_uri
xml.Alias url_for_target(@account)
xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: url_for_target(@account))
xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: atom_user_stream_url(id: @account.id))
xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom'))
xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))
xml.Link(rel: 'magic-public-key', href: @magic_key)
end