Skip to content

Commit f3739cf

Browse files
acid-chickenGargron
authored andcommitted
Add WebP support (mastodon#9879)
* Add WebP support * Remove the changes to the tooltip refs: mastodon#9879 (review)
1 parent 455b1e5 commit f3739cf

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

app/javascript/mastodon/utils/resize_image.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const loadImage = inputFile => new Promise((resolve, reject) => {
3131
});
3232

3333
const getOrientation = (img, type = 'image/png') => new Promise(resolve => {
34-
if (type !== 'image/jpeg') {
34+
if (!['image/jpeg', 'image/webp'].includes(type)) {
3535
resolve(1);
3636
return;
3737
}

app/models/concerns/account_avatar.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module AccountAvatar
44
extend ActiveSupport::Concern
55

6-
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
6+
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
77
LIMIT = 2.megabytes
88

99
class_methods do

app/models/concerns/account_header.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module AccountHeader
44
extend ActiveSupport::Concern
55

6-
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
6+
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
77
LIMIT = 2.megabytes
88
MAX_PIXELS = 750_000 # 1500x500px
99

app/models/media_attachment.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class MediaAttachment < ApplicationRecord
2525

2626
enum type: [:image, :gifv, :video, :unknown]
2727

28-
IMAGE_FILE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif'].freeze
28+
IMAGE_FILE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif', '.webp'].freeze
2929
VIDEO_FILE_EXTENSIONS = ['.webm', '.mp4', '.m4v', '.mov'].freeze
3030

31-
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
31+
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
3232
VIDEO_MIME_TYPES = ['video/webm', 'video/mp4', 'video/quicktime'].freeze
3333
VIDEO_CONVERTIBLE_MIME_TYPES = ['video/webm', 'video/quicktime'].freeze
3434

app/models/preview_card.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#
2626

2727
class PreviewCard < ApplicationRecord
28-
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
28+
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
2929
LIMIT = 1.megabytes
3030

3131
self.inheritance_column = false

0 commit comments

Comments
 (0)