Merge branch 'kb_development' into kb_migration

This commit is contained in:
KMY 2023-04-04 17:05:24 +09:00
commit 3a088f3c21
7 changed files with 38 additions and 6 deletions

View file

@ -1,3 +1,7 @@
:ruby
grouped_emoji_reactions ||= Oj.load(status.status_stat&.emoji_reactions || '', mode: :strict) || []
p '=================== DEBUG ' + grouped_emoji_reactions.first&.to_s
.detailed-status.detailed-status--flex{ class: "detailed-status-#{status.visibility}" }
.p-author.h-card
= link_to ActivityPub::TagManager.instance.url_for(status.account), class: 'detailed-status__display-name u-url', target: stream_link_target, rel: 'noopener' do
@ -36,6 +40,13 @@
- elsif status.preview_card
= render_card_component(status)
- if grouped_emoji_reactions.size > 0
.status__emoji-reactions-bar
- grouped_emoji_reactions.each do |reaction|
%button.emoji-reactions-bar__button
%span.emojify= prerender_custom_emojis_from_hash(emoji_name_format(reaction, status), reaction)
%span.count= reaction['count']
.detailed-status__meta
%data.dt-published{ value: status.created_at.to_time.iso8601 }
- if status.edited?