Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media...

Make replies default to privacy settings of the status being replied to

diff --git a/app/assets/javascripts/components/reducers/compose.jsx b/app/assets/javascripts/components/reducers/compose.jsx
index ef8cde75b4464e40fc39cad2c5aca12b4c5ffb85..77ec2705f080df6acbd19d530538ff6a4a8b6b77 100644 (file)
--- 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 d97010c0e54d4a3699a4d3c9097d6001605450aa..0d02294eb30ede63c500f9dc28c1df12732e173e 100644 (file)
--- 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 f91a866ba711a3cb182860d0189976c655dd6ed1..70e252409d1e92d798d668252a482228c9a7b977 100644 (file)
--- 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