diff options
| author | raeno <just.raeno@gmail.com> | 2018-12-18 14:59:32 +0100 |
|---|---|---|
| committer | raeno <just.raeno@gmail.com> | 2018-12-18 14:59:32 +0100 |
| commit | a3003364598b42849e384a216948dad810481f51 (patch) | |
| tree | 2ed2b04efab457220a60fb7630906b1b26f24df3 /lib/pleroma/user.ex | |
| parent | 30812f84518f1b2fcc70a416d1a6b9f81264f3a5 (diff) | |
| parent | b6ae412fcd7c67d64dd1467e8e35d17140e992df (diff) | |
| download | pleroma-a3003364598b42849e384a216948dad810481f51.tar.gz | |
Merge branch 'develop' into oembed_provider
Diffstat (limited to 'lib/pleroma/user.ex')
| -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 28ff08a39..c86ad4afe 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -851,7 +851,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 -> @@ -862,7 +862,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} = |