Explorar el Código

maybe_notify_subscribers: Don't create notifications from ingested replies

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
stable^2
Haelwenn (lanodan) Monnier hace 2 años
padre
commit
bb2d5879cc
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: D5B7A8E43C997DEE
Se han modificado 2 ficheros con 7 adiciones y 11 borrados
  1. +1
    -0
      CHANGELOG.md
  2. +6
    -11
      lib/pleroma/web/common_api/utils.ex

+ 1
- 0
CHANGELOG.md Ver fichero

@@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- MastodonAPI: Stream out Create activities
- MRF ObjectAgePolicy: Fix pattern matching on "published"
- TwitterAPI: Make `change_password` and `change_email` require params on body instead of query
- Subscription(Bell) Notifications: Don't create from Pipeline Ingested replies

## 2.4.0 - 2021-08-08



+ 6
- 11
lib/pleroma/web/common_api/utils.ex Ver fichero

@@ -412,19 +412,14 @@ defmodule Pleroma.Web.CommonAPI.Utils do

def maybe_notify_mentioned_recipients(recipients, _), do: recipients

# Do not notify subscribers if author is making a reply
def maybe_notify_subscribers(recipients, %Activity{
object: %Object{data: %{"inReplyTo" => _ap_id}}
}) do
recipients
end

def maybe_notify_subscribers(
recipients,
%Activity{data: %{"actor" => actor, "type" => type}} = activity
)
when type == "Create" do
with %User{} = user <- User.get_cached_by_ap_id(actor) do
%Activity{data: %{"actor" => actor, "type" => "Create"}} = activity
) do
# Do not notify subscribers if author is making a reply
with %Object{data: object} <- Object.normalize(activity, fetch: false),
nil <- object["inReplyTo"],
%User{} = user <- User.get_cached_by_ap_id(actor) do
subscriber_ids =
user
|> User.subscriber_users()


Cargando…
Cancelar
Guardar