diff --git a/config/config-base.json b/config/config-base.json
index 409cca7..2a361c9 100644
--- a/config/config-base.json
+++ b/config/config-base.json
@@ -403,7 +403,7 @@
"value": "",
"depends_true": "enabled",
"required": "false",
- "description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user."
+ "description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user. Note message cards are not private, little effort is required for anyone to view them."
}
}
},
diff --git a/html/form-base.html b/html/form-base.html
index 1675c56..ba8c318 100644
--- a/html/form-base.html
+++ b/html/form-base.html
@@ -30,6 +30,7 @@
window.reCAPTCHA = {{ .reCAPTCHA }};
window.reCAPTCHASiteKey = "{{ .reCAPTCHASiteKey }}";
window.userPageEnabled = {{ .userPageEnabled }};
+ window.userPageAddress = "{{ .userPageAddress }}";
{{ if .passwordReset }}
diff --git a/html/user.html b/html/user.html
index d75b1b9..e073cf2 100644
--- a/html/user.html
+++ b/html/user.html
@@ -26,7 +26,7 @@
window.validationStrings = JSON.parse({{ .validationStrings }});
{{ template "header.html" . }}
-
{{ .lang.Strings.myAccount }}
+ {{ .strings.myAccount }}
diff --git a/ts/form.ts b/ts/form.ts
index e0d3a57..5610430 100644
--- a/ts/form.ts
+++ b/ts/form.ts
@@ -36,6 +36,7 @@ interface formWindow extends Window {
reCAPTCHA: boolean;
reCAPTCHASiteKey: string;
userPageEnabled: boolean;
+ userPageAddress: string;
}
loadLangSelector("form");
@@ -348,7 +349,8 @@ const create = (event: SubmitEvent) => {
} else {
if (window.userPageEnabled) {
const userPageNoticeArea = document.getElementById("modal-success-user-page-area");
- userPageNoticeArea.textContent = userPageNoticeArea.textContent.replace("{myAccount}", userPageNoticeArea.getAttribute("my-account-term"));
+ const link = `
${userPageNoticeArea.getAttribute("my-account-term")}`;
+ userPageNoticeArea.innerHTML = userPageNoticeArea.textContent.replace("{myAccount}", link);
}
window.successModal.show();
}
diff --git a/views.go b/views.go
index 2570469..c7a0a33 100644
--- a/views.go
+++ b/views.go
@@ -596,6 +596,12 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
discord := discordEnabled && app.config.Section("discord").Key("show_on_reg").MustBool(true)
matrix := matrixEnabled && app.config.Section("matrix").Key("show_on_reg").MustBool(true)
+ userPageAddress := app.config.Section("invite_emails").Key("url_base").String()
+ if userPageAddress == "" {
+ userPageAddress = app.config.Section("password_resets").Key("url_base").String()
+ }
+ userPageAddress += "/my/account"
+
data := gin.H{
"urlBase": app.getURLBase(gc),
"cssClass": app.cssClass,
@@ -630,6 +636,7 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
"reCAPTCHA": app.config.Section("captcha").Key("recaptcha").MustBool(false),
"reCAPTCHASiteKey": app.config.Section("captcha").Key("recaptcha_site_key").MustString(""),
"userPageEnabled": app.config.Section("user_page").Key("enabled").MustBool(false),
+ "userPageAddress": userPageAddress,
}
if telegram {
data["telegramPIN"] = app.telegram.NewAuthToken()