Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add conversation model, <ostatus:conversation /> (#3016)

Browse source 
* Add <ostatus:conversation /> tag to Atom input/output

Only uses ref attribute (not href) because href would be
the alternate link that's always included also.

Creates new conversation for every non-reply status. Carries
over conversation for every reply. Keeps remote URIs verbatim,
generates local URIs on the fly like the rest of them.

* Fix conversation migration

* More spec coverage for status before_create

* Prevent n+1 query when generating Atom with the new conversations

* Improve code style

* Remove redundant local variable
This commit is contained in:
Eugen Rochko 2017-05-12 19:09:21 +02:00 • committed by GitHub
parent b5a9c6b3d2
commit 5abdc77c80
11 changed files with 144 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/stream_entry.rb
View file

@ -22,7 +22,7 @@ class StreamEntry < ApplicationRecord
validates :account, :activity, presence: true
STATUS_INCLUDES = [:account, :stream_entry, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :media_attachments, :tags, mentions: :account], thread: [:stream_entry, :account]].freeze
STATUS_INCLUDES = [:account, :stream_entry, :conversation, :media_attachments, :tags, mentions: :account, reblog: [:stream_entry, :account, :conversation, :media_attachments, :tags, mentions: :account], thread: [:stream_entry, :account]].freeze
default_scope { where(activity_type: 'Status') }
scope :with_includes, -> { includes(:account, status: STATUS_INCLUDES) }