diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-16 11:50:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 11:50:35 +0100 |
| commit | 7ca0a71601f92064db64862c8cab46a77d9c3d3d (patch) | |
| tree | 342c9a8972757d3706903a40e27a6f8e5a43533e /app/models/account.rb | |
| parent | 3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (diff) | |
| parent | 0912fb736d435b132779828376cd10cf7ad8e56e (diff) | |
Merge pull request #2014 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 7059c555f..4a7219624 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -339,9 +339,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 |