gearheads
/
mastodon
Archived
2
0
Fork 0

Add API for retrieving blocked accounts

gh/stable
Eugen Rochko 2016-12-29 20:12:32 +01:00
parent 8724094ed0
commit 49834a6e7f
15 changed files with 50 additions and 14 deletions

View File

@ -86,3 +86,4 @@ AllCops:
- 'config/**/*' - 'config/**/*'
- 'bin/*' - 'bin/*'
- 'Rakefile' - 'Rakefile'
- 'node_modules/**/*'

View File

@ -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

View File

@ -1,2 +0,0 @@
module Api::OembedHelper
end

View File

@ -1,2 +0,0 @@
module Api::V1::FollowRequestsHelper
end

View File

@ -1,2 +1,4 @@
# frozen_string_literal: true
module AuthorizeFollowHelper module AuthorizeFollowHelper
end end

View File

@ -10,7 +10,7 @@ module StreamEntriesHelper
end end
def avatar_for_status_url(status) 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 end
def entry_classes(status, is_predecessor, is_successor, include_threads) def entry_classes(status, is_predecessor, is_successor, include_threads)

View File

@ -1,6 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Block < ApplicationRecord class Block < ApplicationRecord
include Paginable
include Streamable include Streamable
belongs_to :account belongs_to :account

View File

@ -0,0 +1,2 @@
collection @accounts
extends 'api/v1/accounts/show'

View File

@ -2,7 +2,7 @@
class ProcessingWorker class ProcessingWorker
include Sidekiq::Worker include Sidekiq::Worker
sidekiq_options backtrace: true sidekiq_options backtrace: true
def perform(account_id, body) def perform(account_id, body)

View File

@ -2,7 +2,7 @@
class SalmonWorker class SalmonWorker
include Sidekiq::Worker include Sidekiq::Worker
sidekiq_options backtrace: true sidekiq_options backtrace: true
def perform(account_id, body) def perform(account_id, body)

View File

@ -100,6 +100,7 @@ Rails.application.routes.draw do
resources :follows, only: [:create] resources :follows, only: [:create]
resources :media, only: [:create] resources :media, only: [:create]
resources :apps, only: [:create] resources :apps, only: [:create]
resources :blocks, only: [:index]
resources :follow_requests, only: [:index] do resources :follow_requests, only: [:index] do
member do member do

View File

@ -7,7 +7,6 @@ RSpec.describe Api::V1::AccountsController, type: :controller do
let(:token) { double acceptable?: true, resource_owner_id: user.id } let(:token) { double acceptable?: true, resource_owner_id: user.id }
before do before do
stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {})
allow(controller).to receive(:doorkeeper_token) { token } allow(controller).to receive(:doorkeeper_token) { token }
end end

View File

@ -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

View File

@ -6,7 +6,6 @@ RSpec.describe Api::V1::TimelinesController, type: :controller do
let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
before do before do
stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {})
allow(controller).to receive(:doorkeeper_token) { token } allow(controller).to receive(:doorkeeper_token) { token }
end end

View File

@ -1,5 +0,0 @@
require 'rails_helper'
RSpec.describe Api::OembedHelper, type: :helper do
end