diff options
| author | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-13 10:56:11 +0200 |
| commit | 76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch) | |
| tree | 34020541df1d6684e935cfd09f36cb6eed7b13f6 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | a3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff) | |
| parent | bb864e96ad4e0be470da78baa000019f571e30db (diff) | |
| download | pleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz | |
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index c12cd7f8a..44ea40a4e 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -1,7 +1,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do alias Pleroma.{User, Activity, Repo, Object} alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter alias Pleroma.Web.TwitterAPI.UserView alias Pleroma.Web.{OStatus, CommonAPI} import Ecto.Query @@ -184,7 +183,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do defp parse_int(_, default), do: default - def search(user, %{"q" => query} = params) do + def search(_user, %{"q" => query} = params) do limit = parse_int(params["rpp"], 20) page = parse_int(params["page"], 1) offset = (page - 1) * limit @@ -206,7 +205,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do order_by: [desc: :inserted_at] ) - activities = Repo.all(q) + _activities = Repo.all(q) end defp make_date do |