Merge pull request #64 from anaclumos/1.0.5

anaclumos · web-flow · commit 4986b747c6cb · 2023-04-04T14:24:02.000-07:00
diff --git a/README.md b/README.md
@@ -2,11 +2,9 @@
 
 # Bing Chat for All Browsers
 
-> **Note**<br/>
-> **You need a Microsoft account that has access to the new Bing Chat to use this extension!**
+> **Note**<br/> > **You need a Microsoft account that has access to the new Bing Chat to use this extension!**
 > If you don't have access to the new Bing Chat, you can join the waitlist at [bing.com/chat](https://bing.com/chat).
 
-
 ## [Chrome](https://chrome.google.com/webstore/detail/bing-chat-for-all-browser/jofbglonpbndadajbafmmaklbfbkggpo)
 
 N/A. It should work out of the box!
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,11 +1,14 @@
 {
   "name": "bing-chat-for-all-browsers",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "bing-chat-for-all-browsers",
   "main": "index.js",
   "scripts": {
     "watch": "webpack --config webpack/webpack.dev.js --watch",
-    "build": "$npm_execpath run clean && webpack --config webpack/webpack.chrome.js && webpack --config webpack/webpack.firefox.js",
+    "build": "$npm_execpath run clean && $npm_execpath run chrome && $npm_execpath run firefox",
+    "chrome": "webpack --config webpack/webpack.chrome.js",
+    "firefox": "webpack --config webpack/webpack.firefox.js",
+    "safari": "xcrun safari-web-extension-converter release/firefox --swift --no-open --copy-resources --project-location safari --force --bundle-identifier sh.cho.bing-chat-for-all-browsers",
     "clean": "rimraf release",
     "test": "npx jest",
     "style": "prettier --write \"**/*.{ts,tsx,json,js,jsx,css,scss,html,md}\"",
diff --git a/public/chrome.json b/public/chrome.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "Bing Chat for All Browsers",
   "description": "Bing Chat for All Browsers",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "icons": {
     "16": "icon16.png",
     "32": "icon32.png",
@@ -23,6 +23,6 @@
       }
     ]
   },
-  "permissions": ["webRequest", "declarativeNetRequest"],
+  "permissions": ["webRequest", "declarativeNetRequestWithHostAccess"],
   "host_permissions": ["http://*.bing.com/*", "https://*.bing.com/*"]
 }
diff --git a/public/firefox.json b/public/firefox.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Bing Chat for All Browsers",
   "description": "Bing Chat for All Browsers",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "background": {
     "scripts": ["js/background.js"]
   },
diff --git a/public/rules.json b/public/rules.json
@@ -8,7 +8,7 @@
         {
           "header": "User-Agent",
           "operation": "set",
-          "value": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.100.0"
+          "value": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/111.0.1661.62"
         }
       ]
     },
diff --git a/release/chrome.zip b/release/chrome.zip
diff --git a/release/firefox.zip b/release/firefox.zip
diff --git a/rules.json b/rules.json
@@ -8,7 +8,7 @@
         {
           "header": "User-Agent",
           "operation": "set",
-          "value": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.100.0"
+          "value": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.1587.61"
         }
       ]
     },
diff --git a/src/background.ts b/src/background.ts
@@ -11,7 +11,7 @@ On Firefox it will replace the entire user agent with a hard coded Chrome user a
 
 //Microsoft Edge has two user agent suffixes, one for mobile and one for desktop
 const MOBILE_UA_SUFFIX = 'EdgA/110.0.1587.41'
-const DESKTOP_UA_SUFFIX = 'Edg/110.0.100.0'
+const DESKTOP_UA_SUFFIX = 'Edg/111.0.1661.62'
 
 const DESKTOP_UA_PREFIX =
   'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36'
@@ -40,7 +40,7 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
     const newHeaders = requestHeaders.map((header) => {
       if (header.name.toLowerCase() === 'user-agent') {
         if (header.value?.toLowerCase().includes('mobile')) header.value = uaMaker(MOBILE_UA_SUFFIX, true)
-        else header.value = uaMaker(MOBILE_UA_SUFFIX, false)
+        else header.value = uaMaker(DESKTOP_UA_SUFFIX, false)
       }
       return header
     })
