2 files changed, 11 insertions, 1 deletions
diff --git a/app/api/mastodon/entities.rb b/app/api/mastodon/entities.rb
index 975e72538..1c0e768f8 100644
--- a/app/api/mastodon/entities.rb
+++ b/app/api/mastodon/entities.rb
@@ -46,5 +46,9 @@ module Mastodon
         expose :updated_at
       end
     end
+
+    class StreamEntry < Grape::Entity
+      expose :activity, using: Mastodon::Entities::Status
+    end
   end
 end
diff --git a/app/api/mastodon/rest.rb b/app/api/mastodon/rest.rb
index 25a53202b..eb5232165 100644
--- a/app/api/mastodon/rest.rb
+++ b/app/api/mastodon/rest.rb
@@ -3,6 +3,12 @@ module Mastodon
     version 'v1', using: :path
     format :json
 
+    helpers do
+      def current_user
+        User.first
+      end
+    end
+
     resource :timelines do
       desc 'Return a public timeline'
 
@@ -13,7 +19,7 @@ module Mastodon
       desc 'Return the home timeline of a logged in user'
 
       get :home do
-        # todo
+        present current_user.timeline, with: Mastodon::Entities::StreamEntry
       end
 
       desc 'Return the notifications timeline of a logged in user'