diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-02 16:33:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 16:33:06 +0100 |
| commit | f4abf8e7829c6a5b952dea6fb9ad01b6b3601f95 (patch) | |
| tree | afc41f393d862885eae63cccd3b72262ce08128b /app/services/fetch_link_card_service.rb | |
| parent | 4aa860b65bd796b09dc0ceffa1fdd7de31060a34 (diff) | |
| parent | 7336276252ab89985c609359eb9953fca0383db3 (diff) | |
Merge pull request #1504 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/fetch_link_card_service.rb')
| -rw-r--r-- | app/services/fetch_link_card_service.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index 74fe9a0a5..d4e4931e6 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -2,12 +2,12 @@ class FetchLinkCardService < BaseService URL_PATTERN = %r{ - ( # $1 URL - (https?:\/\/) # $2 Protocol (required) - (#{Twitter::Regex[:valid_domain]}) # $3 Domain(s) - (?::(#{Twitter::Regex[:valid_port_number]}))? # $4 Port number (optional) - (/#{Twitter::Regex[:valid_url_path]}*)? # $5 URL Path and anchor - (\?#{Twitter::Regex[:valid_url_query_chars]}*#{Twitter::Regex[:valid_url_query_ending_chars]})? # $6 Query String + ( # $1 URL + (https?:\/\/) # $2 Protocol (required) + (#{Twitter::TwitterText::Regex[:valid_domain]}) # $3 Domain(s) + (?::(#{Twitter::TwitterText::Regex[:valid_port_number]}))? # $4 Port number (optional) + (/#{Twitter::TwitterText::Regex[:valid_url_path]}*)? # $5 URL Path and anchor + (\?#{Twitter::TwitterText::Regex[:valid_url_query_chars]}*#{Twitter::TwitterText::Regex[:valid_url_query_ending_chars]})? # $6 Query String ) }iox |