Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

@@ -135,14 +135,23 @@ def custom_emojis(conn, _params) do
     json conn, mastodon_emoji
   end
 
-  defp add_link_headers(conn, method, activities) do
+  defp add_link_headers(conn, method, activities, param \\ false) 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)
+      {next_url, prev_url} = if param do
+        {
+          mastodon_api_url(Pleroma.Web.Endpoint, method, param, max_id: min),
+          mastodon_api_url(Pleroma.Web.Endpoint, method, param, since_id: max)
+        }
+      else
+        {
+          mastodon_api_url(Pleroma.Web.Endpoint, method, max_id: min),
+          mastodon_api_url(Pleroma.Web.Endpoint, method, since_id: max)
+        }
+      end
       conn
       |> put_resp_header("link", "<#{next_url}>; rel=\"next\", <#{prev_url}>; rel=\"prev\"")
     else
@@ -178,7 +187,6 @@ def public_timeline(%{assigns: %{user: user}} = conn, params) do
     |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
   end
 
-  # TODO: Link headers
   def user_statuses(%{assigns: %{user: user}} = conn, params) do
     with %User{ap_id: ap_id} <- Repo.get(User, params["id"]) do
       params = params
@@ -189,7 +197,9 @@ def user_statuses(%{assigns: %{user: user}} = conn, params) do
       activities = ActivityPub.fetch_public_activities(params)
       |> Enum.reverse
 
-      render conn, StatusView, "index.json", %{activities: activities, for: user, as: :activity}
+      conn
+      |> add_link_headers(:user_statuses, activities, params["id"])
+      |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
     end
   end
 
@@ -333,7 +343,6 @@ def reblogged_by(conn, %{"id" => id}) do
     end
   end
 
-  # TODO: Link headers
   def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
     params = params
     |> Map.put("type", "Create")
@@ -344,6 +353,7 @@ def hashtag_timeline(%{assigns: %{user: user}} = conn, params) do
     |> Enum.reverse
 
     conn
+    |> add_link_headers(:hashtag_timeline, activities, params["tag"])
     |> render(StatusView, "index.json", %{activities: activities, for: user, as: :activity})
   end
 
@@ -614,6 +624,11 @@ def empty_array(conn, _) do
     json(conn, [])
   end
 
+  def empty_object(conn, _) do
+    Logger.debug("Unimplemented, returning an empty object")
+    json(conn, %{})
+  end
+
   def render_notification(user, %{id: id, activity: activity, inserted_at: created_at} = _params) do
     actor = User.get_cached_by_ap_id(activity.data["actor"])
     created_at = NaiveDateTime.to_iso8601(created_at)

lib/pleroma/web/router.ex

@@ -132,6 +132,7 @@ def user_fetcher(username) do
 
     get "/statuses/:id", MastodonAPIController, :get_status
     get "/statuses/:id/context", MastodonAPIController, :get_context
+    get "/statuses/:id/card", MastodonAPIController, :empty_object
     get "/statuses/:id/favourited_by", MastodonAPIController, :favourited_by
     get "/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by