Removed users.info and remaining usages.

This commit is contained in:
Ivan Tashkinov 2019-11-23 14:06:19 +03:00
parent 75efdb0781
commit 1636cc5b7e
5 changed files with 14 additions and 27 deletions

View file

@ -31,7 +31,6 @@ defp generate_user_data(i) do
password_hash: password_hash:
"$pbkdf2-sha512$160000$bU.OSFI7H/yqWb5DPEqyjw$uKp/2rmXw12QqnRRTqTtuk2DTwZfF8VR4MYW2xMeIlqPR/UX1nT1CEKVUx2CowFMZ5JON8aDvURrZpJjSgqXrg", "$pbkdf2-sha512$160000$bU.OSFI7H/yqWb5DPEqyjw$uKp/2rmXw12QqnRRTqTtuk2DTwZfF8VR4MYW2xMeIlqPR/UX1nT1CEKVUx2CowFMZ5JON8aDvURrZpJjSgqXrg",
bio: "Tester Number #{i}", bio: "Tester Number #{i}",
info: %{},
local: remote local: remote
} }

View file

@ -119,8 +119,6 @@ defmodule Pleroma.User do
has_many(:registrations, Registration) has_many(:registrations, Registration)
has_many(:deliveries, Delivery) has_many(:deliveries, Delivery)
field(:info, :map, default: %{})
timestamps() timestamps()
end end
@ -244,7 +242,6 @@ def remote_user_creation(params) do
params = params =
params params
|> Map.put(:info, params[:info] || %{})
|> truncate_if_exists(:name, name_limit) |> truncate_if_exists(:name, name_limit)
|> truncate_if_exists(:bio, bio_limit) |> truncate_if_exists(:bio, bio_limit)
|> truncate_fields_param() |> truncate_fields_param()
@ -1226,7 +1223,7 @@ def external_users_query do
def external_users(opts \\ []) do def external_users(opts \\ []) do
query = query =
external_users_query() external_users_query()
|> select([u], struct(u, [:id, :ap_id, :info])) |> select([u], struct(u, [:id, :ap_id]))
query = query =
if opts[:max_id], if opts[:max_id],

View file

@ -0,0 +1,9 @@
defmodule Pleroma.Repo.Migrations.RemoveInfoFromUsers do
use Ecto.Migration
def change do
alter table(:users) do
remove(:info, :map, default: %{})
end
end
end

View file

@ -31,7 +31,6 @@ def user_factory do
nickname: sequence(:nickname, &"nick#{&1}"), nickname: sequence(:nickname, &"nick#{&1}"),
password_hash: Comeonin.Pbkdf2.hashpwsalt("test"), password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
bio: sequence(:bio, &"Tester Number #{&1}"), bio: sequence(:bio, &"Tester Number #{&1}"),
info: %{},
last_digest_emailed_at: NaiveDateTime.utc_now() last_digest_emailed_at: NaiveDateTime.utc_now()
} }

View file

@ -347,18 +347,6 @@ test "it sets the password_hash and ap_id" do
assert changeset.changes.follower_address == "#{changeset.changes.ap_id}/followers" assert changeset.changes.follower_address == "#{changeset.changes.ap_id}/followers"
end end
test "it ensures info is not nil" do
changeset = User.register_changeset(%User{}, @full_user_data)
assert changeset.valid?
{:ok, user} =
changeset
|> Repo.insert()
refute is_nil(user.info)
end
end end
describe "user registration, with :account_activation_required" do describe "user registration, with :account_activation_required" do
@ -412,8 +400,7 @@ test "gets an existing user by ap_id" do
:user, :user,
local: false, local: false,
nickname: "admin@mastodon.example.org", nickname: "admin@mastodon.example.org",
ap_id: ap_id, ap_id: ap_id
info: %{}
) )
{:ok, fetched_user} = User.get_or_fetch(ap_id) {:ok, fetched_user} = User.get_or_fetch(ap_id)
@ -474,8 +461,7 @@ test "updates an existing user, if stale" do
local: false, local: false,
nickname: "admin@mastodon.example.org", nickname: "admin@mastodon.example.org",
ap_id: "http://mastodon.example.org/users/admin", ap_id: "http://mastodon.example.org/users/admin",
last_refreshed_at: a_week_ago, last_refreshed_at: a_week_ago
info: %{}
) )
assert orig_user.last_refreshed_at == a_week_ago assert orig_user.last_refreshed_at == a_week_ago
@ -516,7 +502,6 @@ test "returns an ap_followers link for a user" do
name: "Someone", name: "Someone",
nickname: "a@b.de", nickname: "a@b.de",
ap_id: "http...", ap_id: "http...",
info: %{some: "info"},
avatar: %{some: "avatar"} avatar: %{some: "avatar"}
} }
@ -1121,8 +1106,7 @@ test "with an overly long bio" do
ap_id: user.ap_id, ap_id: user.ap_id,
name: user.name, name: user.name,
nickname: user.nickname, nickname: user.nickname,
bio: String.duplicate("h", current_max_length + 1), bio: String.duplicate("h", current_max_length + 1)
info: %{}
} }
assert {:ok, %User{}} = User.insert_or_update_user(data) assert {:ok, %User{}} = User.insert_or_update_user(data)
@ -1135,8 +1119,7 @@ test "with an overly long display name" do
data = %{ data = %{
ap_id: user.ap_id, ap_id: user.ap_id,
name: String.duplicate("h", current_max_length + 1), name: String.duplicate("h", current_max_length + 1),
nickname: user.nickname, nickname: user.nickname
info: %{}
} }
assert {:ok, %User{}} = User.insert_or_update_user(data) assert {:ok, %User{}} = User.insert_or_update_user(data)