summaryrefslogtreecommitdiff
path: root/test/web/salmon
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
committerlain <lain@soykaf.club>2019-05-01 18:40:41 +0200
commit45f790becc2cc63ac000c6432fe8c84e0b589822 (patch)
tree724d0e8ce5f10807cc25efc2434454bf38c5a52c /test/web/salmon
parent4908e0eeee2ecb58b204198c20720d52548b6f4a (diff)
parentd107919b3d8b2275ddb7b17846cab182682098a7 (diff)
downloadpleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.tar.gz
pleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.zip
Merge remote-tracking branch 'origin/develop' into conversations_three
Diffstat (limited to 'test/web/salmon')
-rw-r--r--test/web/salmon/salmon_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index 35503259b..7532578ca 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -99,7 +99,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
}
{:ok, activity} = Repo.insert(%Activity{data: activity_data, recipients: activity_data["to"]})
- user = User.get_by_ap_id(activity.data["actor"])
+ user = User.get_cached_by_ap_id(activity.data["actor"])
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)
poster = fn url, _data, _headers ->