diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-17 01:30:24 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-17 01:30:24 +0100 |
| commit | 8132cf8153e45aa75333c5bfd636141e1792bd50 (patch) | |
| tree | 39c1732ff8b8302bfa17bcca1c6c518653a7fe97 | |
| parent | d0f087db2df65bd4b6c4c4558ea39f14f38733c7 (diff) | |
Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments
Make replies default to privacy settings of the status being replied to
| -rw-r--r-- | app/assets/javascripts/components/reducers/compose.jsx | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/accounts_controller.rb | 15 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/app/assets/javascripts/components/reducers/compose.jsx b/app/assets/javascripts/components/reducers/compose.jsx index ef8cde75b..77ec2705f 100644 --- a/app/assets/javascripts/components/reducers/compose.jsx +++ b/app/assets/javascripts/components/reducers/compose.jsx @@ -126,6 +126,8 @@ export default function compose(state = initialState, action) { return state.withMutations(map => { map.set('in_reply_to', action.status.get('id')); map.set('text', statusToTextMentions(state, action.status)); + map.set('unlisted', action.status.get('visibility') === 'unlisted'); + map.set('private', action.status.get('visibility') === 'private'); }); case COMPOSE_REPLY_CANCEL: return state.withMutations(map => { diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb index d97010c0e..0d02294eb 100644 --- a/app/controllers/api/v1/accounts_controller.rb +++ b/app/controllers/api/v1/accounts_controller.rb @@ -58,6 +58,21 @@ class Api::V1::AccountsController < ApiController set_pagination_headers(next_path, prev_path) end + def media_statuses + media_ids = MediaAttachment.where(account: @account).where.not(status_id: nil).reorder('').select('distinct status_id') + @statuses = @account.statuses.where(id: media_ids).permitted_for(@account, current_account).paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id]) + @statuses = cache_collection(@statuses, Status) + + set_maps(@statuses) + set_counters_maps(@statuses) + + next_path = media_statuses_api_v1_account_url(max_id: @statuses.last.id) if @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT) + prev_path = media_statuses_api_v1_account_url(since_id: @statuses.first.id) unless @statuses.empty? + + set_pagination_headers(next_path, prev_path) + render action: :statuses + end + def follow FollowService.new.call(current_user.account, @account.acct) set_relationship diff --git a/config/routes.rb b/config/routes.rb index f91a866ba..70e252409 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -151,6 +151,7 @@ Rails.application.routes.draw do member do get :statuses + get 'statuses/media', to: 'accounts#media_statuses', as: :media_statuses get :followers get :following |