diff options
| author | lain <lain@soykaf.club> | 2018-02-24 10:42:47 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-02-24 10:42:47 +0100 |
| commit | 01d5ef65faa8d5e333fdca72c7b779cb0d03c7db (patch) | |
| tree | df58e69385863554f3b840a67414c5bb9564096d | |
| parent | efd4d049331462c234de7364ee194f5a0559e70f (diff) | |
| download | pleroma-01d5ef65faa8d5e333fdca72c7b779cb0d03c7db.tar.gz | |
More fixes to user upgrading.
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 2 | ||||
| -rw-r--r-- | test/web/activity_pub/transmogrifier_test.exs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index fcf3804d5..62c229050 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -203,7 +203,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do data = data |> Map.put(:info, Map.merge(user.info, data[:info])) - old_follower_address = user.follower_address + old_follower_address = User.ap_followers(user) {:ok, user} = User.upgrade_changeset(user, data) |> Repo.update() diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index e3a170e4e..297d48f42 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -181,12 +181,12 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do describe "user upgrade" do test "it upgrades a user to activitypub" do - user = insert(:user, %{local: false, ap_id: "https://niu.moe/users/rye", follower_address: "..."}) + user = insert(:user, %{nickname: "rye@niu.moe", local: false, ap_id: "https://niu.moe/users/rye", follower_address: User.ap_followers(%User{nickname: "rye@niu.moe"})}) user_two = insert(:user, %{following: [user.follower_address]}) {:ok, activity} = CommonAPI.post(user, %{"status" => "test"}) {:ok, unrelated_activity} = CommonAPI.post(user_two, %{"status" => "test"}) - assert "..." in activity.recipients + assert "http://localhost:4001/users/rye@niu.moe/followers" in activity.recipients user = Repo.get(User, user.id) assert user.info["note_count"] == 1 |