* Fix: #442 カスタム絵文字のaliasesにnullが入る場合がある * Fix test * WebのほうにもNULLチェックを追加 * ローカルのエイリアス名を編集するところもついでにスリムに
This commit is contained in:
parent
650d40cb24
commit
dc73c30d2d
8 changed files with 111 additions and 12 deletions
|
@ -72,11 +72,11 @@ class CustomEmoji < ApplicationRecord
|
|||
def copy!
|
||||
copy = self.class.find_or_initialize_by(
|
||||
domain: nil,
|
||||
shortcode: shortcode,
|
||||
license: license,
|
||||
aliases: aliases,
|
||||
is_sensitive: is_sensitive
|
||||
shortcode: shortcode
|
||||
)
|
||||
copy.aliases = (aliases || []).compact_blank
|
||||
copy.license = license
|
||||
copy.is_sensitive = is_sensitive
|
||||
copy.image = image
|
||||
copy.tap(&:save!)
|
||||
end
|
||||
|
@ -96,7 +96,7 @@ class CustomEmoji < ApplicationRecord
|
|||
end
|
||||
|
||||
def aliases_raw=(raw)
|
||||
aliases = raw.split(',').filter(&:present?).uniq
|
||||
aliases = raw.split(',').compact_blank.uniq
|
||||
self[:aliases] = aliases
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue