diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 77f23ae5a4..29523be542 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -85,6 +85,8 @@ class Form::AdminSettings authorized_fetch: :authorized_fetch_mode?, }.freeze + UPLOAD_MIME_TYPES = %w(image/jpeg image/png image/gif image/webp).freeze + DESCRIPTION_LIMIT = 200 DOMAIN_BLOCK_AUDIENCES = %w(disabled users all).freeze REGISTRATION_MODES = %w(open approved none).freeze diff --git a/app/views/admin/custom_emojis/new.html.haml b/app/views/admin/custom_emojis/new.html.haml index acf2231b8e..99f5aa06d8 100644 --- a/app/views/admin/custom_emojis/new.html.haml +++ b/app/views/admin/custom_emojis/new.html.haml @@ -12,7 +12,7 @@ .fields-group = f.input :image, wrapper: :with_label, - input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES.join(',') }, + input_html: { accept: CustomEmoji::IMAGE_MIME_TYPES }, hint: t('admin.custom_emojis.image_hint', size: number_to_human_size(CustomEmoji::LIMIT)) .actions diff --git a/app/views/admin/settings/branding/show.html.haml b/app/views/admin/settings/branding/show.html.haml index 22116167eb..02da7b2c8f 100644 --- a/app/views/admin/settings/branding/show.html.haml +++ b/app/views/admin/settings/branding/show.html.haml @@ -44,7 +44,7 @@ .fields-row__column.fields-row__column-6.fields-group = f.input :favicon, as: :file, - input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') }, + input_html: { accept: f.object.class::UPLOAD_MIME_TYPES }, wrapper: :with_block_label .fields-row__column.fields-row__column-6.fields-group @@ -58,7 +58,7 @@ .fields-row__column.fields-row__column-6.fields-group = f.input :app_icon, as: :file, - input_html: { accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].join(',') }, + input_html: { accept: f.object.class::UPLOAD_MIME_TYPES }, wrapper: :with_block_label .fields-row__column.fields-row__column-6.fields-group diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml index 3815eb7fc2..8df50a5a8c 100644 --- a/app/views/settings/profiles/show.html.haml +++ b/app/views/settings/profiles/show.html.haml @@ -35,7 +35,7 @@ .fields-group = f.input :avatar, hint: t('simple_form.hints.defaults.avatar', dimensions: Account::Avatar::AVATAR_GEOMETRY, size: number_to_human_size(Account::Avatar::AVATAR_LIMIT)), - input_html: { accept: Account::Avatar::AVATAR_IMAGE_MIME_TYPES.join(',') }, + input_html: { accept: Account::Avatar::AVATAR_IMAGE_MIME_TYPES }, wrapper: :with_block_label .fields-row__column.fields-row__column-6 @@ -51,7 +51,7 @@ .fields-group = f.input :header, hint: t('simple_form.hints.defaults.header', dimensions: Account::Header::HEADER_GEOMETRY, size: number_to_human_size(Account::Header::HEADER_LIMIT)), - input_html: { accept: Account::Header::HEADER_IMAGE_MIME_TYPES.join(',') }, + input_html: { accept: Account::Header::HEADER_IMAGE_MIME_TYPES }, wrapper: :with_block_label .fields-row__column.fields-row__column-6