X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/534c92ec60bdffbe5a708b1656ef724578000545..32104684f7fe70bac494ede1f7249a6cf19a63ec:/app/helpers/user_helper.rb?ds=inline diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb index 69b0f6d6b..a6161fa43 100644 --- a/app/helpers/user_helper.rb +++ b/app/helpers/user_helper.rb @@ -2,41 +2,41 @@ module UserHelper # User images def user_image(user, options = {}) - options[:class] ||= "user_image" + options[:class] ||= "user_image border border-grey" options[:alt] ||= "" if user.image_use_gravatar user_gravatar_tag(user, options) elsif user.avatar.attached? - image_tag user_avatar_variant(user, :resize_to_limit => [100, 100]), options + user_avatar_variant_tag(user, { :resize_to_limit => [100, 100] }, options) else - image_tag "avatar_large.png", options + image_tag "avatar_large.png", options.merge(:width => 100, :height => 100) end end def user_thumbnail(user, options = {}) - options[:class] ||= "user_thumbnail" + options[:class] ||= "user_thumbnail border border-grey" options[:alt] ||= "" if user.image_use_gravatar - user_gravatar_tag(user, options) + user_gravatar_tag(user, options.merge(:size => 50)) elsif user.avatar.attached? - image_tag user_avatar_variant(user, :resize_to_limit => [50, 50]), options + user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options) else - image_tag "avatar_small.png", options + image_tag "avatar_small.png", options.merge(:width => 50, :height => 50) end end def user_thumbnail_tiny(user, options = {}) - options[:class] ||= "user_thumbnail_tiny" + options[:class] ||= "user_thumbnail_tiny border border-grey" options[:alt] ||= "" if user.image_use_gravatar - user_gravatar_tag(user, options) + user_gravatar_tag(user, options.merge(:size => 50)) elsif user.avatar.attached? - image_tag user_avatar_variant(user, :resize_to_limit => [50, 50]), options + user_avatar_variant_tag(user, { :resize_to_limit => [50, 50] }, options) else - image_tag "avatar_small.png", options + image_tag "avatar_small.png", options.merge(:width => 50, :height => 50) end end @@ -69,6 +69,22 @@ module UserHelper private # Local avatar support + def user_avatar_variant_tag(user, variant_options, options) + if user.avatar.variable? + variant = user.avatar.variant(variant_options) + # https://stackoverflow.com/questions/61893089/get-metadata-of-active-storage-variant/67228171 + if variant.processed? + metadata = variant.processed.send(:record).image.blob.metadata + if metadata["width"] + options[:width] = metadata["width"] + options[:height] = metadata["height"] + end + end + image_tag variant, options + else + image_tag user.avatar, options + end + end def user_avatar_variant(user, options) if user.avatar.variable? @@ -90,7 +106,7 @@ module UserHelper def user_gravatar_tag(user, options = {}) url = user_gravatar_url(user, options) - options.delete(:size) + options[:height] = options[:width] = options.delete(:size) || 100 image_tag url, options end end