From 33e1c8680e06d1216d4a8d0aa983c6706229fb61 Mon Sep 17 00:00:00 2001 From: "zyn on thu.closed.social" Date: Mon, 30 Dec 2019 23:46:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AD=E7=A4=BE=E6=A0=91=E6=A0=B9=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=8F=AA=E5=8A=A0=E8=BD=BD=E4=B8=80=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/api/v1/statuses_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb index 3a15f37bc9..afa6438c2e 100644 --- a/app/controllers/api/v1/statuses_controller.rb +++ b/app/controllers/api/v1/statuses_controller.rb @@ -25,9 +25,9 @@ class Api::V1::StatusesController < Api::BaseController ancestors_results = @status.in_reply_to_id.nil? ? [] : @status.ancestors(CONTEXT_LIMIT, current_account) treeId = ENV['TREE_ADDRESS'].split('/')[-1].to_i - isTree = @status.id == treeId || (!ancestors_results.empty? && ancestors_results[0].id == treeId) + depth = @status.id == treeId ? 1 : ((!ancestors_results.empty? && ancestors_results[0].id == treeId) ? 2 : nil) - descendants_results = @status.descendants(CONTEXT_LIMIT, current_account, nil, nil, isTree ? 2 : nil) + descendants_results = @status.descendants(CONTEXT_LIMIT, current_account, nil, nil, depth) loaded_ancestors = cache_collection(ancestors_results, Status) loaded_descendants = cache_collection(descendants_results, Status)