zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge branch 'fix_462' of https://github.com/rmhasan/mastodon into rmhasan-fix_462

This commit is contained in:
Eugen Rochko 2017-02-26 23:09:18 +01:00
parent 1b8d3375c8 9433d03705
commit 063432d7e3
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/api/v1/statuses_controller.rb
View File

@ -67,7 +67,6 @@ class Api::V1::StatusesController < ApiController
spoiler_text: params[:spoiler_text], spoiler_text: params[:spoiler_text],
visibility: params[:visibility], visibility: params[:visibility],
application: doorkeeper_token.application) application: doorkeeper_token.application)
render action: :show render action: :show
end end

18
app/services/post_status_service.rb
View File

@ -13,6 +13,7 @@ class PostStatusService < BaseService
# @option [Doorkeeper::Application] :application # @option [Doorkeeper::Application] :application
# @return [Status] # @return [Status]
def call(account, text, in_reply_to = nil, options = {}) def call(account, text, in_reply_to = nil, options = {})
media = validate_media options[:media_ids]
status = account.statuses.create!(text: text, status = account.statuses.create!(text: text,
thread: in_reply_to, thread: in_reply_to,
sensitive: options[:sensitive], sensitive: options[:sensitive],
@ -20,7 +21,7 @@ class PostStatusService < BaseService
visibility: options[:visibility], visibility: options[:visibility],
application: options[:application]) application: options[:application])
attach_media(status, options[:media_ids]) attach_media(status, media)
process_mentions_service.call(status) process_mentions_service.call(status)
process_hashtags_service.call(status) process_hashtags_service.call(status)
@ -33,10 +34,21 @@ class PostStatusService < BaseService
private private
def attach_media(status, media_ids) def validate_media(media_ids)
return if media_ids.nil? || !media_ids.is_a?(Enumerable) 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)) 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
end
def attach_media(status, media)
return if media.nil?
media.update(status_id: status.id) media.update(status_id: status.id)
end end