diff options
| author | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-21 15:35:55 -0700 |
| commit | 592735fd80acd0aeffb5a5674255ed48d7a8db0b (patch) | |
| tree | 0eefc67f624a07df0af860edecd68d5dc64c7ee9 /app/models/poll.rb | |
| parent | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (diff) | |
| parent | bde9196b70299405ebe9b16500b7a3f65539b2c3 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/models/poll.rb')
| -rw-r--r-- | app/models/poll.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/poll.rb b/app/models/poll.rb index 6df230337..8f72c7b11 100644 --- a/app/models/poll.rb +++ b/app/models/poll.rb @@ -60,6 +60,10 @@ class Poll < ApplicationRecord !local? end + def emojis + @emojis ||= CustomEmoji.from_text(options.join(' '), account.domain) + end + class Option < ActiveModelSerializers::Model attributes :id, :title, :votes_count, :poll |