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

Re-add missing transaction around status-from-OStatus creation (#4603)

Browse source
This commit is contained in:
Eugen Rochko 2017-08-14 21:37:21 +02:00 committed by GitHub
parent a855956185
commit 4fcbb1f838
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lib/ostatus/activity/creation.rb
View file

@ -16,11 +16,14 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
return [status, false] unless status.nil? return [status, false] unless status.nil?
cached_reblog = reblog
ApplicationRecord.transaction do
status = Status.create!( status = Status.create!(
uri: id, uri: id,
url: url, url: url,
account: @account, account: @account,
reblog: reblog, reblog: cached_reblog,
text: content, text: content,
spoiler_text: content_warning, spoiler_text: content_warning,
created_at: published, created_at: published,
@ -34,6 +37,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base
save_mentions(status) save_mentions(status)
save_hashtags(status) save_hashtags(status)
save_media(status) save_media(status)
end
if thread? && status.thread.nil? if thread? && status.thread.nil?
Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}" Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}"