luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-05 14:36:04 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/custom_emoji.rb
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