From 1e02ba111ae38ab758135b5b2b46f34c672ca02e Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 23 Sep 2017 14:47:32 +0200 Subject: 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 --- app/models/account.rb | 4 ---- app/models/status.rb | 4 ---- 2 files changed, 8 deletions(-) (limited to 'app/models') 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 diff --git a/app/models/status.rb b/app/models/status.rb index f11064cbd..ea4c097bf 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -30,7 +30,6 @@ class Status < ApplicationRecord include Streamable include Cacheable include StatusThreadingConcern - include EmojiHelper enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility @@ -267,9 +266,6 @@ class Status < ApplicationRecord def prepare_contents text&.strip! spoiler_text&.strip! - - self.text = emojify(text) - self.spoiler_text = emojify(spoiler_text) end def set_reblog -- cgit