diff --git a/src/popup.tsx b/src/popup.tsx
@@ -19,12 +19,12 @@ const Popup = () => {
             style={{
               backgroundColor: 'white',
               color: 'black',
-              border: '1px solid rgb(156 163 175)',
+              border: '1px solid rgb(126 133 145)',
               padding: '10px 20px',
               borderRadius: '5px',
               fontSize: '1rem',
               cursor: 'pointer',
-              boxShadow: '0 0 0 1px rgb(156 163 175), 0 1px 3px 0 rgb(156 163 175)',
+              boxShadow: '0 0 0 1px rgb(126 133 145), 0 1px 3px 0 rgb(126 133 145)',
             }}
           >
             <img src={BingIcon} style={{ width: '1rem', height: '1rem', padding: 'auto', verticalAlign: 'middle' }} />
@@ -41,44 +41,61 @@ const Popup = () => {
           fontSize: '0.8rem',
           fontWeight: 400,
           lineHeight: '1.5',
-          color: 'rgb(156 163 175)',
+          color: 'rgb(126 133 145)',
         }}
       >
-        Found a Bug?{' '}
+        Leave me a review for{' '}
         <a
           style={{ color: 'black', textDecoration: 'underline', cursor: 'pointer' }}
           onClick={() => {
             chrome.tabs.create({
-              url: 'https://github.com/anaclumos/bing-chat-for-all-browsers',
+              url: 'https://chrome.google.com/webstore/detail/bing-chat-for-all-browser/jofbglonpbndadajbafmmaklbfbkggpo',
             })
           }}
         >
-          Let me know on GitHub
+          Chrome
+        </a>{' '}
+        or{' '}
+        <a
+          style={{ color: 'black', textDecoration: 'underline', cursor: 'pointer' }}
+          onClick={() => {
+            chrome.tabs.create({
+              url: 'https://addons.mozilla.org/en-US/firefox/addon/bing-chat-for-all-browsers/',
+            })
+          }}
+        >
+          Firefox
         </a>
-        {'. '}
-        Or, Leave us a review for{' '}
+        . <br />
+        <br />
+        If you love my work, please check out my other open-sourced AI project,{' '}
         <a
           style={{ color: 'black', textDecoration: 'underline', cursor: 'pointer' }}
           onClick={() => {
             chrome.tabs.create({
-              url: 'https://chrome.google.com/webstore/detail/bing-chat-for-all-browser/jofbglonpbndadajbafmmaklbfbkggpo',
+              url: 'https://hn.cho.sh/?ref=bingchat&utm_source=bingchat&utm_medium=extension&utm_campaign=bingchat',
             })
           }}
         >
-          Chrome
+          hn.cho.sh
         </a>{' '}
-        or{' '}
+        — a free AI-summarized newsletter for tech, supporting 29 languages, including Korean, Japanese, English,
+        Chinese and more.
+        <br />
+        <br />
+        <strong>Solution for common problems.</strong> Clear Cache and Cookies on Bing. Disable VPN or Adblock on Bing.
+        Make sure you are logged-in with Microsoft account with Bing Chat enabled. If you still have problems,{' '}
         <a
           style={{ color: 'black', textDecoration: 'underline', cursor: 'pointer' }}
           onClick={() => {
             chrome.tabs.create({
-              url: 'https://addons.mozilla.org/en-US/firefox/addon/bing-chat-for-all-browsers/',
+              url: 'https://github.com/anaclumos/bing-chat-for-all-browsers',
             })
           }}
         >
-          Firefox
+          Let me know on GitHub
         </a>
-        . Thank you!
+        {'. '}
       </p>
     </>
   )

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"manifest_version": 3,`
`3`	`3`	`"name": "Bing Chat for All Browsers",`
`4`	`4`	`"description": "Bing Chat for All Browsers",`
`5`		`- "version": "1.0.4",`
	`5`	`+ "version": "1.0.5",`
`6`	`6`	`"icons": {`
`7`	`7`	`"16": "icon16.png",`
`8`	`8`	`"32": "icon32.png",`
`@@ -23,6 +23,6 @@`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`},`
`26`		`- "permissions": ["webRequest", "declarativeNetRequest"],`
	`26`	`+ "permissions": ["webRequest", "declarativeNetRequestWithHostAccess"],`
`27`	`27`	`"host_permissions": ["http://.bing.com/", "https://.bing.com/"]`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`{`
`9`	`9`	`"header": "User-Agent",`
`10`	`10`	`"operation": "set",`
`11`		`- "value": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.100.0"`
	`11`	`+ "value": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/111.0.1661.62"`
`12`	`12`	`}`
`13`	`13`	`]`
`14`	`14`	`},`