nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix custom emoji category creation silently erroring out on duplicate category (#12647) 

Instead, just re-use the existing category if any.

Fixes #12608
This commit is contained in:
ThibG 2019-12-18 16:56:59 +01:00 committed by Eugen Rochko
parent fb9137752a
commit c0ed53b810
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/form/custom_emoji_batch.rb
View File

@ -40,7 +40,7 @@ class Form::CustomEmojiBatch
if category_id.present? if category_id.present?
CustomEmojiCategory.find(category_id) CustomEmojiCategory.find(category_id)
elsif category_name.present? elsif category_name.present?
CustomEmojiCategory.create!(name: category_name) CustomEmojiCategory.find_or_create_by!(name: category_name)
end end
end end