diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-20 19:43:06 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-04-20 19:43:06 +0700 |
| commit | 60f213bb1a6b1627cd8f6bf2903a42c3f3827f1a (patch) | |
| tree | 297f8ad25104db162b4431f887bb23b3e22255e2 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | 05cdb2f2389376081973d96b32e876d2a032d1f1 (diff) | |
| parent | 6ca82c18a738205483dbbef2fd4de662d70227fb (diff) | |
| download | pleroma-60f213bb1a6b1627cd8f6bf2903a42c3f3827f1a.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index d6ce0a7c6..8e44dbeb8 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -266,6 +266,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do defp parse_int(_, default), do: default + # TODO: unify the search query with MastoAPI one and do only pagination here def search(_user, %{"q" => query} = params) do limit = parse_int(params["rpp"], 20) page = parse_int(params["page"], 1) @@ -273,13 +274,13 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do q = from( - a in Activity, + [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, where: fragment( - "to_tsvector('english', ?->'object'->>'content') @@ plainto_tsquery('english', ?)", - a.data, + "to_tsvector('english', ?->>'content') @@ plainto_tsquery('english', ?)", + o.data, ^query ), limit: ^limit, |