X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fmastodon_api%2Fmastodon_api_controller.ex;h=dede0434db5d383c905b5ac746426d0978e932fd;hb=d2faee01eea3a0cc8eed95d749d41c4a26556a13;hp=07272e5b36aab8e163ce439567c77ce350445990;hpb=61adf676d56db274cb4688a137787e8806e77be9;p=akkoma

diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 07272e5b3..dede0434d 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -7,6 +7,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Pleroma.Web.TwitterAPI.TwitterAPI
   alias Pleroma.Web.CommonAPI
+  import Ecto.Query
   import Logger
 
   def create_app(conn, params) do
@@ -38,10 +39,28 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     json(conn, response)
   end
 
+  defp add_link_headers(conn, method, activities) do
+    last = List.last(activities)
+    first = List.first(activities)
+    if last do
+      min = last.id
+      max = first.id
+      next_url = mastodon_api_url(Pleroma.Web.Endpoint, method, max_id: min)
+      prev_url = mastodon_api_url(Pleroma.Web.Endpoint, method, since_id: max)
+      conn
+      |> put_resp_header("link", "<#{next_url}>; rel=\"next\", <#{prev_url}>; rel=\"prev\"")
+    else
+      conn
+    end
+  end
+
   def home_timeline(%{assigns: %{user: user}} = conn, params) do
     activities = ActivityPub.fetch_activities([user.ap_id | user.following], Map.put(params, "type", "Create"))
     |> Enum.reverse
-    render conn, StatusView, "index.json", %{activities: activities, for: user, as: :activity}
+
+    conn
+    |> add_link_headers(:home_timeline, activities)
+    |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
   end
 
   def public_timeline(%{assigns: %{user: user}} = conn, params) do
@@ -52,7 +71,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     activities = ActivityPub.fetch_public_activities(params)
     |> Enum.reverse
 
-    render conn, StatusView, "index.json", %{activities: activities, for: user, as: :activity}
+    conn
+    |> add_link_headers(:public_timeline, activities)
+    |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
   end
 
   def user_statuses(%{assigns: %{user: user}} = conn, params) do
@@ -136,14 +157,34 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     notifications = Notification.for_user(user, params)
     result = Enum.map(notifications, fn (%{id: id, activity: activity, inserted_at: created_at}) ->
       actor = User.get_cached_by_ap_id(activity.data["actor"])
+      created_at = NaiveDateTime.to_iso8601(created_at)
       case activity.data["type"] do
-        "Create" -> %{ id: id, type: "mention", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: activity})}
+        "Create" ->
+          %{id: id, type: "mention", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: activity})}
+        "Like" ->
+          liked_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
+          %{id: id, type: "favourite", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: liked_activity})}
+        "Announce" ->
+          announced_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"])
+          %{id: id, type: "reblog", created_at: created_at, account: AccountView.render("account.json", %{user: actor}), status: StatusView.render("status.json", %{activity: announced_activity})}
+        "Follow" ->
+          %{id: id, type: "follow", created_at: created_at, account: AccountView.render("account.json", %{user: actor})}
         _ -> nil
       end
     end)
     |> Enum.filter(&(&1))
 
-    json(conn, result)
+    conn
+    |> add_link_headers(:notifications, notifications)
+    |> json(result)
+  end
+
+  def relationships(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    id = List.wrap(id)
+    q = from u in User,
+      where: u.id in ^id
+    targets = Repo.all(q)
+    render conn, AccountView, "relationships.json", %{user: user, targets: targets}
   end
 
   def empty_array(conn, _) do