mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-22 05:16:23 +00:00
feat: reportar desde el panel
This commit is contained in:
parent
67d9731b1e
commit
3fa19ee8b0
11 changed files with 82 additions and 11 deletions
2
Gemfile
2
Gemfile
|
@ -39,7 +39,7 @@ gem 'devise-i18n'
|
||||||
gem 'devise_invitable'
|
gem 'devise_invitable'
|
||||||
gem 'redis-client'
|
gem 'redis-client'
|
||||||
gem 'hiredis-client'
|
gem 'hiredis-client'
|
||||||
gem 'distributed-press-api-client', '~> 0.4.0rc2'
|
gem 'distributed-press-api-client', '~> 0.4.0rc3'
|
||||||
gem 'email_address', git: 'https://github.com/fauno/email_address', branch: 'i18n'
|
gem 'email_address', git: 'https://github.com/fauno/email_address', branch: 'i18n'
|
||||||
gem 'exception_notification'
|
gem 'exception_notification'
|
||||||
gem 'fast_blank'
|
gem 'fast_blank'
|
||||||
|
|
|
@ -166,12 +166,12 @@ GEM
|
||||||
devise_invitable (2.0.9)
|
devise_invitable (2.0.9)
|
||||||
actionmailer (>= 5.0)
|
actionmailer (>= 5.0)
|
||||||
devise (>= 4.6)
|
devise (>= 4.6)
|
||||||
distributed-press-api-client (0.4.0rc2)
|
distributed-press-api-client (0.4.0rc3)
|
||||||
addressable (~> 2.3, >= 2.3.0)
|
addressable (~> 2.3, >= 2.3.0)
|
||||||
climate_control
|
climate_control
|
||||||
dry-schema
|
dry-schema
|
||||||
httparty (~> 0.18)
|
httparty (~> 0.18)
|
||||||
httparty-cache (~> 0.0.4)
|
httparty-cache (~> 0.0.6)
|
||||||
json (~> 2.1, >= 2.1.0)
|
json (~> 2.1, >= 2.1.0)
|
||||||
jwt (~> 2.6.0)
|
jwt (~> 2.6.0)
|
||||||
dotenv (2.8.1)
|
dotenv (2.8.1)
|
||||||
|
@ -272,7 +272,7 @@ GEM
|
||||||
httparty (0.21.0)
|
httparty (0.21.0)
|
||||||
mini_mime (>= 1.0.0)
|
mini_mime (>= 1.0.0)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
httparty-cache (0.0.5)
|
httparty-cache (0.0.6)
|
||||||
httparty (~> 0.18)
|
httparty (~> 0.18)
|
||||||
i18n (1.14.1)
|
i18n (1.14.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
|
@ -626,7 +626,7 @@ DEPENDENCIES
|
||||||
devise
|
devise
|
||||||
devise-i18n
|
devise-i18n
|
||||||
devise_invitable
|
devise_invitable
|
||||||
distributed-press-api-client (~> 0.4.0rc2)
|
distributed-press-api-client (~> 0.4.0rc3)
|
||||||
dotenv-rails
|
dotenv-rails
|
||||||
down
|
down
|
||||||
ed25519
|
ed25519
|
||||||
|
|
|
@ -2,10 +2,13 @@
|
||||||
|
|
||||||
# Gestiona la cola de moderación de actores
|
# Gestiona la cola de moderación de actores
|
||||||
class ActorModerationsController < ApplicationController
|
class ActorModerationsController < ApplicationController
|
||||||
ActorModeration.aasm.events.map(&:name).each do |actor_event|
|
ActorModeration.events.each do |actor_event|
|
||||||
define_method(actor_event) do
|
define_method(actor_event) do
|
||||||
authorize actor_moderation
|
authorize actor_moderation
|
||||||
|
|
||||||
|
# Crea una RemoteFlag si se envían los parámetros adecuados
|
||||||
|
actor_moderation.update(actor_moderation_params) if actor_event == :report
|
||||||
|
|
||||||
actor_moderation.public_send(:"#{actor_event}!") if actor_moderation.public_send(:"may_#{actor_event}?")
|
actor_moderation.public_send(:"#{actor_event}!") if actor_moderation.public_send(:"may_#{actor_event}?")
|
||||||
|
|
||||||
redirect_back fallback_location: site_moderation_queue_path(**(session[:moderation_queue_filters] || {}))
|
redirect_back fallback_location: site_moderation_queue_path(**(session[:moderation_queue_filters] || {}))
|
||||||
|
@ -22,4 +25,11 @@ class ActorModerationsController < ApplicationController
|
||||||
def actor_moderation
|
def actor_moderation
|
||||||
@actor_moderation ||= site.actor_moderations.find(params[:actor_moderation_id] || params[:id])
|
@actor_moderation ||= site.actor_moderations.find(params[:actor_moderation_id] || params[:id])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def actor_moderation_params
|
||||||
|
params.require(:actor_moderation).permit(remote_flag_attributes: %i[message]).tap do |p|
|
||||||
|
p[:remote_flag_attributes][:site_id] = actor_moderation.site_id
|
||||||
|
p[:remote_flag_attributes][:actor_id] = actor_moderation.actor_id
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
20
app/models/activity_pub/remote_flag.rb
Normal file
20
app/models/activity_pub/remote_flag.rb
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class ActivityPub
|
||||||
|
class RemoteFlag < ApplicationRecord
|
||||||
|
belongs_to :actor
|
||||||
|
belongs_to :site
|
||||||
|
|
||||||
|
# Genera la actividad a enviar
|
||||||
|
def content
|
||||||
|
{
|
||||||
|
'@context' => 'https://www.w3.org/ns/activitystreams',
|
||||||
|
'id' => Rails.application.routes.url_helpers.v1_activity_pub_remote_flag_url(self, host: site.social_inbox_hostname),
|
||||||
|
'type' => 'Flag',
|
||||||
|
'actor' => ENV.fetch('PANEL_ACTOR_ID') { "https://#{ENV['SUTTY']}/about.jsonld" },
|
||||||
|
'content' => message.to_s,
|
||||||
|
'object' => [ actor.uri ]
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -5,8 +5,11 @@ class ActorModeration < ApplicationRecord
|
||||||
include AASM
|
include AASM
|
||||||
|
|
||||||
belongs_to :site
|
belongs_to :site
|
||||||
|
belongs_to :remote_flag, class_name: 'ActivityPub::RemoteFlag'
|
||||||
belongs_to :actor, class_name: 'ActivityPub::Actor'
|
belongs_to :actor, class_name: 'ActivityPub::Actor'
|
||||||
|
|
||||||
|
accepts_nested_attributes_for :remote_flag
|
||||||
|
|
||||||
# Bloquea todes les Actores bloqueables
|
# Bloquea todes les Actores bloqueables
|
||||||
def self.block_all!
|
def self.block_all!
|
||||||
self.update_all(aasm_state: 'blocked', updated_at: Time.now)
|
self.update_all(aasm_state: 'blocked', updated_at: Time.now)
|
||||||
|
@ -53,8 +56,14 @@ class ActorModeration < ApplicationRecord
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Al reportar, necesitamos asociar una RemoteFlag para poder
|
||||||
|
# enviarla.
|
||||||
event :report do
|
event :report do
|
||||||
transitions from: %i[blocked], to: :reported
|
transitions from: %i[blocked], to: :reported
|
||||||
|
|
||||||
|
before do
|
||||||
|
ActivityPub::RemoteFlagJob.perform_later(remote_flag: remote_flag)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,13 @@
|
||||||
-# Componente Botonera de Moderación de Cuentas (Remote_profile)
|
-# Componente Botonera de Moderación de Cuentas (Remote_profile)
|
||||||
|
|
||||||
|
- form_params = {}
|
||||||
|
- form_params[:report] = { actor_moderation: { remote_flag_attributes: { message: '' } } }
|
||||||
|
- I18n.available_locales.each do |locale|
|
||||||
|
- form_params[:report][:actor_moderation][:remote_flag_attributes][:message] += t(locale)
|
||||||
|
- form_params[:report][:actor_moderation][:remote_flag_attributes][:message] += ': '
|
||||||
|
- form_params[:report][:actor_moderation][:remote_flag_attributes][:message] += t('.report_message', locale: locale, panel_actor_mention: ENV.fetch('PANEL_ACTOR_MENTION') { '@sutty@sutty.nl' })
|
||||||
|
- form_params[:report][:actor_moderation][:remote_flag_attributes][:message] += '\n\n'
|
||||||
|
|
||||||
.d-flex.flex-row
|
.d-flex.flex-row
|
||||||
- btn_class = 'btn-secondary'
|
- btn_class = 'btn-secondary'
|
||||||
- ActorModeration.events.each do |actor_event|
|
- ActorModeration.events.each do |actor_event|
|
||||||
|
@ -7,4 +15,5 @@
|
||||||
text: t(".text_#{actor_event}"),
|
text: t(".text_#{actor_event}"),
|
||||||
path: public_send(:"site_actor_moderation_#{actor_event}_path", actor_moderation_id: actor_moderation),
|
path: public_send(:"site_actor_moderation_#{actor_event}_path", actor_moderation_id: actor_moderation),
|
||||||
class: btn_class,
|
class: btn_class,
|
||||||
disabled: !actor_moderation.public_send(:"may_#{actor_event}?")
|
disabled: !actor_moderation.public_send(:"may_#{actor_event}?"),
|
||||||
|
params: form_params[actor_event]
|
||||||
|
|
|
@ -8,5 +8,6 @@
|
||||||
= sanitize profile['summary'].html_safe
|
= sanitize profile['summary'].html_safe
|
||||||
|
|
||||||
-# Botones de Moderación
|
-# Botones de Moderación
|
||||||
.d-flex.pb-4
|
- cache actor_moderation do
|
||||||
= render 'components/profiles_btn_box', actor_moderation: actor_moderation
|
.d-flex.pb-4
|
||||||
|
= render 'components/profiles_btn_box', actor_moderation: actor_moderation
|
||||||
|
|
|
@ -106,6 +106,7 @@ en:
|
||||||
text_allow: Always approve
|
text_allow: Always approve
|
||||||
text_block: Block
|
text_block: Block
|
||||||
text_report: Report
|
text_report: Report
|
||||||
|
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}."
|
||||||
actor_moderations:
|
actor_moderations:
|
||||||
show:
|
show:
|
||||||
user: Username
|
user: Username
|
||||||
|
|
|
@ -106,6 +106,7 @@ es:
|
||||||
text_allow: Aprobar siempre
|
text_allow: Aprobar siempre
|
||||||
text_block: Bloquear
|
text_block: Bloquear
|
||||||
text_report: Reportar
|
text_report: Reportar
|
||||||
|
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}."
|
||||||
actor_moderations:
|
actor_moderations:
|
||||||
show:
|
show:
|
||||||
user: Nombre de usuarie
|
user: Nombre de usuarie
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
# Las acciones de moderación pueden tener un reporte remoto asociado
|
||||||
|
class AddRemoteFlagToActorModeration < ActiveRecord::Migration[6.1]
|
||||||
|
def up
|
||||||
|
add_column :actor_moderations, :remote_flag_id, :uuid, null: true
|
||||||
|
|
||||||
|
ActivityPub::RemoteFlag.all.find_each do |remote_flag|
|
||||||
|
actor_moderation = ActorModeration.find_by(actor_id: remote_flag.actor_id)
|
||||||
|
|
||||||
|
actor_moderation&.update_column(:remote_flag_id, remote_flag.id)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
remove_column :actor_moderations, :remote_flag_id
|
||||||
|
end
|
||||||
|
end
|
|
@ -586,7 +586,8 @@ CREATE TABLE public.actor_moderations (
|
||||||
updated_at timestamp(6) without time zone NOT NULL,
|
updated_at timestamp(6) without time zone NOT NULL,
|
||||||
site_id bigint,
|
site_id bigint,
|
||||||
actor_id uuid,
|
actor_id uuid,
|
||||||
aasm_state character varying NOT NULL
|
aasm_state character varying NOT NULL,
|
||||||
|
remote_flag_id uuid
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
@ -2697,6 +2698,7 @@ INSERT INTO "schema_migrations" (version) VALUES
|
||||||
('20240227142019'),
|
('20240227142019'),
|
||||||
('20240228171335'),
|
('20240228171335'),
|
||||||
('20240228202830'),
|
('20240228202830'),
|
||||||
('20240229201155');
|
('20240229201155'),
|
||||||
|
('20240301181224');
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue