diff --git a/app/models/status.rb b/app/models/status.rb index fb5805a32f..f0529e0410 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -318,6 +318,10 @@ class Status < ApplicationRecord status_stat&.emoji_reactions_count || 0 end + def emoji_reactions_count_per_account + status_stat&.emoji_reactions_count_per_account || 0 + end + def increment_count!(key) update_status_stat!(key => public_send(key) + 1) end @@ -345,7 +349,7 @@ class Status < ApplicationRecord def refresh_emoji_reactions_grouped_by_name! generate_emoji_reactions_grouped_by_name.tap do |emoji_reactions_json| - update_status_stat!(emoji_reactions: emoji_reactions_json, emoji_reactions_count: emoji_reactions.size) + update_status_stat!(emoji_reactions: emoji_reactions_json, emoji_reactions_count: emoji_reactions.size, emoji_reactions_count_per_account: emoji_reactions.map(&:account_id).uniq.size) end end diff --git a/app/models/status_stat.rb b/app/models/status_stat.rb index 0f651959f1..cdee95855b 100644 --- a/app/models/status_stat.rb +++ b/app/models/status_stat.rb @@ -4,16 +4,17 @@ # # Table name: status_stats # -# id :bigint(8) not null, primary key -# status_id :bigint(8) not null -# replies_count :bigint(8) default(0), not null -# reblogs_count :bigint(8) default(0), not null -# favourites_count :bigint(8) default(0), not null -# created_at :datetime not null -# updated_at :datetime not null -# emoji_reactions :string -# emoji_reactions_count :integer default(0), not null -# test :integer default(0), not null +# id :bigint(8) not null, primary key +# status_id :bigint(8) not null +# replies_count :bigint(8) default(0), not null +# reblogs_count :bigint(8) default(0), not null +# favourites_count :bigint(8) default(0), not null +# created_at :datetime not null +# updated_at :datetime not null +# emoji_reactions :string +# emoji_reactions_count :integer default(0), not null +# test :integer default(0), not null +# emoji_reactions_count_per_account :integer default(0), not null # class StatusStat < ApplicationRecord @@ -41,6 +42,10 @@ class StatusStat < ApplicationRecord [attributes['emoji_reactions_count'], 0].max end + def emoji_reactions_count_per_account + [attributes['emoji_reactions_count_per_account'], 0].max + end + private def reset_parent_cache diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb index 110c3da045..d808b817be 100644 --- a/app/models/trends/statuses.rb +++ b/app/models/trends/statuses.rb @@ -97,7 +97,7 @@ class Trends::Statuses < Trends::Base def calculate_scores(statuses, at_time) items = statuses.map do |status| expected = 1.0 - observed = (status.reblogs_count + status.favourites_count + status.emoji_reactions_count * 0.3).to_f + observed = (status.reblogs_count + status.favourites_count + status.emoji_reactions_count_per_account * 0.8).to_f score = if expected > observed || observed < options[:threshold] 0 diff --git a/db/migrate/20230414010523_add_emoji_reactions_count_per_account_to_status_stats.rb b/db/migrate/20230414010523_add_emoji_reactions_count_per_account_to_status_stats.rb new file mode 100644 index 0000000000..8a3eba8b2c --- /dev/null +++ b/db/migrate/20230414010523_add_emoji_reactions_count_per_account_to_status_stats.rb @@ -0,0 +1,5 @@ +class AddEmojiReactionsCountPerAccountToStatusStats < ActiveRecord::Migration[6.1] + def change + add_column :status_stats, :emoji_reactions_count_per_account, :integer, null: false, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb index 991cfaf140..02b1025332 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_04_12_073021) do +ActiveRecord::Schema.define(version: 2023_04_14_010523) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -936,6 +936,7 @@ ActiveRecord::Schema.define(version: 2023_04_12_073021) do t.string "emoji_reactions" t.integer "emoji_reactions_count", default: 0, null: false t.integer "test", default: 0, null: false + t.integer "emoji_reactions_count_per_account", default: 0, null: false t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true end