diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-11-30 10:42:51 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-11-30 10:42:51 +0000 |
| commit | 0d24ab04c5ea779432b4ea174a1d470dac87315d (patch) | |
| tree | 077ddbcab15d0c228144015fb9317d5bf46951d5 /lib/pleroma | |
| parent | cf0c861d0012f27ae555247834187d509d7a7114 (diff) | |
| parent | 1636cc5b7e2ad324c828c993d5fb39ac9cdb40cc (diff) | |
| download | pleroma-0d24ab04c5ea779432b4ea174a1d470dac87315d.tar.gz | |
Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field
See merge request pleroma/pleroma!2006
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/user.ex | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index b18a4c6a5..8851b0a79 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -118,8 +118,6 @@ defmodule Pleroma.User do has_many(:registrations, Registration) has_many(:deliveries, Delivery) - field(:info, :map, default: %{}) - timestamps() end @@ -225,7 +223,6 @@ defmodule Pleroma.User do params = params - |> Map.put(:info, params[:info] || %{}) |> truncate_if_exists(:name, name_limit) |> truncate_if_exists(:bio, bio_limit) |> truncate_fields_param() @@ -1211,7 +1208,7 @@ defmodule Pleroma.User do def external_users(opts \\ []) do query = external_users_query() - |> select([u], struct(u, [:id, :ap_id, :info])) + |> select([u], struct(u, [:id, :ap_id])) query = if opts[:max_id], |