diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:38:24 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:38:24 +0000 |
| commit | c6d5f189d9847b0c23d8150f41c05d87402680eb (patch) | |
| tree | 9b1e162be62e33ca5db733676a63af783e470efd /lib | |
| parent | 98c31deaa960392184da4f34ddc9e3eecbce3f4c (diff) | |
| parent | 0f67c1d487e65c851bafbf53e9ca744db9d84def (diff) | |
| download | pleroma-c6d5f189d9847b0c23d8150f41c05d87402680eb.tar.gz | |
Merge branch 'fix-tags' into 'develop'
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 49928bc13..3ad1ab87a 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -838,7 +838,7 @@ defmodule Pleroma.User do do: tag(User.get_by_nickname(nickname), tags) def tag(%User{} = user, tags), - do: update_tags(user, Enum.uniq(user.tags ++ normalize_tags(tags))) + do: update_tags(user, Enum.uniq((user.tags || []) ++ normalize_tags(tags))) def untag(user_identifiers, tags) when is_list(user_identifiers) do Repo.transaction(fn -> @@ -849,7 +849,8 @@ defmodule Pleroma.User do def untag(nickname, tags) when is_binary(nickname), do: untag(User.get_by_nickname(nickname), tags) - def untag(%User{} = user, tags), do: update_tags(user, user.tags -- normalize_tags(tags)) + def untag(%User{} = user, tags), + do: update_tags(user, (user.tags || []) -- normalize_tags(tags)) defp update_tags(%User{} = user, new_tags) do {:ok, updated_user} = |