gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240109

Browse source
This commit is contained in:
KMY 2025-01-09 13:20:56 +09:00
commit d35fa72842
333 changed files with 4444 additions and 2541 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/notification_group.rb
View file

@ -20,7 +20,6 @@ class NotificationGroup < ActiveModelSerializers::Model
group_keys = grouped_notifications.pluck(:group_key)
with_emoji_reaction = grouped_notifications.any? { |notification| notification.type == :emoji_reaction }
notifications.any? { |notification| notification.type == :list_status }
groups_data = load_groups_data(notifications.first.account_id, group_keys, pagination_range: pagination_range)
accounts_map = Account.where(id: groups_data.values.pluck(1).flatten).index_by(&:id)
@ -74,6 +73,7 @@ class NotificationGroup < ActiveModelSerializers::Model
return [] if activity_ids.empty?
EmojiReaction.where(id: activity_ids)
.order(id: :desc)
.each_with_object({}) { |e, h| h[e.name] = (h[e.name] || []).push(e) }
.to_a
.map { |pair| NotificationEmojiReactionGroup.new(emoji_reaction: pair[1].first, sample_accounts: pair[1].take(SAMPLE_ACCOUNTS_SIZE).map(&:account)) }