2 files changed, 38 insertions, 0 deletions
diff --git a/app/views/accounts/show.atom.ruby b/app/views/accounts/show.atom.ruby
new file mode 100644
index 000000000..12d2bb233
--- /dev/null
+++ b/app/views/accounts/show.atom.ruby
@@ -0,0 +1,24 @@
+Nokogiri::XML::Builder.new do |xml|
+  feed(xml) do
+    simple_id  xml, account_url(@account, format: 'atom')
+    title      xml, @account.display_name
+    subtitle   xml, @account.note
+    updated_at xml, stream_updated_at
+    logo       xml, asset_url(@account.avatar.url(:medium))
+
+    author(xml) do
+      include_author xml, @account
+    end
+
+    link_alternate xml, url_for_target(@account)
+    link_self      xml, account_url(@account, format: 'atom')
+    link_hub       xml, HUB_URL
+    link_salmon    xml, api_salmon_url(@account.id)
+
+    @account.stream_entries.order('id desc').each do |stream_entry|
+      entry(xml, false) do
+        include_entry xml, stream_entry
+      end
+    end
+  end
+end.to_xml
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
new file mode 100644
index 000000000..113db12f6
--- /dev/null
+++ b/app/views/accounts/show.html.haml
@@ -0,0 +1,14 @@
+- content_for :header_tags do
+  %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
+  %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
+
+.card
+  .avatar= image_tag @account.avatar.url(:medium)
+  .bio
+    %h1.name
+      = @account.display_name.blank? ? @account.username : @account.display_name
+      %small= "@#{@account.username}"
+
+.activity-stream
+  - @account.statuses.order('id desc').each do |status|
+    = render partial: 'stream_entries/status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false }