Skip to content

Commit 2e775b3

Browse files
Fix welcomeMessage
1 parent c2a06ae commit 2e775b3

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

build/message.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ type Time = {
33
text: string;
44
}[];
55
declare function showMessage(text: string | string[], timeout: number, priority: number, override?: boolean): void;
6-
declare function welcomeMessage(time: Time, welcomeTemplate: string, referrerTemplate: string): string;
6+
declare function welcomeMessage(time: Time, welcomeTemplate?: string, referrerTemplate?: string): string;
77
declare function i18n(template: string, ...args: string[]): string;
88
export { showMessage, welcomeMessage, i18n, Time };

build/message.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@ function welcomeMessage(time, welcomeTemplate, referrerTemplate) {
3333
}
3434
}
3535
}
36+
if (!welcomeTemplate)
37+
return '';
3638
const text = i18n(welcomeTemplate, document.title);
37-
if (document.referrer !== '') {
38-
const referrer = new URL(document.referrer);
39-
if (location.hostname === referrer.hostname)
40-
return text;
41-
return `${i18n(referrerTemplate, referrer.hostname)}<br>${text}`;
42-
}
43-
return text;
39+
if (document.referrer === '' || !referrerTemplate)
40+
return text;
41+
const referrer = new URL(document.referrer);
42+
if (location.hostname === referrer.hostname)
43+
return text;
44+
return `${i18n(referrerTemplate, referrer.hostname)}<br>${text}`;
4445
}
4546
function i18n(template, ...args) {
4647
return template.replace(/\$(\d+)/g, (_, idx) => {

dist/waifu-tips.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.

dist/waifu-tips.js.map

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/message.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ function showMessage(
6161
/**
6262
* Show welcome message based on time.
6363
* @param {Time} time - Time message configuration.
64+
* @param {string} [welcomeTemplate] - Welcome message template.
65+
* @param {string} [referrerTemplate] - Referrer message template.
6466
* @returns {string} Welcome message.
6567
*/
66-
function welcomeMessage(time: Time, welcomeTemplate: string, referrerTemplate: string): string {
68+
function welcomeMessage(time: Time, welcomeTemplate?: string, referrerTemplate?: string): string {
6769
if (location.pathname === '/') {
6870
// If on the homepage
6971
for (const { hour, text } of time) {
@@ -78,13 +80,13 @@ function welcomeMessage(time: Time, welcomeTemplate: string, referrerTemplate: s
7880
}
7981
}
8082
}
83+
if (!welcomeTemplate) return '';
8184
const text = i18n(welcomeTemplate, document.title);
82-
if (document.referrer !== '') {
83-
const referrer = new URL(document.referrer);
84-
if (location.hostname === referrer.hostname) return text;
85-
return `${i18n(referrerTemplate, referrer.hostname)}<br>${text}`;
86-
}
87-
return text;
85+
if (document.referrer === '' || !referrerTemplate) return text;
86+
87+
const referrer = new URL(document.referrer);
88+
if (location.hostname === referrer.hostname) return text;
89+
return `${i18n(referrerTemplate, referrer.hostname)}<br>${text}`;
8890
}
8991

9092
function i18n(template: string, ...args: string[]) {

0 commit comments

Comments
 (0)