From b530279a144ad5fb35070952898c8e6ae3ba68ea Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 23 Jan 2013 09:39:50 +0100 Subject: not inluding link to key if there is none --- users/app/views/webfinger/search.xml.erb | 4 +++- users/lib/webfinger/user_presenter.rb | 14 ++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'users') diff --git a/users/app/views/webfinger/search.xml.erb b/users/app/views/webfinger/search.xml.erb index 0bcb7e5..270383e 100644 --- a/users/app/views/webfinger/search.xml.erb +++ b/users/app/views/webfinger/search.xml.erb @@ -2,5 +2,7 @@ acct:<%= @subject.email_identifier %> "<%= user_url(@subject.subject) %>" - + <%- if @subject.key.present? %> + + <% end %> diff --git a/users/lib/webfinger/user_presenter.rb b/users/lib/webfinger/user_presenter.rb index 8184c52..8288bff 100644 --- a/users/lib/webfinger/user_presenter.rb +++ b/users/lib/webfinger/user_presenter.rb @@ -12,16 +12,22 @@ class Webfinger::UserPresenter end def key - Base64.encode64(@subject.public_key.to_s) + if @subject.public_key.present? + Base64.encode64(@subject.public_key.to_s) + end + end + + def links + links = {} + links[:public_key] = { type: 'PGP', href: key } if key + return links end def to_json(options) { subject: "acct:#{email_identifier}", aliases: [ user_url(@subject, :host => @request.host) ], - links: { - public_key: { type: 'PGP', href: key } - } + links: links }.to_json(options) end -- cgit v1.2.3