fix: can't redirect when URL has fragment

closes #687
ikemo3 · Apr 30, 2023 · b95d0c4 · b95d0c4
1 parent f76a846
commit b95d0c4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/apps/entry/popup.ts b/apps/entry/popup.ts
@@ -4,6 +4,7 @@ import { OptionRepository } from "../repository/options";
 import BlockDialog from "../content_script/dialog";
 import { IBasicBlockMediator } from "../content_script/mediator";
 import localizeHtmlPage from "../option/l10n";
+import DocumentURL from "../values/document_url";
 
 function getCurrentTab(): Promise<chrome.tabs.Tab> {
     return new Promise((resolve, reject) => {
@@ -29,7 +30,12 @@ searchInEnglishButton.addEventListener("click", async () => {
     const currentTab = await getCurrentTab();
     const { url } = currentTab;
 
-    chrome.tabs.update(currentTab.id!, { url: `${url}&gl=us&hl=en` });
+    if (!url) {
+        return;
+    }
+
+    const documentUrl = new DocumentURL(url);
+    chrome.tabs.update(currentTab.id!, { url: documentUrl.buildSearchInEnglishURL() });
 });
 
 exceptIkagadesitakaButton.addEventListener("click", async () => {

diff --git a/apps/values/document_url.ts b/apps/values/document_url.ts
@@ -18,6 +18,14 @@ class DocumentURL {
     isGoogleSearch(): boolean {
         return !this.isGoogleSearchNewsTab() && !this.isGoogleSearchImageTab();
     }
+
+    buildSearchInEnglishURL(): string {
+        const returnURL = new URL(this.url.toString());
+        const params = returnURL.searchParams;
+        params.set("gl", "us");
+        params.set("hl", "en");
+        return returnURL.toString();
+    }
 }
 
 export default DocumentURL;
diff --git a/test/document_url.test.ts b/test/document_url.test.ts
@@ -32,3 +32,19 @@ describe("DocumentURL", () => {
         expect(documentUrl.isGoogleSearchImageTab()).toBe(true);
     });
 });
+
+describe("Search In English", () => {
+    it("normal", () => {
+        const documentUrl = new DocumentURL(GOOGLE_SEARCH_URL);
+        const expected = GOOGLE_SEARCH_URL + "&gl=us&hl=en";
+
+        expect(documentUrl.buildSearchInEnglishURL()).toBe(expected);
+    });
+
+    it("has fragment", () => {
+        const documentUrl = new DocumentURL("https://www.google.com/search?q=test&rlz=xxx&oq=test&aqs=yyy&sourceid=chrome&ie=UTF-8#bsht=zzz");
+        const expected = "https://www.google.com/search?q=test&rlz=xxx&oq=test&aqs=yyy&sourceid=chrome&ie=UTF-8&gl=us&hl=en#bsht=zzz";
+
+        expect(documentUrl.buildSearchInEnglishURL()).toBe(expected);
+    })
+});