Merge branch 'user-follow-all-unique' into 'develop'

User.follow_all: ensure the following array stays unique

See merge request pleroma/pleroma!750
This commit is contained in:
kaniini 2019-01-31 18:50:00 +00:00
commit e914eeb632
2 changed files with 23 additions and 1 deletions

View file

@ -315,7 +315,16 @@ defmodule Pleroma.User do
q = q =
from(u in User, from(u in User,
where: u.id == ^follower.id, where: u.id == ^follower.id,
update: [set: [following: fragment("array_cat(?, ?)", u.following, ^followed_addresses)]] update: [
set: [
following:
fragment(
"array(select distinct unnest (array_cat(?, ?)))",
u.following,
^followed_addresses
)
]
]
) )
{1, [follower]} = Repo.update_all(q, [], returning: true) {1, [follower]} = Repo.update_all(q, [], returning: true)

View file

@ -65,6 +65,19 @@ defmodule Pleroma.UserTest do
refute User.following?(user, not_followed) refute User.following?(user, not_followed)
end end
test "follow_all follows mutliple users without duplicating" do
user = insert(:user)
followed_zero = insert(:user)
followed_one = insert(:user)
followed_two = insert(:user)
{:ok, user} = User.follow_all(user, [followed_zero, followed_one])
assert length(user.following) == 3
{:ok, user} = User.follow_all(user, [followed_one, followed_two])
assert length(user.following) == 4
end
test "follow takes a user and another user" do test "follow takes a user and another user" do
user = insert(:user) user = insert(:user)
followed = insert(:user) followed = insert(:user)