luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 20:03:24 +00:00
Code Issues Projects Releases Wiki Activity

attach_media should be in transaction of creation status (#2426)

Browse source
This commit is contained in:
Keiji, Yoshimi 2017-04-26 10:47:44 +09:00 committed by Eugen Rochko
parent 8ee1af9530
commit 8fe36654ef
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/post_status_service.rb
View file

@ -20,6 +20,8 @@ class PostStatusService < BaseService
end end
media = validate_media!(options[:media_ids]) media = validate_media!(options[:media_ids])
status = nil
ApplicationRecord.transaction do
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],
@ -27,8 +29,8 @@ class PostStatusService < BaseService
visibility: options[:visibility], visibility: options[:visibility],
language: detect_language_for(text, account), language: detect_language_for(text, account),
application: options[:application]) application: options[:application])
attach_media(status, media) attach_media(status, media)
end
process_mentions_service.call(status) process_mentions_service.call(status)
process_hashtags_service.call(status) process_hashtags_service.call(status)