updating benchmarks

benchmarks/load_testing/activities.ex

@@ -313,7 +313,7 @@ defp insert_activity("simple_thread", visibility, group, user, friends, non_frie
     tasks = get_reply_tasks(visibility, group)
 
     {:ok, activity} =
-      CommonAPI.post(user, %{"status" => "Simple status", "visibility" => "unlisted"})
+      CommonAPI.post(user, %{"status" => "Simple status", "visibility" => visibility})
 
     acc = {activity.id, ["@" <> actor.nickname, "reply to status"]}
     insert_replies(tasks, visibility, user, friends, non_friends, acc)

benchmarks/load_testing/fetcher.ex

@@ -41,6 +41,7 @@ defp fetch_timelines(user) do
     fetch_notifications(user)
     fetch_favourites(user)
     fetch_long_thread(user)
+    fetch_timelines_with_reply_filtering(user)
   end
 
   defp render_views(user) do
@@ -496,16 +497,11 @@ defp render_long_thread(user) do
     )
   end
 
-  def query_replies(user) do
-    public_params = %{
-      "type" => ["Create", "Announce"],
-      "local_only" => false,
-      "blocking_user" => user,
-      "muting_user" => user,
-      "count" => 20
-    }
+  defp fetch_timelines_with_reply_filtering(user) do
+    public_params = opts_for_public_timeline(user)
 
-    Benchee.run(%{
+    Benchee.run(
+      %{
         "Public timeline without reply filtering" => fn ->
           ActivityPub.fetch_public_activities(public_params)
         end,
@@ -521,19 +517,16 @@ def query_replies(user) do
           |> Map.put("user", user)
           |> ActivityPub.fetch_public_activities()
         end
-    })
+      },
+      formatters: formatters()
+    )
 
-    private_params = %{
-      "type" => ["Create", "Announce"],
-      "blocking_user" => user,
-      "muting_user" => user,
-      "user" => user,
-      "count" => 20
-    }
+    private_params = opts_for_home_timeline(user)
 
     recipients = [user.ap_id | User.following(user)]
 
-    Benchee.run(%{
+    Benchee.run(
+      %{
         "Home timeline without reply filtering" => fn ->
           ActivityPub.fetch_activities(recipients, private_params)
         end,
@@ -546,6 +539,8 @@ def query_replies(user) do
           private_params = Map.put(private_params, "reply_visibility", "self")
           ActivityPub.fetch_activities(recipients, private_params)
         end
-    })
+      },
+      formatters: formatters()
+    )
   end
 end