commit: 49834a6e7f06301a5bcc17b8771ed4513622b6a8 parent: 8724094ed0e531f4435bf2784c9c1b7176acd764 Author: Eugen Rochko <eugen@zeonfederated.com> Date: Thu, 29 Dec 2016 20:12:32 +0100 Add API for retrieving blocked accountsDiffstat:
15 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/.rubocop.yml b/.rubocop.yml @@ -86,3 +86,4 @@ AllCops: - 'config/**/*' - 'bin/*' - 'Rakefile' + - 'node_modules/**/*' diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class Api::V1::BlocksController < ApiController + before_action -> { doorkeeper_authorize! :follow } + before_action :require_user! + + respond_to :json + + def index + results = Block.where(account: current_account).paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id]) + accounts = Account.where(id: results.map(&:target_account_id)).map { |a| [a.id, a] }.to_h + @accounts = results.map { |f| accounts[f.target_account_id] } + + set_account_counters_maps(@accounts) + + next_path = api_v1_blocks_url(max_id: results.last.id) if results.size == DEFAULT_ACCOUNTS_LIMIT + prev_path = api_v1_blocks_url(since_id: results.first.id) unless results.empty? + + set_pagination_headers(next_path, prev_path) + end +end diff --git a/app/helpers/api/oembed_helper.rb b/app/helpers/api/oembed_helper.rb @@ -1,2 +0,0 @@ -module Api::OembedHelper -end diff --git a/app/helpers/api/v1/follow_requests_helper.rb b/app/helpers/api/v1/follow_requests_helper.rb @@ -1,2 +0,0 @@ -module Api::V1::FollowRequestsHelper -end diff --git a/app/helpers/authorize_follow_helper.rb b/app/helpers/authorize_follow_helper.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + module AuthorizeFollowHelper end diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb @@ -10,7 +10,7 @@ module StreamEntriesHelper end def avatar_for_status_url(status) - status.reblog? ? status.reblog.account.avatar.url( :original) : status.account.avatar.url( :original) + status.reblog? ? status.reblog.account.avatar.url(:original) : status.account.avatar.url(:original) end def entry_classes(status, is_predecessor, is_successor, include_threads) diff --git a/app/models/block.rb b/app/models/block.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true class Block < ApplicationRecord + include Paginable include Streamable belongs_to :account diff --git a/app/views/api/v1/blocks/index.rabl b/app/views/api/v1/blocks/index.rabl @@ -0,0 +1,2 @@ +collection @accounts +extends 'api/v1/accounts/show' diff --git a/app/workers/processing_worker.rb b/app/workers/processing_worker.rb @@ -2,7 +2,7 @@ class ProcessingWorker include Sidekiq::Worker - + sidekiq_options backtrace: true def perform(account_id, body) diff --git a/app/workers/salmon_worker.rb b/app/workers/salmon_worker.rb @@ -2,7 +2,7 @@ class SalmonWorker include Sidekiq::Worker - + sidekiq_options backtrace: true def perform(account_id, body) diff --git a/config/routes.rb b/config/routes.rb @@ -100,6 +100,7 @@ Rails.application.routes.draw do resources :follows, only: [:create] resources :media, only: [:create] resources :apps, only: [:create] + resources :blocks, only: [:index] resources :follow_requests, only: [:index] do member do diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb @@ -7,7 +7,6 @@ RSpec.describe Api::V1::AccountsController, type: :controller do let(:token) { double acceptable?: true, resource_owner_id: user.id } before do - stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {}) allow(controller).to receive(:doorkeeper_token) { token } end diff --git a/spec/controllers/api/v1/blocks_controller_spec.rb b/spec/controllers/api/v1/blocks_controller_spec.rb @@ -0,0 +1,19 @@ +require 'rails_helper' + +RSpec.describe Api::V1::BlocksController, type: :controller do + render_views + + let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } + let(:token) { double acceptable?: true, resource_owner_id: user.id } + + before do + allow(controller).to receive(:doorkeeper_token) { token } + end + + describe 'GET #index' do + it 'returns http success' do + get :index + expect(response).to have_http_status(:success) + end + end +end diff --git a/spec/controllers/api/v1/timelines_controller_spec.rb b/spec/controllers/api/v1/timelines_controller_spec.rb @@ -6,7 +6,6 @@ RSpec.describe Api::V1::TimelinesController, type: :controller do let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } before do - stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {}) allow(controller).to receive(:doorkeeper_token) { token } end diff --git a/spec/helpers/api/oembed_helper_spec.rb b/spec/helpers/api/oembed_helper_spec.rb @@ -1,5 +0,0 @@ -require 'rails_helper' - -RSpec.describe Api::OembedHelper, type: :helper do - -end