1 files changed, 10 insertions, 4 deletions
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