config/config-base.json

@@ -72,7 +72,6 @@
                     "name": "Client Name",
                     "required": true,
                     "requires_restart": true,
-                    "advanced": true,
                     "type": "text",
                     "value": "jfa-go",
                     "description": "The name of the client that will show up in the Jellyfin dashboard."
@@ -81,7 +80,6 @@
                     "name": "User cache timeout (minutes)",
                     "required": false,
                     "requires_restart": true,
-                    "advanced": true,
                     "type": "number",
                     "value": 30,
                     "description": "Timeout of user cache in minutes. Set to 0 to disable."
@@ -385,7 +383,6 @@
                     "name": "Date format",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "method",
                     "type": "text",
                     "value": "%d/%m/%y",
@@ -435,7 +432,6 @@
                     "name": "Send emails as plain text",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "method",
                     "type": "bool",
                     "value": false,
@@ -472,7 +468,6 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -482,7 +477,6 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -518,7 +512,6 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -528,7 +521,6 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -574,7 +566,6 @@
                     "name": "Expiry email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced":  true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -584,7 +575,6 @@
                     "name": "Expiry email (Plaintext)",
                     "required": false,
                     "requires_restart": "false",
-                    "advanced":  true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -594,7 +584,6 @@
                     "name": "User created email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced":  true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -604,7 +593,6 @@
                     "name": "User created email (Plaintext)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced":  true,
                     "depends_true": "enabled",
                     "type": "text",
                     "value": "",
@@ -685,15 +673,6 @@
                     "requires_restart": false,
                     "type": "password",
                     "value": "smtp password"
-                },
-                "ssl_cert": {
-                    "name": "Path to custom SSL certificate",
-                    "required": false,
-                    "requires_restart": false,
-                    "advanced":  true,
-                    "type": "text",
-                    "value": "",
-                    "description": "Use if your SMTP server's SSL Certificate is not trusted by the system."
                 }
             }
         },
@@ -760,7 +739,6 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email html"
@@ -769,7 +747,6 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email in plain text"
@@ -803,7 +780,6 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email html"
@@ -812,7 +788,6 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email in plain text"
@@ -860,7 +835,6 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "email|method",
                     "type": "text",
                     "value": "",
@@ -870,7 +844,6 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "depends_true": "email|method",
                     "type": "text",
                     "value": "",
