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

Merge commit '15fd712464' into kb_migration

Browse source
This commit is contained in:
KMY 2023-05-01 15:05:34 +09:00
commit 3a1a6ba39e
289 changed files with 1339 additions and 1337 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/lib/emoji_formatter.rb
View file

@ -63,11 +63,9 @@ class EmojiFormatter
def emoji_map
# from emoji_reactions_grouped_by_name (status_stat)
if !custom_emojis.first&.image.present?
return @emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.name] = [e.url, e.static_url] }
end
return @emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.name] = [e.url, e.static_url] } if custom_emojis.first&.image.blank?
return @emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] }
@emoji_map ||= custom_emojis.each_with_object({}) { |e, h| h[e.shortcode] = [full_asset_url(e.image.url), full_asset_url(e.image.url(:static))] }
end
def count_tag_nesting(tag)
@ -102,7 +100,7 @@ class EmojiFormatter
end
def image_style
'min-width:16px;' + (@options[:style] || '')
"min-width:16px;#{@options[:style] || ''}"
end
def animate?