aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-11-02 21:57:37 +0100
committerRoger Braun <roger@rogerbraun.net>2017-11-02 21:57:37 +0100
commit6a5f0871745316b50742ea9ebf3ff7c69881e105 (patch)
tree6f21b63ce5e6aeda94ff94a8bbe5a644f34ecd23
parent345ad870f710ef8e8da8bc49878317696362c5c0 (diff)
downloadpleroma-6a5f0871745316b50742ea9ebf3ff7c69881e105.tar.gz
Add blocks to User.
-rw-r--r--lib/pleroma/user.ex24
-rw-r--r--test/user_test.exs23
2 files changed, 47 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 5f1750035..771c54e81 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -293,4 +293,28 @@ defmodule Pleroma.User do
limit: 20
Repo.all(q)
end
+
+ def block(user, %{ap_id: ap_id}) do
+ blocks = user.info["blocks"] || []
+ new_blocks = Enum.uniq([ap_id | blocks])
+ new_info = Map.put(user.info, "blocks", new_blocks)
+
+ cs = User.info_changeset(user, %{info: new_info})
+ Repo.update(cs)
+ end
+
+ def unblock(user, %{ap_id: ap_id}) do
+ blocks = user.info["blocks"] || []
+ new_blocks = List.delete(blocks, ap_id)
+ new_info = Map.put(user.info, "blocks", new_blocks)
+
+ cs = User.info_changeset(user, %{info: new_info})
+ Repo.update(cs)
+ end
+
+ def blocks?(user, %{ap_id: ap_id}) do
+ blocks = user.info["blocks"] || []
+ Enum.member?(blocks, ap_id)
+ end
+
end
diff --git a/test/user_test.exs b/test/user_test.exs
index 36ac27656..151b9afc0 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -273,5 +273,28 @@ defmodule Pleroma.UserTest do
assert user.info["follower_count"] == 1
end
end
+
+ describe "blocks" do
+ test "it blocks people" do
+ user = insert(:user)
+ blocked_user = insert(:user)
+
+ refute User.blocks?(user, blocked_user)
+
+ {:ok, user} = User.block(user, blocked_user)
+
+ assert User.blocks?(user, blocked_user)
+ end
+
+ test "it unblocks users" do
+ user = insert(:user)
+ blocked_user = insert(:user)
+
+ {:ok, user} = User.block(user, blocked_user)
+ {:ok, user} = User.unblock(user, blocked_user)
+
+ refute User.blocks?(user, blocked_user)
+ end
+ end
end