From eec0dc46a6d6782f6aebdc759d4822ef17fd57a2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 5 Sep 2016 18:39:53 +0200
Subject: PostStatusService can attach media to status, ProcessFeedService
 likewise

---
 app/controllers/api/statuses_controller.rb |  2 +-
 app/controllers/statuses_controller.rb     | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 app/controllers/statuses_controller.rb

(limited to 'app/controllers')

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