diff options
author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-05-31 15:36:24 -0400 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-31 21:36:24 +0200 |
commit | 5c6352397257d82e75b90cc5e7de1a3922bde7bd (patch) | |
tree | 38d617da023ed80e36d1255f8190b22b4a624c75 /app/controllers/api/v1/accounts | |
parent | de4681b2be0b0efa1dede092445a53d4a593c140 (diff) |
Spec coverage and refactor for the api/v1/accounts controllers (#3451)
Diffstat (limited to 'app/controllers/api/v1/accounts')
6 files changed, 304 insertions, 0 deletions
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb new file mode 100644 index 000000000..8f2ded29e --- /dev/null +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::CredentialsController < ApiController + before_action -> { doorkeeper_authorize! :write }, only: [:update] + before_action :require_user! + + def show + @account = current_account + render 'api/v1/accounts/show' + end + + def update + current_account.update!(account_params) + @account = current_account + render 'api/v1/accounts/show' + end + + private + + def account_params + params.permit(:display_name, :note, :avatar, :header) + end +end diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb new file mode 100644 index 000000000..3e9da29e3 --- /dev/null +++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb @@ -0,0 +1,68 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::FollowerAccountsController < ApiController + before_action -> { doorkeeper_authorize! :read } + before_action :set_account + after_action :insert_pagination_headers + + respond_to :json + + def index + @accounts = load_accounts + render 'api/v1/accounts/index' + end + + private + + def set_account + @account = Account.find(params[:account_id]) + end + + def load_accounts + default_accounts.merge(paginated_follows).to_a + end + + def default_accounts + Account.includes(:active_relationships).references(:active_relationships) + end + + def paginated_follows + Follow.where(target_account: @account).paginate_by_max_id( + limit_param(DEFAULT_ACCOUNTS_LIMIT), + params[:max_id], + params[:since_id] + ) + end + + def insert_pagination_headers + set_pagination_headers(next_path, prev_path) + end + + def next_path + if records_continue? + api_v1_account_followers_url pagination_params(max_id: pagination_max_id) + end + end + + def prev_path + unless @accounts.empty? + api_v1_account_followers_url pagination_params(since_id: pagination_since_id) + end + end + + def pagination_max_id + @accounts.last.active_relationships.first.id + end + + def pagination_since_id + @accounts.first.active_relationships.first.id + end + + def records_continue? + @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) + end + + def pagination_params(core_params) + params.permit(:limit).merge(core_params) + end +end diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb new file mode 100644 index 000000000..732961aac --- /dev/null +++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb @@ -0,0 +1,68 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::FollowingAccountsController < ApiController + before_action -> { doorkeeper_authorize! :read } + before_action :set_account + after_action :insert_pagination_headers + + respond_to :json + + def index + @accounts = load_accounts + render 'api/v1/accounts/index' + end + + private + + def set_account + @account = Account.find(params[:account_id]) + end + + def load_accounts + default_accounts.merge(paginated_follows).to_a + end + + def default_accounts + Account.includes(:passive_relationships).references(:passive_relationships) + end + + def paginated_follows + Follow.where(account: @account).paginate_by_max_id( + limit_param(DEFAULT_ACCOUNTS_LIMIT), + params[:max_id], + params[:since_id] + ) + end + + def insert_pagination_headers + set_pagination_headers(next_path, prev_path) + end + + def next_path + if records_continue? + api_v1_account_following_index_url pagination_params(max_id: pagination_max_id) + end + end + + def prev_path + unless @accounts.empty? + api_v1_account_following_index_url pagination_params(since_id: pagination_since_id) + end + end + + def pagination_max_id + @accounts.last.passive_relationships.first.id + end + + def pagination_since_id + @accounts.first.passive_relationships.first.id + end + + def records_continue? + @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT) + end + + def pagination_params(core_params) + params.permit(:limit).merge(core_params) + end +end diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb new file mode 100644 index 000000000..d1a4f178b --- /dev/null +++ b/app/controllers/api/v1/accounts/relationships_controller.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::RelationshipsController < ApiController + before_action -> { doorkeeper_authorize! :read } + before_action :require_user! + + respond_to :json + + def index + @accounts = Account.where(id: account_ids).select('id') + @following = Account.following_map(account_ids, current_user.account_id) + @followed_by = Account.followed_by_map(account_ids, current_user.account_id) + @blocking = Account.blocking_map(account_ids, current_user.account_id) + @muting = Account.muting_map(account_ids, current_user.account_id) + @requested = Account.requested_map(account_ids, current_user.account_id) + @domain_blocking = Account.domain_blocking_map(account_ids, current_user.account_id) + end + + private + + def account_ids + @_account_ids ||= Array(params[:id]).map(&:to_i) + end +end diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb new file mode 100644 index 000000000..6d4c6e4cf --- /dev/null +++ b/app/controllers/api/v1/accounts/search_controller.rb @@ -0,0 +1,29 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::SearchController < ApiController + before_action -> { doorkeeper_authorize! :read } + before_action :require_user! + + respond_to :json + + def show + @accounts = account_search + + render 'api/v1/accounts/index' + end + + private + + def account_search + AccountSearchService.new.call( + params[:q], + limit_param(DEFAULT_ACCOUNTS_LIMIT), + resolving_search?, + current_account + ) + end + + def resolving_search? + params[:resolve] == 'true' + end +end diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb new file mode 100644 index 000000000..1e0d2a740 --- /dev/null +++ b/app/controllers/api/v1/accounts/statuses_controller.rb @@ -0,0 +1,92 @@ +# frozen_string_literal: true + +class Api::V1::Accounts::StatusesController < ApiController + before_action -> { doorkeeper_authorize! :read } + before_action :set_account + after_action :insert_pagination_headers + + respond_to :json + + def index + @statuses = load_statuses + end + + private + + def set_account + @account = Account.find(params[:account_id]) + end + + def load_statuses + cached_account_statuses.tap do |statuses| + set_maps(statuses) + end + end + + def cached_account_statuses + cache_collection account_statuses, Status + end + + def account_statuses + default_statuses.tap do |statuses| + statuses.merge!(only_media_scope) if params[:only_media] + statuses.merge!(no_replies_scope) if params[:exclude_replies] + end + end + + def default_statuses + permitted_account_statuses.paginate_by_max_id( + limit_param(DEFAULT_STATUSES_LIMIT), + params[:max_id], + params[:since_id] + ) + end + + def permitted_account_statuses + @account.statuses.permitted_for(@account, current_account) + end + + def only_media_scope + Status.where(id: account_media_status_ids) + end + + def account_media_status_ids + @account.media_attachments.attached.reorder(nil).select(:status_id).distinct + end + + def no_replies_scope + Status.without_replies + end + + def pagination_params(core_params) + params.permit(:limit, :only_media, :exclude_replies).merge(core_params) + end + + def insert_pagination_headers + set_pagination_headers(next_path, prev_path) + end + + def next_path + if records_continue? + api_v1_account_statuses_url pagination_params(max_id: pagination_max_id) + end + end + + def prev_path + unless @statuses.empty? + api_v1_account_statuses_url pagination_params(since_id: pagination_since_id) + end + end + + def records_continue? + @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT) + end + + def pagination_max_id + @statuses.last.id + end + + def pagination_since_id + @statuses.first.id + end +end |