aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-17 11:49:13 +0200
committerlain <lain@soykaf.club>2019-05-17 11:49:13 +0200
commit249b31ffe53115ad187235890c405138ba190e14 (patch)
tree7519a1ad4b25959513e4820b7a0afd3b105b6cf2
parent67af50ec713d46e6e1d72605b985858cc15aad3c (diff)
downloadpleroma-249b31ffe53115ad187235890c405138ba190e14.tar.gz
Fix specs.
-rw-r--r--lib/pleroma/user.ex1
-rw-r--r--test/web/ostatus/ostatus_test.exs2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 9607c1f03..28da310ee 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1144,7 +1144,6 @@ defmodule Pleroma.User do
stream =
ap_id
|> Activity.query_by_actor()
- |> Activity.with_preloaded_object()
|> Repo.stream()
Repo.transaction(fn -> Enum.each(stream, &delete_activity(&1)) end, timeout: :infinity)
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs
index 3516a13fa..f6be16862 100644
--- a/test/web/ostatus/ostatus_test.exs
+++ b/test/web/ostatus/ostatus_test.exs
@@ -407,7 +407,7 @@ defmodule Pleroma.Web.OStatusTest do
{:ok, user} = OStatus.find_or_make_user(uri)
old_name = user.name
old_bio = user.bio
- change = Ecto.Changeset.change(user, %{avatar: nil, bio: nil, old_name: nil})
+ change = Ecto.Changeset.change(user, %{avatar: nil, bio: nil, name: nil})
{:ok, user} = Repo.update(change)
refute user.avatar