Small bug fixes

Author: oneiros

app/controllers/fasp/trends/v0/hashtags_controller.rb

@@ -4,6 +4,6 @@ def index
       .trending(**trend_params)
     distribution = HashtagActivity.distribution_of(trending_hashtags, hours: trend_params[:hours], language: trend_params[:language])
 
-    render json: { hashtag: trending_hashtags.map { |c| { name: c.name, rank: c.rank, distribution: distribution[c.id], examples: c.recent_examples.map(&:uri) } } }
+    render json: { hashtags: trending_hashtags.map { |c| { name: c.name, rank: c.rank, distribution: distribution[c.id], examples: c.recent_examples.map(&:uri) } } }
   end
 end

app/controllers/fasp/trends/v0/links_controller.rb

@@ -4,6 +4,6 @@ def index
       .trending(**trend_params)
     distribution = LinkActivity.distribution_of(trending_links, hours: trend_params[:hours], language: trend_params[:language])
 
-    render json: { link: trending_links.map { |l| { url: l.url, rank: l.rank, distribution: distribution[l.id], examples: l.recent_examples.map(&:uri) } } }
+    render json: { links: trending_links.map { |l| { url: l.url, rank: l.rank, distribution: distribution[l.id], examples: l.recent_examples.map(&:uri) } } }
   end
 end

app/models/content_activity.rb

@@ -29,7 +29,7 @@ def self.record_reply(content_object, replied_at)
 
   def self.distribution_of(content_objects, hours: 24)
     timerange_end = Time.zone.now.beginning_of_hour
-    timerange_start = timerange_end.ago((hours -1).hours)
+    timerange_start = timerange_end.ago((hours.to_i - 1).hours)
     where(content_object_id: content_objects.map(&:id), hour_of_activity: timerange_start..timerange_end)
       .order(hour_of_activity: :asc)
       .group_by(&:content_object_id)

app/models/hashtag_activity.rb

@@ -23,7 +23,7 @@ def self.record(content_object, hashtag)
 
   def self.distribution_of(hashtags, hours: 24, language: nil)
     timerange_end = Time.zone.now.beginning_of_hour
-    timerange_start = timerange_end.ago((hours -1).hours)
+    timerange_start = timerange_end.ago((hours.to_i - 1).hours)
     query = select("hashtag_activities.hashtag_id, SUM(hashtag_activities.score) AS score")
       .where(hashtag_id: hashtags.map(&:id), hour_of_activity: timerange_start..timerange_end)
       .order(hour_of_activity: :asc)

app/models/link_activity.rb

@@ -23,7 +23,7 @@ def self.record(content_object, link)
 
   def self.distribution_of(links, hours: 24, language: nil)
     timerange_end = Time.zone.now.beginning_of_hour
-    timerange_start = timerange_end.ago((hours -1).hours)
+    timerange_start = timerange_end.ago((hours.to_i - 1).hours)
     query = select("link_activities.link_id, SUM(link_activities.score) AS score")
       .where(link_id: links.map(&:id), hour_of_activity: timerange_start..timerange_end)
       .order(hour_of_activity: :asc)

app/queries/content_object/trends_query.rb

@@ -4,8 +4,8 @@ def self.call(...)
   end
 
   def initialize(hours: 24, limit: 20, language: nil)
-    @hours = hours
-    @limit = limit
+    @hours = hours.to_i
+    @limit = limit.to_i
     @language = language
   end