From 6f9ecd899e9e7cb335940465c23dd53acc37269c Mon Sep 17 00:00:00 2001
From: Rakib Hasan <rmhasan@gmail.com>
Date: Thu, 2 Feb 2017 23:10:17 -0500
Subject: revisted fix for #462 Moved validation to
 services/post_status_service.rb

---
 app/services/post_status_service.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/services')

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 979941c84..d70103547 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -35,8 +35,14 @@ class PostStatusService < BaseService
 
   def attach_media(status, 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
+      media.each do |m|
+        if m.video?
+          raise Mastodon::NotPermitted, 'Cannot attach a video to a toot that already contains images'
+        end
+      end
+    end
     media.update(status_id: status.id)
   end
 
-- 
cgit 


From 87a6bed9e947aaad62466f072d1a27cd0f782a7d Mon Sep 17 00:00:00 2001
From: Rakib Hasan <rmhasan@gmail.com>
Date: Sat, 4 Feb 2017 22:03:24 -0500
Subject: 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

---
 app/services/post_status_service.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/services')

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index d70103547..7ead80430 100644
--- 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
 
-- 
cgit