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

Fix AccountNote not having a maximum length (#16942)

Browse Source
This commit is contained in:
Claire
2021-11-06 00:12:25 +01:00
committed by GitHub
parent 39cdf61ab7
commit 87085a5152
4 changed files with 86 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/workers/move_worker.rb
View File

@ -53,10 +53,16 @@ class MoveWorker
new_note = AccountNote.find_by(account: note.account, target_account: @target_account)
if new_note.nil?
AccountNote.create!(account: note.account, target_account: @target_account, comment: [text, note.comment].join("\n"))
begin
AccountNote.create!(account: note.account, target_account: @target_account, comment: [text, note.comment].join("\n"))
rescue ActiveRecord::RecordInvalid
AccountNote.create!(account: note.account, target_account: @target_account, comment: note.comment)
end
else
new_note.update!(comment: [text, note.comment, "\n", new_note.comment].join("\n"))
end
rescue ActiveRecord::RecordInvalid
nil
rescue => e
@deferred_error = e
end