{{ .strings.settingsRestartRequired }} ×
diff --git a/lang/admin/en-us.json b/lang/admin/en-us.json
index 4a91a26..013d842 100644
--- a/lang/admin/en-us.json
+++ b/lang/admin/en-us.json
@@ -33,6 +33,8 @@
"announce": "Announce",
"subject": "Email Subject",
"message": "Message",
+ "variables": "Variables",
+ "preview": "Preview",
"markdownSupported": "Markdown is supported.",
"modifySettings": "Modify Settings",
"modifySettingsDescription": "Apply settings from an existing profile, or source them directly from a user.",
@@ -76,6 +78,7 @@
"userCreated": "User {n} created.",
"createProfile": "Created profile {n}.",
"saveSettings": "Settings were saved",
+ "saveEmail": "Email saved.",
"sentAnnouncement": "Announcement sent.",
"setOmbiDefaults": "Stored ombi defaults.",
"errorConnection": "Couldn't connect to jfa-go.",
@@ -85,6 +88,7 @@
"errorSettingsFailed": "Application failed.",
"errorLoginBlank": "The username and/or password were left blank.",
"errorUnknown": "Unknown error.",
+ "errorSaveEmail": "Failed to save email.",
"errorBlankFields": "Fields were left blank",
"errorDeleteProfile": "Failed to delete profile {n}",
"errorLoadProfiles": "Failed to load profiles.",
diff --git a/models.go b/models.go
index 12a94e1..2d8d06c 100644
--- a/models.go
+++ b/models.go
@@ -180,3 +180,7 @@ type emailListDTO map[string]string
type emailSetDTO struct {
Content string `json:"content"`
}
+
+type emailTestDTO struct {
+ Address string `json:"address"`
+}
diff --git a/router.go b/router.go
index 78dff39..e531f42 100644
--- a/router.go
+++ b/router.go
@@ -142,7 +142,8 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
api.GET(p+"/config/emails", app.GetEmails)
api.GET(p+"/config/emails/:id", app.GetEmail)
api.POST(p+"/config/emails/:id", app.SetEmail)
- api.POST(p+"/config/emails/:id/:state", app.SetEmailState)
+ api.POST(p+"/config/emails/:id/test", app.GetTestEmail)
+ api.POST(p+"/config/emails/:id/state/:state", app.SetEmailState)
api.GET(p+"/config", app.GetConfig)
api.POST(p+"/config", app.ModifyConfig)
api.POST(p+"/restart", app.restart)
diff --git a/stripmd.go b/stripmd.go
index 0fb6e96..7ea2266 100644
--- a/stripmd.go
+++ b/stripmd.go
@@ -44,7 +44,9 @@ func stripMarkdown(md string) string {
}
fullLinks := make([]string, len(openSquares))
for i := range openSquares {
- fullLinks[i] = md[openSquares[i] : closeBrackets[i]+1]
+ if openSquares[i] != -1 && closeBrackets[i] != -1 {
+ fullLinks[i] = md[openSquares[i] : closeBrackets[i]+1]
+ }
}
for i, _ := range openSquares {
md = strings.Replace(md, fullLinks[i], links[i], 1)
diff --git a/ts/admin.ts b/ts/admin.ts
index 319e160..bc8eee1 100644
--- a/ts/admin.ts
+++ b/ts/admin.ts
@@ -53,6 +53,8 @@ window.availableProfiles = window.availableProfiles || [];
window.modals.addProfile = new Modal(document.getElementById("modal-add-profile"));
window.modals.announce = new Modal(document.getElementById("modal-announce"));
+
+ window.modals.editor = new Modal(document.getElementById("modal-editor"));
})();
var inviteCreator = new createInvite();
diff --git a/ts/modules/settings.ts b/ts/modules/settings.ts
index fba0522..b9bf2f8 100644
--- a/ts/modules/settings.ts
+++ b/ts/modules/settings.ts
@@ -653,3 +653,127 @@ class ombiDefaults {
});
}
}
+
+interface Email {
+ subject: string;
+ html: string;
+ text: string;
+}
+
+interface templateEmail {
+ content: string;
+ variables: string[];
+}
+
+class EmailEditor {
+ private _currentID: string;
+ private _names: { [id: string]: string };
+ private _content: string;
+ private _form = document.getElementById("form-editor") as HTMLFormElement;
+ private _header = document.getElementById("header-editor") as HTMLSpanElement;
+ private _variables = document.getElementById("editor-variables") as HTMLDivElement;
+ private _textArea = document.getElementById("textarea-editor") as HTMLTextAreaElement;
+ private _preview = document.getElementById("editor-preview") as HTMLDivElement;
+
+ insert = (textarea: HTMLTextAreaElement, text: string) => { // https://kubyshkin.name/posts/insert-text-into-textarea-at-cursor-position <3
+ const isSuccess = document.execCommand("insertText", false, text);
+
+ // Firefox (non-standard method)
+ if (!isSuccess && typeof textarea.setRangeText === "function") {
+ const start = textarea.selectionStart;
+ textarea.setRangeText(text);
+ // update cursor to be at the end of insertion
+ textarea.selectionStart = textarea.selectionEnd = start + text.length;
+
+ // Notify any possible listeners of the change
+ const e = document.createEvent("UIEvent");
+ e.initEvent("input", true, false);
+ textarea.dispatchEvent(e);
+ textarea.focus();
+ }
+ }
+
+ load = (id: string) => {
+ this._currentID = id;
+ this.loadPreview();
+ _get("/config/emails/" + id, null, (req: XMLHttpRequest) => {
+ if (req.readyState == 4) {
+ if (req.status != 200) {
+ window.notifications.customError("loadTemplateError", window.lang.notif("errorFailureCheckLogs"));
+ return;
+ }
+ if (this._names[id] !== undefined) {
+ this._header.textContent = this._names[id];
+ }
+ const templ = req.response as templateEmail;
+ this._textArea.value = templ.content;
+ this._content = templ.content;
+ const colors = ["info", "urge", "positive", "neutral"];
+ let innerHTML = '';
+ for (let i = 0; i < templ.variables.length; i++) {
+ let ci = i % colors.length;
+ innerHTML += ''
+ }
+ this._variables.innerHTML = innerHTML
+ const buttons = this._variables.querySelectorAll("span.button") as NodeListOf;
+ for (let i = 0; i < templ.variables.length; i++) {
+ buttons[i].innerHTML = `` + templ.variables[i] + ``;
+ buttons[i].onclick = () => this.insert(this._textArea, templ.variables[i]);
+ }
+ window.modals.editor.show();
+ }
+ })
+ }
+ loadPreview = () => {
+ _post("/config/emails/" + this._currentID + "/test", { "content": this._textArea.value }, (req: XMLHttpRequest) => {
+ if (req.readyState == 4) {
+ if (req.status != 200) {
+ window.notifications.customError("loadTemplateError", window.lang.notif("errorFailureCheckLogs"));
+ return;
+ }
+ this._preview.innerHTML = req.response.html;
+ }
+ }, true);
+ }
+ constructor() {
+ _get("/config/emails", null, (req: XMLHttpRequest) => {
+ if (req.readyState == 4) {
+ if (req.status != 200) {
+ window.notifications.customError("loadTemplateError", window.lang.notif("errorFailureCheckLogs"));
+ return;
+ }
+ this._names = req.response;
+ }
+ });
+
+ let timeout: number;
+ const finishInterval = 1000;
+ this._textArea.onkeyup = () => {
+ clearTimeout(timeout);
+ timeout = setTimeout(this.loadPreview, finishInterval);
+ };
+ this._textArea.onkeydown = () => {
+ clearTimeout(timeout);
+ };
+
+ this._form.onsubmit = (event: Event) => {
+ if (this._textArea.value == this._content) {
+ window.modals.editor.close();
+ return;
+ }
+ event.preventDefault()
+ _post("/config/emails/" + this._currentID, { "content": this._textArea.value }, (req: XMLHttpRequest) => {
+ if (req.readyState == 4) {
+ window.modals.editor.close();
+ if (req.status != 200) {
+ window.notifications.customError("saveEmailError", window.lang.notif("errorSaveEmail"));
+ return;
+ }
+ window.notifications.customSuccess("saveEmail", window.lang.notif("saveEmail"));
+ }
+ });
+ };
+ }
+}
+
+(window as any).ee = () => { (window as any).ee = new EmailEditor(); };
diff --git a/ts/typings/d.ts b/ts/typings/d.ts
index 75e2e62..90a1812 100644
--- a/ts/typings/d.ts
+++ b/ts/typings/d.ts
@@ -75,6 +75,7 @@ declare interface Modals {
profiles: Modal;
addProfile: Modal;
announce: Modal;
+ editor: Modal;
}
interface Invite {