Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-22 13:46:20 +00:00
Code Issues Projects Releases Wiki Activity

fix: reportar implicar bloquear #15600

Browse source
This commit is contained in:
f 2024-03-20 17:50:39 -03:00
parent 0a1b86c111
commit 0578b03ee7
No known key found for this signature in database
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/activity_pub.rb
View file

@ -135,11 +135,12 @@ class ActivityPub < ApplicationRecord
end end
end end
# Solo podemos reportarla luego de rechazarla # Reportarla implica rechazarla
event :report do event :report do
transitions from: :rejected, to: :reported transitions from: %i[paused approved rejected], to: :reported
after do after do
ActivityPub::InboxJob.perform_later(site: site, activity: activities.first.uri, action: :reject)
ActivityPub::RemoteFlagJob.perform_later(remote_flag: remote_flag) if remote_flag.waiting? ActivityPub::RemoteFlagJob.perform_later(remote_flag: remote_flag) if remote_flag.waiting?
end end
end end

2
app/models/actor_moderation.rb
View file

@ -43,7 +43,7 @@ class ActorModeration < ApplicationRecord
# Al reportar, necesitamos asociar una RemoteFlag para poder # Al reportar, necesitamos asociar una RemoteFlag para poder
# enviarla. # enviarla.
event :report do event :report do
transitions from: %i[blocked], to: :reported transitions from: %i[pause allowed blocked], to: :reported, after: :synchronize!
after do after do
ActivityPub::RemoteFlagJob.perform_later(remote_flag: remote_flag) if remote_flag.waiting? ActivityPub::RemoteFlagJob.perform_later(remote_flag: remote_flag) if remote_flag.waiting?

4
config/locales/en.yml
View file

@ -106,7 +106,7 @@ en:
text_reject: Reject text_reject: Reject
text_reply: Reply text_reply: Reply
text_report: Report text_report: Report
confirm_report: "Send report to the remote instance?" confirm_report: "Send report to the remote instance? This action will also reject the comment."
instances_btn_box: instances_btn_box:
text_pause: Check case by case text_pause: Check case by case
text_allow: Allow everything text_allow: Allow everything
@ -116,7 +116,7 @@ en:
text_allow: Always approve text_allow: Always approve
text_block: Block text_block: Block
text_report: Report text_report: Report
confirm_report: "Send report to the remote instance?" confirm_report: "Send report to the remote instance? This action will also block the account."
remote_flags: remote_flags:
report_message: "Hi! Someone using Sutty CMS reported this account on your instance. We don't have support for customized report messages yet, but we will soon. You can reach us at %{panel_actor_mention}." report_message: "Hi! Someone using Sutty CMS reported this account on your instance. We don't have support for customized report messages yet, but we will soon. You can reach us at %{panel_actor_mention}."
activity_pubs: activity_pubs:

4
config/locales/es.yml
View file

@ -105,7 +105,7 @@ es:
text_approve: Aceptar text_approve: Aceptar
text_reject: Rechazar text_reject: Rechazar
text_report: Reportar text_report: Reportar
confirm_report: "¿Enviar el reporte a la instancia remota?" confirm_report: "¿Enviar el reporte a la instancia remota? Esta acción también rechazará el comentario."
instances_btn_box: instances_btn_box:
text_pause: Moderar caso por caso text_pause: Moderar caso por caso
text_allow: Permitir todo text_allow: Permitir todo
@ -115,7 +115,7 @@ es:
text_allow: Aprobar siempre text_allow: Aprobar siempre
text_block: Bloquear text_block: Bloquear
text_report: Reportar text_report: Reportar
confirm_report: "¿Enviar el reporte a la instancia remota?" confirm_report: "¿Enviar el reporte a la instancia remota? Esta acción también bloqueará la cuenta."
remote_flags: remote_flags:
report_message: "¡Hola! Une usuarie de Sutty CMS reportó esta cuenta en tu instancia. Todavía no tenemos soporte para mensajes personalizados. Podés contactarnos en %{panel_actor_mention}." report_message: "¡Hola! Une usuarie de Sutty CMS reportó esta cuenta en tu instancia. Todavía no tenemos soporte para mensajes personalizados. Podés contactarnos en %{panel_actor_mention}."
activity_pubs: activity_pubs: