Merge branch 'features/add-credo-to-ci' into 'develop'

[akkoma] / lib / pleroma / web / ostatus / feed_representer.ex

diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index 1576b47108eb0c725925d0c0bacee8e81273ba48..b7b97e5050e7ca1a71be92db4d4e9d89ada91d21 100644 (file)
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -1,28 +1,66 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.OStatus.FeedRepresenter do
+  alias Pleroma.User
+  alias Pleroma.Web.MediaProxy
   alias Pleroma.Web.OStatus
-  alias Pleroma.Web.OStatus.{UserRepresenter, ActivityRepresenter}
+  alias Pleroma.Web.OStatus.ActivityRepresenter
+  alias Pleroma.Web.OStatus.UserRepresenter
+
+  def to_simple_form(user, activities, _users) do
+    most_recent_update =
+      (List.first(activities) || user).updated_at
+      |> NaiveDateTime.to_iso8601()
 
-  def to_simple_form(user, activities, users) do
-    most_recent_update = List.first(activities).updated_at
-    |> NaiveDateTime.to_iso8601
+    h = fn str -> [to_charlist(str)] end
 
-    h = fn(str) -> [to_charlist(str)] end
+    last_activity = List.last(activities)
 
-    entries = Enum.map(activities, fn(activity) ->
-      {:entry, ActivityRepresenter.to_simple_form(activity, user)}
-    end)
+    entries =
+      activities
+      |> Enum.map(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/'
-      ], [
-        {: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)}
-      ] ++ entries
-    }]
+    [
+      {
+        :feed,
+        [
+          xmlns: 'http://www.w3.org/2005/Atom',
+          "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)},
+          {:logo, [to_charlist(User.avatar_url(user) |> MediaProxy.url())]},
+          {:link, [rel: 'hub', href: h.(OStatus.pubsub_path(user))], []},
+          {:link, [rel: 'salmon', href: h.(OStatus.salmon_path(user))], []},
+          {:link, [rel: 'self', href: h.(OStatus.feed_path(user)), type: 'application/atom+xml'],
+           []},
+          {:author, UserRepresenter.to_simple_form(user)}
+        ] ++
+          if last_activity do
+            [
+              {:link,
+               [
+                 rel: 'next',
+                 href:
+                   to_charlist(OStatus.feed_path(user)) ++
+                     '?max_id=' ++ to_charlist(last_activity.id),
+                 type: 'application/atom+xml'
+               ], []}
+            ]
+          else
+            []
+          end ++ entries
+      }
+    ]
   end
 end