From 15ec4ae07b17821625bd2ca1088a7573a7ed128c Mon Sep 17 00:00:00 2001
From: Eugen <eugen@zeonfederated.com>
Date: Mon, 17 Apr 2017 19:58:54 +0200
Subject: Fix #1972, fix #1870 - Fix special characters in XML, add tests
 (#1988)

Also improve efficiency of the mastodon:maintenance:add_static_avatars task
---
 lib/tasks/mastodon.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/tasks/mastodon.rake')

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index a1947ea0e..453db101c 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -145,8 +145,8 @@ namespace :mastodon do
 
       Account.unscoped.where(avatar_content_type: 'image/gif').or(Account.unscoped.where(header_content_type: 'image/gif')).find_each do |account|
         begin
-          account.avatar.reprocess!
-          account.header.reprocess!
+          account.avatar.reprocess! if account.avatar_content_type == 'image/gif' && !account.avatar.exists?(:static)
+          account.header.reprocess! if account.header_content_type == 'image/gif' && !account.header.exists?(:static)
         rescue StandardError => e
           Rails.logger.error "Error while generating static avatars/headers for account #{account.id}: #{e}"
           next
-- 
cgit