X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fostatus%2Ffeed_representer.ex;h=db7b685f36129cae6a34379ccbff5721abaae3fc;hb=d937a8e69567ace33a72d5248c046860305076d7;hp=1576b47108eb0c725925d0c0bacee8e81273ba48;hpb=1b9cc721a0d49d786b4864c2b8aceaf49b9ff088;p=akkoma

diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index 1576b4710..db7b685f3 100644
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -3,7 +3,7 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
   alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
 
   def to_simple_form(user, activities, users) do
-    most_recent_update = List.first(activities).updated_at
+    most_recent_update = (List.first(activities) || user).updated_at
     |> NaiveDateTime.to_iso8601
 
     h = fn(str) -> [to_charlist(str)] end
@@ -11,17 +11,23 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
     entries = Enum.map(activities, fn(activity) ->
       {:entry, ActivityRepresenter.to_simple_form(activity, user)}
     end)
+    |> Enum.filter(fn ({_, form}) -> form end)
 
     [{
       :feed, [
         xmlns: 'http://www.w3.org/2005/Atom',
-        "xmlns:activity": 'http://activitystrea.ms/spec/1.0/'
+        "xmlns:thr": 'http://purl.org/syndication/thread/1.0',
+        "xmlns:activity": 'http://activitystrea.ms/spec/1.0/',
+        "xmlns:poco": 'http://portablecontacts.net/spec/1.0',
+        "xmlns:ostatus": 'http://ostatus.org/schema/1.0'
       ], [
         {:id, h.(OStatus.feed_path(user))},
         {:title, ['#{user.nickname}\'s timeline']},
         {:updated, h.(most_recent_update)},
         {:link, [rel: 'hub', href: h.(OStatus.pubsub_path(user))], []},
-        {:author, UserRepresenter.to_simple_form(user)}
+        {:link, [rel: 'salmon', href: h.(OStatus.salmon_path(user))], []},
+        {:link, [rel: 'self', href: h.(OStatus.feed_path(user))], []},
+        {:author, UserRepresenter.to_simple_form(user)},
       ] ++ entries
     }]
   end