Save avatar or header correctly even if other one fails (#18465)

* Save avatar or header correctly if other one fails

* Fix test

1 files changed, 9 insertions, 3 deletions

diff --git a/app/models/account.rb b/app/models/account.rb
index fc7359cfc..a7bda15d3 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -341,9 +341,15 @@ class Account < ApplicationRecord
 
   def save_with_optional_media!
     save!
-  rescue ActiveRecord::RecordInvalid
-    self.avatar = nil
-    self.header = nil
+  rescue ActiveRecord::RecordInvalid => e
+    errors = e.record.errors.errors
+    errors.each do |err|
+      if err.attribute == :avatar
+        self.avatar = nil
+      elsif err.attribute == :header
+        self.header = nil
+      end
+    end
 
     save!
   end