Unify user fetching.

[akkoma] / lib / pleroma / web / twitter_api / twitter_api.ex

diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 174a794846dd89ffffe1f12c7c122d9dfc5dd727..61b11681a08589744c4d278d9e49bf82e13b55e5 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -16,26 +16,35 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     opts = opts
     |> Map.put("blocking_user", user)
     |> Map.put("user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow", "Like"])
 
     ActivityPub.fetch_activities([user.ap_id | user.following], opts)
     |> activities_to_statuses(%{for: user})
   end
 
   def fetch_public_statuses(user, opts \\ %{}) do
-    opts = Map.put(opts, "local_only", true)
-    opts = Map.put(opts, "blocking_user", user)
+    opts = opts
+    |> Map.put("local_only", true)
+    |> Map.put("blocking_user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
+
     ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
   def fetch_public_and_external_statuses(user, opts \\ %{}) do
-    opts = Map.put(opts, "blocking_user", user)
+    opts = opts
+    |> Map.put("blocking_user", user)
+    |> Map.put("type", ["Create", "Announce", "Follow"])
+
     ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
   def fetch_user_statuses(user, opts \\ %{}) do
-    ActivityPub.fetch_activities([], opts)
+    opts = opts
+    |> Map.put("type", ["Create"])
+    ActivityPub.fetch_public_activities(opts)
     |> activities_to_statuses(%{for: user})
   end
 
@@ -46,7 +55,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
 
   def fetch_conversation(user, id) do
     with context when is_binary(context) <- conversation_id_to_context(id),
-         activities <- ActivityPub.fetch_activities_for_context(context, %{"blocking_user" => user}),
+         activities <- ActivityPub.fetch_activities_for_context(context, %{"blocking_user" => user, "user" => user}),
          statuses <- activities |> activities_to_statuses(%{for: user})
     do
       statuses
@@ -280,7 +289,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     actor = get_in(activity.data, ["actor"])
     user = User.get_cached_by_ap_id(actor)
     # mentioned_users = Repo.all(from user in User, where: user.ap_id in ^activity.data["to"])
-    mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
+    mentioned_users = Enum.map(activity.recipients || [], fn (ap_id) ->
       if ap_id do
         User.get_cached_by_ap_id(ap_id)
       else
@@ -319,7 +328,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
   end
 
   def get_external_profile(for_user, uri) do
-    with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do
+    IO.inspect(uri)
+    with %User{} = user <- User.get_or_fetch_by_nickname(uri) do
       spawn(fn ->
         with url <- user.info["topic"],
              {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do