Browse Source

Use race-condition free mass follow.

tags/v0.9.9
lain 5 years ago
parent
commit
47ec690c54
2 changed files with 15 additions and 8 deletions
  1. +9
    -8
      lib/pleroma/user.ex
  2. +6
    -0
      test/user_test.exs

+ 9
- 8
lib/pleroma/user.ex View File

@@ -309,20 +309,21 @@ defmodule Pleroma.User do
@doc "A mass follow for local users. Ignores blocks and has no side effects"
@spec follow_all(User.t(), list(User.t())) :: {atom(), User.t()}
def follow_all(follower, followeds) do
following =
(follower.following ++ Enum.map(followeds, fn %{follower_address: fa} -> fa end))
|> Enum.uniq()
followed_addresses = Enum.map(followeds, fn %{follower_address: fa} -> fa end)

q =
from(u in User,
where: u.id == ^follower.id,
update: [set: [following: fragment("array_cat(?, ?)", u.following, ^followed_addresses)]]
)

{:ok, follower} =
follower
|> follow_changeset(%{following: following})
|> update_and_set_cache
{1, [follower]} = Repo.update_all(q, [], returning: true)

Enum.each(followeds, fn followed ->
update_follower_count(followed)
end)

{:ok, follower}
set_cache(follower)
end

def follow(%User{} = follower, %User{info: info} = followed) do


+ 6
- 0
test/user_test.exs View File

@@ -50,13 +50,19 @@ defmodule Pleroma.UserTest do

test "follow_all follows mutliple users" do
user = insert(:user)
followed_zero = insert(:user)
followed_one = insert(:user)
followed_two = insert(:user)
not_followed = insert(:user)

{:ok, user} = User.follow(user, followed_zero)

{:ok, user} = User.follow_all(user, [followed_one, followed_two])

assert User.following?(user, followed_one)
assert User.following?(user, followed_two)
assert User.following?(user, followed_zero)
refute User.following?(user, not_followed)
end

test "follow takes a user and another user" do


Loading…
Cancel
Save