gearheads
/
mastodon
Archived
2
0
Fork 0

Fix empty query sent to postgres for custom emojis (#5121)

gh/stable
Eugen Rochko 2017-09-27 04:14:03 +02:00 committed by GitHub
parent 6e83b5e719
commit 3caf0ba923
1 changed files with 5 additions and 1 deletions

View File

@ -33,7 +33,11 @@ class CustomEmoji < ApplicationRecord
class << self class << self
def from_text(text, domain) def from_text(text, domain)
return [] if text.blank? 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) where(shortcode: shortcodes, domain: domain)
end end
end end