diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-05 18:39:53 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-09-05 18:39:53 +0200 |
commit | eec0dc46a6d6782f6aebdc759d4822ef17fd57a2 (patch) | |
tree | 0c3f88e90e1f5274df1805c97181c3d6f3e3e40a /app/controllers | |
parent | ae1fac006206ab28cd7cba63ab85c07a27f3d606 (diff) |
PostStatusService can attach media to status, ProcessFeedService likewise
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/api/statuses_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/statuses_controller.rb | 16 |
2 files changed, 1 insertions, 17 deletions
diff --git a/app/controllers/api/statuses_controller.rb b/app/controllers/api/statuses_controller.rb index d5d7a062f..0ef56580c 100644 --- a/app/controllers/api/statuses_controller.rb +++ b/app/controllers/api/statuses_controller.rb @@ -7,7 +7,7 @@ class Api::StatusesController < ApiController end def create - @status = PostStatusService.new.(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id])) + @status = PostStatusService.new.(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), params[:media_ids]) render action: :show end diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb deleted file mode 100644 index d6779e0a7..000000000 --- a/app/controllers/statuses_controller.rb +++ /dev/null @@ -1,16 +0,0 @@ -class StatusesController < ApplicationController - before_action :authenticate_user! - - def create - PostStatusService.new.(current_user.account, status_params[:text]) - redirect_to root_path - rescue ActiveRecord::RecordInvalid - redirect_to root_path - end - - private - - def status_params - params.require(:status).permit(:text) - end -end |