From 6f8f018e3ed7811998bf2cc10d1b6f0dad54dcef Mon Sep 17 00:00:00 2001 From: ysksn Date: Sat, 11 Jan 2020 19:55:33 +0900 Subject: Refactor StatusThreadingConcern (#9626) * Remove #filter_from_context? * Create scope Status.with_accounts Retrieving AR objects should be their model's scope --- app/models/concerns/status_threading_concern.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'app/models/concerns') diff --git a/app/models/concerns/status_threading_concern.rb b/app/models/concerns/status_threading_concern.rb index 15eb695cd..a0ead1995 100644 --- a/app/models/concerns/status_threading_concern.rb +++ b/app/models/concerns/status_threading_concern.rb @@ -81,12 +81,12 @@ module StatusThreadingConcern end def find_statuses_from_tree_path(ids, account, promote: false) - statuses = statuses_with_accounts(ids).to_a + statuses = Status.with_accounts(ids).to_a account_ids = statuses.map(&:account_id).uniq domains = statuses.map(&:account_domain).compact.uniq relations = relations_map_for_account(account, account_ids, domains) - statuses.reject! { |status| filter_from_context?(status, account, relations) } + statuses.reject! { |status| StatusFilter.new(status, account, relations).filtered? } # Order ancestors/descendants by tree path statuses.sort_by! { |status| ids.index(status.id) } @@ -125,12 +125,4 @@ module StatusThreadingConcern domain_blocking_by_domain: Account.domain_blocking_map_by_domain(domains, account.id), } end - - def statuses_with_accounts(ids) - Status.where(id: ids).includes(:account) - end - - def filter_from_context?(status, account, relations) - StatusFilter.new(status, account, relations).filtered? - end end -- cgit From 3287ec8ca3bf8baad6cea0cc497753ff003d2d35 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 13 Jan 2020 12:54:33 +0100 Subject: Fix file names being obfuscated on update when file didn't change (#12857) Fix #12849 --- app/models/concerns/attachmentable.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/concerns') diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index 1e8c4806f..43ff8ac12 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -74,7 +74,7 @@ module Attachmentable self.class.attachment_definitions.each_key do |attachment_name| attachment = send(attachment_name) - next if attachment.blank? + next if attachment.blank? || attachment.queued_for_write[:original].blank? attachment.instance_write :file_name, SecureRandom.hex(8) + File.extname(attachment.instance_read(:file_name)) end -- cgit