previous commit was creating the status regardless

of mix of video and images in status, just wasn't rendering
the show action. I moved the validation before the status creation

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index d7010354751b79b4e6ab65e5af39ea7d0f25b4b6..7ead80430290d13d89ff249bb41eb79ca9824686 100644 (file)
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -13,6 +13,7 @@ class PostStatusService < BaseService
   # @option [Doorkeeper::Application] :application
   # @return [Status]
   def call(account, text, in_reply_to = nil, options = {})
+    media = validate_media options[:media_ids]
     status = account.statuses.create!(text: text,
                                       thread: in_reply_to,
                                       sensitive: options[:sensitive],
@@ -20,7 +21,7 @@ class PostStatusService < BaseService
                                       visibility: options[:visibility],
                                       application: options[:application])
 
-    attach_media(status, options[:media_ids])
+    attach_media(status, media)
     process_mentions_service.call(status)
     process_hashtags_service.call(status)
 
@@ -33,7 +34,7 @@ class PostStatusService < BaseService
 
   private
 
-  def attach_media(status, media_ids)
+  def validate_media(media_ids)
     return if media_ids.nil? || !media_ids.is_a?(Enumerable)
     media = MediaAttachment.where(status_id: nil).where(id: media_ids.take(4).map(&:to_i))
     if media.length > 1
@@ -43,6 +44,11 @@ class PostStatusService < BaseService
         end
       end
     end
+    return media
+  end
+
+  def attach_media(status, media)
+    return if media.nil?
     media.update(status_id: status.id)
   end