thomate/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Look through whole db for user timelines.

Browse source 
They already have an index that's good enough.
This commit is contained in:
Roger Braun 2017-11-08 17:25:18 +01:00
parent 36557155af
commit d2430d5007
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -157,6 +157,7 @@ defp restrict_favorited_by(query, %{"favorited_by" => ap_id}) do
defp restrict_favorited_by(query, _), do: query defp restrict_favorited_by(query, _), do: query
# Only search through last 100_000 activities by default # Only search through last 100_000 activities by default
defp restrict_recent(query, %{"whole_db" => true}), do: query
defp restrict_recent(query, _) do defp restrict_recent(query, _) do
since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000 since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000

1
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -122,6 +122,7 @@ def user_statuses(%{assigns: %{user: user}} = conn, params) do
params = params params = params
|> Map.put("type", ["Create", "Announce"]) |> Map.put("type", ["Create", "Announce"])
|> Map.put("actor_id", ap_id) |> Map.put("actor_id", ap_id)
|> Map.put("whole_db", true)
activities = ActivityPub.fetch_activities([], params) activities = ActivityPub.fetch_activities([], params)
|> Enum.reverse |> Enum.reverse

2
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file

@ -68,7 +68,7 @@ def friends_timeline(%{assigns: %{user: user}} = conn, params) do
def user_timeline(%{assigns: %{user: user}} = conn, params) do def user_timeline(%{assigns: %{user: user}} = conn, params) do
case TwitterAPI.get_user(user, params) do case TwitterAPI.get_user(user, params) do
{:ok, target_user} -> {:ok, target_user} ->
params = Map.merge(params, %{"actor_id" => target_user.ap_id}) params = Map.merge(params, %{"actor_id" => target_user.ap_id, "whole_db" => true})
statuses = TwitterAPI.fetch_user_statuses(user, params) statuses = TwitterAPI.fetch_user_statuses(user, params)
conn conn
|> json_reply(200, statuses |> Poison.encode!) |> json_reply(200, statuses |> Poison.encode!)