Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)

Browse source 
* 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
This commit is contained in:
Claire 2021-03-02 12:02:56 +01:00 • committed by GitHub
parent a8139ab016
commit 65db262550
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 99 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/lib/extractor.rb
View file

@ -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