From 004382e4d09f90e5ca824996c4b20e99599bf98f Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 26 Dec 2016 19:30:45 +0100 Subject: [PATCH] Adding follow requests API --- .../api/v1/follow_requests_controller.rb | 29 +++++++++++ app/helpers/api/v1/follow_requests_helper.rb | 2 + app/models/follow_request.rb | 2 + app/views/api/v1/follow_requests/index.rabl | 2 + config/routes.rb | 7 +++ .../api/v1/follow_requests_controller_spec.rb | 52 +++++++++++++++++++ spec/helpers/api/oembed_helper_spec.rb | 12 +---- 7 files changed, 95 insertions(+), 11 deletions(-) create mode 100644 app/controllers/api/v1/follow_requests_controller.rb create mode 100644 app/helpers/api/v1/follow_requests_helper.rb create mode 100644 app/views/api/v1/follow_requests/index.rabl create mode 100644 spec/controllers/api/v1/follow_requests_controller_spec.rb diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb new file mode 100644 index 000000000..a30e97e71 --- /dev/null +++ b/app/controllers/api/v1/follow_requests_controller.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +class Api::V1::FollowRequestsController < ApiController + before_action -> { doorkeeper_authorize! :follow } + before_action :require_user! + + def index + results = FollowRequest.where(target_account: current_account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id]) + accounts = Account.where(id: results.map(&:account_id)).map { |a| [a.id, a] }.to_h + @accounts = results.map { |f| accounts[f.account_id] } + + set_account_counters_maps(@accounts) + + next_path = api_v1_follow_requests_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT + prev_path = api_v1_follow_requests_url(since_id: results.first.id) unless results.empty? + + set_pagination_headers(next_path, prev_path) + end + + def authorize + FollowRequest.find_by!(account_id: params[:id], target_account: current_account).authorize! + render_empty + end + + def reject + FollowRequest.find_by!(account_id: params[:id], target_account: current_account).reject! + render_empty + end +end diff --git a/app/helpers/api/v1/follow_requests_helper.rb b/app/helpers/api/v1/follow_requests_helper.rb new file mode 100644 index 000000000..b36faf2a3 --- /dev/null +++ b/app/helpers/api/v1/follow_requests_helper.rb @@ -0,0 +1,2 @@ +module Api::V1::FollowRequestsHelper +end diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index 132316fb4..b46065d53 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class FollowRequest < ApplicationRecord + include Paginable + belongs_to :account belongs_to :target_account, class_name: 'Account' diff --git a/app/views/api/v1/follow_requests/index.rabl b/app/views/api/v1/follow_requests/index.rabl new file mode 100644 index 000000000..9f3b13a53 --- /dev/null +++ b/app/views/api/v1/follow_requests/index.rabl @@ -0,0 +1,2 @@ +collection @accounts +extends 'api/v1/accounts/show' diff --git a/config/routes.rb b/config/routes.rb index e8c8f619d..2e9b2a87c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -104,6 +104,13 @@ Rails.application.routes.draw do resources :media, only: [:create] resources :apps, only: [:create] + resources :follow_requests, only: [:index] do + member do + post :authorize + post :reject + end + end + resources :notifications, only: [:index] resources :accounts, only: [:show] do diff --git a/spec/controllers/api/v1/follow_requests_controller_spec.rb b/spec/controllers/api/v1/follow_requests_controller_spec.rb new file mode 100644 index 000000000..a90d2d290 --- /dev/null +++ b/spec/controllers/api/v1/follow_requests_controller_spec.rb @@ -0,0 +1,52 @@ +require 'rails_helper' + +RSpec.describe Api::V1::FollowRequestsController, type: :controller do + render_views + + let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice', locked: true)) } + let(:token) { double acceptable?: true, resource_owner_id: user.id } + let(:follower) { Fabricate(:account, username: 'bob') } + + before do + FollowService.new.call(follower, user.account.acct) + allow(controller).to receive(:doorkeeper_token) { token } + end + + describe 'GET #index' do + before do + get :index + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + end + + describe 'POST #authorize' do + before do + post :authorize, params: { id: follower.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'allows follower to follow' do + expect(follower.following?(user.account)).to be true + end + end + + describe 'POST #reject' do + before do + post :reject, params: { id: follower.id } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'removes follow request' do + expect(FollowRequest.where(target_account: user.account, account: follower).count).to eq 0 + end + end +end diff --git a/spec/helpers/api/oembed_helper_spec.rb b/spec/helpers/api/oembed_helper_spec.rb index 4f64cb84f..a671e2d65 100644 --- a/spec/helpers/api/oembed_helper_spec.rb +++ b/spec/helpers/api/oembed_helper_spec.rb @@ -1,15 +1,5 @@ require 'rails_helper' -# Specs in this file have access to a helper object that includes -# the Api::OembedHelper. For example: -# -# describe Api::OembedHelper do -# describe "string concat" do -# it "concats two strings with spaces" do -# expect(helper.concat_strings("this","that")).to eq("this that") -# end -# end -# end RSpec.describe Api::OembedHelper, type: :helper do - pending "add some examples to (or delete) #{__FILE__}" + end