@@ -898,7 +871,6 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email html"
@@ -907,7 +879,6 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
-                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email in plain text"
@@ -918,8 +889,7 @@
             "order": [],
             "meta": {
                 "name": "File Storage",
-                "description": "Optional settings for changing storage locations.",
+                "description": "Optional settings for changing storage locations."
-                "advanced": true
             },
             "settings": {
                 "invites": {

email.go

@@ -4,13 +4,10 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
-	"crypto/x509"
-	"errors"
 	"fmt"
 	"html/template"
 	"io"
 	"net/smtp"
-	"os"
 	"strings"
 	"sync"
 	textTemplate "text/template"
@@ -52,15 +49,18 @@ func (mg *Mailgun) send(fromName, fromAddr string, email *Email, address ...stri
 
 // SMTP supports SSL/TLS and STARTTLS; implements emailClient.
 type SMTP struct {
-	sslTLS    bool
+	sslTLS bool
-	server    string
+	server string
-	port      int
+	port   int
-	auth      smtp.Auth
+	auth   smtp.Auth
-	tlsConfig *tls.Config
 }
 
 func (sm *SMTP) send(fromName, fromAddr string, email *Email, address ...string) error {
 	server := fmt.Sprintf("%s:%d", sm.server, sm.port)
+	tlsConfig := &tls.Config{
+		InsecureSkipVerify: false,
+		ServerName:         sm.server,
+	}
 	from := fmt.Sprintf("%s <%s>", fromName, fromAddr)
 	var wg sync.WaitGroup
 	var err error
@@ -75,9 +75,9 @@ func (sm *SMTP) send(fromName, fromAddr string, email *Email, address ...string)
 			e.HTML = []byte(email.HTML)
 			e.To = []string{addr}
 			if sm.sslTLS {
-				err = e.SendWithTLS(server, sm.auth, sm.tlsConfig)
+				err = e.SendWithTLS(server, sm.auth, tlsConfig)
 			} else {
-				err = e.SendWithStartTLS(server, sm.auth, sm.tlsConfig)
+				err = e.SendWithStartTLS(server, sm.auth, tlsConfig)
 			}
 		}(addr)
 	}
@@ -139,10 +139,7 @@ func NewEmailer(app *appContext) *Emailer {
 		} else {
 			username = emailer.fromAddr
 		}
-		err := emailer.NewSMTP(app.config.Section("smtp").Key("server").String(), app.config.Section("smtp").Key("port").MustInt(465), username, app.config.Section("smtp").Key("password").String(), sslTls, app.config.Section("smtp").Key("ssl_cert").MustString(""))
+		emailer.NewSMTP(app.config.Section("smtp").Key("server").String(), app.config.Section("smtp").Key("port").MustInt(465), username, app.config.Section("smtp").Key("password").String(), sslTls)
-		if err != nil {
-			app.err.Printf("Error while initiating SMTP mailer: %v", err)
-		}
 	} else if method == "mailgun" {
 		emailer.NewMailgun(app.config.Section("mailgun").Key("api_url").String(), app.config.Section("mailgun").Key("api_key").String())
 	}
@@ -164,30 +161,13 @@ func (emailer *Emailer) NewMailgun(url, key string) {
 }
 
 // NewSMTP returns an SMTP emailClient.
-func (emailer *Emailer) NewSMTP(server string, port int, username, password string, sslTLS bool, certPath string) (err error) {
+func (emailer *Emailer) NewSMTP(server string, port int, username, password string, sslTLS bool) {
-	rootCAs, err := x509.SystemCertPool()
-	if rootCAs == nil || err != nil {
-		rootCAs = x509.NewCertPool()
-	}
-	if certPath != "" {
-		var cert []byte
-		cert, err = os.ReadFile(certPath)
-		if rootCAs.AppendCertsFromPEM(cert) == false {
-			err = errors.New("Failed to append cert to pool")
-		}
-	}
 	emailer.sender = &SMTP{
 		auth:   smtp.PlainAuth("", username, password, server),
 		server: server,
 		port:   port,
 		sslTLS: sslTLS,
-		tlsConfig: &tls.Config{
-			InsecureSkipVerify: false,
-			ServerName:         server,
-			RootCAs:            rootCAs,
-		},
 	}
-	return
 }
 
 type templ interface {

html/admin.html

@@ -427,18 +427,10 @@
             </div>
             <div id="tab-settings" class="unfocused">
                 <div class="card ~neutral !low settings overflow">
-                    <div class="flex-expand">
+                    <span class="heading">{{ .strings.settings }}</span>
-                        <div class="flex-row">
+                    <div class="fr">
-                            <span class="heading">{{ .strings.settings }}</span>
+                        <span class="button ~neutral !normal" id="settings-restart">{{ .strings.settingsRestart }}</span>
-                            <label for="settings-advanced-enabled" class="button ~neutral !normal ml-1">
+                        <span class="button ~urge !normal unfocused" id="settings-save">{{ .strings.settingsSave }}</span>
-                                <input type="checkbox" id="settings-advanced-enabled" aria-label="Advanced settings enabled">
-                                <span class="ml-half">{{ .strings.advancedSettings }} </span>
-                            </label>
-                        </div>
-                        <div>
-                            <span class="button ~neutral !normal" id="settings-restart">{{ .strings.settingsRestart }}</span>
-                            <span class="button ~urge !normal unfocused" id="settings-save">{{ .strings.settingsSave }}</span>
-                        </div>
                     </div>
                     <div class="row">
                         <div class="card ~neutral !normal col" id="settings-sidebar">

lang/admin/en-us.json

@@ -28,7 +28,6 @@
         "update": "Update",
         "download": "Download",
         "search": "Search",
-        "advancedSettings": "Advanced Settings",
         "lastActiveTime": "Last Active",
         "from": "From",
         "user": "User",

lang/admin/nl-nl.json

@@ -83,11 +83,7 @@
         "admin": "Beheerder",
         "expiry": "Verloop",
         "userExpiry": "Gebruikersverloop",
-        "extendExpiry": "Verleng verloop",
+        "extendExpiry": "Verleng verloop"
-        "updates": "Updates",
-        "update": "Bijwerken",
-        "download": "Download",
-        "search": "Zoeken"
     },
     "notifications": {
         "changedEmailAddress": "E-mailadres van {n} gewijzigd.",
@@ -119,12 +115,7 @@
         "errorUserCreated": "Aanmaken van gebruiker {n} is mislukt.",
         "sentAnnouncement": "Aankondiging verzonden.",
         "saveEmail": "E-mail opgeslagen.",
-        "errorSaveEmail": "Opslaan van e-mail mislukt.",
+        "errorSaveEmail": "Opslaan van e-mail mislukt."
-        "updateApplied": "De update is geïnstalleerd, doe alsjeblieft een herstart.",
-        "errorApplyUpdate": "Installatie van update mislukt, probeer handmatig.",
-        "errorCheckUpdate": "Controleren op update mislukt.",
-        "updateAvailable": "Er is een nieuwe update beschikbaar, kijk bij instellingen.",
-        "noUpdatesAvailable": "Geen nieuwe updates beschikbaar."
     },
     "quantityStrings": {
         "modifySettingsFor": {

models.go

@@ -156,7 +156,6 @@ type configDTO map[string]interface{}
 type meta struct {
 	Name         string `json:"name"`
 	Description  string `json:"description"`
-	Advanced     bool   `json:"advanced,omitempty"`
 	DependsTrue  string `json:"depends_true,omitempty"`
 	DependsFalse string `json:"depends_false,omitempty"`
 }
@@ -165,7 +164,6 @@ type setting struct {
 	Name            string      `json:"name"`
 	Description     string      `json:"description"`
 	Required        bool        `json:"required"`
-	Advanced        bool        `json:"advanced,omitempty"`
 	RequiresRestart bool        `json:"requires_restart"`
 	Type            string      `json:"type"` // Type (string, number, bool, etc.)
 	Value           interface{} `json:"value"`

scripts/compile_mjml.py

@@ -3,7 +3,6 @@ import shutil
 import os
 import argparse
 from pathlib import Path
-from threading import Thread
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-o", "--output", help="output directory for .html and .txt files")
@@ -16,23 +15,15 @@ def runcmd(cmd):
     proc = subprocess.Popen(cmd.split(), stdout=subprocess.PIPE)
     return proc.communicate()
 
-def compile(mjml: Path):
-    fname = mjml.with_suffix(".html")
-    runcmd(f"npx mjml {str(mjml)} -o {str(fname)}")
-    if fname.is_file():
-        print(f"Compiled {mjml.name}")
 
 local_path = Path("mail")
 
-threads = []
-
 for mjml in [f for f in local_path.iterdir() if f.is_file() and "mjml" in f.suffix]:
-    threads.append(Thread(target=compile, args=(mjml,)))
+    print(f"Compiling {mjml.name}")
-
+    fname = mjml.with_suffix(".html")
-for thread in threads:
+    runcmd(f"npx mjml {str(mjml)} -o {str(fname)}")
-    thread.start()
+    if fname.is_file():
-for thread in threads:
+        print("Done.")
-    thread.join()
 
 html = [f for f in local_path.iterdir() if f.is_file() and "html" in f.suffix]
 

scripts/enumerate_config.py

@@ -1,5 +1,3 @@
-# Since go doesn't order its json, this script adds ordered lists
-# of section/setting names for the settings tab to use.
 import json, argparse
 
 parser = argparse.ArgumentParser()

scripts/version.sh

@@ -1,5 +1,3 @@
 #!/bin/bash
-# sets version environment variable for goreleaser to use
-# scripts/version.sh goreleaser ...
 JFA_GO_VERSION=$(git describe --exact-match HEAD 2> /dev/null || echo 'vgit')
 JFA_GO_VERSION="$(echo $JFA_GO_VERSION | sed 's/v//g')" $@

ts/modules/settings.ts

@@ -9,7 +9,6 @@ interface settingsBoolEvent extends Event {
 interface Meta {
     name: string;
     description: string;
-    advanced?: boolean;
     depends_true?: string;
     depends_false?: string;
 }
@@ -19,7 +18,6 @@ interface Setting {
     description: string;
     required: boolean;
     requires_restart: boolean;
-    advanced?: boolean;
     type: string;
     value: string | boolean | number;
     depends_true?: string;
@@ -43,25 +41,6 @@ class DOMInput {
     private _tooltip: HTMLDivElement;
     private _required: HTMLSpanElement;
     private _restart: HTMLSpanElement;
-    private _advanced: boolean;
-
-    private _advancedListener = (event: settingsBoolEvent) => {
-        if (!Boolean(event.detail)) {
-            this._input.parentElement.classList.add("unfocused");
-        } else {
-            this._input.parentElement.classList.remove("unfocused");
-        }
-    }
-
-    get advanced(): boolean { return this._advanced; }
-    set advanced(advanced: boolean) {
-        this._advanced = advanced;
-        if (advanced) {
-            document.addEventListener("settings-advancedState", this._advancedListener);
-        } else {
-            document.removeEventListener("settings-advancedState", this._advancedListener);
-        }
-    }
 
     get name(): string { return this._container.querySelector("span.setting-label").textContent; }
     set name(n: string) { this._container.querySelector("span.setting-label").textContent = n; }
@@ -146,7 +125,6 @@ class DOMInput {
         this.required = s.required;
         this.requires_restart = s.requires_restart;
         this.value = s.value;
-        this.advanced = s.advanced;
     }
     
     asElement = (): HTMLDivElement => { return this._container; }
@@ -202,25 +180,6 @@ class DOMBool implements SBool {
     private _required: HTMLSpanElement;
     private _restart: HTMLSpanElement;
     type: string = "bool";
-    private _advanced: boolean;
-
-    private _advancedListener = (event: settingsBoolEvent) => {
-        if (!Boolean(event.detail)) {
-            this._input.parentElement.classList.add("unfocused");
-        } else {
-            this._input.parentElement.classList.remove("unfocused");
-        }
-    }
-
-    get advanced(): boolean { return this._advanced; }
-    set advanced(advanced: boolean) {
-        this._advanced = advanced;
-        if (advanced) {
-            document.addEventListener("settings-advancedState", this._advancedListener);
-        } else {
-            document.removeEventListener("settings-advancedState", this._advancedListener);
-        }
-    }
 
     get name(): string { return this._container.querySelector("span.setting-label").textContent; }
     set name(n: string) { this._container.querySelector("span.setting-label").textContent = n; }
@@ -306,7 +265,6 @@ class DOMBool implements SBool {
         this.required = s.required;
         this.requires_restart = s.requires_restart;
         this.value = s.value;
-        this.advanced = s.advanced;
     }
     
     asElement = (): HTMLDivElement => { return this._container; }
@@ -324,25 +282,6 @@ class DOMSelect implements SSelect {
     private _restart: HTMLSpanElement;
     private _options: string[][];
     type: string = "bool";
-    private _advanced: boolean;
-
-    private _advancedListener = (event: settingsBoolEvent) => {
-        if (!Boolean(event.detail)) {
-            this._container.classList.add("unfocused");
-        } else {
-            this._container.classList.remove("unfocused");
-        }
-    }
-
-    get advanced(): boolean { return this._advanced; }
-    set advanced(advanced: boolean) {
-        this._advanced = advanced;
-        if (advanced) {
-            document.addEventListener("settings-advancedState", this._advancedListener);
-        } else {
-            document.removeEventListener("settings-advancedState", this._advancedListener);
-        }
-    }
 
     get name(): string { return this._container.querySelector("span.setting-label").textContent; }
     set name(n: string) { this._container.querySelector("span.setting-label").textContent = n; }
@@ -505,7 +444,7 @@ class sectionPanel {
                 }
                 this.values[name] = ""+setting.value;
                 document.addEventListener(`settings-${this._sectionName}-${name}`, (event: CustomEvent) => {
-                    // const oldValue = this.values[name];
+                    const oldValue = this.values[name];
                     this.values[name] = ""+event.detail;
                     document.dispatchEvent(new CustomEvent("settings-section-changed"));
                 });
@@ -565,15 +504,6 @@ export class settingsList {
                 }
             });
         }
-        if (s.meta.advanced) {
-            document.addEventListener("settings-advancedState", (event: settingsBoolEvent) => {
-                if (!Boolean(event.detail)) {
-                    button.classList.add("unfocused");
-                } else {
-                    button.classList.remove("unfocused");
-                }
-            });
-        }
         this._buttons[name] = button;
         this._sidebar.appendChild(this._buttons[name]);
     }
@@ -638,20 +568,6 @@ export class settingsList {
         this._saveButton.onclick = this._save;
         document.addEventListener("settings-requires-restart", () => { this._needsRestart = true; });
 
-        const advancedEnableToggle = document.getElementById("settings-advanced-enabled") as HTMLInputElement;
-        advancedEnableToggle.onchange = () => {
-            document.dispatchEvent(new CustomEvent("settings-advancedState", { detail: advancedEnableToggle.checked }));
-            const parent = advancedEnableToggle.parentElement;
-            if (advancedEnableToggle.checked) {
-                parent.classList.add("~urge");
-                parent.classList.remove("~neutral");
-            } else {
-                parent.classList.add("~neutral");
-                parent.classList.remove("~urge");
-            }
-        };
-        advancedEnableToggle.checked = false;
-
         if (window.ombiEnabled) {
             let ombi = new ombiDefaults();
             this._sidebar.appendChild(ombi.button());
@@ -697,7 +613,6 @@ export class settingsList {
             }
             this._showPanel(settings.order[0]);
             document.dispatchEvent(new CustomEvent("settings-loaded"));
-            document.dispatchEvent(new CustomEvent("settings-advancedState", { detail: false }));
             this._saveButton.classList.add("unfocused");
             this._needsRestart = false;
         }