zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix trying to privatize empty media attachments (#15414)

This commit is contained in:
Eugen Rochko 2020-12-23 07:47:03 +01:00 committed by GitHub
parent 444b21b55f
commit 473abc35a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/suspend_account_service.rb
View File

@ -65,6 +65,8 @@ class SuspendAccountService < BaseService
attachment = media_attachment.public_send(attachment_name) attachment = media_attachment.public_send(attachment_name)
styles = [:original] | attachment.styles.keys styles = [:original] | attachment.styles.keys
next if attachment.blank?
styles.each do |style| styles.each do |style|
case Paperclip::Attachment.default_options[:storage] case Paperclip::Attachment.default_options[:storage]
when :s3 when :s3

2
app/services/unsuspend_account_service.rb
View File

@ -56,6 +56,8 @@ class UnsuspendAccountService < BaseService
attachment = media_attachment.public_send(attachment_name) attachment = media_attachment.public_send(attachment_name)
styles = [:original] | attachment.styles.keys styles = [:original] | attachment.styles.keys
next if attachment.blank?
styles.each do |style| styles.each do |style|
case Paperclip::Attachment.default_options[:storage] case Paperclip::Attachment.default_options[:storage]
when :s3 when :s3