From e89078ac2a27bb0a833c982dbb5eef63ddea3cc0 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Mon, 6 Apr 2020 10:59:35 +0200
Subject: [PATCH] User: remove source_data

---
 lib/pleroma/user.ex                               |  3 ---
 lib/pleroma/web/activity_pub/activity_pub.ex      |  1 -
 .../20200406105422_users_remove_source_data.exs   | 15 +++++++++++++++
 test/user_test.exs                                |  2 +-
 test/web/activity_pub/activity_pub_test.exs       |  1 -
 5 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 priv/repo/migrations/20200406105422_users_remove_source_data.exs

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 79e9b2c86..d05dfb480 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -97,7 +97,6 @@ defmodule Pleroma.User do
     field(:last_digest_emailed_at, :naive_datetime)
     field(:banner, :map, default: %{})
     field(:background, :map, default: %{})
-    field(:source_data, :map, default: %{})
     field(:note_count, :integer, default: 0)
     field(:follower_count, :integer, default: 0)
     field(:following_count, :integer, default: 0)
@@ -377,7 +376,6 @@ defmodule Pleroma.User do
         :public_key,
         :avatar,
         :ap_enabled,
-        :source_data,
         :banner,
         :locked,
         :magic_key,
@@ -536,7 +534,6 @@ defmodule Pleroma.User do
         :avatar,
         :last_refreshed_at,
         :ap_enabled,
-        :source_data,
         :banner,
         :locked,
         :magic_key,
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 63502b484..9b832f4cb 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1459,7 +1459,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       ap_id: data["id"],
       uri: get_actor_url(data["url"]),
       ap_enabled: true,
-      source_data: data,
       banner: banner,
       fields: fields,
       emoji: emojis,
diff --git a/priv/repo/migrations/20200406105422_users_remove_source_data.exs b/priv/repo/migrations/20200406105422_users_remove_source_data.exs
new file mode 100644
index 000000000..9812d480f
--- /dev/null
+++ b/priv/repo/migrations/20200406105422_users_remove_source_data.exs
@@ -0,0 +1,15 @@
+defmodule Pleroma.Repo.Migrations.UsersRemoveSourceData do
+  use Ecto.Migration
+
+  def up do
+    alter table(:users) do
+      remove_if_exists(:source_data, :map)
+    end
+  end
+
+  def down do
+    alter table(:users) do
+      add_if_not_exists(:source_data, :map, default: %{})
+    end
+  end
+end
diff --git a/test/user_test.exs b/test/user_test.exs
index d39787f35..d35005353 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -581,7 +581,7 @@ defmodule Pleroma.UserTest do
 
       {:ok, user} = User.get_or_fetch_by_ap_id("http://mastodon.example.org/users/admin")
 
-      assert user.source_data["endpoints"]
+      assert user.inbox
 
       refute user.last_refreshed_at == orig_user.last_refreshed_at
     end
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 17e7b97de..6410df49b 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -180,7 +180,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
       {:ok, user} = ActivityPub.make_user_from_ap_id(user_id)
       assert user.ap_id == user_id
       assert user.nickname == "admin@mastodon.example.org"
-      assert user.source_data
       assert user.ap_enabled
       assert user.follower_address == "http://mastodon.example.org/users/admin/followers"
     end
-- 
2.45.2