diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:23:06 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-26 23:23:06 +0100 |
commit | 5f511324b65f94d800dbbd3850214955d7d9eb73 (patch) | |
tree | 5ed179289819d61df1a4c15851389aa7d9b42f19 /app/services/post_status_service.rb | |
parent | 063432d7e352a0dfb7da0e198886b88e3b8a55bb (diff) |
Add validation of media attachments, clean up mastodon-own exception classes
Diffstat (limited to 'app/services/post_status_service.rb')
-rw-r--r-- | app/services/post_status_service.rb | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 7ead80430..b8179f7dc 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -13,7 +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] + media = validate_media!(options[:media_ids]) status = account.statuses.create!(text: text, thread: in_reply_to, sensitive: options[:sensitive], @@ -34,17 +34,16 @@ class PostStatusService < BaseService private - def validate_media(media_ids) + def validate_media!(media_ids) return if media_ids.nil? || !media_ids.is_a?(Enumerable) + + raise Mastodon::ValidationError, 'Cannot attach more than 4 files' if media_ids.size > 4 + 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 - return media + + raise Mastodon::ValidationError, 'Cannot attach a video to a toot that already contains images' if media.size > 1 && media.find(&:video?) + + media end def attach_media(status, media) |