diff options
author | ThibG <thib@sitedethib.com> | 2019-03-20 17:29:12 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-20 17:29:12 +0100 |
commit | 80f0910e2141b24082b9143266a9a6cf1ef6a516 (patch) | |
tree | af7a96def3f54cdb4b8fcb11adc1ecb36166c529 /app/models/poll.rb | |
parent | 66d945209278c9344d503fe4e7a58d5c6f040e50 (diff) |
Add support for custom emojis in poll options (#10322)
* Backend changes for custom emoji support in poll options * Serialize poll emojis in REST API * Render custom emojis in poll options * Render custom emoji in poll options on public pages
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 |