summaryrefslogtreecommitdiff
path: root/benchmarks/load_testing
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-25 19:57:53 -0600
committerAlex Gleason <alex@alexgleason.me>2021-12-25 19:57:53 -0600
commitdb2bf55e9bb31af2ed34805ca7fa98ce67b471b1 (patch)
treef532711eaf19111e22375e87706edf5a3024e5b5 /benchmarks/load_testing
parentb15c4629ff3093353ac5e37d381db1cdc4da1c3a (diff)
parent73609211a425922a5068d3912a36b82abe24e12c (diff)
downloadpleroma-db2bf55e9bb31af2ed34805ca7fa98ce67b471b1.tar.gz
pleroma-db2bf55e9bb31af2ed34805ca7fa98ce67b471b1.zip
Merge remote-tracking branch 'origin/develop' into notice-routes
Diffstat (limited to 'benchmarks/load_testing')
-rw-r--r--benchmarks/load_testing/activities.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/benchmarks/load_testing/activities.ex b/benchmarks/load_testing/activities.ex
index f5c7bfce8..7f262d228 100644
--- a/benchmarks/load_testing/activities.ex
+++ b/benchmarks/load_testing/activities.ex
@@ -299,7 +299,7 @@ defmodule Pleroma.LoadTesting.Activities do
"url" => [
%{
"href" =>
- "#{Pleroma.Web.base_url()}/media/b1b873552422a07bf53af01f3c231c841db4dfc42c35efde681abaf0f2a4eab7.jpg",
+ "#{Pleroma.Web.Endpoint.url()}/media/b1b873552422a07bf53af01f3c231c841db4dfc42c35efde681abaf0f2a4eab7.jpg",
"mediaType" => "image/jpeg",
"type" => "Link"
}
@@ -394,7 +394,7 @@ defmodule Pleroma.LoadTesting.Activities do
defp other_data(actor, content) do
%{host: host} = URI.parse(actor.ap_id)
- datetime = DateTime.utc_now()
+ datetime = DateTime.utc_now() |> to_string()
context_id = "https://#{host}/contexts/#{UUID.generate()}"
activity_id = "https://#{host}/activities/#{UUID.generate()}"
object_id = "https://#{host}/objects/#{UUID.generate()}"