diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-04 01:15:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-04 01:15:29 +0100 |
| commit | f03148f441d8dfc1856451c4faa00b5e26b6e199 (patch) | |
| tree | 3d39c780306ee52a48b3c3d1ae30ecf600ba962d /app/controllers/api/v1/follow_requests_controller.rb | |
| parent | 3637a0101e1f5095397f190e88f281d603797c32 (diff) | |
| parent | d9c3109bb67f64c671573b1bab02132c6214509b (diff) | |
Merge pull request #1712 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/follow_requests_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/follow_requests_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb index f4b2a74d0..54ff0e11d 100644 --- a/app/controllers/api/v1/follow_requests_controller.rb +++ b/app/controllers/api/v1/follow_requests_controller.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true class Api::V1::FollowRequestsController < Api::BaseController - before_action -> { doorkeeper_authorize! :follow, :'read:follows' }, only: :index - before_action -> { doorkeeper_authorize! :follow, :'write:follows' }, except: :index + before_action -> { doorkeeper_authorize! :follow, :read, :'read:follows' }, only: :index + before_action -> { doorkeeper_authorize! :follow, :write, :'write:follows' }, except: :index before_action :require_user! after_action :insert_pagination_headers, only: :index @@ -13,7 +13,7 @@ class Api::V1::FollowRequestsController < Api::BaseController def authorize AuthorizeFollowService.new.call(account, current_account) - NotifyService.new.call(current_account, :follow, Follow.find_by(account: account, target_account: current_account)) + LocalNotificationWorker.perform_async(current_account.id, Follow.find_by(account: account, target_account: current_account).id, 'Follow', 'follow') render json: account, serializer: REST::RelationshipSerializer, relationships: relationships end |