diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/helpers/text_helper.rb | 58 | ||||
-rw-r--r-- | app/models/status.rb | 12 |
2 files changed, 0 insertions, 70 deletions
diff --git a/app/helpers/text_helper.rb b/app/helpers/text_helper.rb deleted file mode 100644 index 16bb3f66e..000000000 --- a/app/helpers/text_helper.rb +++ /dev/null @@ -1,58 +0,0 @@ -# coding: utf-8 -require 'htmlentities' -require 'sixarm_ruby_unaccent' - -module TextHelper - - def html2text(html) - html = html - .gsub(/<(?:p|pre|blockquote|code|h[1-6]|li)\b[^>]*>/, "\n") - .gsub(/<[bh]r[\/ ]*>/, "\n") - .gsub(/<\/?[^>]*>/, '') - - HTMLEntities.new.decode(html) - end - - def normalize_text(text) - text.downcase - .gsub(Account::MENTION_RE, '') - .gsub(/^(?:#[\w:._·\-]+\s*)+|(?:#[\w:._·\-]+\s*)+$/, '') - .gsub(/\s*\302\240+\s*/, ' ') - .gsub(/\n\s+|\s+\n/, "\n") - .gsub(/\r\n?/, "\n") - .gsub(/\n\n+/, "\n") - .unaccent_via_split_map - .gsub(/(?:htt|ft)ps?:\/\//, '') - .gsub(/[^\n\p{Word} [:punct:]]/, '') - .gsub(/ +/, ' ') - .strip - end - - def normalize_status(status) - "#{_format_tags(status)}\n#{_format_spoiler(status)}\n#{_format_status(status)}\n#{_format_desc(status)}".strip - end - - def _format_tags(status) - return unless status.tags.present? - "tag #{status.tags.pluck(:name).join("\ntag ")}" - end - - def _format_spoiler(status) - return if status.spoiler_text.blank? - "subj #{normalize_text(status.spoiler_text)}" - end - - def _format_status(status) - text = status.local? ? Formatter.instance.format(status) : status.text - return if text.blank? - text = normalize_text(html2text(text)) - text.gsub!("\n", "\ntext ") - "text #{text}" - end - - def _format_desc(status) - return unless status.media_attachments.present? - text = status.media_attachments.pluck(:description).compact.join("\ndesc ") - "desc #{normalize_text(text)}" - end -end diff --git a/app/models/status.rb b/app/models/status.rb index d051d8962..f5f51779f 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -40,7 +40,6 @@ class Status < ApplicationRecord include Streamable include Cacheable include StatusThreadingConcern - include TextHelper # match both with and without U+FE0F (the emoji variation selector) LOCAL_ONLY_TOKENS = /(?:#!|\u{1f441}\ufe0f?)\u200b?\z/ @@ -358,7 +357,6 @@ class Status < ApplicationRecord after_save :update_sharekey, if: :local? after_save :update_origin, if: :local? - after_save :update_normalized_text after_save :process_bangtags, if: :local? class << self @@ -680,16 +678,6 @@ class Status < ApplicationRecord end end - def update_normalized_text - return if destroyed? || text.blank? || !(text_changed? || saved_change_to_text?) - normalized_text = normalize_status(self) - if self.normalized_status.nil? - self.create_normalized_status(text: normalized_text) - else - self.normalized_status.update_attributes(text: normalized_text) - end - end - def set_conversation self.thread = thread.reblog if thread&.reblog? |