diff options
| author | lain <lain@soykaf.club> | 2018-12-17 20:12:01 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-12-17 20:12:01 +0100 |
| commit | e4763cd459d36b2fcd22e2e4abd3a2a326a21f5f (patch) | |
| tree | 2ba0c7169c25f33470992db0c473ec9688bcb28b /lib | |
| parent | 567359790ea623949585629c41580961c59a01ff (diff) | |
| download | pleroma-e4763cd459d36b2fcd22e2e4abd3a2a326a21f5f.tar.gz pleroma-e4763cd459d36b2fcd22e2e4abd3a2a326a21f5f.zip | |
Fix tagging problems for existing instances.
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} = |