kikobar/mastodon
1
0
Fork 0
mirror of https://github.com/kikobar/mastodon.git synced 2024-11-17 12:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

authorize-follow-requests-after-unlocking (#4658)

Browse source
This commit is contained in:
masarakki 2017-08-26 19:40:03 +09:00 committed by Eugen Rochko
parent 3ac7b353f8
commit 649a20ab46
4 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/accounts/credentials_controller.rb
View file

@ -12,7 +12,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
def update def update
@account = current_account @account = current_account
@account.update!(account_params) UpdateAccountService.new.call(@account, account_params, raise_error: true)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id) ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
render json: @account, serializer: REST::CredentialAccountSerializer render json: @account, serializer: REST::CredentialAccountSerializer
end end

2
app/controllers/settings/profiles_controller.rb
View file

@ -14,7 +14,7 @@ class Settings::ProfilesController < ApplicationController
def show; end def show; end
def update def update
if @account.update(account_params) if UpdateAccountService.new.call(@account, account_params)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id) ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg') redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
else else

21
app/services/update_account_service.rb Normal file
View file

@ -0,0 +1,21 @@
# frozen_string_literal: true
class UpdateAccountService < BaseService
def call(account, params, raise_error: false)
was_locked = account.locked
update_method = raise_error ? :update! : :update
account.send(update_method, params).tap do |ret|
next unless ret
authorize_all_follow_requests(account) if was_locked && !account.locked
end
end
private
def authorize_all_follow_requests(account)
follow_requests = FollowRequest.where(target_account: account)
AuthorizeFollowWorker.push_bulk(follow_requests) do |req|
[req.account_id, req.target_account_id]
end
end
end

14
app/workers/authorize_follow_worker.rb Normal file
View file

@ -0,0 +1,14 @@
# frozen_string_literal: true
class AuthorizeFollowWorker
include Sidekiq::Worker
def perform(source_account_id, target_account_id)
source_account = Account.find(source_account_id)
target_account = Account.find(target_account_id)
AuthorizeFollowService.new.call(source_account, target_account)
rescue ActiveRecord::RecordNotFound
true
end
end