1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00

Add follow/mute/block.removed events for Webhooks and associate seemingly fitting permissions with them.

This commit is contained in:
CSDUMMI 2024-01-26 13:30:19 +01:00
parent 45287049ab
commit c40cc9e2f8
5 changed files with 27 additions and 2 deletions

View file

@ -23,6 +23,9 @@ class Webhook < ApplicationRecord
report.updated
status.created
status.updated
follow.removed
block.removed
mute.removed
).freeze
attr_writer :current_account
@ -58,10 +61,12 @@ class Webhook < ApplicationRecord
def self.permission_for_event(event)
case event
when 'account.approved', 'account.created', 'account.updated'
when 'account.approved', 'account.created', 'account.updated', 'follow.removed'
:manage_users
when 'report.created', 'report.updated'
:manage_reports
when 'block.removed', 'mute.removed'
:manage_blocks
when 'status.created', 'status.updated'
:view_devops
end

View file

@ -7,6 +7,9 @@ class UnblockService < BaseService
return unless account.blocking?(target_account)
unblock = account.unblock!(target_account)
TriggerWebhookWithObjectWorker.perform_async('block.removed', Oj.to_json({ 'account_id': unblock.account_id, 'target_account_id': unblock.target_account_id, 'id': unblock.id }))
create_notification(unblock) if !target_account.local? && target_account.activitypub?
unblock
end

View file

@ -29,6 +29,8 @@ class UnfollowService < BaseService
follow.destroy!
TriggerWebhookWithObjectWorker.perform_async('follow.removed', Oj.to_json({ 'account_id': follow.account_id, 'target_account_id': follow.target_account_id, 'id': follow.id }))
create_notification(follow) if !@target_account.local? && @target_account.activitypub?
create_reject_notification(follow) if @target_account.local? && !@source_account.local? && @source_account.activitypub?
UnmergeWorker.perform_async(@target_account.id, @source_account.id) unless @options[:skip_unmerge]

View file

@ -4,7 +4,9 @@ class UnmuteService < BaseService
def call(account, target_account)
return unless account.muting?(target_account)
account.unmute!(target_account)
unmute = account.unmute!(target_account)
TriggerWebhookWithObjectWorker.perform_async('mute.removed', Oj.to_json({ 'account_id': unmute.account_id, 'target_account_id': unmute.target_account_id, 'id': unmute.id }))
MergeWorker.perform_async(target_account.id, account.id) if account.following?(target_account)
end

View file

@ -0,0 +1,13 @@
# frozen_string_literal: true
class TriggerWebhookWithObjectWorker
include Sidekiq::Worker
# Triggers a webhook for a destructive event (e.g. an unfollow),
# where the object cannot be queried from the database.
# @param event [String] type of the event
# @param object [String] event payload serialized with JSON
def perform(event, object)
WebhookService.new.call(event, Oj.load(object))
end
end