fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-22 06:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix post rising to top of trends because of future date

Browse source
This commit is contained in:
Eugen Rochko 2024-11-09 21:31:17 +01:00
parent 1e71c4e247
commit 17445e368e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/lib/activitypub/activity/create.rb
View file

@ -89,8 +89,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
text: converted_object_type? ? converted_text : (@status_parser.text || ''), text: converted_object_type? ? converted_text : (@status_parser.text || ''),
language: @status_parser.language, language: @status_parser.language,
spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || ''), spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || ''),
created_at: @status_parser.created_at, created_at: [Time.now.utc, @status_parser.created_at].compact.min,
edited_at: @status_parser.edited_at && @status_parser.edited_at != @status_parser.created_at ? @status_parser.edited_at : nil, edited_at: @status_parser.edited_at && @status_parser.edited_at != @status_parser.created_at ? [Time.now.utc, @status_parser.edited_at].compact.min : nil,
override_timestamps: @options[:override_timestamps], override_timestamps: @options[:override_timestamps],
reply: @status_parser.reply, reply: @status_parser.reply,
sensitive: @account.sensitized? || @status_parser.sensitive || false, sensitive: @account.sensitized? || @status_parser.sensitive || false,

2
app/models/trends/statuses.rb
View file

@ -123,7 +123,7 @@ class Trends::Statuses < Trends::Base
decaying_score = if score.zero? || !eligible?(status) decaying_score = if score.zero? || !eligible?(status)
0 0
else else
score * (0.5**((at_time.to_f - status.created_at.to_f) / options[:score_halflife].to_f)) score * (0.5**((at_time.to_f - [at_time.to_f, status.created_at.to_f].min) / options[:score_halflife].to_f))
end end
[decaying_score, status] [decaying_score, status]