Skip to content

Commit 7417932

Browse files
committed
feat(header): append version and client info to FAQ referer URL
fix(request): update dictionary text formatting for better readability
1 parent 6e65291 commit 7417932

File tree

6 files changed

+10
-40
lines changed

6 files changed

+10
-40
lines changed

main.js

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ const createMainWin = () => {
295295

296296
setTimeout(() => {
297297
app.quit();
298-
}, 3000);
298+
}, 1000);
299299
child.unref();
300300
} catch (err) {
301301
console.error(`spawn 执行异常: ${err.message}`);
@@ -694,41 +694,8 @@ const createMainWin = () => {
694694
hasShadow: true,
695695
transparent: false,
696696
});
697+
console.log(config.url)
697698
chatWindow.loadURL(config.url);
698-
//insert chatwoot script
699-
const script = `
700-
const script = document.createElement('script');
701-
script.type = 'text/javascript';
702-
script.text = \`
703-
(function (d, t) {
704-
var BASE_URL = "https://app.chatwoot.com";
705-
var g = d.createElement(t),
706-
s = d.getElementsByTagName(t)[0];
707-
g.src = BASE_URL + "/packs/js/sdk.js";
708-
g.defer = true;
709-
g.async = true;
710-
s.parentNode.insertBefore(g, s);
711-
g.onload = function () {
712-
setTimeout(() => {
713-
window.chatwootSDK.run({
714-
websiteToken: "svaD5wxfU5UY1r5ZzpMtLqv2",
715-
baseUrl: BASE_URL,
716-
});
717-
window.addEventListener('chatwoot:ready', function () {
718-
window.$chatwoot.setLocale('${config.locale}');
719-
window.$chatwoot.setCustomAttributes({
720-
version: '${packageJson.version}',
721-
client: 'desktop',
722-
});
723-
});
724-
}, 1000);
725-
726-
};
727-
})(document, "script");
728-
\`;
729-
document.head.appendChild(script);
730-
`;
731-
chatWindow.webContents.executeJavaScript(script);
732699
chatWindow.on("close", (event) => {
733700
chatWindow && chatWindow.destroy();
734701
chatWindow = null;

src/assets/lib/kookit-extra-browser.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/lib/kookit-extra.min.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/assets/lib/kookit.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/containers/header/component.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import SupportDialog from "../../components/dialogs/supportDialog";
4040
import SyncService from "../../utils/storage/syncService";
4141
import { LocalFileManager } from "../../utils/file/localFile";
4242
import { updateUserConfig } from "../../utils/request/user";
43+
import packageJson from "../../../package.json";
4344
declare var window: any;
4445

4546
class Header extends React.Component<HeaderProps, HeaderState> {
@@ -560,7 +561,9 @@ class Header extends React.Component<HeaderProps, HeaderState> {
560561
(ConfigService.getReaderConfig("lang").startsWith("zh")
561562
? "/zh/faq"
562563
: "/en/faq") +
563-
"?referer=app",
564+
"?referer=app&version=" +
565+
packageJson.version +
566+
"&client=desktop",
564567
locale: getChatLocale(),
565568
});
566569
}}

src/utils/request/reader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export const getDictText = async (word: string, from: string, to: string) => {
119119
officialDictList.find((item) => item.code === from)?.nativeLang ||
120120
from
121121
) +
122-
"-" +
122+
" -> " +
123123
i18n.t(
124124
officialDictList.find((item) => item.code === to)?.nativeLang || to
125125
)

0 commit comments

Comments
 (0)