From 517db9c4d3ecaa5a629cbd40df15e4cb95b21203 Mon Sep 17 00:00:00 2001 From: Artem Chaikin Date: Fri, 9 Feb 2024 00:25:48 +0300 Subject: [PATCH 1/2] Update BraveTalkScript.js --- .../DomainSpecific/Paged/BraveTalkScript.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/DomainSpecific/Paged/BraveTalkScript.js b/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/DomainSpecific/Paged/BraveTalkScript.js index be32f7956a7..d728421c7c9 100644 --- a/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/DomainSpecific/Paged/BraveTalkScript.js +++ b/Sources/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/DomainSpecific/Paged/BraveTalkScript.js @@ -29,14 +29,12 @@ window.__firefox__.includeOnce("BraveTalkScript", function($) { }); }); - if (document.location.host === "talk.brave.com") { - const postRoom = $((event) => { - if (event.target.tagName !== undefined && event.target.tagName.toLowerCase() == "iframe") { - launchNativeBraveTalk(event.target.src); - window.removeEventListener("DOMNodeInserted", postRoom) - } - }); - window.addEventListener("DOMNodeInserted", postRoom); - } + const postRoom = $((event) => { + if (event.target.tagName !== undefined && event.target.tagName.toLowerCase() == "iframe") { + launchNativeBraveTalk(event.target.src); + window.removeEventListener("DOMNodeInserted", postRoom) + } + }); + window.addEventListener("DOMNodeInserted", postRoom); }); From 8cd3df1e067d93b093ae9b6cd60eb324f19e1c28 Mon Sep 17 00:00:00 2001 From: Artem Chaikin Date: Fri, 9 Feb 2024 01:12:58 +0300 Subject: [PATCH 2/2] Remove unused domains --- Sources/Brave/Frontend/Browser/DomainUserScript.swift | 7 +++---- Tests/ClientTests/DomainUserScriptTests.swift | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Sources/Brave/Frontend/Browser/DomainUserScript.swift b/Sources/Brave/Frontend/Browser/DomainUserScript.swift index 1756249bfcd..9fcf84ae462 100644 --- a/Sources/Brave/Frontend/Browser/DomainUserScript.swift +++ b/Sources/Brave/Frontend/Browser/DomainUserScript.swift @@ -43,10 +43,9 @@ enum DomainUserScript: CaseIterable { "search-dev-local.brave.com"]) #if canImport(BraveTalk) case .braveTalkHelper: - return Set(["talk.brave.com", "beta.talk.brave.com", - "talk.bravesoftware.com", "beta.talk.bravesoftware.com", - "dev.talk.brave.software", "beta.talk.brave.software", - "talk.brave.software"]) + return Set(["talk.brave.com", + "talk.bravesoftware.com", + "talk.brave.software"]) #endif case .bravePlaylistFolderSharingHelper: return Set(["playlist.bravesoftware.com", "playlist.brave.com"]) diff --git a/Tests/ClientTests/DomainUserScriptTests.swift b/Tests/ClientTests/DomainUserScriptTests.swift index bc18306fcd2..d9ddc5bb108 100644 --- a/Tests/ClientTests/DomainUserScriptTests.swift +++ b/Tests/ClientTests/DomainUserScriptTests.swift @@ -38,11 +38,7 @@ class DomainUserScriptTests: XCTestCase { func testBraveTalkAPIAvailability() throws { let goodURLs = [ URL(string: "https://talk.brave.com"), - URL(string: "https://beta.talk.brave.com"), URL(string: "https://talk.bravesoftware.com"), - URL(string: "https://beta.talk.bravesoftware.com"), - URL(string: "https://dev.talk.brave.software"), - URL(string: "https://beta.talk.brave.software"), URL(string: "https://talk.brave.com/account"), ].compactMap { $0 }