diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-23 14:47:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-23 14:47:32 +0200 |
| commit | 1e02ba111ae38ab758135b5b2b46f34c672ca02e (patch) | |
| tree | 62c916782bf9340837a12fcb0c79bb9d481b4ce8 /app/models/account.rb | |
| parent | 66126f302167d21e4bf247e660f595ff0beaaf20 (diff) | |
Add emoji autosuggest (#5053)
* Add emoji autosuggest Some credit goes to glitch-soc/mastodon#149 * Remove server-side shortcode->unicode conversion * Insert shortcode when suggestion is custom emoji * Remove remnant of server-side emojis * Update style of autosuggestions * Fix wrong emoji filenames generated in autosuggest item * Do not lazy load emoji picker, as that no longer works * Fix custom emoji autosuggest * Fix multiple "Custom" categories getting added to emoji index, only add once
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index f175c7081..0b025d1be 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -52,7 +52,6 @@ class Account < ApplicationRecord include AccountInteractions include Attachmentable include Remotable - include EmojiHelper enum protocol: [:ostatus, :activitypub] @@ -269,9 +268,6 @@ class Account < ApplicationRecord def prepare_contents display_name&.strip! note&.strip! - - self.display_name = emojify(display_name) - self.note = emojify(note) end def generate_keys |