commit: 3d636cf533e7e73f35d1837bcc70e8d9f4306b37
parent: 5612716c25fa442f06a08083d945e421840300fe
Author: lambda <pleromagit@rogerbraun.net>
Date: Wed, 11 Apr 2018 20:58:25 +0000
Merge branch 'develop' into 'develop'
Fix issue #124
Closes #124
See merge request pleroma/pleroma!108
Diffstat:
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -212,9 +212,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|> Map.put("actor_id", ap_id)
|> Map.put("whole_db", true)
- activities =
- ActivityPub.fetch_public_activities(params)
- |> Enum.reverse()
+ if params["pinned"] == "true" do
+ # Since Pleroma has no "pinned" posts feature, we'll just set an empty list here
+ activities = []
+ else
+ activities =
+ ActivityPub.fetch_public_activities(params)
+ |> Enum.reverse()
+ end
conn
|> add_link_headers(:user_statuses, activities, params["id"])
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -316,6 +316,17 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert id == to_string(note_two.id)
end
+ test "unimplemented pinned statuses feature", %{conn: conn} do
+ note = insert(:note_activity)
+ user = User.get_by_ap_id(note.data["actor"])
+
+ conn =
+ conn
+ |> get("/api/v1/accounts/#{user.id}/statuses?pinned=true")
+
+ assert json_response(conn, 200) == []
+ end
+
test "gets an users media", %{conn: conn} do
note = insert(:note_activity)
user = User.get_by_ap_id(note.data["actor"])