pleroma

commit: c6d5f189d9847b0c23d8150f41c05d87402680eb
parent: 98c31deaa960392184da4f34ddc9e3eecbce3f4c
Author: lambda <pleromagit@rogerbraun.net>
Date:   Mon, 17 Dec 2018 19:38:24 +0000

Merge branch 'fix-tags' into 'develop'

Fix tagging problems for existing instances.

See merge request pleroma/pleroma!562
Diffstat:
M
.gitlab-ci.yml
1
-
M
lib/pleroma/user.ex
5
+++--
M
test/user_test.exs
17
+++++++++++++++++

3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -13,7 +13,6 @@ cache:
   key: ${CI_COMMIT_REF_SLUG}
   paths:
           - deps
-          - _build
 stages:
   - lint
   - test
diff --git 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} =
diff --git a/test/user_test.exs b/test/user_test.exs
@@ -11,6 +11,23 @@ defmodule Pleroma.UserTest do
     :ok
   end
 
+  describe "when tags are nil" do
+    test "tagging a user" do
+      user = insert(:user, %{tags: nil})
+      user = User.tag(user, ["cool", "dude"])
+
+      assert "cool" in user.tags
+      assert "dude" in user.tags
+    end
+
+    test "untagging a user" do
+      user = insert(:user, %{tags: nil})
+      user = User.untag(user, ["cool", "dude"])
+
+      assert user.tags == []
+    end
+  end
+
   test "ap_id returns the activity pub id for the user" do
     user = UserBuilder.build()