1
0
Fork 0
forked from gitea/nas

Fix: #442 カスタム絵文字のaliasesにnullが入る場合がある (#443)

* Fix: #442 カスタム絵文字のaliasesにnullが入る場合がある

* Fix test

* WebのほうにもNULLチェックを追加

* ローカルのエイリアス名を編集するところもついでにスリムに
This commit is contained in:
KMY(雪あすか) 2024-01-10 09:43:56 +09:00 committed by GitHub
parent 650d40cb24
commit dc73c30d2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 111 additions and 12 deletions

View file

@ -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