diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 12:02:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 12:02:56 +0100 |
| commit | 65db2625508c220fd3c0a1f37cdd2e13b6e02987 (patch) | |
| tree | 47b7ffdb601a3eed8870699f74212706450d04e9 /app/lib/extractor.rb | |
| parent | a8139ab0160096d09d83e8d3f9c7849129be1aa8 (diff) | |
Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)
* Update twitter-text from 1.14 to 3.1.0 * Disable emoji parsing * Properly depend on twitter-text for url detection * Fix some URLs being wrongly detected client-side * Add test for server-side validation of non-autolinkable URLs * Fix server-side status length counting
Diffstat (limited to 'app/lib/extractor.rb')
| -rw-r--r-- | app/lib/extractor.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/lib/extractor.rb b/app/lib/extractor.rb index 6076458ad..8020aa916 100644 --- a/app/lib/extractor.rb +++ b/app/lib/extractor.rb @@ -1,20 +1,20 @@ # frozen_string_literal: true module Extractor - extend Twitter::Extractor + extend Twitter::TwitterText::Extractor module_function # :yields: username, list_slug, start, end def extract_mentions_or_lists_with_indices(text) - return [] unless Twitter::Regex[:at_signs].match?(text) + return [] unless Twitter::TwitterText::Regex[:at_signs].match?(text) possible_entries = [] text.to_s.scan(Account::MENTION_RE) do |screen_name, _| match_data = $LAST_MATCH_INFO after = $' - unless Twitter::Regex[:end_mention_match].match?(after) + unless Twitter::TwitterText::Regex[:end_mention_match].match?(after) start_position = match_data.char_begin(1) - 1 end_position = match_data.char_end(1) possible_entries << { @@ -44,7 +44,7 @@ module Extractor if %r{\A://}.match?(after) hash_text.match(/(.+)(https?\Z)/) do |matched| hash_text = matched[1] - end_position -= matched[2].char_length + end_position -= matched[2].codepoint_length end end |