From 649a20ab46eadf9ae3bfc30782ae62379383bd72 Mon Sep 17 00:00:00 2001
From: masarakki <masaki182@gmail.com>
Date: Sat, 26 Aug 2017 19:40:03 +0900
Subject: [PATCH] authorize-follow-requests-after-unlocking (#4658)
---
.../api/v1/accounts/credentials_controller.rb | 2 +-
.../settings/profiles_controller.rb | 2 +-
app/services/update_account_service.rb | 21 +++++++++++++++++++
app/workers/authorize_follow_worker.rb | 14 +++++++++++++
4 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 app/services/update_account_service.rb
create mode 100644 app/workers/authorize_follow_worker.rb
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index bea83cd2a..da534d960 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -12,7 +12,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
def update
@account = current_account
- @account.update!(account_params)
+ UpdateAccountService.new.call(@account, account_params, raise_error: true)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
render json: @account, serializer: REST::CredentialAccountSerializer
end
diff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rb
index c751c64ae..28f78a4fb 100644
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -14,7 +14,7 @@ class Settings::ProfilesController < ApplicationController
def show; end
def update
- if @account.update(account_params)
+ if UpdateAccountService.new.call(@account, account_params)
ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
else
diff --git a/app/services/update_account_service.rb b/app/services/update_account_service.rb
new file mode 100644
index 000000000..09ea377e7
--- /dev/null
+++ b/app/services/update_account_service.rb
@@ -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
diff --git a/app/workers/authorize_follow_worker.rb b/app/workers/authorize_follow_worker.rb
new file mode 100644
index 000000000..0d5014624
--- /dev/null
+++ b/app/workers/authorize_follow_worker.rb
@@ -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