summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGian Sass <gian.sass@outlook.de>2018-04-11 14:55:49 -0400
committerGian Sass <gian.sass@outlook.de>2018-04-11 14:55:49 -0400
commit907df9b8eda1951a70fbec3adb68029b367932a0 (patch)
treee2772927c603845b5344c758ede1b3fa4f8295fa
parentfaa0feb0956359c5fe7e68e56556bb621f6d08f5 (diff)
downloadpleroma-907df9b8eda1951a70fbec3adb68029b367932a0.tar.gz
pleroma-907df9b8eda1951a70fbec3adb68029b367932a0.zip
Fix issue #124
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex11
1 files changed, 8 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
index 21b99f919..21a3660c8 100644
--- 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"])