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

Fix #50 - Order ancestors/descendants by tree path

Browse source
This commit is contained in:
Eugen Rochko 2016-09-21 23:18:28 +02:00
parent d709151781
commit c0e9603c92
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/statuses_controller.rb
View file

@ -8,8 +8,8 @@ class Api::StatusesController < ApiController
def context def context
@status = Status.find(params[:id]) @status = Status.find(params[:id])
@ancestors = @status.ancestors.with_includes.with_counters.to_a @ancestors = @status.ancestors
@descendants = @status.descendants.with_includes.with_counters.to_a @descendants = @status.descendants
end end
def create def create

4
app/controllers/stream_entries_controller.rb
View file

@ -9,8 +9,8 @@ class StreamEntriesController < ApplicationController
@type = @stream_entry.activity_type.downcase @type = @stream_entry.activity_type.downcase
if @stream_entry.activity_type == 'Status' if @stream_entry.activity_type == 'Status'
@ancestors = @stream_entry.activity.ancestors.with_includes.with_counters @ancestors = @stream_entry.activity.ancestors
@descendants = @stream_entry.activity.descendants.with_includes.with_counters @descendants = @stream_entry.activity.descendants
if user_signed_in? if user_signed_in?
status_ids = [@stream_entry.activity_id] + @ancestors.map { |s| s.id } + @descendants.map { |s| s.id } status_ids = [@stream_entry.activity_id] + @ancestors.map { |s| s.id } + @descendants.map { |s| s.id }

10
app/models/status.rb
View file

@ -61,11 +61,17 @@ class Status < ApplicationRecord
end end
def ancestors def ancestors
Status.where(id: Status.find_by_sql(['WITH RECURSIVE search_tree(id, in_reply_to_id, path) AS (SELECT id, in_reply_to_id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, statuses.in_reply_to_id, path || statuses.id FROM search_tree JOIN statuses ON statuses.id = search_tree.in_reply_to_id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path DESC', self.id]) - [self]) ids = (Status.find_by_sql(['WITH RECURSIVE search_tree(id, in_reply_to_id, path) AS (SELECT id, in_reply_to_id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, statuses.in_reply_to_id, path || statuses.id FROM search_tree JOIN statuses ON statuses.id = search_tree.in_reply_to_id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path DESC', self.id]) - [self]).pluck(:id)
statuses = Status.where(id: ids).with_counters.with_includes.group_by(&:id)
ids.map { |id| statuses[id].first }
end end
def descendants def descendants
Status.where(id: Status.find_by_sql(['WITH RECURSIVE search_tree(id, path) AS (SELECT id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, path || statuses.id FROM search_tree JOIN statuses ON statuses.in_reply_to_id = search_tree.id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path', self.id]) - [self]) ids = (Status.find_by_sql(['WITH RECURSIVE search_tree(id, path) AS (SELECT id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, path || statuses.id FROM search_tree JOIN statuses ON statuses.in_reply_to_id = search_tree.id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path', self.id]) - [self]).pluck(:id)
statuses = Status.where(id: ids).with_counters.with_includes.group_by(&:id)
ids.map { |id| statuses[id].first }
end end
def self.as_home_timeline(account) def self.as_home_timeline(account)