aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-05-29 14:25:53 +0000
committerlambda <lain@soykaf.club>2019-05-29 14:25:53 +0000
commit7e889786b82b1b988cf6b8c572ac2b0d8de900d2 (patch)
tree60d7133034eb3d812b6dd7af6df5d19919c941ca /lib
parent6fb67b74dac789654cbaaef4b6969017f5d985ed (diff)
parent672fddb7213b69f3ee8b9a7728426373090847ed (diff)
downloadpleroma-7e889786b82b1b988cf6b8c572ac2b0d8de900d2.tar.gz
Merge branch 'fix/mastodon-search-limit' into 'develop'
Default search limit should be 40 See merge request pleroma/pleroma!1210
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 0fe09c285..2110027c3 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1084,7 +1084,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
from([a, o] in Activity.with_preloaded_object(Activity),
where: fragment("?->>'type' = 'Create'", a.data),
where: "https://www.w3.org/ns/activitystreams#Public" in a.recipients,
- limit: 20
+ limit: 40
)
q =