Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop

This commit is contained in:
lain 2018-04-24 14:25:17 +02:00
commit 3f9385096e
3 changed files with 31 additions and 1 deletions

View file

@ -322,6 +322,16 @@ defmodule Pleroma.User do
update_and_set_cache(cs) update_and_set_cache(cs)
end end
def decrease_note_count(%User{} = user) do
note_count = user.info["note_count"] || 0
note_count = if note_count <= 0, do: 0, else: note_count - 1
new_info = Map.put(user.info, "note_count", note_count)
cs = info_changeset(user, %{info: new_info})
update_and_set_cache(cs)
end
def update_note_count(%User{} = user) do def update_note_count(%User{} = user) do
note_count_query = note_count_query =
from( from(

View file

@ -172,7 +172,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
with Repo.delete(object), with Repo.delete(object),
Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)), Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
{:ok, activity} <- insert(data, local), {:ok, activity} <- insert(data, local),
:ok <- maybe_federate(activity) do :ok <- maybe_federate(activity),
{:ok, actor} <- User.decrease_note_count(user) do
{:ok, activity} {:ok, activity}
end end
end end

View file

@ -296,6 +296,25 @@ defmodule Pleroma.UserTest do
assert user.info["note_count"] == 2 assert user.info["note_count"] == 2
end end
test "it decreases the info->note_count property" do
note = insert(:note)
user = User.get_by_ap_id(note.data["actor"])
assert user.info["note_count"] == nil
{:ok, user} = User.increase_note_count(user)
assert user.info["note_count"] == 1
{:ok, user} = User.decrease_note_count(user)
assert user.info["note_count"] == 0
{:ok, user} = User.decrease_note_count(user)
assert user.info["note_count"] == 0
end
test "it sets the info->follower_count property" do test "it sets the info->follower_count property" do
user = insert(:user) user = insert(:user)
follower = insert(:user) follower = insert(:user)