mirror of https://github.com/mastodon/mastodon.git
Merge branch 'fix_462' of https://github.com/rmhasan/mastodon into rmhasan-fix_462
commit
063432d7e3
|
@ -62,12 +62,11 @@ class Api::V1::StatusesController < ApiController
|
|||
end
|
||||
|
||||
def create
|
||||
@status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids],
|
||||
sensitive: params[:sensitive],
|
||||
spoiler_text: params[:spoiler_text],
|
||||
visibility: params[:visibility],
|
||||
application: doorkeeper_token.application)
|
||||
|
||||
@status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids],
|
||||
sensitive: params[:sensitive],
|
||||
spoiler_text: params[:spoiler_text],
|
||||
visibility: params[:visibility],
|
||||
application: doorkeeper_token.application)
|
||||
render action: :show
|
||||
end
|
||||
|
||||
|
|
|
@ -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,10 +34,21 @@ 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
|
||||
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)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue