Merge branch 'kb_patch' into kb_development

app/models/status.rb

@@ -357,21 +357,30 @@ class Status < ApplicationRecord
     return [] if account.present? && !self.account.show_emoji_reaction?(account)
     return [] if account.nil? && !options[:force] && self.account.emoji_reaction_policy != :allow
 
+    permitted_account_ids = options[:permitted_account_ids]
+
     (Oj.load(status_stat&.emoji_reactions || '', mode: :strict) || []).tap do |emoji_reactions|
       if account.present?
-        remove_emoji_reactions = []
+        public_emoji_reactions = []
+
         emoji_reactions.each do |emoji_reaction|
           emoji_reaction['me'] = emoji_reaction['account_ids'].include?(account.id.to_s)
           emoji_reaction['account_ids'] -= account.excluded_from_timeline_account_ids.map(&:to_s)
 
-          accounts = Account.where(id: emoji_reaction['account_ids'], silenced_at: nil, suspended_at: nil)
-          accounts = accounts.where('domain IS NULL OR domain NOT IN (?)', account.excluded_from_timeline_domains) if account.excluded_from_timeline_domains.size.positive?
-          emoji_reaction['account_ids'] = accounts.pluck(:id).map(&:to_s)
+          accounts = []
+          if permitted_account_ids
+            emoji_reaction['account_ids'] = emoji_reaction['account_ids'] & permitted_account_ids.map(&:to_s)
+          else
+            accounts = Account.where(id: emoji_reaction['account_ids'], silenced_at: nil, suspended_at: nil)
+            accounts = accounts.where('domain IS NULL OR domain NOT IN (?)', account.excluded_from_timeline_domains) if account.excluded_from_timeline_domains.size.positive?
+            emoji_reaction['account_ids'] = accounts.pluck(:id).map(&:to_s)
+          end
 
           emoji_reaction['count'] = emoji_reaction['account_ids'].size
-          remove_emoji_reactions << emoji_reaction if emoji_reaction['count'] <= 0
+          public_emoji_reactions << emoji_reaction if (emoji_reaction['count']).positive?
         end
-        emoji_reactions - remove_emoji_reactions
+
+        public_emoji_reactions
       end
     end
   end
@@ -463,6 +472,11 @@ class Status < ApplicationRecord
       EmojiReaction.select('status_id').where(status_id: status_ids).where(account_id: account_id).each_with_object({}) { |e, h| h[e.status_id] = true }
     end
 
+    def emoji_reaction_allows_map(status_ids, account_id)
+      my_account = Account.find_by(id: account_id)
+      Status.where(id: status_ids).pluck(:account_id).uniq.index_with { |a| Account.find_by(id: a).show_emoji_reaction?(my_account) }
+    end
+
     def reload_stale_associations!(cached_items)
       account_ids = []
 

app/models/status_reference.rb

@@ -18,8 +18,16 @@ class StatusReference < ApplicationRecord
   has_one :notification, as: :activity, dependent: :destroy
 
   validate :validate_status_visibilities
+  after_commit :reset_parent_cache
+
+  private
 
   def validate_status_visibilities
     raise Mastodon::ValidationError, I18n.t('status_references.errors.invalid_status_visibilities') if [:public, :public_unlisted, :unlisted, :login].exclude?(target_status.visibility.to_sym)
   end
+
+  def reset_parent_cache
+    Rails.cache.delete("statuses/#{status_id}")
+    Rails.cache.delete("statuses/#{target_status_id}")
+  end
 end