diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-12-23 16:00:16 +0000 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-12-23 16:00:16 +0000 |
| commit | d9746ae4cba32f7544edb776f77134be4141ba2c (patch) | |
| tree | 1a36cf2ff5f99046f5d95e45a63bf5c8f96a3060 /lib | |
| parent | 05c7a141016cc7709357922842c7f9fb88c5b9aa (diff) | |
| parent | 8376e83f61b8dbe61134e814e093e8fe7288440f (diff) | |
| download | pleroma-d9746ae4cba32f7544edb776f77134be4141ba2c.tar.gz pleroma-d9746ae4cba32f7544edb776f77134be4141ba2c.zip | |
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/utils.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 1df53f79a..c1f6b2b49 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -446,7 +446,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do |> Activity.Queries.by_type() |> Activity.Queries.by_actor(actor) |> Activity.Queries.by_object_id(object) - |> where(fragment("data->>'state' = 'pending'")) + |> where(fragment("data->>'state' = 'pending'") or fragment("data->>'state' = 'accept'")) |> update(set: [data: fragment("jsonb_set(data, '{state}', ?)", ^state)]) |> Repo.update_all([]) |