diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 17:32:39 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-20 17:32:39 +0100 |
| commit | cbf1d711ba2fab4921bfcf57e7df0b952503f568 (patch) | |
| tree | a5b928c0da3b018c422b7337708d041bdb9be986 /app/models/poll.rb | |
| parent | 803c350ef5500229eafce222370c5f97a7532e41 (diff) | |
| parent | 80f0910e2141b24082b9143266a9a6cf1ef6a516 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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 |