tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB,

Browse Source 
fix ProcessFeedService pushing status into distribution if called a second time
while the first is still running (i.e. when a PuSH comes after a Salmon slap),
fix not running escape on spoiler text before emojify
This commit is contained in:
Eugen Rochko
2017-01-27 16:55:06 +01:00
parent 9f57c7d4a6
commit 450ad43180
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/media_attachment.rb
View File

@ -12,7 +12,7 @@ class MediaAttachment < ApplicationRecord
processors: -> (f) { f.video? ? [:transcoder] : [:thumbnail] },
convert_options: { all: '-quality 90 -strip' }
validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES
validates_attachment_size :file, less_than: 4.megabytes
validates_attachment_size :file, less_than: 8.megabytes
validates :account, presence: true