Remove WebP support (mastodon#11589)

ProjectMyosotis · Oct 2, 2019 · 00c733f · 00c733f
1 parent 365d093
commit 00c733f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/app/javascript/mastodon/utils/resize_image.js b/app/javascript/mastodon/utils/resize_image.js
@@ -31,7 +31,7 @@ const loadImage = inputFile => new Promise((resolve, reject) => {
 });
 
 const getOrientation = (img, type = 'image/png') => new Promise(resolve => {
- if (!['image/jpeg', 'image/webp'].includes(type)) {
+ if (type !== 'image/jpeg') {
  resolve(1);
  return;
  }

diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb
@@ -3,7 +3,7 @@
 module AccountAvatar
  extend ActiveSupport::Concern
 
- IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
+ IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
  LIMIT = 2.megabytes
 
  class_methods do

diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb
@@ -3,7 +3,7 @@
 module AccountHeader
  extend ActiveSupport::Concern
 
- IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
+ IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
  LIMIT = 2.megabytes
  MAX_PIXELS = 750_000 # 1500x500px
 

diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
@@ -28,7 +28,7 @@ class CustomEmoji < ApplicationRecord
  :(#{SHORTCODE_RE_FRAGMENT}):
  (?=[^[:alnum:]:]|$)/x
 
- IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze
+ IMAGE_MIME_TYPES = %w(image/png image/gif).freeze
 
  belongs_to :category, class_name: 'CustomEmojiCategory', optional: true
  has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
@@ -26,11 +26,11 @@ class MediaAttachment < ApplicationRecord
 
  enum type: [:image, :gifv, :video, :unknown, :audio]
 
- IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif .webp).freeze
+ IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif).freeze
  VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze
  AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp).freeze
 
- IMAGE_MIME_TYPES = %w(image/jpeg image/png image/gif image/webp).freeze
+ IMAGE_MIME_TYPES = %w(image/jpeg image/png image/gif).freeze
  VIDEO_MIME_TYPES = %w(video/webm video/mp4 video/quicktime video/ogg).freeze
  VIDEO_CONVERTIBLE_MIME_TYPES = %w(video/webm video/quicktime).freeze
  AUDIO_MIME_TYPES = %w(audio/wave audio/wav audio/x-wav audio/x-pn-wave audio/ogg audio/mpeg audio/mp3 audio/webm audio/flac audio/aac audio/m4a audio/3gpp).freeze

diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
@@ -25,7 +25,7 @@
 #
 
 class PreviewCard < ApplicationRecord
- IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
+ IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
  LIMIT = 1.megabytes
 
  self.inheritance_column = false