Browse Source

Change to use attachment only when fields do not exist

tags/v1.1.4
kPherox 4 years ago
parent
commit
3549cd9754
No known key found for this signature in database GPG Key ID: C04751C2BFA2F62D
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      lib/pleroma/user/info.ex

+ 4
- 2
lib/pleroma/user/info.ex View File

@@ -49,7 +49,7 @@ defmodule Pleroma.User.Info do
field(:mascot, :map, default: nil)
field(:emoji, {:array, :map}, default: [])
field(:pleroma_settings_store, :map, default: %{})
field(:fields, {:array, :map}, default: [])
field(:fields, {:array, :map}, default: nil)
field(:raw_fields, {:array, :map}, default: [])

field(:notification_settings, :map,
@@ -422,7 +422,7 @@ defmodule Pleroma.User.Info do

# ``fields`` is an array of mastodon profile field, containing ``{"name": "…", "value": "…"}``.
# For example: [{"name": "Pronoun", "value": "she/her"}, …]
def fields(%{fields: [], source_data: %{"attachment" => attachment}}) do
def fields(%{fields: nil, source_data: %{"attachment" => attachment}}) do
limit = Pleroma.Config.get([:instance, :max_remote_account_fields], 0)

attachment
@@ -431,6 +431,8 @@ defmodule Pleroma.User.Info do
|> Enum.take(limit)
end

def fields(%{fields: nil}), do: []

def fields(%{fields: fields}), do: fields

def follow_information_update(info, params) do


Loading…
Cancel
Save