`;
- icons = icons.concat(
- `${icon}`,
- );
- }
- icons.reverse();
-
- reactionsDisplay = `
- 
',
- ),
- ).toBeDefined();
- });
});
diff --git a/app/models/concerns/reactable.rb b/app/models/concerns/reactable.rb
index 2758aba28..6611d6857 100644
--- a/app/models/concerns/reactable.rb
+++ b/app/models/concerns/reactable.rb
@@ -3,24 +3,13 @@ module Reactable
included do
has_many :reactions, as: :reactable, inverse_of: :reactable, dependent: :destroy
- has_many :distinct_reaction_categories, -> { order(:category).merge(Reaction.distinct_categories) },
- as: :reactable,
- inverse_of: :reactable,
- dependent: nil,
- class_name: "Reaction"
end
def sync_reactions_count
update_column(:public_reactions_count, reactions.public_category.size)
end
- def public_reaction_categories
- @public_reaction_categories ||= begin
- # .map is intentional below - .pluck would break eager-loaded association!
- reacted = distinct_reaction_categories.map(&:category)
- ReactionCategory.for_view.select do |reaction_type|
- reacted.include?(reaction_type.slug.to_s)
- end
- end
+ def reaction_categories
+ reactions.distinct(:category).pluck(:category)
end
end
diff --git a/app/models/reaction.rb b/app/models/reaction.rb
index 533e9bd3d..a5c72e966 100644
--- a/app/models/reaction.rb
+++ b/app/models/reaction.rb
@@ -39,7 +39,6 @@ class Reaction < ApplicationRecord
scope :unarchived, -> { where.not(status: "archived") }
scope :from_user, ->(user) { where(user: user) }
scope :readinglist_for_user, ->(user) { readinglist.unarchived.only_articles.from_user(user) }
- scope :distinct_categories, -> { select("distinct(reactions.category) as category, reactable_id, reactable_type") }
validates :category, inclusion: { in: ReactionCategory.all_slugs.map(&:to_s) }
validates :reactable_type, inclusion: { in: REACTABLE_TYPES }
diff --git a/app/models/reaction_category.rb b/app/models/reaction_category.rb
index c54916e49..608d40f03 100644
--- a/app/models/reaction_category.rb
+++ b/app/models/reaction_category.rb
@@ -68,13 +68,4 @@ class ReactionCategory
def visible_to_public?
!privileged? && published?
end
-
- def as_json(_options = nil)
- {
- slug: slug,
- name: name,
- icon: icon,
- position: position
- }
- end
end
diff --git a/app/queries/homepage/articles_query.rb b/app/queries/homepage/articles_query.rb
index 0e7ce6525..ae2fc2537 100644
--- a/app/queries/homepage/articles_query.rb
+++ b/app/queries/homepage/articles_query.rb
@@ -67,7 +67,6 @@ module Homepage
@relation = @relation.where(user_id: user_id) if user_id.present?
@relation = @relation.where(organization_id: organization_id) if organization_id.present?
@relation = @relation.cached_tagged_with_any(tags) if tags.any?
- @relation = @relation.includes(:distinct_reaction_categories)
relation
end
diff --git a/app/serializers/homepage/article_serializer.rb b/app/serializers/homepage/article_serializer.rb
index 072d8565a..5c9d27777 100644
--- a/app/serializers/homepage/article_serializer.rb
+++ b/app/serializers/homepage/article_serializer.rb
@@ -28,7 +28,6 @@ module Homepage
:reading_time,
:title,
:user_id,
- :public_reaction_categories,
)
attribute :video_duration_string, &:video_duration_in_minutes
diff --git a/app/services/articles/feeds/basic.rb b/app/services/articles/feeds/basic.rb
index 8bf8ab153..8b457b37c 100644
--- a/app/services/articles/feeds/basic.rb
+++ b/app/services/articles/feeds/basic.rb
@@ -15,7 +15,6 @@ module Articles
.with_at_least_home_feed_minimum_score
.limit(@number_of_articles)
.limited_column_select.includes(top_comments: :user)
- .includes(:distinct_reaction_categories)
return articles unless @user
articles = articles.where.not(user_id: UserBlock.cached_blocked_ids_for_blocker(@user.id))
diff --git a/app/services/articles/feeds/large_forem_experimental.rb b/app/services/articles/feeds/large_forem_experimental.rb
index e0fb97de3..566a038b5 100644
--- a/app/services/articles/feeds/large_forem_experimental.rb
+++ b/app/services/articles/feeds/large_forem_experimental.rb
@@ -103,7 +103,6 @@ module Articles
def experimental_hot_story_grab
start_time = Articles::Feeds.oldest_published_at_to_consider_for(user: @user)
Article.published.limited_column_select.includes(top_comments: :user)
- .includes(:distinct_reaction_categories)
.where("published_at > ?", start_time)
.page(@page).per(@number_of_articles)
.order(score: :desc)
diff --git a/app/services/articles/feeds/tag.rb b/app/services/articles/feeds/tag.rb
index 49eb7abd0..8bdd6015b 100644
--- a/app/services/articles/feeds/tag.rb
+++ b/app/services/articles/feeds/tag.rb
@@ -17,7 +17,6 @@ module Articles
.published
.limited_column_select
.includes(top_comments: :user)
- .includes(:distinct_reaction_categories)
.page(page)
.per(number_of_articles)
end
diff --git a/app/services/articles/feeds/variant_query.rb b/app/services/articles/feeds/variant_query.rb
index 6e2372e8a..47c172fd6 100644
--- a/app/services/articles/feeds/variant_query.rb
+++ b/app/services/articles/feeds/variant_query.rb
@@ -134,7 +134,6 @@ module Articles
Article.joins(join_fragment)
.limited_column_select
.includes(top_comments: :user)
- .includes(:distinct_reaction_categories)
.order(config.order_by.to_sql)
end
diff --git a/app/views/articles/_single_story.html.erb b/app/views/articles/_single_story.html.erb
index 743b89cbb..8c66f2a7d 100644
--- a/app/views/articles/_single_story.html.erb
+++ b/app/views/articles/_single_story.html.erb
@@ -120,21 +120,13 @@