github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Add onebox support for x.com (#27140)

Browse Source
This commit is contained in:
Jan Cernik
2024-05-23 10:25:42 -03:00
committed by GitHub
parent ebc3af90eb
commit 1ed1a1f96a
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/onebox/engine/twitter_status_onebox.rb
View File

@ -9,7 +9,7 @@ module Onebox
include ActionView::Helpers::NumberHelper
matches_regexp(
%r{^https?://(mobile\.|www\.)?twitter\.com/.+?/status(es)?/\d+(/(video|photo)/\d?+)?+(/?\?.*)?/?$},
%r{^https?://(mobile\.|www\.)?(twitter\.com|x\.com)/.+?/status(es)?/\d+(/(video|photo)/\d?+)?+(/?\?.*)?/?$},
)
always_https
@ -26,7 +26,13 @@ module Onebox
def get_twitter_data
response =
begin
Onebox::Helpers.fetch_response(url, headers: http_params)
# We need to allow cross domain cookies to prevent an
# infinite redirect loop between twitter.com and x.com
Onebox::Helpers.fetch_response(
url,
headers: http_params,
allow_cross_domain_cookies: true,
)
rescue StandardError
return nil
end
@ -45,7 +51,7 @@ module Onebox
end
def match
@match ||= @url.match(%r{twitter\.com/.+?/status(es)?/(?<id>\d+)})
@match ||= @url.match(%r{(twitter\.com|x\.com)/.+?/status(es)?/(?<id>\d+)})
end
def twitter_data