Merge 6fb6b9fa4b into 74fc4dbacf

app/javascript/styles/mastodon/components.scss

@@ -2848,7 +2848,6 @@ a.account__display-name {
     &__pane {
       height: 100%;
       overflow: hidden;
-      pointer-events: none;
       display: flex;
       justify-content: flex-end;
       min-width: 285px;
@@ -2860,7 +2859,6 @@ a.account__display-name {
       &__inner {
         position: fixed;
         width: 285px;
-        pointer-events: auto;
         height: 100%;
       }
     }

app/presenters/tag_relationships_presenter.rb

@@ -3,13 +3,29 @@
 class TagRelationshipsPresenter
   attr_reader :following_map, :featuring_map
 
-  def initialize(tags, current_account_id = nil, **options)
+  def initialize(tags, current_account_id = nil)
     if current_account_id.nil?
       @following_map = {}
       @featuring_map = {}
     else
-      @following_map = TagFollow.select(:tag_id).where(tag_id: tags.map(&:id), account_id: current_account_id).each_with_object({}) { |f, h| h[f.tag_id] = true }.merge(options[:following_map] || {})
+      @following_map = mapped_tag_follows(tags, current_account_id)
-      @featuring_map = FeaturedTag.select(:tag_id).where(tag_id: tags.map(&:id), account_id: current_account_id).each_with_object({}) { |f, h| h[f.tag_id] = true }.merge(options[:featuring_map] || {})
+      @featuring_map = mapped_featured_tags(tags, current_account_id)
     end
   end
+
+  private
+
+  def mapped_tag_follows(tags, account_id)
+    TagFollow
+      .where(tag_id: tags.map(&:id), account_id: account_id)
+      .pluck(:tag_id)
+      .index_with(true)
+  end
+
+  def mapped_featured_tags(tags, account_id)
+    FeaturedTag
+      .where(tag_id: tags.map(&:id), account_id: account_id)
+      .pluck(:tag_id)
+      .index_with(true)
+  end
 end

spec/presenters/tag_relationships_presenter_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe TagRelationshipsPresenter do
+  context 'without an account' do
+    subject { described_class.new(tags, nil) }
+
+    let(:tags) { Fabricate.times 2, :tag }
+
+    it 'includes empty hashes for maps' do
+      expect(subject)
+        .to have_attributes(
+          following_map: eq({}),
+          featuring_map: eq({})
+        )
+    end
+  end
+
+  context 'with an account and following and featured tags' do
+    subject { described_class.new(Tag.all, account.id) }
+
+    let(:account) { Fabricate :account }
+    let(:tag_to_feature) { Fabricate :tag }
+    let(:tag_to_follow) { Fabricate :tag }
+
+    before do
+      Fabricate :featured_tag, account: account, tag: tag_to_feature
+      Fabricate :tag_follow, account: account, tag: tag_to_follow
+    end
+
+    it 'includes map with relevant id values' do
+      expect(subject)
+        .to have_attributes(
+          featuring_map: eq(tag_to_feature.id => true),
+          following_map: eq(tag_to_follow.id => true)
+        )
+    end
+  end
+end