Merge tag 'v4.4.4' into chinwag-next
This commit is contained in:
commit
4346d0d376
209 changed files with 4120 additions and 1030 deletions
|
|
@ -56,11 +56,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
|||
process_audience
|
||||
|
||||
ApplicationRecord.transaction do
|
||||
@status = Status.create!(@params)
|
||||
@status = Status.create!(@params.merge(quote: @quote))
|
||||
attach_tags(@status)
|
||||
attach_mentions(@status)
|
||||
attach_counts(@status)
|
||||
attach_quote(@status)
|
||||
end
|
||||
|
||||
resolve_thread(@status)
|
||||
|
|
@ -202,13 +201,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
|||
end
|
||||
end
|
||||
|
||||
def attach_quote(status)
|
||||
return if @quote.nil?
|
||||
|
||||
@quote.status = status
|
||||
@quote.save
|
||||
end
|
||||
|
||||
def process_tags
|
||||
return if @object['tag'].nil?
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue