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 /config/initializers/twitter_regex.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 'config/initializers/twitter_regex.rb')
| -rw-r--r-- | config/initializers/twitter_regex.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/config/initializers/twitter_regex.rb b/config/initializers/twitter_regex.rb index aca85dd43..3ff2aa9e5 100644 --- a/config/initializers/twitter_regex.rb +++ b/config/initializers/twitter_regex.rb @@ -1,4 +1,10 @@ -module Twitter +module Twitter::TwitterText + class Configuration + def emoji_parsing_enabled + false + end + end + class Regex REGEXEN[:valid_general_url_path_chars] = /[^\p{White_Space}<>\(\)\?]/iou REGEXEN[:valid_url_path_ending_chars] = /[^\p{White_Space}\(\)\?!\*"'「」<>;:=\,\.\$%\[\]~&\|@]|(?:#{REGEXEN[:valid_url_balanced_parens]})/iou @@ -79,7 +85,7 @@ module Twitter return [] unless text && text.index(":") urls = [] - text.to_s.scan(Twitter::Regex[:valid_extended_uri]) do + text.to_s.scan(Twitter::TwitterText::Regex[:valid_extended_uri]) do valid_uri_match_data = $~ start_position = valid_uri_match_data.char_begin(3) |