mirror of https://github.com/Siphonay/mastodon
Fix empty query sent to postgres for custom emojis (#5121)
This commit is contained in:
parent
6e83b5e719
commit
3caf0ba923
|
@ -33,7 +33,11 @@ class CustomEmoji < ApplicationRecord
|
|||
class << self
|
||||
def from_text(text, domain)
|
||||
return [] if text.blank?
|
||||
shortcodes = text.scan(SCAN_RE).map(&:first)
|
||||
|
||||
shortcodes = text.scan(SCAN_RE).map(&:first).uniq
|
||||
|
||||
return [] if shortcodes.empty?
|
||||
|
||||
where(shortcode: shortcodes, domain: domain)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue