Commit 7bcb6a18 authored by Ivan Tashkinov's avatar Ivan Tashkinov
Browse files

[#394] Refactoring.

parent 22830c8f
......@@ -846,12 +846,7 @@ defp tag_or_untag([hd | _] = users, tags, action) when is_map(hd) do
Repo.transaction(fn ->
for user <- users do
new_tags =
if action == :tag do
Enum.uniq(user.tags ++ tags)
else
user.tags -- tags
end
new_tags = mutate_tags(user, tags, action)
{:ok, updated_user} =
user
......@@ -862,4 +857,8 @@ defp tag_or_untag([hd | _] = users, tags, action) when is_map(hd) do
end
end)
end
defp mutate_tags(user, tags, :tag), do: Enum.uniq(user.tags ++ tags)
defp mutate_tags(user, tags, :untag), do: user.tags -- tags
end
......@@ -59,7 +59,7 @@ def render("account.json", %{user: user} = opts) do
privacy: user_info.default_scope,
sensitive: false
},
# Note: Mastodon does not return this field:
# Pleroma extension
tags: user.tags
}
end
......
......@@ -78,7 +78,7 @@ def render("user.json", %{user: user = %User{}} = assigns) do
"default_scope" => user.info.default_scope,
"no_rich_text" => user.info.no_rich_text,
"fields" => fields,
# Note: twitter.com does not return this field:
# Pleroma extension
"tags" => user.tags
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment