Merge branch 'main' into telegram

By clicking the cog next to the telegram username, one can select
whether to contact through telegram or email.

.drone.yml

@@ -11,14 +11,21 @@ steps:
     - name: release
       image: golang:latest
       environment:
+          BUILDRONE_KEY:
+              from_secret: BUILDRONE_KEY
           GITHUB_TOKEN:
               from_secret: github_token
       commands:
-        - apt update -y
-        - apt install build-essential python3-pip curl software-properties-common sed upx -y
+        - apt-get update -y
+        - apt-get install build-essential python3-pip curl software-properties-common sed upx -y
         - (curl -sL https://deb.nodesource.com/setup_14.x | bash -)
-        - apt install nodejs
-        - curl -sL https://git.io/goreleaser | bash
+        - apt-get install nodejs
+        - curl -sL https://git.io/goreleaser > ../goreleaser
+        - chmod +x ../goreleaser
+        - ./scripts/version.sh ../goreleaser
+        - wget https://builds.hrfee.pw/upload.py -P ../
+        - pip3 install requests
+        - bash -c 'python3 ../upload.py https://builds.hrfee.pw hrfee jfa-go --tag internal=true'
 trigger:
     event:
         - tag
@@ -46,6 +53,10 @@ steps:
           command_timeout: 50m
           script:
               - /mnt/buildx/jfa-go/build.sh stable
+              - wget https://builds.hrfee.pw/upload.py -O /mnt/buildx/jfa-go/jfa-go/upload.py
+              - pip3 install requests
+              - bash -c 'cd /mnt/buildx/jfa-go/jfa-go && BUILDRONE_KEY=$(cat /mnt/buildx/jfa-go/key) python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-stable=true'
+              - rm -f /mnt/buildx/jfa-go/jfa-go/upload.py
 trigger:
     event:
         - tag
@@ -62,16 +73,16 @@ steps:
     - name: build
       image: golang:latest
       commands:
-        - apt update -y
-        - apt install build-essential python3-pip curl software-properties-common sed upx -y
+        - apt-get update -y
+        - apt-get install build-essential python3-pip curl software-properties-common sed upx -y
         - (curl -sL https://deb.nodesource.com/setup_14.x | bash -)
-        - apt install nodejs
-        - curl -sL https://git.io/goreleaser > goreleaser.sh
-        - chmod +x goreleaser.sh
-        - ./goreleaser.sh --snapshot --skip-publish --rm-dist
+        - apt-get install nodejs
+        - curl -sL https://git.io/goreleaser > goreleaser
+        - chmod +x goreleaser
+        - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --rm-dist
         - wget https://builds.hrfee.pw/upload.py
         - pip3 install requests
-        - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go ./dist/*.tar.gz'
+        - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --upload ./dist/*.tar.gz --tag internal-git=true'
       environment:
           BUILDRONE_KEY:
               from_secret: BUILDRONE_KEY
@@ -108,6 +119,10 @@ steps:
           command_timeout: 50m
           script:
               - /mnt/buildx/jfa-go/build.sh
+              - wget https://builds.hrfee.pw/upload.py -O /mnt/buildx/jfa-go/jfa-go/upload.py
+              - pip3 install requests
+              - bash -c 'cd /mnt/buildx/jfa-go/jfa-go && BUILDRONE_KEY=$(cat /mnt/buildx/jfa-go/key) python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-unstable=true'
+              - rm -f /mnt/buildx/jfa-go/jfa-go/upload.py
 trigger:
     branch:
         - main
@@ -128,13 +143,13 @@ steps:
     - name: build
       image: golang:latest
       commands:
-        - apt update -y
-        - apt install build-essential python3-pip curl software-properties-common sed upx -y
+        - apt-get update -y
+        - apt-get install build-essential python3-pip curl software-properties-common sed upx -y
         - (curl -sL https://deb.nodesource.com/setup_14.x | bash -)
-        - apt install nodejs
-        - curl -sL https://git.io/goreleaser > goreleaser.sh
-        - chmod +x goreleaser.sh
-        - ./goreleaser.sh --snapshot --skip-publish --rm-dist
+        - apt-get install nodejs
+        - curl -sL https://git.io/goreleaser > goreleaser
+        - chmod +x goreleaser
+        - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --rm-dist
 
 trigger:
     event:

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: hrfee
 ko_fi: hrfee
+custom: https://www.buymeacoffee.com/hrfee

.gitignore

@@ -4,7 +4,6 @@ dist/
 build/
 data/
 version.go
-embed.go
 notes
 docs/*
 lang/langtostruct.py
@@ -13,3 +12,6 @@ config-payload.json
 server.key
 server.pem
 server.crt
+instructions-debian.txt
+cl.md
+./telegram/

.goreleaser.yml

@@ -17,20 +17,22 @@ before:
     - cp node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 data/web/css/
     - cp -r html data/
     - cp -r lang data/
+    - cp LICENSE data/
     - python3 scripts/enumerate_config.py -i config/config-base.json -o data/config-base.json
     - python3 scripts/generate_ini.py -i config/config-base.json -o data/config-default.ini
     - python3 scripts/compile_mjml.py -o data/
-    - python3 scripts/version.py {{.Version}}
     - npx esbuild --bundle ts/admin.ts --outfile=./data/web/js/admin.js --minify
+    - npx esbuild --bundle ts/pwr.ts --outfile=./data/web/js/pwr.js --minify
     - npx esbuild --bundle ts/form.ts --outfile=./data/web/js/form.js --minify
     - npx esbuild --bundle ts/setup.ts --outfile=./data/web/js/setup.js --minify
     - go get -u github.com/swaggo/swag/cmd/swag
     - swag init -g main.go
-    - python3 scripts/embed.py internal
 builds:
     - dir: ./
       env:
         - CGO_ENABLED=0
+      ldflags:
+        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary
       goos:
         - linux
         - windows

CONTRIBUTING.md

@@ -1,8 +1,15 @@
 #### Code
 I use 4 spaces for indentation. Go should ideally be formatted with `goimports` and/or `gofmt`. I don't use a formatter on typescript, so don't worry about that.
 
-If you need to test your changes:
-* `make debug` will build everything, and include sourcemaps for typescript. This should be the first thing you run.
-* `make compile` compiles go into `build/jfa-go`.
-* `make ts-debug` will compile typescript w/ sourcemaps into `build/data/web/js`.
-* `make copy` will copy css, html, language and static files into `build/data`.
+#### Compiling
+
+Prefix each of these with `make DEBUG=on INTERNAL=off `:
+* `all` will download deps and build everything. The executable and data will be placed in `build`. This is only necessary the first time.
+* `compile` will only compile go code into the `build/jfa-go` executable.
+* `typescript` will compile typescript w/ sourcemaps into `build/data/web/js`.
+* `bundle-css` will bundle CSS and place it in `build/data/web/css`.
+* `configuration` will generate the `config-base.json` (used to render settings in the web ui) and `config-default.ini` and put them in `build/data`.
+* `email` will compile email mjml, and copy the text versions in to `build/data`.
+* `copy` will copy iconography, html, language files and static data into `build/data`.
+
+See the [wiki](https://github.com/hrfee/jfa-go/wiki/Build) for more info.

Dockerfile

@@ -2,12 +2,12 @@ FROM --platform=$BUILDPLATFORM golang:latest AS support
 
 COPY . /opt/build
 
-RUN apt update -y \
-    && apt install build-essential python3-pip curl software-properties-common sed -y \
+RUN apt-get update -y \
+    && apt-get install build-essential python3-pip curl software-properties-common sed -y \
     && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \
-    && apt install nodejs \
-    && (cd /opt/build; make configuration npm email version typescript bundle-css swagger copy external-files GOESBUILD=on) \
-    && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/data/html/setup.html
+    && apt-get install nodejs \
+    && (cd /opt/build; make configuration npm email typescript bundle-css swagger copy INTERNAL=off GOESBUILD=on) \
+    && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
 
 
 FROM --platform=$BUILDPLATFORM golang:latest AS build
@@ -16,7 +16,7 @@ ENV GOARCH=$TARGETARCH
 
 COPY --from=support /opt/build /opt/build
 
-RUN (cd /opt/build; make compile)
+RUN (cd /opt/build; make compile INTERNAL=off UPDATER=docker)
 
 FROM golang:latest
 

Makefile

@@ -6,6 +6,40 @@ else
 endif
 GOBINARY ?= go
 
+VERSION ?= $(shell git describe --exact-match HEAD 2> /dev/null || echo vgit)
+VERSION := $(shell echo $(VERSION) | sed 's/v//g')
+COMMIT ?= $(shell git rev-parse --short HEAD || echo unknown)
+
+UPDATER ?= off
+LDFLAGS := -X main.version=$(VERSION) -X main.commit=$(COMMIT)
+ifeq ($(UPDATER), on)
+	LDFLAGS := $(LDFLAGS) -X main.updater=binary
+else ifneq ($(UPDATER), off)
+	LDFLAGS := $(LDFLAGS) -X main.updater=$(UPDATER)
+endif
+
+INTERNAL ?= on
+ifeq ($(INTERNAL), on)
+	TAGS :=
+	DATA := data
+else
+	DATA := build/data
+	TAGS := -tags external
+endif
+
+DEBUG ?= off
+ifeq ($(DEBUG), on)
+	LDFLAGS := -s -w $(LDFLAGS)
+	SOURCEMAP := --sourcemap
+	TYPECHECK := tsc -noEmit --project ts/tsconfig.json
+	# jank
+	COPYTS := rm -r $(DATA)/web/js/ts; cp -r ts $(DATA)/web/js
+else
+	SOURCEMAP :=
+	COPYTS :=
+	TYPECHECK :=
+endif
+
 npm:
 	$(info installing npm dependencies)
 	npm install
@@ -17,84 +51,75 @@ npm:
 
 configuration:
 	$(info Fixing config-base)
-	-mkdir -p data
-	python3 scripts/enumerate_config.py -i config/config-base.json -o data/config-base.json
+	-mkdir -p $(DATA)
+	python3 scripts/enumerate_config.py -i config/config-base.json -o $(DATA)/config-base.json
 	$(info Generating config-default.ini)
-	python3 scripts/generate_ini.py -i config/config-base.json -o data/config-default.ini
+	python3 scripts/generate_ini.py -i config/config-base.json -o $(DATA)/config-default.ini
 
 email:
 	$(info Generating email html)
-	python3 scripts/compile_mjml.py -o data/
+	python3 scripts/compile_mjml.py -o $(DATA)/
 
 typescript:
+	$(TYPECHECK)
 	$(info compiling typescript)
-	-mkdir -p data/web/js
-	-$(ESBUILD) --bundle ts/admin.ts --outfile=./data/web/js/admin.js --minify
-	-$(ESBUILD) --bundle ts/form.ts --outfile=./data/web/js/form.js --minify
-	-$(ESBUILD) --bundle ts/setup.ts --outfile=./data/web/js/setup.js --minify
-
-ts-debug:
-	$(info compiling typescript w/ sourcemaps)
-	-mkdir -p data/web/js
-	-$(ESBUILD) --bundle ts/admin.ts --sourcemap --outfile=./data/web/js/admin.js
-	-$(ESBUILD) --bundle ts/form.ts --sourcemap --outfile=./data/web/js/form.js
-	-$(ESBUILD) --bundle ts/setup.ts --sourcemap --outfile=./data/web/js/setup.js
-	-rm -r data/web/js/ts
-	$(info copying typescript)
-	cp -r ts data/web/js
+	-mkdir -p $(DATA)/web/js
+	-$(ESBUILD) --bundle ts/admin.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/admin.js --minify
+	-$(ESBUILD) --bundle ts/pwr.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/pwr.js --minify
+	-$(ESBUILD) --bundle ts/form.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/form.js --minify
+	-$(ESBUILD) --bundle ts/setup.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/setup.js --minify
+	$(COPYTS)
 
 swagger:
 	$(GOBINARY) get github.com/swaggo/swag/cmd/swag
 	swag init -g main.go
 
-version:
-	python3 scripts/version.py auto
-
 compile:
 	$(info Downloading deps)
 	$(GOBINARY) mod download
 	$(info Building)
 	mkdir -p build
-	cd build && CGO_ENABLED=0 $(GOBINARY) build -ldflags="-s -w" -o ./jfa-go ../*.go
-
-compile-debug:
-	$(info Downloading deps)
-	$(GOBINARY) mod download
-	$(info Building)
-	mkdir -p build
-	cd build && CGO_ENABLED=0 $(GOBINARY) build -o ./jfa-go ../*.go
+	CGO_ENABLED=0 $(GOBINARY) build -ldflags="-s -w $(LDFLAGS)" $(TAGS) -o build/jfa-go
 
 compress:
 	upx --lzma build/jfa-go
 
 bundle-css:
-	-mkdir -p data/web/css
+	-mkdir -p $(DATA)/web/css
 	$(info bundling css)
-	$(ESBUILD) --bundle css/base.css --outfile=data/web/css/bundle.css --external:remixicon.css --minify
+	$(ESBUILD) --bundle css/base.css --outfile=$(DATA)/web/css/bundle.css --external:remixicon.css --minify
 
 copy:
 	$(info copying fonts)
-	cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 data/web/css/
+	cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 $(DATA)/web/css/
 	$(info copying html)
-	cp -r html data/
+	cp -r html $(DATA)/
 	$(info copying static data)
-	-mkdir -p data/web
-	cp -r static/* data/web/
+	-mkdir -p $(DATA)/web
+	cp -r static/* $(DATA)/web/
+	$(info copying systemd service)
+	cp jfa-go.service $(DATA)/
 	$(info copying language files)
-	cp -r lang data/
+	cp -r lang $(DATA)/
+	cp LICENSE $(DATA)/
 
-internal-files:
-	python3 scripts/embed.py internal
-
-external-files:
-	python3 scripts/embed.py external
-	-mkdir -p build
-	$(info copying internal data into build/)
-	cp -r data build/
+# internal-files:
+# 	python3 scripts/embed.py internal
+# 
+# external-files:
+# 	python3 scripts/embed.py external
+# 	-mkdir -p build
+# 	$(info copying internal data into build/)
+# 	cp -r data build/
 
 install:
 	cp -r build $(DESTDIR)/jfa-go
 
-all: configuration npm email version typescript bundle-css swagger copy internal-files compile
-all-external: configuration npm email version typescript bundle-css swagger copy external-files compile
-debug: configuration npm email version ts-debug bundle-css swagger copy external-files compile-debug
+clean:
+	-rm -r $(DATA)
+	-rm -r build
+	-rm mail/*.html
+	-rm docs/docs.go docs/swagger.json docs/swagger.yaml
+	go clean
+
+all: configuration npm email typescript bundle-css swagger copy compile

README.md

@@ -1,27 +1,32 @@
 ![jfa-go](images/banner.svg)
-[![Build Status](https://drone.hrfee.pw/api/badges/hrfee/jfa-go/status.svg?ref=refs/heads/main)](https://drone.hrfee.pw/hrfee/jfa-go)
+[![Build Status](https://drone.hrfee.dev/api/badges/hrfee/jfa-go/status.svg?ref=refs/heads/main)](https://drone.hrfee.dev/hrfee/jfa-go)
 [![Docker Hub](https://img.shields.io/docker/pulls/hrfee/jfa-go?label=docker)](https://hub.docker.com/r/hrfee/jfa-go)
 [![Translation status](https://weblate.hrfee.pw/widgets/jfa-go/-/svg-badge.svg)](https://weblate.hrfee.pw/engage/jfa-go/)
+
+##### Downloads:
+##### [dockerhub](https://hub.docker.com/r/hrfee/jfa-go) | [stable](https://github.com/hrfee/jfa-go/releases) | [nightly](https://builds.hrfee.pw/view/hrfee/jfa-go) | [aur stable](https://aur.archlinux.org/packages/jfa-go) | [aur binary](https://aur.archlinux.org/packages/jfa-go-bin) | [aur nightly](https://aur.archlinux.org/packages/jfa-go-git)
 ---
 jfa-go is a user management app for [Jellyfin](https://github.com/jellyfin/jellyfin) (and now [Emby](https://emby.media/)) that provides invite-based account creation as well as other features that make one's instance much easier to manage.
 
-I chose to rewrite the python [jellyfin-accounts](https://github.com/hrfee/jellyfin-accounts) in Go mainly as a learning experience, but also to slightly improve speeds and efficiency.
-
 #### Features
 * 🧑 Invite based account creation: Sends invites to your friends or family, and let them choose their own username and password without relying on you.
     * Send invites via a link and/or email
     * Granular control over invites: Validity period as well as number of uses can be specified.
     * Account profiles: Assign settings profiles to invites so new users have your predefined permissions, homescreen layout, etc. applied to their account on creation.
     * Password validation: Ensure users choose a strong password.
+* ⌛ User expiry: Specify a validity period, and new users accounts will be disabled/deleted after it. The period can be manually extended too.
 * 🔗 Ombi Integration: Automatically creates Ombi accounts for new users using their email address and login details, and your own defined set of permissions.
 * Account management: Apply settings to your users individually or en masse, and delete users, optionally sending them an email notification with a reason.
+* Telegram Integration: Verify users via telegram, and send Password Resets, Announcements, etc. through it.
 * 📨 Email storage: Add your existing users email addresses through the UI, and jfa-go will ask new users for them on account creation.
     * Email addresses can optionally be used instead of usernames
-* 🔑 Password resets: When user's forget their passwords and request a change in Jellyfin, jfa-go reads the PIN from the created file and sends it straight to the user via email.
+* 🔑 Password resets: When users forget their passwords and request a change in Jellyfin, jfa-go reads the PIN from the created file and sends it straight to the user via email/telegram.
 * Notifications: Get notified when someone creates an account, or an invite expires.
+* 📣 Announcements: Bulk message your users with announcements about your server.
 * Authentication via Jellyfin: Instead of using separate credentials for jfa-go and Jellyfin, jfa-go can use it as the authentication provider.
     * Enables the usage of jfa-go by multiple people
-* 🌓 Customizable look
+* 🌓 Customizations
+    * Customize emails with variables and markdown
     * Specify contact and help messages to appear in emails and pages
     * Light and dark themes available
 
@@ -31,30 +36,31 @@ I chose to rewrite the python [jellyfin-accounts](https://github.com/hrfee/jelly
 </p>
 
 <p align="center">
-    <img src="images/invites.png" width="48%" style="margin-left: 1.5%;" alt="Invites tab"></img>
-    <img src="images/accounts.png" width="48%" style="margin-right: 1.5%;" alt="Accounts tab"></img> 
+    <img src="images/invites.png" width="31%" style="margin-left: 1.5%;" alt="Invites tab"></img>
+    <img src="images/accounts.png" width="31%" style="margin-right: 1.5%;" alt="Accounts tab"></img> 
+    <img src="images/create.png" width="31%" style="margin-right: 1.5%;" alt="Accounts creation"></img> 
 </p>
 
 #### Install
 
-Available on the AUR as [jfa-go](https://aur.archlinux.org/packages/jfa-go/) or [jfa-go-git](https://aur.archlinux.org/packages/jfa-go-git/).
-
-For other platforms, grab an archive from the release section for your platform (or nightly builds [here](https://builds.hrfee.pw/view/hrfee/jfa-go)), and extract the `jfa-go` executable to somewhere useful.
-* For \*nix/macOS users, `chmod +x jfa-go` then place it somewhere in your PATH like `/usr/bin`.
-
-Run the executable to start.
-
-For [docker](https://hub.docker.com/repository/docker/hrfee/jfa-go), run: 
-```
+The [Docker](https://hub.docker.com/r/hrfee/jfa-go) image is your best bet.
+```sh
 docker create \
              --name "jfa-go" \ # Whatever you want to name it
              -p 8056:8056 \
             # -p 8057:8057 if using tls
              -v /path/to/.config/jfa-go:/data \ # Path to wherever you want to store the config file and other data
-             -v /path/to/jellyfin:/jf \ # Path to jellyfin config directory
+             -v /path/to/jellyfin:/jf \ # Path to Jellyfin config directory, ignore if using Emby
              -v /etc/localtime:/etc/localtime:ro \ # Makes sure time is correct
              hrfee/jfa-go # hrfee/jfa-go:unstable for latest build from git
 ```
+Available on the AUR as [jfa-go](https://aur.archlinux.org/packages/jfa-go/), [jfa-go-bin](https://aur.archlinux.org/packages/jfa-go) or [jfa-go-git](https://aur.archlinux.org/packages/jfa-go-git/).
+
+For other platforms, grab an archive from the release section for your platform (or nightly builds [here](https://builds.hrfee.dev/view/hrfee/jfa-go)), and extract the `jfa-go` executable to somewhere useful.
+* For \*nix/macOS users, `chmod +x jfa-go` then place it somewhere in your PATH like `/usr/bin`.
+
+Run the executable to start.
+
 
 #### Build from source
 If you're using docker, a Dockerfile is provided that builds from source.
@@ -64,8 +70,6 @@ Otherwise, full build instructions can be found [here](https://github.com/hrfee/
 #### Usage
 Simply run `jfa-go` to start the application. A setup wizard will start on `localhost:8056` (or your own specified address). Upon completion, refresh the page.
 
-Note: jfa-go does not run as a daemon by default. You'll need to figure this out yourself.
-
 ```
 Usage of ./jfa-go:
   -config string
@@ -82,6 +86,11 @@ Usage of ./jfa-go:
     	Enable swagger at /swagger/index.html
 ```
 
+#### Systemd
+jfa-go does not run as a daemon by default. Run `jfa-go systemd` to create a systemd `.service` file in your current directory, which you can copy into `~/.config/systemd/user` or somewhere else.
+
+---
+
 If you're switching from jellyfin-accounts, copy your existing `~/.jf-accounts` to:
 
 * `XDG_CONFIG_DIR/jfa-go` (usually ~/.config/jfa-go) on \*nix systems, 

args.go

@@ -0,0 +1,154 @@
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"flag"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+func (app *appContext) loadArgs(firstCall bool) {
+	if firstCall {
+		flag.Usage = helpFunc
+		help := flag.Bool("help", false, "prints this message.")
+		flag.BoolVar(help, "h", false, "SHORTHAND")
+
+		DATA = flag.String("data", app.dataPath, "alternate path to data directory.")
+		flag.StringVar(DATA, "d", app.dataPath, "SHORTHAND")
+		CONFIG = flag.String("config", app.configPath, "alternate path to config file.")
+		flag.StringVar(CONFIG, "c", app.configPath, "SHORTHAND")
+		HOST = flag.String("host", "", "alternate address to host web ui on.")
+		PORT = flag.Int("port", 0, "alternate port to host web ui on.")
+		flag.IntVar(PORT, "p", 0, "SHORTHAND")
+		DEBUG = flag.Bool("debug", false, "Enables debug logging.")
+		PPROF = flag.Bool("pprof", false, "Exposes pprof profiler on /debug/pprof.")
+		SWAGGER = flag.Bool("swagger", false, "Enable swagger at /swagger/index.html")
+
+		flag.Parse()
+		if *help {
+			flag.Usage()
+			os.Exit(0)
+		}
+		if *SWAGGER {
+			os.Setenv("SWAGGER", "1")
+		}
+		if *DEBUG {
+			os.Setenv("DEBUG", "1")
+		}
+		if *PPROF {
+			os.Setenv("PPROF", "1")
+		}
+	}
+
+	if os.Getenv("SWAGGER") == "1" {
+		*SWAGGER = true
+	}
+	if os.Getenv("DEBUG") == "1" {
+		*DEBUG = true
+	}
+	if os.Getenv("PPROF") == "1" {
+		*PPROF = true
+	}
+	// attempt to apply command line flags correctly
+	if app.configPath == *CONFIG && app.dataPath != *DATA {
+		app.dataPath = *DATA
+		app.configPath = filepath.Join(app.dataPath, "config.ini")
+	} else if app.configPath != *CONFIG && app.dataPath == *DATA {
+		app.configPath = *CONFIG
+	} else {
+		app.configPath = *CONFIG
+		app.dataPath = *DATA
+	}
+
+	// Previously used for self-restarts but leaving them here as they might be useful.
+	if v := os.Getenv("JFA_CONFIGPATH"); v != "" {
+		app.configPath = v
+	}
+	if v := os.Getenv("JFA_DATAPATH"); v != "" {
+		app.dataPath = v
+	}
+
+	os.Setenv("JFA_CONFIGPATH", app.configPath)
+	os.Setenv("JFA_DATAPATH", app.dataPath)
+}
+
+/* Adds start/stop/systemd to help message, and
+also gets rid of usage for shorthand flags, and merge them with the full-length one.
+implementation is 🤢, will clean this up eventually.
+	-h SHORTHAND
+	-help
+		prints this message.
+becomes:
+	-help, -h
+		prints this message.
+*/
+func helpFunc() {
+	fmt.Fprint(os.Stderr, `Usage of jfa-go:
+  start
+	start jfa-go as a daemon and run in the background.
+  stop
+	stop a daemonized instance of jfa-go.
+  systemd
+	generate a systemd .service file.
+`)
+	shortHands := []string{"-help", "-data", "-config", "-port"}
+	var b bytes.Buffer
+	// Write defaults into buffer then remove any shorthands
+	flag.CommandLine.SetOutput(&b)
+	flag.PrintDefaults()
+	flag.CommandLine.SetOutput(os.Stderr)
+	scanner := bufio.NewScanner(&b)
+	out := ""
+	line := scanner.Text()
+	eof := !scanner.Scan()
+	lastLine := false
+	for !eof || lastLine {
+		nextline := scanner.Text()
+		start := 0
+		if len(nextline) != 0 {
+			for nextline[start] == ' ' && start < len(nextline) {
+				start++
+			}
+		}
+		if strings.Contains(line, "SHORTHAND") || (len(nextline) != 0 && strings.Contains(nextline, "SHORTHAND") && nextline[start] != '-') {
+			line = nextline
+			if lastLine {
+				break
+			}
+			eof := !scanner.Scan()
+			if eof {
+				lastLine = true
+			}
+			continue
+		}
+		// if !strings.Contains(line, "SHORTHAND") && !(strings.Contains(nextline, "SHORTHAND") && !strings.Contains(nextline, "-")) {
+		match := false
+		for i, c := range line {
+			if c != '-' {
+				continue
+			}
+			for _, s := range shortHands {
+				if i+len(s) <= len(line) && line[i:i+len(s)] == s {
+					out += line[:i+len(s)] + ", " + s[:2] + line[i+len(s):] + "\n"
+					match = true
+					break
+				}
+			}
+		}
+		if !match {
+			out += line + "\n"
+		}
+		line = nextline
+		if lastLine {
+			break
+		}
+		eof := !scanner.Scan()
+		if eof {
+			lastLine = true
+		}
+	}
+	fmt.Fprint(os.Stderr, out)
+}

auth.go

@@ -135,10 +135,7 @@ func (app *appContext) getTokenLogin(gc *gin.Context) {
 		return
 	}
 	if !match {
-		var status int
-		var err error
-		var user map[string]interface{}
-		user, status, err = app.authJf.Authenticate(creds[0], creds[1])
+		user, status, err := app.authJf.Authenticate(creds[0], creds[1])
 		if status != 200 || err != nil {
 			if status == 401 || status == 400 {
 				app.info.Println("Auth denied: Invalid username/password (Jellyfin)")
@@ -149,9 +146,9 @@ func (app *appContext) getTokenLogin(gc *gin.Context) {
 			respond(500, "Jellyfin error", gc)
 			return
 		}
-		jfID = user["Id"].(string)
+		jfID = user.ID
 		if app.config.Section("ui").Key("admin_only").MustBool(true) {
-			if !user["Policy"].(map[string]interface{})["IsAdministrator"].(bool) {
+			if !user.Policy.IsAdministrator {
 				app.debug.Printf("Auth denied: Users \"%s\" isn't admin", creds[0])
 				respond(401, "Unauthorized", gc)
 				return

common/common.go

@@ -5,7 +5,7 @@ import (
 	"log"
 )
 
-// TimeoutHandler recovers from an http timeout.
+// TimeoutHandler recovers from an http timeout or panic.
 type TimeoutHandler func()
 
 // NewTimeoutHandler returns a new Timeout handler.

config.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"io/fs"
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -11,13 +12,20 @@ import (
 )
 
 var emailEnabled = false
+var messagesEnabled = false
+var telegramEnabled = false
 
 func (app *appContext) GetPath(sect, key string) (fs.FS, string) {
 	val := app.config.Section(sect).Key(key).MustString("")
 	if strings.HasPrefix(val, "jfa-go:") {
 		return localFS, strings.TrimPrefix(val, "jfa-go:")
 	}
-	return app.systemFS, val
+	dir, file := filepath.Split(val)
+	return os.DirFS(dir), file
+}
+
+func (app *appContext) MustSetValue(section, key, val string) {
+	app.config.Section(section).Key(key).SetValue(app.config.Section(section).Key(key).MustString(val))
 }
 
 func (app *appContext) loadConfig() error {
@@ -27,49 +35,94 @@ func (app *appContext) loadConfig() error {
 		return err
 	}
 
-	app.config.Section("jellyfin").Key("public_server").SetValue(app.config.Section("jellyfin").Key("public_server").MustString(app.config.Section("jellyfin").Key("server").String()))
+	app.MustSetValue("jellyfin", "public_server", app.config.Section("jellyfin").Key("server").String())
 
 	for _, key := range app.config.Section("files").Keys() {
-		if key.Name() != "html_templates" {
+		if name := key.Name(); name != "html_templates" && name != "lang_files" {
 			key.SetValue(key.MustString(filepath.Join(app.dataPath, (key.Name() + ".json"))))
 		}
 	}
-	for _, key := range []string{"user_configuration", "user_displayprefs", "user_profiles", "ombi_template", "invites", "emails", "user_template"} {
+	for _, key := range []string{"user_configuration", "user_displayprefs", "user_profiles", "ombi_template", "invites", "emails", "user_template", "custom_emails", "users", "telegram_users"} {
 		app.config.Section("files").Key(key).SetValue(app.config.Section("files").Key(key).MustString(filepath.Join(app.dataPath, (key + ".json"))))
 	}
 	app.URLBase = strings.TrimSuffix(app.config.Section("ui").Key("url_base").MustString(""), "/")
 	app.config.Section("email").Key("no_username").SetValue(strconv.FormatBool(app.config.Section("email").Key("no_username").MustBool(false)))
 
-	app.config.Section("password_resets").Key("email_html").SetValue(app.config.Section("password_resets").Key("email_html").MustString("jfa-go:" + "email.html"))
-	app.config.Section("password_resets").Key("email_text").SetValue(app.config.Section("password_resets").Key("email_text").MustString("jfa-go:" + "email.txt"))
+	app.MustSetValue("password_resets", "email_html", "jfa-go:"+"email.html")
+	app.MustSetValue("password_resets", "email_text", "jfa-go:"+"email.txt")
 
-	app.config.Section("invite_emails").Key("email_html").SetValue(app.config.Section("invite_emails").Key("email_html").MustString("jfa-go:" + "invite-email.html"))
-	app.config.Section("invite_emails").Key("email_text").SetValue(app.config.Section("invite_emails").Key("email_text").MustString("jfa-go:" + "invite-email.txt"))
+	app.MustSetValue("invite_emails", "email_html", "jfa-go:"+"invite-email.html")
+	app.MustSetValue("invite_emails", "email_text", "jfa-go:"+"invite-email.txt")
 
-	app.config.Section("email_confirmation").Key("email_html").SetValue(app.config.Section("email_confirmation").Key("email_html").MustString("jfa-go:" + "confirmation.html"))
-	app.config.Section("email_confirmation").Key("email_text").SetValue(app.config.Section("email_confirmation").Key("email_text").MustString("jfa-go:" + "confirmation.txt"))
+	app.MustSetValue("email_confirmation", "email_html", "jfa-go:"+"confirmation.html")
+	app.MustSetValue("email_confirmation", "email_text", "jfa-go:"+"confirmation.txt")
 
-	app.config.Section("notifications").Key("expiry_html").SetValue(app.config.Section("notifications").Key("expiry_html").MustString("jfa-go:" + "expired.html"))
-	app.config.Section("notifications").Key("expiry_text").SetValue(app.config.Section("notifications").Key("expiry_text").MustString("jfa-go:" + "expired.txt"))
+	app.MustSetValue("notifications", "expiry_html", "jfa-go:"+"expired.html")
+	app.MustSetValue("notifications", "expiry_text", "jfa-go:"+"expired.txt")
 
-	app.config.Section("notifications").Key("created_html").SetValue(app.config.Section("notifications").Key("created_html").MustString("jfa-go:" + "created.html"))
-	app.config.Section("notifications").Key("created_text").SetValue(app.config.Section("notifications").Key("created_text").MustString("jfa-go:" + "created.txt"))
+	app.MustSetValue("notifications", "created_html", "jfa-go:"+"created.html")
+	app.MustSetValue("notifications", "created_text", "jfa-go:"+"created.txt")
 
-	app.config.Section("deletion").Key("email_html").SetValue(app.config.Section("deletion").Key("email_html").MustString("jfa-go:" + "deleted.html"))
-	app.config.Section("deletion").Key("email_text").SetValue(app.config.Section("deletion").Key("email_text").MustString("jfa-go:" + "deleted.txt"))
+	app.MustSetValue("deletion", "email_html", "jfa-go:"+"deleted.html")
+	app.MustSetValue("deletion", "email_text", "jfa-go:"+"deleted.txt")
 
-	app.config.Section("welcome_email").Key("email_html").SetValue(app.config.Section("welcome_email").Key("email_html").MustString("jfa-go:" + "welcome.html"))
-	app.config.Section("welcome_email").Key("email_text").SetValue(app.config.Section("welcome_email").Key("email_text").MustString("jfa-go:" + "welcome.txt"))
+	// Deletion template is good enough for these as well.
+	app.MustSetValue("disable_enable", "disabled_html", "jfa-go:"+"deleted.html")
+	app.MustSetValue("disable_enable", "disabled_text", "jfa-go:"+"deleted.txt")
+	app.MustSetValue("disable_enable", "enabled_html", "jfa-go:"+"deleted.html")
+	app.MustSetValue("disable_enable", "enabled_text", "jfa-go:"+"deleted.txt")
 
-	app.config.Section("jellyfin").Key("version").SetValue(VERSION)
+	app.MustSetValue("welcome_email", "email_html", "jfa-go:"+"welcome.html")
+	app.MustSetValue("welcome_email", "email_text", "jfa-go:"+"welcome.txt")
+
+	app.MustSetValue("template_email", "email_html", "jfa-go:"+"template.html")
+	app.MustSetValue("template_email", "email_text", "jfa-go:"+"template.txt")
+
+	app.MustSetValue("user_expiry", "behaviour", "disable_user")
+	app.MustSetValue("user_expiry", "email_html", "jfa-go:"+"user-expired.html")
+	app.MustSetValue("user_expiry", "email_text", "jfa-go:"+"user-expired.txt")
+
+	app.config.Section("jellyfin").Key("version").SetValue(version)
 	app.config.Section("jellyfin").Key("device").SetValue("jfa-go")
-	app.config.Section("jellyfin").Key("device_id").SetValue(fmt.Sprintf("jfa-go-%s-%s", VERSION, COMMIT))
-
-	if app.config.Section("email").Key("method").MustString("") == "" {
+	app.config.Section("jellyfin").Key("device_id").SetValue(fmt.Sprintf("jfa-go-%s-%s", version, commit))
+	messagesEnabled = app.config.Section("messages").Key("enabled").MustBool(false)
+	telegramEnabled = app.config.Section("telegram").Key("enabled").MustBool(false)
+	if !messagesEnabled {
+		emailEnabled = false
+		telegramEnabled = false
+	} else if app.config.Section("email").Key("method").MustString("") == "" {
 		emailEnabled = false
 	} else {
 		emailEnabled = true
 	}
+	if !emailEnabled && !telegramEnabled {
+		messagesEnabled = false
+	}
+
+	app.MustSetValue("updates", "enabled", "true")
+	releaseChannel := app.config.Section("updates").Key("channel").String()
+	if app.config.Section("updates").Key("enabled").MustBool(false) {
+		v := version
+		if releaseChannel == "stable" {
+			if version == "git" {
+				v = "0.0.0"
+			}
+		} else if releaseChannel == "unstable" {
+			v = "git"
+		}
+		app.updater = newUpdater(baseURL, namespace, repo, v, commit, updater)
+	}
+	if releaseChannel == "" {
+		if version == "git" {
+			releaseChannel = "unstable"
+		} else {
+			releaseChannel = "stable"
+		}
+		app.MustSetValue("updates", "channel", releaseChannel)
+	}
+
+	app.storage.customEmails_path = app.config.Section("files").Key("custom_emails").String()
+	app.storage.loadCustomEmails()
 
 	substituteStrings = app.config.Section("jellyfin").Key("substitute_jellyfin_strings").MustString("")
 
@@ -83,8 +136,35 @@ func (app *appContext) loadConfig() error {
 	}
 	app.storage.lang.chosenAdminLang = app.config.Section("ui").Key("language-admin").MustString("en-us")
 	app.storage.lang.chosenEmailLang = app.config.Section("email").Key("language").MustString("en-us")
+	app.storage.lang.chosenPWRLang = app.config.Section("password_resets").Key("language").MustString("en-us")
+	app.storage.lang.chosenTelegramLang = app.config.Section("telegram").Key("language").MustString("en-us")
 
 	app.email = NewEmailer(app)
 
 	return nil
 }
+
+func (app *appContext) migrateEmailConfig() {
+	tempConfig, _ := ini.Load(app.configPath)
+	fmt.Println(warning("Part of your email configuration will be migrated to the new \"messages\" section.\nA backup will be made."))
+	err := tempConfig.SaveTo(app.configPath + "_" + commit + ".bak")
+	if err != nil {
+		app.err.Fatalf("Failed to backup config: %v", err)
+		return
+	}
+	for _, setting := range []string{"use_24h", "date_format", "message"} {
+		if val := app.config.Section("email").Key(setting).Value(); val != "" {
+			tempConfig.Section("email").Key(setting).SetValue("")
+			tempConfig.Section("messages").Key(setting).SetValue(val)
+		}
+	}
+	if app.config.Section("messages").Key("enabled").MustBool(false) || app.config.Section("telegram").Key("enabled").MustBool(false) {
+		tempConfig.Section("messages").Key("enabled").SetValue("true")
+	}
+	err = tempConfig.SaveTo(app.configPath)
+	if err != nil {
+		app.err.Fatalf("Failed to save config: %v", err)
+		return
+	}
+	app.loadConfig()
+}

config/README.md

@@ -1,11 +1,4 @@
 ###  fixconfig
 
-Python's `json` library retains the order of data in a JSON file, which meant settings sent to the web page would be in the right order. Go's `encoding/json` and maps do not retain order, so this script opens the json file, and for each section, adds an "order" list which tells the web page in which order to display settings. 
-
+Python's `json` library retains the order of data in a JSON file, which meant settings sent to the web page would be in the right order. Go's `encoding/json` and maps do not retain order, so `enumerate/enumerate_config.py` opens the json file, and for each section, adds an "order" array which tells the web page in which order to display settings. 
 Specify the input and output files with `-i` and `-o` respectively.
-
-### jsontostruct
-
-Generates a go struct from `config-base.json`. I wrote this because i was annoyed with the `ini` library, but i've since realised mapping the ini values onto it is painful. 
-
-

config/config-base.json

@@ -1,6 +1,35 @@
 {
     "order": [],
     "sections": {
+        "updates": {
+            "order": [],
+            "meta": {
+                "name": "Updates",
+                "description": "Settings for update notifications and release channel."
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": true,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": true,
+                    "description": "Enable/disable updating notifications and downloading/applying updates."
+                },
+                "channel": {
+                    "name": "Release Channel",
+                    "required": true,
+                    "requires_restart": false,
+                    "type": "select",
+                    "options": [
+                        ["stable", "Stable"],
+                        ["unstable", "Unstable"]
+                    ],
+                    "value": "",
+                    "description": "Release channel for updates."
+                }
+            }
+        },
         "jellyfin": {
             "order": [],
             "meta": {
@@ -43,6 +72,7 @@
                     "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."
@@ -51,6 +81,7 @@
                     "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."
@@ -73,7 +104,7 @@
                     "requires_restart": true,
                     "type": "text",
                     "value": "",
-                    "description": "Optionally substitute occurrences of \"Jellyfin\" in the account creation form with this. May result in bad grammar."
+                    "description": "Optionally substitute occurrences of \"Jellyfin\" in the account creation form and emails with this. May result in bad grammar."
                 }
             }
         },
@@ -93,7 +124,7 @@
                         ["en-us", "English (US)"]
                     ],
                     "value": "en-us",
-                    "description": "Default Account Form Language. See issue #12 on Github if you'd like to translate."
+                    "description": "Default Account Form Language. Visit weblate.hrfee.dev if you'd like to translate."
                 },
                 "language-admin": {
                     "name": "Default Admin Language",
@@ -104,7 +135,7 @@
                         ["en-us", "English (US)"]
                     ],
                     "value": "en-us",
-                    "description": "Default Admin page Language. Settings has not been translated. Submit a PR on github if you'd like to translate."
+                    "description": "Default Admin page Language. Settings has not been translated. Visit weblate.hrfee.dev if you'd like to translate."
                 },
                 "theme": {
                     "name": "Default Look",
@@ -314,11 +345,56 @@
                 }
             }
         },
+        "messages": {
+            "order": [],
+            "meta": {
+                "name": "Messages/Notifications",
+                "description": "General settings for emails/messages."
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": true,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": true,
+                    "description": "Enable the sending of emails/messages such as password resets, announcements, etc."
+                },
+                "use_24h": {
+                    "name": "Use 24h time",
+                    "required": false,
+                    "requires_restart": false,
+                    "depends_true": "method",
+                    "type": "bool",
+                    "value": true
+                },
+                "date_format": {
+                    "name": "Date format",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "method",
+                    "type": "text",
+                    "value": "%d/%m/%y",
+                    "description": "Date format used in emails. Follows datetime.strftime format."
+                },
+                "message": {
+                    "name": "Help message",
+                    "required": false,
+                    "requires_restart": false,
+                    "depends_true": "method",
+                    "type": "text",
+                    "value": "Need help? contact me.",
+                    "description": "Message displayed at bottom of emails."
+                }
+            }
+        },
         "email": {
             "order": [],
             "meta": {
                 "name": "Email",
-                "description": "General email settings."
+                "description": "General email settings.",
+                "depends_true": "messages|enabled"
             },
             "settings": {
                 "language": {
@@ -342,32 +418,6 @@
                     "value": false,
                     "description": "Use email address from invite form as username on Jellyfin."
                 },
-                "use_24h": {
-                    "name": "Use 24h time",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "method",
-                    "type": "bool",
-                    "value": true
-                },
-                "date_format": {
-                    "name": "Date format",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "method",
-                    "type": "text",
-                    "value": "%d/%m/%y",
-                    "description": "Date format used in emails. Follows datetime.strftime format."
-                },
-                "message": {
-                    "name": "Help message",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "method",
-                    "type": "text",
-                    "value": "Need help? contact me.",
-                    "description": "Message displayed at bottom of emails."
-                },
                 "method": {
                     "name": "Email method",
                     "required": false,
@@ -398,167 +448,16 @@
                     "type": "text",
                     "value": "Jellyfin",
                     "description": "The name of the sender"
-                }
-            }
-        },
-        "password_resets": {
-            "order": [],
-            "meta": {
-                "name": "Password Resets",
-                "description": "Settings for the password reset handler.",
-                "depends_true": "email|method"
-            },
-            "settings": {
-                "enabled": {
-                    "name": "Enabled",
+                },
+                "plaintext": {
+                    "name": "Send emails as plain text",
                     "required": false,
-                    "requires_restart": true,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "method",
                     "type": "bool",
-                    "value": true,
-                    "description": "Enable to store provided email addresses, monitor Jellyfin directory for pw-resets, and send reset pins"
-                },
-                "watch_directory": {
-                    "name": "Jellyfin directory",
-                    "required": false,
-                    "requires_restart": true,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "/path/to/jellyfin",
-                    "description": "Path to the folder Jellyfin puts password-reset files."
-                },
-                "email_html": {
-                    "name": "Custom email (HTML)",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to custom email html"
-                },
-                "email_text": {
-                    "name": "Custom email (plaintext)",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to custom email in plain text"
-                },
-                "subject": {
-                    "name": "Email subject",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Subject of password reset emails."
-                }
-            }
-        },
-        "invite_emails": {
-            "order": [],
-            "meta": {
-                "name": "Invite emails",
-                "description": "Settings for sending invites directly to users.",
-                "depends_true": "email|method"
-            },
-            "settings": {
-                "enabled": {
-                    "name": "Enabled",
-                    "required": false,
-                    "requires_restart": false,
-                    "type": "bool",
-                    "value": true
-                },
-                "email_html": {
-                    "name": "Custom email (HTML)",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to custom email HTML"
-                },
-                "email_text": {
-                    "name": "Custom email (plaintext)",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to custom email in plain text"
-                },
-                "subject": {
-                    "name": "Email subject",
-                    "required": true,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Subject of invite emails."
-                },
-                "url_base": {
-                    "name": "URL Base",
-                    "required": true,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "http://accounts.jellyf.in:8056/invite",
-                    "description": "Base URL for jfa-go. This is necessary because using a reverse proxy means the program has no way of knowing the URL itself."
-                }
-            }
-        },
-        "notifications": {
-            "order": [],
-            "meta": {
-                "name": "Notifications",
-                "description": "Notification related settings.",
-                "depends_true": "email|method"
-            },
-            "settings": {
-                "enabled": {
-                    "name": "Enabled",
-                    "required": "false",
-                    "requires_restart": true,
-                    "type": "bool",
-                    "value": true,
-                    "description": "Enabling adds optional toggles to invites to notify on expiry and user creation."
-                },
-                "expiry_html": {
-                    "name": "Expiry email (HTML)",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to expiry notification email HTML."
-                },
-                "expiry_text": {
-                    "name": "Expiry email (Plaintext)",
-                    "required": false,
-                    "requires_restart": "false",
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to expiry notification email in plaintext."
-                },
-                "created_html": {
-                    "name": "User created email (HTML)",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to user creation notification email HTML."
-                },
-                "created_text": {
-                    "name": "User created email (Plaintext)",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to user creation notification email in plaintext."
+                    "value": false,
+                    "description": "Send emails as plain text instead of HTML."
                 }
             }
         },
@@ -635,6 +534,251 @@
                     "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."
+                }
+            }
+        },
+        "telegram": {
+            "order": [],
+            "meta": {
+                "name": "Telegram",
+                "description": "Settings for Telegram signup/notifications"
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Enable signup verification through Telegram and the sending of notifications through it.\nSee the jfa-go wiki for setting up a bot."
+                },
+                "required": {
+                    "name": "Require on sign-up",
+                    "required": false,
+                    "required_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Require telegram connection on sign-up."
+                },
+                "token": {
+                    "name": "API Token",
+                    "required": false,
+                    "requires_restart": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Telegram Bot API Token."
+                },
+                "language": {
+                    "name": "Language",
+                    "required": false,
+                    "requires_restart": false,
+                    "depends_true": "enabled",
+                    "type": "select",
+                    "options": [
+                        ["en-us", "English (US)"]
+                    ],
+                    "value": "en-us",
+                    "description": "Default telegram message language. Visit weblate if you'd like to translate."
+                }
+            }
+        },
+        "password_resets": {
+            "order": [],
+            "meta": {
+                "name": "Password Resets",
+                "description": "Settings for the password reset handler.",
+                "depends_true": "messages|enabled"
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": true,
+                    "description": "Enable to store provided email addresses, monitor Jellyfin directory for pw-resets, and send reset pins"
+                },
+                "watch_directory": {
+                    "name": "Jellyfin directory",
+                    "required": false,
+                    "requires_restart": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "/path/to/jellyfin",
+                    "description": "Path to the folder Jellyfin puts password-reset files."
+                },
+                "link_reset": {
+                    "name": "Use reset link instead of PIN (Required for Ombi)",
+                    "required": false,
+                    "requires_restart": true,
+                    "depends_true": "enabled",
+                    "type": "bool",
+                    "value": false,
+                    "description": "Send users a link to reset their password instead of a PIN. Must be enabled to reset Ombi password at the same time as the Jellyfin password."
+                },
+                "language": {
+                    "name": "Default reset link language",
+                    "required": false,
+                    "requires_restart": true,
+                    "depends_true": "link_reset",
+                    "type": "select",
+                    "options": [
+                        ["en-us", "English (US)"]
+                    ],
+                    "value": "en-us",
+                    "description": "Default language for password reset success screen."
+                },
+                "email_html": {
+                    "name": "Custom email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email html"
+                },
+                "email_text": {
+                    "name": "Custom email (plaintext)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email in plain text"
+                },
+                "subject": {
+                    "name": "Email subject",
+                    "required": false,
+                    "requires_restart": false,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Subject of password reset emails."
+                }
+            }
+        },
+        "invite_emails": {
+            "order": [],
+            "meta": {
+                "name": "Invite emails",
+                "description": "Settings for sending invites directly to users.",
+                "depends_true": "email|method"
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "bool",
+                    "value": true
+                },
+                "email_html": {
+                    "name": "Custom email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email HTML"
+                },
+                "email_text": {
+                    "name": "Custom email (plaintext)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email in plain text"
+                },
+                "subject": {
+                    "name": "Email subject",
+                    "required": true,
+                    "requires_restart": false,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Subject of invite emails."
+                },
+                "url_base": {
+                    "name": "URL Base",
+                    "required": true,
+                    "requires_restart": false,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "http://accounts.jellyf.in:8056/invite",
+                    "description": "Base URL for jfa-go. This is necessary because using a reverse proxy means the program has no way of knowing the URL itself."
+                }
+            }
+        },
+        "notifications": {
+            "order": [],
+            "meta": {
+                "name": "Notifications",
+                "description": "Notification related settings.",
+                "depends_true": "messages|enabled"
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": "false",
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": true,
+                    "description": "Enabling adds optional toggles to invites to notify on expiry and user creation."
+                },
+                "expiry_html": {
+                    "name": "Expiry email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced":  true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to expiry notification email HTML."
+                },
+                "expiry_text": {
+                    "name": "Expiry email (Plaintext)",
+                    "required": false,
+                    "requires_restart": "false",
+                    "advanced":  true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to expiry notification email in plaintext."
+                },
+                "created_html": {
+                    "name": "User created email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced":  true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to user creation notification email HTML."
+                },
+                "created_text": {
+                    "name": "User created email (Plaintext)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced":  true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to user creation notification email in plaintext."
                 }
             }
         },
@@ -642,7 +786,7 @@
             "order": [],
             "meta": {
                 "name": "Ombi Integration",
-                "description": "Connect to Ombi to automatically create both Ombi and Jellyfin accounts for new users. You'll need to create a user template for this to work. Once enabled, refresh to see an option in settings for this."
+                "description": "Connect to Ombi to automatically create both Ombi and Jellyfin accounts for new users. You'll need to create a user template for this to work. Once enabled, refresh to see an option in settings for this. To handle password resets for Ombi & Jellyfin, enable \"Use reset link instead of PIN\"."
             },
             "settings": {
                 "enabled": {
@@ -676,9 +820,9 @@
         "welcome_email": {
             "order": [],
             "meta": {
-                "name": "Welcome Emails",
-                "description": "Optionally send a welcome email to new users with the Jellyfin URL and their username.",
-                "depends_true": "email|method"
+                "name": "Welcome Message",
+                "description": "Optionally send a welcome message to new users with the Jellyfin URL and their username.",
+                "depends_true": "messages|enabled"
             },
             "settings": {
                 "enabled": {
@@ -701,6 +845,7 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
+                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email html"
@@ -709,6 +854,7 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
+                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email in plain text"
@@ -742,6 +888,7 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
+                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email html"
@@ -750,6 +897,128 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
+                    "advanced": true,
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email in plain text"
+                }
+            }
+        },
+        "user_expiry": {
+            "order": [],
+            "meta": {
+                "name": "User Expiry",
+                "description": "When set on an invite, users will be deleted or disabled a specified amount of time after they create their account."
+            },
+            "settings": {
+                "behaviour": {
+                    "name": "Behaviour",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "select",
+                    "options": [
+                        ["delete_user", "Delete user"],
+                        ["disable_user", "Disable user"]
+                    ],
+                    "value": "disable_user",
+                    "description": "Whether to delete or disable users on expiry."
+                },
+                "send_email": {
+                    "name": "Send email",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "bool",
+                    "value": true,
+                    "depends_true": "messages|enabled",
+                    "description": "Send an email when a user's account expires."
+                },
+                "subject": {
+                    "name": "Email subject",
+                    "required": false,
+                    "requires_restart": false,
+                    "depends_true": "messages|enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Subject of user expiry emails."
+                },
+                "email_html": {
+                    "name": "Custom email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "messages|enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email html"
+                },
+                "email_text": {
+                    "name": "Custom email (plaintext)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "messages|enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email in plain text"
+                }
+            }
+        },
+        "disable_enable": {
+            "order": [],
+            "meta": {
+                "name": "Account Disabling/Enabling",
+                "description": "Subject/email files for account disabling/enabling emails.",
+                "depends_true": "messages|enabled"
+            },
+            "settings": {
+                "subject_disabled": {
+                    "name": "Email subject (Disabled)",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "Subject of account disabling emails."
+                },
+                "subject_enabled": { 
+                    "name": "Email subject (Enabled)",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "Subject of account enabling emails."
+                },
+                "disabled_html": {
+                    "name": "Custom disabling email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email html"
+                },
+                "disabled_text": {
+                    "name": "Custom disabling email (plaintext)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email in plain text"
+                },
+                "enabled_html": {
+                    "name": "Custom enabling email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email html"
+                },
+                "enabled_text": {
+                    "name": "Custom enabling email (plaintext)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email in plain text"
@@ -761,7 +1030,7 @@
             "meta": {
                 "name": "Account Deletion",
                 "description": "Subject/email files for account deletion emails.",
-                "depends_true": "email|method"
+                "depends_true": "messages|enabled"
             },
             "settings": {
                 "subject": {
@@ -776,6 +1045,7 @@
                     "name": "Custom email (HTML)",
                     "required": false,
                     "requires_restart": false,
+                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email html"
@@ -784,6 +1054,7 @@
                     "name": "Custom email (plaintext)",
                     "required": false,
                     "requires_restart": false,
+                    "advanced": true,
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email in plain text"
@@ -794,7 +1065,8 @@
             "order": [],
             "meta": {
                 "name": "File Storage",
-                "description": "Optional settings for changing storage locations."
+                "description": "Optional settings for changing storage locations.",
+                "advanced": true
             },
             "settings": {
                 "invites": {
@@ -813,6 +1085,14 @@
                     "value": "",
                     "description": "Location of stored email addresses (json)."
                 },
+                "users": {
+                    "name": "User storage",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "Stores users temporarily when a user expiry is set."
+                },
                 "ombi_template": {
                     "name": "Ombi user template",
                     "required": false,
@@ -844,6 +1124,22 @@
                     "type": "text",
                     "value": "",
                     "description": "The path to a directory which following the same form as the internal 'lang/' directory. See GitHub for more info."
+                },
+                "custom_emails": {
+                    "name": "Custom email content",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "JSON file generated by program in settings, different from email_html/email_text. See wiki for more info."
+                },
+                "telegram_users": {
+                    "name": "Telegram users",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "Stores telegram user IDs and language preferences."
                 }
             }
         }

config/configStruct.go

@@ -1,541 +0,0 @@
-package main
-
-type Metadata struct{
-	Name string `json:"name"`
-	Description string `json:"description"`
-}
-
-type Config struct{
-	Order []string `json:"order"`
-	Jellyfin struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Username struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"username"`
-		} `json:"username" cfg:"username"`
-		Password struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"password"`
-		} `json:"password" cfg:"password"`
-		Server struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"server"`
-		} `json:"server" cfg:"server"`
-		PublicServer struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"public_server"`
-		} `json:"public_server" cfg:"public_server"`
-		Client struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"client"`
-		} `json:"client" cfg:"client"`
-		Version struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"version"`
-		} `json:"version" cfg:"version"`
-		Device struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"device"`
-		} `json:"device" cfg:"device"`
-		DeviceId struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"device_id"`
-		} `json:"device_id" cfg:"device_id"`
-	} `json:"jellyfin"`
-	Ui struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Theme struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Options []string `json:"options"`
-			Value string `json:"value" cfg:"theme"`
-		} `json:"theme" cfg:"theme"`
-		Host struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"host"`
-		} `json:"host" cfg:"host"`
-		Port struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value int `json:"value" cfg:"port"`
-		} `json:"port" cfg:"port"`
-		JellyfinLogin struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"jellyfin_login"`
-		} `json:"jellyfin_login" cfg:"jellyfin_login"`
-		AdminOnly struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"admin_only"`
-		} `json:"admin_only" cfg:"admin_only"`
-		Username struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"username"`
-		} `json:"username" cfg:"username"`
-		Password struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"password"`
-		} `json:"password" cfg:"password"`
-		Email struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"email"`
-		} `json:"email" cfg:"email"`
-		Debug struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"debug"`
-		} `json:"debug" cfg:"debug"`
-		ContactMessage struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"contact_message"`
-		} `json:"contact_message" cfg:"contact_message"`
-		HelpMessage struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"help_message"`
-		} `json:"help_message" cfg:"help_message"`
-		SuccessMessage struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"success_message"`
-		} `json:"success_message" cfg:"success_message"`
-		Bs5 struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"bs5"`
-		} `json:"bs5" cfg:"bs5"`
-	} `json:"ui"`
-	PasswordValidation struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Enabled struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"enabled"`
-		} `json:"enabled" cfg:"enabled"`
-		MinLength struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"min_length"`
-		} `json:"min_length" cfg:"min_length"`
-		Upper struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"upper"`
-		} `json:"upper" cfg:"upper"`
-		Lower struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"lower"`
-		} `json:"lower" cfg:"lower"`
-		Number struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"number"`
-		} `json:"number" cfg:"number"`
-		Special struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"special"`
-		} `json:"special" cfg:"special"`
-	} `json:"password_validation"`
-	Email struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		NoUsername struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"no_username"`
-		} `json:"no_username" cfg:"no_username"`
-		Use24H struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"use_24h"`
-		} `json:"use_24h" cfg:"use_24h"`
-		DateFormat struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"date_format"`
-		} `json:"date_format" cfg:"date_format"`
-		Message struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"message"`
-		} `json:"message" cfg:"message"`
-		Method struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Options []string `json:"options"`
-			Value string `json:"value" cfg:"method"`
-		} `json:"method" cfg:"method"`
-		Address struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"address"`
-		} `json:"address" cfg:"address"`
-		From struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"from"`
-		} `json:"from" cfg:"from"`
-	} `json:"email"`
-	PasswordResets struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Enabled struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"enabled"`
-		} `json:"enabled" cfg:"enabled"`
-		WatchDirectory struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"watch_directory"`
-		} `json:"watch_directory" cfg:"watch_directory"`
-		EmailHtml struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"email_html"`
-		} `json:"email_html" cfg:"email_html"`
-		EmailText struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"email_text"`
-		} `json:"email_text" cfg:"email_text"`
-		Subject struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"subject"`
-		} `json:"subject" cfg:"subject"`
-	} `json:"password_resets"`
-	InviteEmails struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Enabled struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"enabled"`
-		} `json:"enabled" cfg:"enabled"`
-		EmailHtml struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"email_html"`
-		} `json:"email_html" cfg:"email_html"`
-		EmailText struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"email_text"`
-		} `json:"email_text" cfg:"email_text"`
-		Subject struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"subject"`
-		} `json:"subject" cfg:"subject"`
-		UrlBase struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"url_base"`
-		} `json:"url_base" cfg:"url_base"`
-	} `json:"invite_emails"`
-	Notifications struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Enabled struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value bool `json:"value" cfg:"enabled"`
-		} `json:"enabled" cfg:"enabled"`
-		ExpiryHtml struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"expiry_html"`
-		} `json:"expiry_html" cfg:"expiry_html"`
-		ExpiryText struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"expiry_text"`
-		} `json:"expiry_text" cfg:"expiry_text"`
-		CreatedHtml struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"created_html"`
-		} `json:"created_html" cfg:"created_html"`
-		CreatedText struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"created_text"`
-		} `json:"created_text" cfg:"created_text"`
-	} `json:"notifications"`
-	Mailgun struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		ApiUrl struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"api_url"`
-		} `json:"api_url" cfg:"api_url"`
-		ApiKey struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"api_key"`
-		} `json:"api_key" cfg:"api_key"`
-	} `json:"mailgun"`
-	Smtp struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Encryption struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Options []string `json:"options"`
-			Value string `json:"value" cfg:"encryption"`
-		} `json:"encryption" cfg:"encryption"`
-		Server struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"server"`
-		} `json:"server" cfg:"server"`
-		Port struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value int `json:"value" cfg:"port"`
-		} `json:"port" cfg:"port"`
-		Password struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"password"`
-		} `json:"password" cfg:"password"`
-	} `json:"smtp"`
-	Files struct{
-		Order []string `json:"order"`
-		Meta Metadata `json:"meta"`
-		Invites struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"invites"`
-		} `json:"invites" cfg:"invites"`
-		Emails struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"emails"`
-		} `json:"emails" cfg:"emails"`
-		UserTemplate struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"user_template"`
-		} `json:"user_template" cfg:"user_template"`
-		UserConfiguration struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"user_configuration"`
-		} `json:"user_configuration" cfg:"user_configuration"`
-		UserDisplayprefs struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"user_displayprefs"`
-		} `json:"user_displayprefs" cfg:"user_displayprefs"`
-		CustomCss struct{
-			Name string `json:"name"`
-			Required bool `json:"required"`
-			Restart bool `json:"requires_restart"`
-			Description string `json:"description"`
-			Type string `json:"type"`
-			Value string `json:"value" cfg:"custom_css"`
-		} `json:"custom_css" cfg:"custom_css"`
-	} `json:"files"`
-}

css/base.css

@@ -39,6 +39,11 @@
     }
 }
 
+.chip.btn:hover:not([disabled]):not(.textarea),
+.chip.btn:focus:not([disabled]):not(.textarea) {
+    filter: brightness(var(--button-filter-brightness,95%));
+}
+
 .banner {
     margin: calc(-1 * var(--spacing-4,1rem));
 }
@@ -52,6 +57,11 @@
     padding: var(--spacing-4,1rem);
 }
 
+.modal-content .banner {
+    margin-left: calc(-1 * var(--spacing-4,1rem) - 0.5%); /* Not sure why this is necessary */
+    margin-right: calc(-1 * var(--spacing-4,1rem) - 0.5%);
+}
+
 div.card:contains(section.banner.footer) {
     padding-bottom: 0px;
 }
@@ -88,10 +98,18 @@ div.card:contains(section.banner.footer) {
     margin-left: 0.5rem;
 }
 
+.mr-half {
+    margin-right: 0.5rem;
+}
+
 .mr-1 {
     margin-right: 1rem;
 }
 
+.p-1 {
+    padding: 1rem;
+}
+
 .pb-1 {
     padding-bottom: 1rem;
 }
@@ -108,6 +126,10 @@ div.card:contains(section.banner.footer) {
     text-align: right;
 }
 
+.ac {
+    text-align: center;
+}
+
 .inline-block {
     display: inline-block;
 }
@@ -149,6 +171,21 @@ div.card:contains(section.banner.footer) {
     margin: 0.5rem;
 }
 
+p.sm,
+span.sm {
+    font-size: 0.75rem;
+}
+
+
+.col.sm {
+    margin: .25rem;
+}
+
+.flex-col {
+    display: flex;
+    flex-direction: column;
+}
+
 @media screen and (max-width: 400px) {
     .row {
         flex-direction: column;
@@ -164,6 +201,7 @@ div.card:contains(section.banner.footer) {
 
 .monospace {
     background-color: inherit; /* so we can use a17t code blocks */
+    font-family: Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;
 }
 
 sup.\~critical, .text-critical {
@@ -268,6 +306,10 @@ sup.\~critical, .text-critical {
     width: 100%;
 }
 
+.flex-auto {
+    flex: auto;
+}
+
 .center {
     justify-content: center;
 }
@@ -395,3 +437,49 @@ p.top {
     padding-bottom: 0.5rem;
     margin-bottom: -0.5rem;
 }
+
+pre {
+    white-space: pre-wrap;       /* css-3 */
+    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
+    white-space: -pre-wrap;      /* Opera 4-6 */
+    white-space: -o-pre-wrap;    /* Opera 7 */
+    word-wrap: break-word;       /* Internet Explorer 5.5+ */
+}
+
+.circle {
+    height: 0.5rem;
+    width: 0.5rem;
+    border-radius: 50%;
+}
+
+.circle.\~urge {
+    background-color: var(--color-urge-200);
+}
+
+.markdown-box {
+    max-height: 20rem;
+    display: block;
+    overflow-y: scroll;
+}
+
+a:link:not(.lang-link):not(.\~urge) {
+    color: var(--color-urge-200);
+}
+
+a:visited:not(.lang-link):not(.\~urge) {
+    color: var(--color-urge-100);
+}
+
+a:hover:not(.lang-link):not(.\~urge), a:active:not(.lang-link):not(.\~urge) {
+    color: var(--color-urge-200);
+}
+
+.link-center {
+    display: block;
+    text-align: center;
+}
+
+.search {
+    max-width: 15rem;
+    min-width: 10rem;
+}

css/dark.css

@@ -85,3 +85,7 @@
 .dark-only {
   display: initial;
 }
+
+.dark-theme select option {
+    background: #202020;
+}

daemon.go

@@ -4,7 +4,7 @@ import "time"
 
 // https://bbengfort.github.io/snippets/2016/06/26/background-work-goroutines-timer.html THANKS
 
-type repeater struct {
+type inviteDaemon struct {
 	Stopped         bool
 	ShutdownChannel chan string
 	Interval        time.Duration
@@ -12,8 +12,8 @@ type repeater struct {
 	app             *appContext
 }
 
-func newRepeater(interval time.Duration, app *appContext) *repeater {
-	return &repeater{
+func newInviteDaemon(interval time.Duration, app *appContext) *inviteDaemon {
+	return &inviteDaemon{
 		Stopped:         false,
 		ShutdownChannel: make(chan string),
 		Interval:        interval,
@@ -22,7 +22,7 @@ func newRepeater(interval time.Duration, app *appContext) *repeater {
 	}
 }
 
-func (rt *repeater) run() {
+func (rt *inviteDaemon) run() {
 	rt.app.info.Println("Invite daemon started")
 	for {
 		select {
@@ -42,7 +42,7 @@ func (rt *repeater) run() {
 	}
 }
 
-func (rt *repeater) shutdown() {
+func (rt *inviteDaemon) shutdown() {
 	rt.Stopped = true
 	rt.ShutdownChannel <- "Down"
 	<-rt.ShutdownChannel

email.go

@@ -4,20 +4,37 @@ import (
 	"bytes"
 	"context"
 	"crypto/tls"
+	"crypto/x509"
+	"errors"
 	"fmt"
 	"html/template"
+	"io"
+	"io/fs"
 	"net/smtp"
+	"os"
+	"strconv"
 	"strings"
+	"sync"
+	textTemplate "text/template"
 	"time"
 
+	"github.com/gomarkdown/markdown"
+	"github.com/gomarkdown/markdown/html"
+	"github.com/itchyny/timefmt-go"
 	jEmail "github.com/jordan-wright/email"
-	"github.com/knz/strtime"
 	"github.com/mailgun/mailgun-go/v4"
 )
 
 // implements email sending, right now via smtp or mailgun.
-type emailClient interface {
-	send(address, fromName, fromAddr string, email *Email) error
+type EmailClient interface {
+	Send(fromName, fromAddr string, message *Message, address ...string) error
+}
+
+type DummyClient struct{}
+
+func (dc *DummyClient) Send(fromName, fromAddr string, email *Message, address ...string) error {
+	fmt.Printf("FROM: %s <%s>\nTO: %s\nTEXT: %s\n", fromName, fromAddr, strings.Join(address, ", "), email.Text)
+	return nil
 }
 
 // Mailgun client implements emailClient.
@@ -25,14 +42,17 @@ type Mailgun struct {
 	client *mailgun.MailgunImpl
 }
 
-func (mg *Mailgun) send(address, fromName, fromAddr string, email *Email) error {
+func (mg *Mailgun) Send(fromName, fromAddr string, email *Message, address ...string) error {
 	message := mg.client.NewMessage(
 		fmt.Sprintf("%s <%s>", fromName, fromAddr),
-		email.subject,
-		email.text,
-		address,
+		email.Subject,
+		email.Text,
 	)
-	message.SetHtml(email.html)
+	for _, a := range address {
+		// Adding variable tells mailgun to do a batch send, so users don't see other recipients.
+		message.AddRecipientAndVariables(a, map[string]interface{}{"unique_id": a})
+	}
+	message.SetHtml(email.HTML)
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
 	_, _, err := mg.client.Send(ctx, message)
@@ -41,63 +61,70 @@ func (mg *Mailgun) send(address, fromName, fromAddr string, email *Email) error
 
 // SMTP supports SSL/TLS and STARTTLS; implements emailClient.
 type SMTP struct {
-	sslTLS bool
-	server string
-	port   int
-	auth   smtp.Auth
+	sslTLS    bool
+	server    string
+	port      int
+	auth      smtp.Auth
+	tlsConfig *tls.Config
 }
 
-func (sm *SMTP) send(address, fromName, fromAddr string, email *Email) error {
-	e := jEmail.NewEmail()
-	e.Subject = email.subject
-	e.From = fmt.Sprintf("%s <%s>", fromName, fromAddr)
-	e.To = []string{address}
-	e.Text = []byte(email.text)
-	e.HTML = []byte(email.html)
+func (sm *SMTP) Send(fromName, fromAddr string, email *Message, 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
-	// err = e.Send(server, sm.auth)
-	if sm.sslTLS {
-		err = e.SendWithTLS(server, sm.auth, tlsConfig)
-	} else {
-		err = e.SendWithStartTLS(server, sm.auth, tlsConfig)
+	for _, addr := range address {
+		wg.Add(1)
+		go func(addr string) {
+			defer wg.Done()
+			e := jEmail.NewEmail()
+			e.Subject = email.Subject
+			e.From = from
+			e.Text = []byte(email.Text)
+			e.HTML = []byte(email.HTML)
+			e.To = []string{addr}
+			if sm.sslTLS {
+				err = e.SendWithTLS(server, sm.auth, sm.tlsConfig)
+			} else {
+				err = e.SendWithStartTLS(server, sm.auth, sm.tlsConfig)
+			}
+		}(addr)
 	}
+	wg.Wait()
 	return err
 }
 
-// Emailer contains the email sender, email content, and methods to construct message content.
+// Emailer contains the email sender, translations, and methods to construct messages.
 type Emailer struct {
 	fromAddr, fromName string
 	lang               emailLang
-	sender             emailClient
+	sender             EmailClient
 }
 
-// Email stores content.
-type Email struct {
-	subject    string
-	html, text string
+// Message stores content.
+type Message struct {
+	Subject  string `json:"subject"`
+	HTML     string `json:"html"`
+	Text     string `json:"text"`
+	Markdown string `json:"markdown"`
 }
 
 func (emailer *Emailer) formatExpiry(expiry time.Time, tzaware bool, datePattern, timePattern string) (d, t, expiresIn string) {
-	d, _ = strtime.Strftime(expiry, datePattern)
-	t, _ = strtime.Strftime(expiry, timePattern)
+	d = timefmt.Format(expiry, datePattern)
+	t = timefmt.Format(expiry, timePattern)
 	currentTime := time.Now()
 	if tzaware {
 		currentTime = currentTime.UTC()
 	}
 	_, _, days, hours, minutes, _ := timeDiff(expiry, currentTime)
 	if days != 0 {
-		expiresIn += fmt.Sprintf("%dd ", days)
+		expiresIn += strconv.Itoa(days) + "d "
 	}
 	if hours != 0 {
-		expiresIn += fmt.Sprintf("%dh ", hours)
+		expiresIn += strconv.Itoa(hours) + "h "
 	}
 	if minutes != 0 {
-		expiresIn += fmt.Sprintf("%dm ", minutes)
+		expiresIn += strconv.Itoa(minutes) + "m "
 	}
 	expiresIn = strings.TrimSuffix(expiresIn, " ")
 	return
@@ -122,9 +149,14 @@ func NewEmailer(app *appContext) *Emailer {
 		} else {
 			username = emailer.fromAddr
 		}
-		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)
+		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(""))
+		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())
+	} else if method == "dummy" {
+		emailer.sender = &DummyClient{}
 	}
 	return emailer
 }
@@ -144,52 +176,164 @@ 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) {
+func (emailer *Emailer) NewSMTP(server string, port int, username, password string, sslTLS bool, certPath string) (err error) {
+	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
 }
 
-func (emailer *Emailer) construct(app *appContext, section, keyFragment string, data map[string]interface{}) (html, text string, err error) {
-	var tpl *template.Template
-	for _, key := range []string{"html", "text"} {
-		filesystem, fpath := app.GetPath(section, keyFragment+key)
-		tpl, err = template.ParseFS(filesystem, fpath)
+type templ interface {
+	Execute(wr io.Writer, data interface{}) error
+}
+
+func (emailer *Emailer) construct(app *appContext, section, keyFragment string, data map[string]interface{}) (html, text, markdown string, err error) {
+	var tpl templ
+	if substituteStrings == "" {
+		data["jellyfin"] = "Jellyfin"
+	} else {
+		data["jellyfin"] = substituteStrings
+	}
+	var keys []string
+	plaintext := app.config.Section("email").Key("plaintext").MustBool(false)
+	telegram := app.config.Section("telegram").Key("enabled").MustBool(false)
+	if plaintext {
+		if telegram {
+			keys = []string{"text"}
+			text, markdown = "", ""
+		} else {
+			keys = []string{"text"}
+			text = ""
+		}
+	} else {
+		if telegram {
+			keys = []string{"html", "text", "markdown"}
+		} else {
+			keys = []string{"html", "text"}
+		}
+	}
+	for _, key := range keys {
+		var filesystem fs.FS
+		var fpath string
+		if key == "markdown" {
+			filesystem, fpath = app.GetPath(section, keyFragment+"text")
+		} else {
+			filesystem, fpath = app.GetPath(section, keyFragment+key)
+		}
+		if key == "html" {
+			tpl, err = template.ParseFS(filesystem, fpath)
+		} else {
+			tpl, err = textTemplate.ParseFS(filesystem, fpath)
+		}
 		if err != nil {
 			return
 		}
+		// For constructTemplate, if "md" is found in data it's used in stead of "text".
+		foundMarkdown := false
+		if key == "markdown" {
+			_, foundMarkdown = data["md"]
+			if foundMarkdown {
+				data["plaintext"], data["md"] = data["md"], data["plaintext"]
+			}
+		}
 		var tplData bytes.Buffer
 		err = tpl.Execute(&tplData, data)
 		if err != nil {
 			return
 		}
+		if foundMarkdown {
+			data["plaintext"], data["md"] = data["md"], data["plaintext"]
+		}
 		if key == "html" {
 			html = tplData.String()
-		} else {
+		} else if key == "text" {
 			text = tplData.String()
+		} else {
+			markdown = tplData.String()
 		}
 	}
 	return
 }
 
-func (emailer *Emailer) constructConfirmation(code, username, key string, app *appContext) (*Email, error) {
-	email := &Email{
-		subject: app.config.Section("email_confirmation").Key("subject").MustString(emailer.lang.EmailConfirmation.get("title")),
-	}
-	message := app.config.Section("email").Key("message").String()
-	inviteLink := app.config.Section("invite_emails").Key("url_base").String()
-	inviteLink = fmt.Sprintf("%s/%s?key=%s", inviteLink, code, key)
-	var err error
-	email.html, email.text, err = emailer.construct(app, "email_confirmation", "email_", map[string]interface{}{
-		"helloUser":     emailer.lang.Strings.format("helloUser", username),
+func (emailer *Emailer) confirmationValues(code, username, key string, app *appContext, noSub bool) map[string]interface{} {
+	template := map[string]interface{}{
 		"clickBelow":    emailer.lang.EmailConfirmation.get("clickBelow"),
 		"ifItWasNotYou": emailer.lang.Strings.get("ifItWasNotYou"),
-		"urlVal":        inviteLink,
 		"confirmEmail":  emailer.lang.EmailConfirmation.get("confirmEmail"),
-		"message":       message,
+		"message":       "",
+		"username":      username,
+	}
+	if noSub {
+		template["helloUser"] = emailer.lang.Strings.get("helloUser")
+		empty := []string{"confirmationURL"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
+	} else {
+		message := app.config.Section("messages").Key("message").String()
+		inviteLink := app.config.Section("invite_emails").Key("url_base").String()
+		inviteLink = fmt.Sprintf("%s/%s?key=%s", inviteLink, code, key)
+		template["helloUser"] = emailer.lang.Strings.template("helloUser", tmpl{"username": username})
+		template["confirmationURL"] = inviteLink
+		template["message"] = message
+	}
+	return template
+}
+
+func (emailer *Emailer) constructConfirmation(code, username, key string, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("email_confirmation").Key("subject").MustString(emailer.lang.EmailConfirmation.get("title")),
+	}
+	var err error
+	template := emailer.confirmationValues(code, username, key, app, noSub)
+	if app.storage.customEmails.EmailConfirmation.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.EmailConfirmation.Content,
+			app.storage.customEmails.EmailConfirmation.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "email_confirmation", "email_", template)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return email, nil
+}
+
+func (emailer *Emailer) constructTemplate(subject, md string, app *appContext) (*Message, error) {
+	email := &Message{Subject: subject}
+	renderer := html.NewRenderer(html.RendererOptions{Flags: html.Smartypants})
+	html := markdown.ToHTML([]byte(md), nil, renderer)
+	text := stripMarkdown(md)
+	message := app.config.Section("messages").Key("message").String()
+	var err error
+	email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "template_email", "email_", map[string]interface{}{
+		"text":      template.HTML(html),
+		"plaintext": text,
+		"message":   message,
+		"md":        md,
 	})
 	if err != nil {
 		return nil, err
@@ -197,129 +341,443 @@ func (emailer *Emailer) constructConfirmation(code, username, key string, app *a
 	return email, nil
 }
 
-func (emailer *Emailer) constructInvite(code string, invite Invite, app *appContext) (*Email, error) {
-	email := &Email{
-		subject: app.config.Section("email_confirmation").Key("subject").MustString(emailer.lang.InviteEmail.get("title")),
-	}
+func (emailer *Emailer) inviteValues(code string, invite Invite, app *appContext, noSub bool) map[string]interface{} {
 	expiry := invite.ValidTill
 	d, t, expiresIn := emailer.formatExpiry(expiry, false, app.datePattern, app.timePattern)
-	message := app.config.Section("email").Key("message").String()
+	message := app.config.Section("messages").Key("message").String()
 	inviteLink := app.config.Section("invite_emails").Key("url_base").String()
 	inviteLink = fmt.Sprintf("%s/%s", inviteLink, code)
-	var err error
-	email.html, email.text, err = emailer.construct(app, "invite_emails", "email_", map[string]interface{}{
+	template := map[string]interface{}{
 		"hello":              emailer.lang.InviteEmail.get("hello"),
 		"youHaveBeenInvited": emailer.lang.InviteEmail.get("youHaveBeenInvited"),
 		"toJoin":             emailer.lang.InviteEmail.get("toJoin"),
-		"inviteExpiry":       emailer.lang.InviteEmail.format("inviteExpiry", d, t, expiresIn),
 		"linkButton":         emailer.lang.InviteEmail.get("linkButton"),
-		"invite_link":        inviteLink,
-		"message":            message,
-	})
-	if err != nil {
-		return nil, err
+		"message":            "",
+		"date":               d,
+		"time":               t,
+		"expiresInMinutes":   expiresIn,
 	}
-	return email, nil
-}
-
-func (emailer *Emailer) constructExpiry(code string, invite Invite, app *appContext) (*Email, error) {
-	email := &Email{
-		subject: emailer.lang.InviteExpiry.get("title"),
-	}
-	expiry := app.formatDatetime(invite.ValidTill)
-	var err error
-	email.html, email.text, err = emailer.construct(app, "notifications", "expiry_", map[string]interface{}{
-		"inviteExpired":      emailer.lang.InviteExpiry.get("inviteExpired"),
-		"expiredAt":          emailer.lang.InviteExpiry.format("expiredAt", "\""+code+"\"", expiry),
-		"notificationNotice": emailer.lang.InviteExpiry.get("notificationNotice"),
-	})
-	if err != nil {
-		return nil, err
-	}
-	return email, nil
-}
-
-func (emailer *Emailer) constructCreated(code, username, address string, invite Invite, app *appContext) (*Email, error) {
-	email := &Email{
-		subject: emailer.lang.UserCreated.get("title"),
-	}
-	created := app.formatDatetime(invite.Created)
-	var tplAddress string
-	if app.config.Section("email").Key("no_username").MustBool(false) {
-		tplAddress = "n/a"
+	if noSub {
+		template["inviteExpiry"] = emailer.lang.InviteEmail.get("inviteExpiry")
+		empty := []string{"inviteURL"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
 	} else {
-		tplAddress = address
+		template["inviteExpiry"] = emailer.lang.InviteEmail.template("inviteExpiry", tmpl{"date": d, "time": t, "expiresInMinutes": expiresIn})
+		template["inviteURL"] = inviteLink
+		template["message"] = message
 	}
+	return template
+}
+
+func (emailer *Emailer) constructInvite(code string, invite Invite, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("invite_emails").Key("subject").MustString(emailer.lang.InviteEmail.get("title")),
+	}
+	template := emailer.inviteValues(code, invite, app, noSub)
 	var err error
-	email.html, email.text, err = emailer.construct(app, "notifications", "created_", map[string]interface{}{
-		"aUserWasCreated":    emailer.lang.UserCreated.format("aUserWasCreated", "\""+code+"\""),
-		"name":               emailer.lang.Strings.get("name"),
-		"address":            emailer.lang.Strings.get("emailAddress"),
-		"time":               emailer.lang.UserCreated.get("time"),
-		"nameVal":            username,
-		"addressVal":         tplAddress,
-		"timeVal":            created,
-		"notificationNotice": emailer.lang.UserCreated.get("notificationNotice"),
-	})
+	if app.storage.customEmails.InviteEmail.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.InviteEmail.Content,
+			app.storage.customEmails.InviteEmail.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "invite_emails", "email_", template)
+	}
 	if err != nil {
 		return nil, err
 	}
 	return email, nil
 }
 
-func (emailer *Emailer) constructReset(pwr PasswordReset, app *appContext) (*Email, error) {
-	email := &Email{
-		subject: app.config.Section("password_resets").Key("subject").MustString(emailer.lang.PasswordReset.get("title")),
+func (emailer *Emailer) expiryValues(code string, invite Invite, app *appContext, noSub bool) map[string]interface{} {
+	expiry := app.formatDatetime(invite.ValidTill)
+	template := map[string]interface{}{
+		"inviteExpired":      emailer.lang.InviteExpiry.get("inviteExpired"),
+		"notificationNotice": emailer.lang.InviteExpiry.get("notificationNotice"),
+		"code":               "\"" + code + "\"",
+		"time":               expiry,
 	}
+	if noSub {
+		template["expiredAt"] = emailer.lang.InviteExpiry.get("expiredAt")
+	} else {
+		template["expiredAt"] = emailer.lang.InviteExpiry.template("expiredAt", tmpl{"code": template["code"].(string), "time": template["time"].(string)})
+	}
+	return template
+}
+
+func (emailer *Emailer) constructExpiry(code string, invite Invite, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: emailer.lang.InviteExpiry.get("title"),
+	}
+	var err error
+	template := emailer.expiryValues(code, invite, app, noSub)
+	if app.storage.customEmails.InviteExpiry.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.InviteExpiry.Content,
+			app.storage.customEmails.InviteExpiry.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "notifications", "expiry_", template)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return email, nil
+}
+
+func (emailer *Emailer) createdValues(code, username, address string, invite Invite, app *appContext, noSub bool) map[string]interface{} {
+	template := map[string]interface{}{
+		"nameString":         emailer.lang.Strings.get("name"),
+		"addressString":      emailer.lang.Strings.get("emailAddress"),
+		"timeString":         emailer.lang.UserCreated.get("time"),
+		"notificationNotice": "",
+		"code":               "\"" + code + "\"",
+	}
+	if noSub {
+		template["aUserWasCreated"] = emailer.lang.UserCreated.get("aUserWasCreated")
+		empty := []string{"name", "address", "time"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
+	} else {
+		created := app.formatDatetime(invite.Created)
+		var tplAddress string
+		if app.config.Section("email").Key("no_username").MustBool(false) {
+			tplAddress = "n/a"
+		} else {
+			tplAddress = address
+		}
+		template["aUserWasCreated"] = emailer.lang.UserCreated.template("aUserWasCreated", tmpl{"code": template["code"].(string)})
+		template["name"] = username
+		template["address"] = tplAddress
+		template["time"] = created
+		template["notificationNotice"] = emailer.lang.UserCreated.get("notificationNotice")
+	}
+	return template
+}
+
+func (emailer *Emailer) constructCreated(code, username, address string, invite Invite, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: emailer.lang.UserCreated.get("title"),
+	}
+	template := emailer.createdValues(code, username, address, invite, app, noSub)
+	var err error
+	if app.storage.customEmails.UserCreated.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.UserCreated.Content,
+			app.storage.customEmails.UserCreated.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "notifications", "created_", template)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return email, nil
+}
+
+func (emailer *Emailer) resetValues(pwr PasswordReset, app *appContext, noSub bool) map[string]interface{} {
 	d, t, expiresIn := emailer.formatExpiry(pwr.Expiry, true, app.datePattern, app.timePattern)
-	message := app.config.Section("email").Key("message").String()
-	var err error
-	email.html, email.text, err = emailer.construct(app, "password_resets", "email_", map[string]interface{}{
-		"helloUser":                emailer.lang.Strings.format("helloUser", pwr.Username),
+	message := app.config.Section("messages").Key("message").String()
+	template := map[string]interface{}{
 		"someoneHasRequestedReset": emailer.lang.PasswordReset.get("someoneHasRequestedReset"),
-		"ifItWasYou":               emailer.lang.PasswordReset.get("ifItWasYou"),
-		"codeExpiry":               emailer.lang.PasswordReset.format("codeExpiry", d, t, expiresIn),
 		"ifItWasNotYou":            emailer.lang.Strings.get("ifItWasNotYou"),
-		"pin":                      emailer.lang.PasswordReset.get("pin"),
-		"pinVal":                   pwr.Pin,
-		"message":                  message,
-	})
+		"pinString":                emailer.lang.PasswordReset.get("pin"),
+		"link_reset":               false,
+		"message":                  "",
+		"username":                 pwr.Username,
+		"date":                     d,
+		"time":                     t,
+		"expiresInMinutes":         expiresIn,
+	}
+	linkResetEnabled := app.config.Section("password_resets").Key("link_reset").MustBool(false)
+	if linkResetEnabled {
+		template["ifItWasYou"] = emailer.lang.PasswordReset.get("ifItWasYouLink")
+	} else {
+		template["ifItWasYou"] = emailer.lang.PasswordReset.get("ifItWasYou")
+	}
+	if noSub {
+		template["helloUser"] = emailer.lang.Strings.get("helloUser")
+		template["codeExpiry"] = emailer.lang.PasswordReset.get("codeExpiry")
+		empty := []string{"pin"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
+	} else {
+		template["helloUser"] = emailer.lang.Strings.template("helloUser", tmpl{"username": pwr.Username})
+		template["codeExpiry"] = emailer.lang.PasswordReset.template("codeExpiry", tmpl{"date": d, "time": t, "expiresInMinutes": expiresIn})
+		inviteLink := app.config.Section("invite_emails").Key("url_base").String()
+		if linkResetEnabled {
+			if inviteLink != "" {
+				// Strip /invite form end of this URL, ik its ugly.
+				template["link_reset"] = true
+				pinLink := fmt.Sprintf("%s/reset?pin=%s", strings.Replace(inviteLink, "/invite", "", 1), pwr.Pin)
+				template["pin"] = pinLink
+				// Only used in html email.
+				template["pin_code"] = pwr.Pin
+			} else {
+				app.info.Println("Password Reset link disabled as no URL Base provided. Set in Settings > Invite Emails.")
+				template["pin"] = pwr.Pin
+			}
+		} else {
+			template["pin"] = pwr.Pin
+		}
+		template["message"] = message
+	}
+	return template
+}
+
+func (emailer *Emailer) constructReset(pwr PasswordReset, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("password_resets").Key("subject").MustString(emailer.lang.PasswordReset.get("title")),
+	}
+	template := emailer.resetValues(pwr, app, noSub)
+	var err error
+	if app.storage.customEmails.PasswordReset.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.PasswordReset.Content,
+			app.storage.customEmails.PasswordReset.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "password_resets", "email_", template)
+	}
 	if err != nil {
 		return nil, err
 	}
 	return email, nil
 }
 
-func (emailer *Emailer) constructDeleted(reason string, app *appContext) (*Email, error) {
-	email := &Email{
-		subject: app.config.Section("deletion").Key("subject").MustString(emailer.lang.UserDeleted.get("title")),
+func (emailer *Emailer) deletedValues(reason string, app *appContext, noSub bool) map[string]interface{} {
+	template := map[string]interface{}{
+		"yourAccountWas": emailer.lang.UserDeleted.get("yourAccountWasDeleted"),
+		"reasonString":   emailer.lang.Strings.get("reason"),
+		"message":        "",
+	}
+	if noSub {
+		empty := []string{"reason"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
+	} else {
+		template["reason"] = reason
+		template["message"] = app.config.Section("messages").Key("message").String()
+	}
+	return template
+}
+
+func (emailer *Emailer) constructDeleted(reason string, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("deletion").Key("subject").MustString(emailer.lang.UserDeleted.get("title")),
 	}
 	var err error
-	email.html, email.text, err = emailer.construct(app, "deletion", "email_", map[string]interface{}{
-		"yourAccountWasDeleted": emailer.lang.UserDeleted.get("yourAccountWasDeleted"),
-		"reason":                emailer.lang.UserDeleted.get("reason"),
-		"reasonVal":             reason,
-	})
+	template := emailer.deletedValues(reason, app, noSub)
+	if app.storage.customEmails.UserDeleted.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.UserDeleted.Content,
+			app.storage.customEmails.UserDeleted.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "deletion", "email_", template)
+	}
 	if err != nil {
 		return nil, err
 	}
 	return email, nil
 }
 
-func (emailer *Emailer) constructWelcome(username string, app *appContext) (*Email, error) {
-	email := &Email{
-		subject: app.config.Section("welcome_email").Key("subject").MustString(emailer.lang.WelcomeEmail.get("title")),
+func (emailer *Emailer) disabledValues(reason string, app *appContext, noSub bool) map[string]interface{} {
+	template := map[string]interface{}{
+		"yourAccountWas": emailer.lang.UserDisabled.get("yourAccountWasDisabled"),
+		"reasonString":   emailer.lang.Strings.get("reason"),
+		"message":        "",
+	}
+	if noSub {
+		empty := []string{"reason"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
+	} else {
+		template["reason"] = reason
+		template["message"] = app.config.Section("messages").Key("message").String()
+	}
+	return template
+}
+
+func (emailer *Emailer) constructDisabled(reason string, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("disable_enable").Key("subject_disabled").MustString(emailer.lang.UserDisabled.get("title")),
 	}
 	var err error
-	email.html, email.text, err = emailer.construct(app, "welcome_email", "email_", map[string]interface{}{
-		"welcome":         emailer.lang.WelcomeEmail.get("welcome"),
-		"youCanLoginWith": emailer.lang.WelcomeEmail.get("youCanLoginWith"),
-		"jellyfinURL":     emailer.lang.WelcomeEmail.get("jellyfinURL"),
-		"jellyfinURLVal":  app.config.Section("jellyfin").Key("public_server").String(),
-		"username":        emailer.lang.Strings.get("username"),
-		"usernameVal":     username,
-		"message":         app.config.Section("email").Key("message").String(),
-	})
+	template := emailer.disabledValues(reason, app, noSub)
+	if app.storage.customEmails.UserDisabled.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.UserDisabled.Content,
+			app.storage.customEmails.UserDisabled.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "disable_enable", "disabled_", template)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return email, nil
+}
+
+func (emailer *Emailer) enabledValues(reason string, app *appContext, noSub bool) map[string]interface{} {
+	template := map[string]interface{}{
+		"yourAccountWas": emailer.lang.UserEnabled.get("yourAccountWasEnabled"),
+		"reasonString":   emailer.lang.Strings.get("reason"),
+		"message":        "",
+	}
+	if noSub {
+		empty := []string{"reason"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
+	} else {
+		template["reason"] = reason
+		template["message"] = app.config.Section("messages").Key("message").String()
+	}
+	return template
+}
+
+func (emailer *Emailer) constructEnabled(reason string, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("disable_enable").Key("subject_enabled").MustString(emailer.lang.UserEnabled.get("title")),
+	}
+	var err error
+	template := emailer.enabledValues(reason, app, noSub)
+	if app.storage.customEmails.UserEnabled.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.UserEnabled.Content,
+			app.storage.customEmails.UserEnabled.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "disable_enable", "enabled_", template)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return email, nil
+}
+
+func (emailer *Emailer) welcomeValues(username string, expiry time.Time, app *appContext, noSub bool, custom bool) map[string]interface{} {
+	template := map[string]interface{}{
+		"welcome":               emailer.lang.WelcomeEmail.get("welcome"),
+		"youCanLoginWith":       emailer.lang.WelcomeEmail.get("youCanLoginWith"),
+		"jellyfinURLString":     emailer.lang.WelcomeEmail.get("jellyfinURL"),
+		"usernameString":        emailer.lang.Strings.get("username"),
+		"message":               "",
+		"yourAccountWillExpire": "",
+	}
+	if noSub {
+		empty := []string{"jellyfinURL", "username", "yourAccountWillExpire"}
+		for _, v := range empty {
+			template[v] = "{" + v + "}"
+		}
+	} else {
+		template["jellyfinURL"] = app.config.Section("jellyfin").Key("public_server").String()
+		template["username"] = username
+		template["message"] = app.config.Section("messages").Key("message").String()
+		exp := app.formatDatetime(expiry)
+		if !expiry.IsZero() {
+			if custom {
+				template["yourAccountWillExpire"] = exp
+			} else if !expiry.IsZero() {
+				template["yourAccountWillExpire"] = emailer.lang.WelcomeEmail.template("yourAccountWillExpire", tmpl{
+					"date": exp,
+				})
+			}
+		}
+	}
+	return template
+}
+
+func (emailer *Emailer) constructWelcome(username string, expiry time.Time, app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("welcome_email").Key("subject").MustString(emailer.lang.WelcomeEmail.get("title")),
+	}
+	var err error
+	var template map[string]interface{}
+	if app.storage.customEmails.WelcomeEmail.Enabled {
+		template = emailer.welcomeValues(username, expiry, app, noSub, true)
+	} else {
+		template = emailer.welcomeValues(username, expiry, app, noSub, false)
+	}
+	if noSub {
+		template["yourAccountWillExpire"] = emailer.lang.WelcomeEmail.template("yourAccountWillExpire", tmpl{
+			"date": "{yourAccountWillExpire}",
+		})
+	}
+	if app.storage.customEmails.WelcomeEmail.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.WelcomeEmail.Content,
+			app.storage.customEmails.WelcomeEmail.Variables,
+			app.storage.customEmails.WelcomeEmail.Conditionals,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "welcome_email", "email_", template)
+	}
+	if err != nil {
+		return nil, err
+	}
+	return email, nil
+}
+
+func (emailer *Emailer) userExpiredValues(app *appContext, noSub bool) map[string]interface{} {
+	template := map[string]interface{}{
+		"yourAccountHasExpired": emailer.lang.UserExpired.get("yourAccountHasExpired"),
+		"contactTheAdmin":       emailer.lang.UserExpired.get("contactTheAdmin"),
+		"message":               "",
+	}
+	if !noSub {
+		template["message"] = app.config.Section("messages").Key("message").String()
+	}
+	return template
+}
+
+func (emailer *Emailer) constructUserExpired(app *appContext, noSub bool) (*Message, error) {
+	email := &Message{
+		Subject: app.config.Section("user_expiry").Key("subject").MustString(emailer.lang.UserExpired.get("title")),
+	}
+	var err error
+	template := emailer.userExpiredValues(app, noSub)
+	if app.storage.customEmails.UserExpired.Enabled {
+		content := templateEmail(
+			app.storage.customEmails.UserExpired.Content,
+			app.storage.customEmails.UserExpired.Variables,
+			nil,
+			template,
+		)
+		email, err = emailer.constructTemplate(email.Subject, content, app)
+	} else {
+		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "user_expiry", "email_", template)
+	}
 	if err != nil {
 		return nil, err
 	}
@@ -327,6 +785,31 @@ func (emailer *Emailer) constructWelcome(username string, app *appContext) (*Ema
 }
 
 // calls the send method in the underlying emailClient.
-func (emailer *Emailer) send(address string, email *Email) error {
-	return emailer.sender.send(address, emailer.fromName, emailer.fromAddr, email)
+func (emailer *Emailer) send(email *Message, address ...string) error {
+	return emailer.sender.Send(emailer.fromName, emailer.fromAddr, email, address...)
+}
+
+func (app *appContext) sendByID(email *Message, ID ...string) error {
+	for _, id := range ID {
+		var err error
+		if tgChat, ok := app.storage.telegram[id]; ok && tgChat.Contact && telegramEnabled {
+			err = app.telegram.Send(email, tgChat.ChatID)
+		} else if address, ok := app.storage.emails[id]; ok {
+			err = app.email.send(email, address.(string))
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (app *appContext) getAddressOrName(jfID string) string {
+	if tgChat, ok := app.storage.telegram[jfID]; ok && tgChat.Contact && telegramEnabled {
+		return "@" + tgChat.Username
+	}
+	if addr, ok := app.storage.emails[jfID]; ok {
+		return addr.(string)
+	}
+	return ""
 }

embed/README.md

@@ -1 +0,0 @@
-`scripts/embed.py [internal/external]` will copy the respective file into the main directory. If internal, `//go:embed` is used to embed the `data/` directory in the binary. If external, `os.DirFS` is used to access the `data/` directory, which should be placed next to the executable.

embed/external.go

@@ -1,20 +0,0 @@
-package main
-
-import (
-	"io/fs"
-	"log"
-	"os"
-	"path/filepath"
-)
-
-var localFS fs.FS
-var langFS fs.FS
-
-func FSJoin(elem ...string) string { return filepath.Join(elem...) }
-
-func loadFilesystems() {
-	log.Println("Using external storage")
-	executable, _ := os.Executable()
-	localFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data"))
-	langFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data", "lang"))
-}

external.go

@@ -0,0 +1,37 @@
+// +build external
+
+package main
+
+import (
+	"io/fs"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+const binaryType = "external"
+
+var localFS fs.FS
+var langFS fs.FS
+
+// When using os.DirFS, even on Windows the separator seems to be '/'.
+// func FSJoin(elem ...string) string { return filepath.Join(elem...) }
+func FSJoin(elem ...string) string {
+	sep := "/"
+	if strings.Contains(elem[0], "\\") {
+		sep = "\\"
+	}
+	path := ""
+	for _, el := range elem {
+		path += el + sep
+	}
+	return strings.TrimSuffix(path, sep)
+}
+
+func loadFilesystems() {
+	log.Println("Using external storage")
+	executable, _ := os.Executable()
+	localFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data"))
+	langFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data", "lang"))
+}

go.mod

@@ -4,41 +4,46 @@ go 1.16
 
 replace github.com/hrfee/jfa-go/docs => ./docs
 
-replace github.com/hrfee/jfa-go/mediabrowser => ./mediabrowser
-
 replace github.com/hrfee/jfa-go/common => ./common
 
 replace github.com/hrfee/jfa-go/ombi => ./ombi
 
+replace github.com/hrfee/jfa-go/logger => ./logger
+
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/fatih/color v1.10.0
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/gin-contrib/pprof v1.3.0
 	github.com/gin-contrib/static v0.0.0-20200916080430-d45d9a37d28e
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-chi/chi v4.1.2+incompatible // indirect
 	github.com/go-openapi/spec v0.20.3 // indirect
+	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/validator/v10 v10.4.1 // indirect
+	github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible // indirect
 	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20210408062403-ad838ccf8cdd
 	github.com/google/uuid v1.1.2 // indirect
 	github.com/hrfee/jfa-go/common v0.0.0-20210105184019-fdc97b4e86cc
 	github.com/hrfee/jfa-go/docs v0.0.0-20201112212552-b6f3cd7c1f71
-	github.com/hrfee/jfa-go/mediabrowser v0.0.0-20201112212552-b6f3cd7c1f71
+	github.com/hrfee/jfa-go/logger v0.0.0-00010101000000-000000000000
 	github.com/hrfee/jfa-go/ombi v0.0.0-20201112212552-b6f3cd7c1f71
-	github.com/jordan-wright/email v4.0.1-0.20200917010138-e1c00e156980+incompatible
-	github.com/knz/strtime v0.0.0-20200924090105-187c67f2bf5e
+	github.com/hrfee/mediabrowser v0.3.3
+	github.com/itchyny/timefmt-go v0.1.2
+	github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
 	github.com/lithammer/shortuuid/v3 v3.0.4
-	github.com/logrusorgru/aurora/v3 v3.0.0
-	github.com/mailgun/mailgun-go/v4 v4.3.0
+	github.com/mailgun/mailgun-go/v4 v4.5.1
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
 	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14
 	github.com/swaggo/gin-swagger v1.3.0
 	github.com/swaggo/swag v1.7.0 // indirect
+	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
 	github.com/ugorji/go v1.2.0 // indirect
+	github.com/writeas/go-strip-markdown v2.0.1+incompatible
 	golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect
-	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
+	golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c // indirect
+	golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54 // indirect
 	golang.org/x/tools v0.1.0 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/ini.v1 v1.62.0

go.sum

@@ -36,6 +36,8 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojt
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
 github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y=
 github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
+github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
+github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
@@ -56,9 +58,6 @@ github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmC
 github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
-github.com/go-chi/chi v4.0.0+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
-github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec=
-github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -80,8 +79,9 @@ github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY=
-github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
+github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
@@ -93,6 +93,8 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
+github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible h1:2cauKuaELYAEARXRkq2LrJ0yDDv1rW7+wrTEdVL3uaU=
+github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
@@ -109,6 +111,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/gomarkdown/markdown v0.0.0-20210408062403-ad838ccf8cdd h1:0b8AqsWQb6A0jjx80UXLG/uMTXQkGD0IGuXWqsrNz1M=
+github.com/gomarkdown/markdown v0.0.0-20210408062403-ad838ccf8cdd/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -122,8 +126,14 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/jordan-wright/email v4.0.1-0.20200917010138-e1c00e156980+incompatible h1:CL0ooBNfbNyJTJATno+m0h+zM5bW6v7fKlboKUGP/dI=
-github.com/jordan-wright/email v4.0.1-0.20200917010138-e1c00e156980+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/hrfee/mediabrowser v0.3.3 h1:7E05uiol8hh2ytKn3WVLrUIvHAyifYEIy3Y5qtuNh8I=
+github.com/hrfee/mediabrowser v0.3.3/go.mod h1:PnHZbdxmbv1wCVdAQyM7nwPwpVj9fdKx2EcET7sAk+U=
+github.com/itchyny/timefmt-go v0.1.2 h1:q0Xa4P5it6K6D7ISsbLAMwx1PnWlixDcJL6/sFs93Hs=
+github.com/itchyny/timefmt-go v0.1.2/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A=
+github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=
+github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -134,8 +144,6 @@ github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/knz/strtime v0.0.0-20200924090105-187c67f2bf5e h1:ViPE0JEOvtw5I0EGUiFSr2VNKGNU+3oBT+oHbDXHbxk=
-github.com/knz/strtime v0.0.0-20200924090105-187c67f2bf5e/go.mod h1:4ZxfWkxwtc7dBeifERVVWRy9F9rTU9p0yCDgeCtlius=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -149,16 +157,16 @@ github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lithammer/shortuuid/v3 v3.0.4 h1:uj4xhotfY92Y1Oa6n6HUiFn87CdoEHYUlTy0+IgbLrs=
 github.com/lithammer/shortuuid/v3 v3.0.4/go.mod h1:RviRjexKqIzx/7r1peoAITm6m7gnif/h+0zmolKJjzw=
-github.com/logrusorgru/aurora/v3 v3.0.0 h1:R6zcoZZbvVcGMvDCKo45A9U/lzYyzl5NfYIvznmDfE4=
-github.com/logrusorgru/aurora/v3 v3.0.0/go.mod h1:vsR12bk5grlLvLXAYrBsb5Oc/N+LxAlxggSjiwMnCUc=
-github.com/mailgun/mailgun-go/v4 v4.3.0 h1:9nAF7LI3k6bfDPbMZQMMl63Q8/vs+dr1FUN8eR1XMhk=
-github.com/mailgun/mailgun-go/v4 v4.3.0/go.mod h1:fWuBI2iaS/pSSyo6+EBpHjatQO3lV8onwqcRy7joSJI=
+github.com/mailgun/mailgun-go/v4 v4.5.1 h1:XrQQ/ZgqFvINRKy+eBqowLl7k3pQO6OCLpKphliMOFs=
+github.com/mailgun/mailgun-go/v4 v4.5.1/go.mod h1:FJlF9rI5cQT+mrwujtJjPMbIVy3Ebor9bKTVsJ0QU40=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
@@ -173,9 +181,8 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
@@ -207,6 +214,8 @@ github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+t
 github.com/swaggo/swag v1.6.7/go.mod h1:xDhTyuFIujYiN3DKWC/H/83xcfHp+UE/IzWWampG7Zc=
 github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
 github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
+github.com/technoweenie/multipartstreamer v1.0.1 h1:XRztA5MXiR1TIRHxH2uNxXxaIkKQDeX7m2XsSOlQEnM=
+github.com/technoweenie/multipartstreamer v1.0.1/go.mod h1:jNVxdtShOxzAsukZwTSw6MDx5eUJoiEBsSvzDU9uzog=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
@@ -224,8 +233,12 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+github.com/writeas/go-strip-markdown v2.0.1+incompatible h1:IIqxTM5Jr7RzhigcL6FkrCNfXkvbR+Nbu1ls48pXYcw=
+github.com/writeas/go-strip-markdown v2.0.1+incompatible/go.mod h1:Rsyu10ZhbEK9pXdk8V6MVnZmTzRG0alMNLMwa0J01fE=
 github.com/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/dl v0.0.0-20190829154251-82a15e2f2ead h1:jeP6FgaSLNTMP+Yri3qjlACywQLye+huGLmNGhBzm6k=
+golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -254,8 +267,9 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c h1:KHUzaHIpjWVlVVNh65G3hhuj3KB1HnjY6Cq5cTvRQT8=
+golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -274,11 +288,13 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54 h1:rF3Ohx8DRyl8h2zw9qojyLHLhrJpEMgyPOImREEryf0=
+golang.org/x/sys v0.0.0-20210331175145-43e1dd70ce54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

html/admin.html

@@ -6,9 +6,11 @@
             window.URLBase = "{{ .urlBase }}";
             window.notificationsEnabled = {{ .notifications }};
             window.emailEnabled = {{ .email_enabled }};
+            window.telegramEnabled = {{ .telegram_enabled }};
             window.ombiEnabled = {{ .ombiEnabled }};
             window.usernameEnabled = {{ .username }};
             window.langFile = JSON.parse({{ .language }});
+            window.language = "{{ .langName }}";
         </script>
         {{ template "header.html" . }}
         <title>Admin - jfa-go</title>
@@ -39,12 +41,26 @@
         </div>
         <div id="modal-about" class="modal">
             <div class="modal-content content card">
-                <span class="heading">{{ .strings.aboutProgram }} <span class="modal-close">&times;</span></span>
-                <img src="{{ .urlBase }}/banner.svg" class="mt-1" alt="jfa-go banner">
+                <img src="{{ .urlBase }}/banner.svg" class="banner header" alt="jfa-go banner">
+                <span class="heading"><span class="modal-close">&times;</span></span>
                 <p><i class="icon ri-github-fill"></i><a href="https://github.com/hrfee/jfa-go">jfa-go</a></p>
                 <p>{{ .strings.version }} <span class="code monospace">{{ .version }}</span></p>
                 <p>{{ .strings.commitNoun }} <span class="code monospace">{{ .commit }}</span></p>
+                <div class="dropdown" tabindex="0">
+                    <span class="button ~info dropdown-button">
+                        <i class="ri-hand-heart-line mr-half"></i>
+                        {{ .strings.donate }}
+                        <span class="ml-1 chev"></span>
+                    </span>
+                    <div class="dropdown-display">
+                        <div class="card ~neutral !low">
+                            <a href="https://github.com/sponsors/hrfee" target="_blank" class="button input ~neutral field mb-half lang-link">GitHub</a>
+                            <a href="https://ko-fi.com/hrfee" target="_blank" class="button input ~neutral field mb-half lang-link">Ko-fi</a>
+                        </div>
+                    </div>
+                </div>
                 <p><a href="https://github.com/hrfee/jfa-go/blob/main/LICENSE">Available under the MIT License.</a></p>
+                <pre class="monospace">{{ .license }}</pre>
             </div>
         </div>
         <div id="modal-modify-user" class="modal">
@@ -93,6 +109,119 @@
                 </div>
             </form>
         </div>
+        <div id="modal-extend-expiry" class="modal">
+            <form class="modal-content card" id="form-extend-expiry" href="">
+                <span class="heading"><span id="header-extend-expiry"></span> <span class="modal-close">&times;</span></span>
+                <div class="content mt-half">
+                    <div class="row">
+                        <div class="col">
+                            <label class="label supra" for="extend-expiry-months">{{ .strings.inviteMonths }}</label>
+                            <div class="select ~neutral !normal mb-1 mt-half">
+                                <select id="extend-expiry-months">
+                                    <option>0</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <label class="label supra" for="extend-expiry-days">{{ .strings.inviteDays }}</label>
+                            <div class="select ~neutral !normal mb-1 mt-half">
+                                <select id="extend-expiry-days">
+                                    <option>0</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <label class="label supra" for="extend-expiry-hours">{{ .strings.inviteHours }}</label>
+                            <div class="select ~neutral !normal mb-1 mt-half">
+                                <select id="extend-expiry-hours">
+                                    <option>0</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col">
+                            <label class="label supra" for="extend-expiry-minutes">{{ .strings.inviteMinutes }}</label>
+                            <div class="select ~neutral !normal mb-1 mt-half">
+                                <select id="extend-expiry-minutes">
+                                    <option>0</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <label>
+                        <input type="submit" class="unfocused">
+                        <span class="button ~critical !normal full-width center supra submit">{{ .strings.submit }}</span>
+                    </label>
+                </div>
+            </form>
+        </div>
+        <div id="modal-announce" class="modal">
+            <form class="modal-content wide card" id="form-announce" href="">
+                <span class="heading"><span id="header-announce"></span> <span class="modal-close">&times;</span></span>
+                <div class="row">
+                    <div class="col flex-col content mt-half">
+                        <label class="label supra" for="announce-subject"> {{ .strings.subject }}</label>
+                        <input type="text" id="announce-subject" class="input ~neutral !normal mb-1 mt-half">
+                        <label class="label supra" for="textarea-announce">{{ .strings.message }}</label>
+                        <textarea id="textarea-announce" class="textarea full-width ~neutral !normal mt-half monospace"></textarea>
+                        <p class="support mt-half mb-1">{{ .strings.markdownSupported }}</p>
+                        <label>
+                            <input type="submit" class="unfocused">
+                            <span class="button ~urge !normal full-width center supra submit">{{ .strings.submit }}</span>
+                        </label>
+                    </div>
+                    <div class="col card ~neutral !low">
+                        <span class="subheading supra">{{ .strings.preview }}</span>
+                        <div class="mt-half" id="announce-preview"></div>
+                    </div>
+                </div>
+            </form>
+        </div>
+        <div id="modal-customize" class="modal">
+            <div class="modal-content card">
+                <span class="heading">{{ .strings.customizeMessages }} <span class="modal-close">&times;</span></span>
+                <p class="content">{{ .strings.customizeMessagesDescription }}</p>
+                <div class="table-responsive">
+                    <table class="table">
+                        <thead>
+                            <tr>
+                                <th>{{ .strings.name }}</th>
+                                <th>{{ .strings.reset }}</th>
+                                <th>{{ .strings.edit }}</th>
+                            </tr>
+                        </thead>
+                        <tbody id="customize-list"></tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div id="modal-editor" class="modal">
+            <form class="modal-content wide card" id="form-editor" href="">
+                <span class="heading"><span id="header-editor"></span> <span class="modal-close">&times;</span></span>
+                <div class="row">
+                    <div class="col flex-col content mt-half">
+                        <span class="label supra" for="editor-variables" id="label-editor-variables">{{ .strings.variables }}</span>
+                        <div id="editor-variables"></div>
+                        <span class="label supra" for="editor-conditionals" id="label-editor-conditionals">{{ .strings.conditionals }}</span>
+                        <div id="editor-conditionals"></div>
+                        <label class="label supra" for="textarea-editor">{{ .strings.message }}</label>
+                        <textarea id="textarea-editor" class="textarea full-width flex-auto ~neutral !normal mt-half monospace"></textarea>
+                        <p class="support mt-half mb-1">{{ .strings.markdownSupported }}</p>
+                        <div class="flex-row">
+                            <label class="full-width ml-half">
+                                <input type="submit" class="unfocused">
+                                <span class="button ~urge !normal full-width center supra submit">{{ .strings.submit }}</span>
+                            </label>
+                        </div>
+                    </div>
+                    <div class="col card ~neutral !low">
+                        <span class="subheading supra">{{ .strings.preview }}</span>
+                        <div class="mt-half" id="editor-preview"></div>
+                    </div>
+                </div>
+            </form>
+        </div>
         <div id="modal-restart" class="modal">
             <div class="modal-content card ~critical !low">
                 <span class="heading">{{ .strings.settingsRestartRequired }} <span class="modal-close">&times;</span></span>
@@ -165,6 +294,39 @@
                 </label>
             </form>
         </div>
+        <div id="modal-update" class="modal">
+            <div class="modal-content wide card">
+                <span class="heading">{{ .strings.updates }} <span class="modal-close">&times;</span></span>
+                <p class="content">
+                    <h2>
+                        <a id="update-version"></a> (<span class="monospace" id="update-commit"></span>)
+                    </h2>
+                    <p class="content" id="update-description"></p>
+                    <p class="support" id="update-date"></p>
+                    <div class="content markdown-box" id="update-changelog"></div>
+                </p>
+                <span class="button ~info !normal full-width center" id="update-download">{{ .strings.download }}</span>
+                <span class="button ~urge !normal full-width center" id="update-update">{{ .strings.update }}</span>
+            </div>
+        </div>
+        {{ if .telegram_enabled }}
+        <div id="modal-telegram" class="modal">
+            <div class="modal-content card">
+                <span class="heading mb-1">{{ .strings.linkTelegram }}</span>
+                <p class="content mb-1">{{ .strings.sendPIN }}</p>
+                <h1 class="ac" id="telegram-pin"></h1>
+                <a class="subheading link-center" id="telegram-link" target="_blank">
+                    <span class="shield ~info mr-1">
+                        <span class="icon">
+                            <i class="ri-telegram-line"></i>
+                        </span>
+                    </span>
+                    &#64;<span id="telegram-username">
+                </a>
+                <span class="button ~info !normal full-width center mt-1" id="telegram-waiting">{{ .strings.success }}</span>
+            </div>
+        </div>
+        {{ end }}
         <div id="notification-box"></div>
         <span class="dropdown" tabindex="0" id="lang-dropdown">
             <span class="button ~urge dropdown-button">
@@ -172,7 +334,16 @@
                 <span class="ml-1 chev"></span>
             </span>
             <div class="dropdown-display">
-                <div class="card ~neutral !low" id="lang-list">
+                <div class="card ~neutral !low">
+                    <label class="switch pb-1">
+                        <input type="radio" name="lang-time" id="lang-12h">
+                        <span>{{ .strings.time12h }}</span>
+                    </label>
+                    <label class="switch pb-1">
+                        <input type="radio" name="lang-time" id="lang-24h">
+                        <span>{{ .strings.time24h }}</span>
+                    </label>
+                    <div id="lang-list"></div>
                 </div>
             </div>
         </span>
@@ -201,26 +372,103 @@
                     <span class="heading">{{ .strings.create }}</span>
                     <div class="row" id="create-inv">
                         <div class="card ~neutral !normal col">
-                            <label class="label supra" for="create-days">{{ .strings.inviteDays }}</label>
-                            <div class="select ~neutral !normal mb-1 mt-half">
-                                <select id="create-days">
-                                    <option>0</option>
-                                </select>
+                            <div class="row mb-1">
+                                <label class="col mr-1">
+                                    <input type="radio" name="duration" class="unfocused" id="radio-inv-duration" checked>
+                                    <span class="button ~neutral !high supra full-width center">{{ .strings.inviteDuration }}</span>
+                                </label>
+                                <label class="col ml-1">
+                                    <input type="radio" name="duration" class="unfocused" id="radio-user-expiry">
+                                    <span class="button ~neutral !normal supra full-width center">{{ .strings.userExpiry }}</span>
+                                </label>
                             </div>
-                            <label class="label supra" for="create-hours">{{ .strings.inviteHours }}</label>
-                            <div class="select ~neutral !normal mb-1 mt-half">
-                                <select id="create-hours">
-                                    <option>0</option>
-                                </select>
+                            <div id="inv-duration">
+                                <div class="row">
+                                    <div class="col">
+                                        <label class="label supra" for="create-months">{{ .strings.inviteMonths }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="create-months">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="col">
+                                        <label class="label supra" for="create-days">{{ .strings.inviteDays }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="create-days">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <label class="label supra" for="create-hours">{{ .strings.inviteHours }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="create-hours">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="col">
+                                        <label class="label supra" for="create-minutes">{{ .strings.inviteMinutes }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="create-minutes">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
-                            <label class="label supra" for="create-minutes">{{ .strings.inviteMinutes }}</label>
-                            <div class="select ~neutral !normal mb-1 mt-half">
-                                <select id="create-minutes">
-                                    <option>0</option>
-                                </select>
+                            <div id="user-expiry" class="unfocused">
+                                <p class="support">{{ .strings.userExpiryDescription }}</p>
+                                <div class="mb-half">
+                                    <label for="create-user-expiry-enabled" class="button ~neutral !normal">
+                                        <input type="checkbox" id="create-user-expiry-enabled" aria-label="User duration enabled">
+                                        <span class="ml-half">{{ .strings.enabled }} </span>
+                                    </label>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <label class="label supra" for="user-months">{{ .strings.inviteMonths }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="user-months">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="col">
+                                        <label class="label supra" for="user-days">{{ .strings.inviteDays }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="user-days">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col">
+                                        <label class="label supra" for="user-hours">{{ .strings.inviteHours }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="user-hours">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div class="col">
+                                        <label class="label supra" for="user-minutes">{{ .strings.inviteMinutes }}</label>
+                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                            <select id="user-minutes">
+                                                <option>0</option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col">
+                                <label class="label supra" for="create-label"> {{ .strings.label }}</label>
+                                <input type="text" id="create-label" class="input ~neutral !normal mb-1 mt-half">
                             </div>
-                            <label class="label supra" for="create-label"> {{ .strings.label }}</label>
-                            <input type="text" id="create-label" class="input ~neutral !normal mb-1 mt-half">
                         </div>
                         <div class="card ~neutral !normal col">
                             <label class="label supra" for="create-uses">{{ .strings.inviteNumberOfUses }}</label>
@@ -253,11 +501,19 @@
             </div>
             <div id="tab-accounts" class="unfocused">
                 <div class="card ~neutral !low accounts mb-1">
-                    <span class="heading">{{ .strings.accounts }}</span>
-                    <div class="fr">
-                        <span class="button ~neutral !normal" id="accounts-add-user">{{ .quantityStrings.addUser.Singular }}</span>
-                        <span class="button ~urge !normal" id="accounts-modify-user">{{ .strings.modifySettings }}</span>
-                        <span class="button ~critical !normal" id="accounts-delete-user">{{ .quantityStrings.deleteUser.Singular }}</span>
+                    <div class="flex-expand row">
+                        <div class="row">
+                            <span class="heading mr-1 col sm">{{ .strings.accounts }}</span>
+                            <input type="search" class="col sm field ~neutral !normal input search ml-1 mr-1" id="accounts-search" placeholder="{{ .strings.search }}">
+                        </div>
+                        <div class="row">
+                            <span class="col sm button ~neutral !normal center mb-half" id="accounts-add-user">{{ .quantityStrings.addUser.Singular }}</span>
+                            <span class="col sm button ~info !normal center mb-half" id="accounts-announce">{{ .strings.announce }}</span>
+                            <span class="col sm button ~urge !normal center mb-half" id="accounts-modify-user">{{ .strings.modifySettings }}</span>
+                            <span class="col sm button ~warning !normal center mb-half" id="accounts-extend-expiry">{{ .strings.extendExpiry }}</span>
+                            <span class="col sm button ~positive !normal center mb-half" id="accounts-disable-enable">{{ .strings.disable }}</span>
+                            <span class="col sm button ~critical !normal center mb-half" id="accounts-delete-user">{{ .quantityStrings.deleteUser.Singular }}</span>
+                        </div>
                     </div>
                     <div class="card ~neutral !normal accounts-header table-responsive mt-half">
                         <table class="table">
@@ -266,6 +522,10 @@
                                     <th><input type="checkbox" value="" id="accounts-select-all"></th>
                                     <th>{{ .strings.username }}</th>
                                     <th>{{ .strings.emailAddress }}</th>
+                                    {{ if .telegram_enabled }}
+                                    <th>Telegram</th>
+                                    {{ end }}
+                                    <th>{{ .strings.expiry }}</th>
                                     <th>{{ .strings.lastActiveTime }}</th>
                                 </tr>
                             </thead>
@@ -276,10 +536,18 @@
             </div>
             <div id="tab-settings" class="unfocused">
                 <div class="card ~neutral !low settings overflow">
-                    <span class="heading">{{ .strings.settings }}</span>
-                    <div class="fr">
-                        <span class="button ~neutral !normal" id="settings-restart">{{ .strings.settingsRestart }}</span>
-                        <span class="button ~urge !normal unfocused" id="settings-save">{{ .strings.settingsSave }}</span>
+                    <div class="flex-expand">
+                        <div class="flex-row">
+                            <span class="heading">{{ .strings.settings }}</span>
+                            <label for="settings-advanced-enabled" class="button ~neutral !normal ml-1">
+                                <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">

html/form-base.html

@@ -5,8 +5,18 @@
     window.invalidPassword = "{{ .strings.reEnterPasswordInvalid }}";
     window.URLBase = "{{ .urlBase }}";
     window.code = "{{ .code }}";
+    window.language = "{{ .langName }}";
     window.messages = JSON.parse({{ .notifications }});
     window.confirmation = {{ .confirmation }};
+    window.userExpiryEnabled = {{ .userExpiry }};
+    window.userExpiryMonths = {{ .userExpiryMonths }};
+    window.userExpiryDays = {{ .userExpiryDays }};
+    window.userExpiryHours = {{ .userExpiryHours }};
+    window.userExpiryMinutes = {{ .userExpiryMinutes }};
+    window.userExpiryMessage = {{ .userExpiryMessage }};
+    window.telegramEnabled = {{ .telegramEnabled }};
+    window.telegramRequired = {{ .telegramRequired }};
+    window.telegramPIN = "{{ .telegramPIN }}";
 </script>
 <script src="js/form.js" type="module"></script>
 {{ end }}

html/form.html

@@ -19,6 +19,24 @@
                 <p class="content mb-1">{{ .strings.confirmationRequiredMessage }}</p>
             </div>
         </div>
+        {{ if .telegramEnabled }}
+        <div id="modal-telegram" class="modal">
+            <div class="modal-content card">
+                <span class="heading mb-1">{{ .strings.linkTelegram }}</span>
+                <p class="content mb-1">{{ .strings.sendPIN }}</p>
+                <h1 class="ac">{{ .telegramPIN }}</h1>
+                <a class="subheading link-center" href="{{ .telegramURL }}" target="_blank">
+                    <span class="shield ~info mr-1">
+                        <span class="icon">
+                            <i class="ri-telegram-line"></i>
+                        </span>
+                    </span>
+                    &#64;{{ .telegramUsername }}
+                </a>
+                <span class="button ~info !normal full-width center mt-1" id="telegram-waiting">{{ .strings.success }}</span>
+            </div>
+        </div>
+        {{ end }}
         <span class="dropdown" tabindex="0" id="lang-dropdown">
             <span class="button ~urge dropdown-button">
                 <i class="ri-global-line"></i>
@@ -29,6 +47,7 @@
                 </div>
             </div>
         </span>
+        <div id="notification-box"></div>
         <div class="page-container">
             <div class="card ~neutral !low">
                 <div class="row baseline">
@@ -37,6 +56,9 @@
                 </div>
                 <div class="row">
                     <div class="col">
+                        {{ if .userExpiry }}
+                        <aside class="col aside sm ~warning" id="user-expiry-message"></aside>
+                        {{ end }}
                         <form class="card ~neutral !normal" id="form-create" href="">
                             <label class="label supra">
                                 {{ .strings.username }}
@@ -44,13 +66,23 @@
                             </label>
                             
                             <label class="label supra" for="create-email">{{ .strings.emailAddress }}</label>
-                            <input type="email" class="input ~neutral 1high mt-half mb-1" placeholder="{{ .strings.emailAddress }}" id="create-email" aria-label="{{ .strings.emailAddress }}" value="{{ .email }}">
-                            
+                            <input type="email" class="input ~neutral !high mt-half mb-1" placeholder="{{ .strings.emailAddress }}" id="create-email" aria-label="{{ .strings.emailAddress }}" value="{{ .email }}">
+                            {{ if .telegramEnabled }}
+                            <span class="button ~info !normal full-width center mb-1" id="link-telegram">{{ .strings.linkTelegram }}</span>
+                            <div id="contact-via" class="unfocused">
+                                <label class="row switch pb-1">
+                                    <input type="radio" name="contact-via" value="email"><span>Contact through Email</span>
+                                </label>
+                                <label class="row switch pb-1">
+                                    <input type="radio" name="contact-via" value="telegram" id="contact-via-telegram"><span>Contact through Telegram</span>
+                                </label>
+                            </div>
+                            {{ end }}
                             <label class="label supra" for="create-password">{{ .strings.password }}</label>
-                            <input type="password" class="input ~neutral 1high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-password" aria-label="{{ .strings.password }}">
+                            <input type="password" class="input ~neutral !high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-password" aria-label="{{ .strings.password }}">
                             
                             <label class="label supra" for="create-reenter-password">{{ .strings.reEnterPassword }}</label>
-                            <input type="password" class="input ~neutral 1high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-reenter-password" aria-label="{{ .strings.reEnterPassword }}">
+                            <input type="password" class="input ~neutral !high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-reenter-password" aria-label="{{ .strings.reEnterPassword }}">
                             <label>
                                 <input type="submit" class="unfocused">
                                 <span class="button ~urge !normal full-width center supra submit">{{ .strings.createAccountButton }}</span>

html/header.html

@@ -1,6 +1,7 @@
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <meta name="Description" content="jfa-go, a better way to manage Jellyfin users.">
+<meta name="color-scheme" content="dark light">
 
 <link rel="apple-touch-icon" sizes="180x180" href="{{ .urlBase }}/apple-touch-icon.png">
 <link rel="icon" type="image/png" sizes="32x32" href="{{ .urlBase }}/favicon-32x32.png">

html/password-reset.html

@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="en" class="{{ .cssClass }}">
+    <head>
+        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        {{ template "header.html" . }}
+        <title>{{ .strings.passwordReset }} -  jfa-go</title>
+    </head>
+    <body class="section">
+        {{ if .success }}
+        <div id="notification-box">
+            <span id="copy-notification" class="unfocused">{{ .strings.copied }}</span>
+        </div>
+        {{ end }}
+        <div class="page-container">
+            <div class="card ~neutral !normal mb-1">
+                <span class="heading mb-1">
+                {{ if .success }}
+                {{ .strings.passwordReset }}
+                {{ else }}
+                {{ .strings.resetFailed }}
+                {{ end }}
+                </span>
+                <p class="content mb-1">
+                {{ if .success }}
+                {{ if .ombiEnabled }}
+                {{ .strings.youCanLoginOmbi }}
+                {{ else }}
+                {{ .strings.youCanLogin }}
+                {{ end }}
+                {{ else }}
+                {{ .strings.tryAgain }}
+                {{ end }}
+                </p>
+                {{ if .success }}
+                <aside class="aside ~warning">
+                    {{ .strings.changeYourPassword }}
+                </aside>
+                <span class="button ~urge !normal full-width center supra p-1 mt-1" id="pin" title="{{ .strings.copy }}">{{ .pin }}</span>
+                {{ end }}
+            </div>
+            <i class="content">{{ .contactMessage }}</i>
+        </div>
+        <script src="{{ .urlBase }}/js/pwr.js" type="module"></script>
+    </body>
+</html>                            

html/setup.html

@@ -82,6 +82,20 @@
                             <span class="mt-half">{{ .lang.General.pathToKeyFile }}</span>
                             <input type="text" class="input ~neutral !normal mt-half mb-1" id="advanced-tls_key">
                         </label>
+                        <span class="heading">{{ .lang.Updates.title }}</span>
+                        <p class="content" id="updates-description"></p>
+                        <label class="row switch pb-1">
+                            <input type="checkbox" id="updates-enabled" checked><span>{{ .lang.Strings.enabled }}</span>
+                        </label>
+                        <label class="label">
+                            <span>{{ .lang.Updates.updateChannel }}</span>
+                            <div class="select ~neutral !normal mt-half mb-1">
+                                <select id="updates-channel">
+                                    <option value="stable">{{ .lang.Updates.stable }}</option>
+                                    <option value="unstable">{{ .lang.Updates.unstable }}</option>
+                                </select>
+                            </div>
+                        </label>
                     </div>
                     <div class="col">
                         <label class="label">
@@ -235,8 +249,8 @@
                         </label>
                         <label class="row switch">
                             <input type="checkbox" id="email-no_username"><span>{{ .lang.Email.useEmailAsUsername }}</span>
+                            <p class="support mb-1">{{ .lang.Email.useEmailAsUsernameNotice }}</p>
                         </label>
-                        <p class="support mb-1">{{ .lang.Email.useEmailAsUsernameNotice }}</p>
                         <label class="label">
                             <span class="mt-half">{{ .lang.Email.fromAddress }}</span>
                             <input type="email" class="input ~neutral !normal mt-half mb-1" id="email-address" placeholder="mail@jellyf.in">
@@ -252,10 +266,10 @@
                         </label>
                         <div>
                             <label class="row switch pb-1">
-                                <input type="radio" name="email-24h" value="true" checked><span>{{ .lang.Email.time24h }}</span>
+                                <input type="radio" name="email-24h" value="true" checked><span>{{ .lang.Strings.time24h }}</span>
                             </label>
                             <label class="row switch pb-1">
-                                <input type="radio" name="email-24h" value="false"><span>{{ .lang.Email.time12h }}</span>
+                                <input type="radio" name="email-24h" value="false"><span>{{ .lang.Strings.time12h }}</span>
                             </label>
                         </div>
                     </div>
@@ -351,7 +365,7 @@
                     </div>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused related-to-email">
+            <div id="password-resets" class="card ~neutral !low mb-1 unfocused related-to-email">
                 <span class="heading">{{ .lang.PasswordResets.title }}</span>
                 <p class="content">{{ .lang.PasswordResets.description }}</p>
                 <label class="row switch pb-1">
@@ -362,7 +376,18 @@
                     <input type="text" class="input ~neutral !normal mt-half" id="password_resets-watch_directory" placeholder="/config/jellyfin">
                     <p class="support mb-1">{{ .lang.PasswordResets.pathToJellyfinNotice }}</p>
                 </label>
-                <label class="label">
+                <label class="switch">
+                    <input type="checkbox" id="password_resets-link_reset"><span>{{ .lang.PasswordResets.resetLinks }}</span>
+                    <p class="support mb-1">{{ .lang.PasswordResets.resetLinksNotice }}</p>
+                </label>
+                <label class="row label">
+                    <p class="mt-half">{{ .lang.PasswordResets.resetLinksLanguage }}</p>
+                    <div class="select ~neutral !normal mt-half mb-1">
+                        <select id="password_resets-language">
+                        </select>
+                    </div>
+                </label>
+                <label class="row label">
                     <span class="mt-half">{{ .lang.Strings.emailSubject }}</span>
                     <input type="text" class="input ~neutral !normal mt-half mb-1" id="password_resets-subject" placeholder="{{ .emailLang.PasswordReset.title }}">
                 </label>

internal.go

@@ -1,3 +1,5 @@
+// +build !external
+
 package main
 
 import (
@@ -6,10 +8,12 @@ import (
 	"log"
 )
 
+const binaryType = "internal"
+
 //go:embed data data/html data/web data/web/css data/web/js
 var loFS embed.FS
 
-//go:embed lang/common lang/admin lang/email lang/form lang/setup
+//go:embed lang/common lang/admin lang/email lang/form lang/setup lang/pwreset lang/telegram
 var laFS embed.FS
 
 var langFS rewriteFS

jfa-go.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=An account management system for Jellyfin.
+
+[Service]
+ExecStart={executable}
+
+[Install]
+WantedBy=default.target

lang.go

@@ -1,11 +1,9 @@
 package main
 
-import (
-	"strings"
-)
-
 type langMeta struct {
 	Name string `json:"name"`
+	// Language to fall back on if strings are missing. Defaults to en-us.
+	Fallback string `json:"fallback,omitempty"`
 }
 
 type quantityString struct {
@@ -61,6 +59,23 @@ type formLang struct {
 	validationStringsJSON string
 }
 
+type pwrLangs map[string]pwrLang
+
+func (ls *pwrLangs) getOptions() [][2]string {
+	opts := make([][2]string, len(*ls))
+	i := 0
+	for key, lang := range *ls {
+		opts[i] = [2]string{key, lang.Meta.Name}
+		i++
+	}
+	return opts
+}
+
+type pwrLang struct {
+	Meta    langMeta    `json:"meta"`
+	Strings langSection `json:"strings"`
+}
+
 type emailLangs map[string]emailLang
 
 func (ls *emailLangs) getOptions() [][2]string {
@@ -80,9 +95,12 @@ type emailLang struct {
 	InviteExpiry      langSection `json:"inviteExpiry"`
 	PasswordReset     langSection `json:"passwordReset"`
 	UserDeleted       langSection `json:"userDeleted"`
+	UserDisabled      langSection `json:"userDisabled"`
+	UserEnabled       langSection `json:"userEnabled"`
 	InviteEmail       langSection `json:"inviteEmail"`
 	WelcomeEmail      langSection `json:"welcomeEmail"`
 	EmailConfirmation langSection `json:"emailConfirmation"`
+	UserExpired       langSection `json:"userExpired"`
 }
 
 type setupLangs map[string]setupLang
@@ -93,6 +111,7 @@ type setupLang struct {
 	StartPage          langSection `json:"startPage"`
 	EndPage            langSection `json:"endPage"`
 	General            langSection `json:"general"`
+	Updates            langSection `json:"updates"`
 	Language           langSection `json:"language"`
 	Login              langSection `json:"login"`
 	JellyfinEmby       langSection `json:"jellyfinEmby"`
@@ -117,14 +136,80 @@ func (ls *setupLangs) getOptions() [][2]string {
 	return opts
 }
 
+type telegramLangs map[string]telegramLang
+
+type telegramLang struct {
+	Meta    langMeta    `json:"meta"`
+	Strings langSection `json:"strings"`
+}
+
+func (ts *telegramLangs) getOptions() [][2]string {
+	opts := make([][2]string, len(*ts))
+	i := 0
+	for key, lang := range *ts {
+		opts[i] = [2]string{key, lang.Meta.Name}
+		i++
+	}
+	return opts
+}
+
 type langSection map[string]string
+type tmpl map[string]string
+
+func templateString(text string, vals tmpl) string {
+	start, previousEnd := -1, -1
+	out := ""
+	for i := range text {
+		if text[i] == '{' {
+			start = i
+			continue
+		}
+		if start != -1 && text[i] == '}' {
+			varName := text[start+1 : i]
+			val, ok := vals[varName]
+			if !ok {
+				start = -1
+				continue
+			}
+			out += text[previousEnd+1:start] + val
+			previousEnd = i
+			start = -1
+		}
+	}
+	if previousEnd != len(text)-1 {
+		out += text[previousEnd+1:]
+	}
+	return out
+}
+
+func (el langSection) template(field string, vals tmpl) string {
+	text := el.get(field)
+	return templateString(text, vals)
+}
 
 func (el langSection) format(field string, vals ...string) string {
 	text := el.get(field)
-	for _, val := range vals {
-		text = strings.Replace(text, "{n}", val, 1)
+	start, previous := -1, -3
+	out := ""
+	val := 0
+	for i := range text {
+		if i == len(text)-2 { // Check if there's even enough space for a {n}
+			break
+		}
+		if text[i:i+3] == "{n}" {
+			start = i
+			out += text[previous+3:start] + vals[val]
+			previous = start
+			val++
+			if val == len(vals) {
+				break
+			}
+		}
 	}
-	return text
+	if previous+2 != len(text)-1 {
+		out += text[previous+3:]
+	}
+	return out
 }
 
 func (el langSection) get(field string) string {

lang/admin/de-de.json

@@ -55,7 +55,6 @@
         "inviteNoUsersCreated": "Noch keine!",
         "inviteUsersCreated": "Erstellte Benutzer",
         "inviteNoProfile": "Kein Profil",
-        "copy": "Kopieren",
         "inviteDateCreated": "Erstellt",
         "inviteRemainingUses": "Verbleibende Verwendungen",
         "inviteNoInvites": "Keine",
@@ -65,7 +64,30 @@
         "notifyUserCreation": "Bei Benutzererstellung",
         "label": "Label",
         "settingsRestarting": "Neustart…",
-        "settingsRestart": "Neustart"
+        "settingsRestart": "Neustart",
+        "variables": "Variablen",
+        "preview": "Vorschau",
+        "reset": "Zurücksetzen",
+        "edit": "Bearbeiten",
+        "customizeMessages": "E-Mails anpassen",
+        "customizeMessagesDescription": "Wenn du jfa-go's E-Mail-Vorlagen nicht benutzen willst, kannst du deinen eigenen unter Verwendung von Markdown erstellen.",
+        "announce": "Ankündigen",
+        "subject": "E-Mail-Betreff",
+        "message": "Nachricht",
+        "markdownSupported": "Markdown wird unterstützt.",
+        "advancedSettings": "Erweiterte Einstellungen",
+        "search": "Suchen",
+        "userExpiry": "Benutzer Ablaufdatum",
+        "inviteDuration": "Invite Dauer",
+        "enabled": "Aktiviert",
+        "userExpiryDescription": "Eine bestimmte Zeit nach der Anmeldung wird jfa-go das Konto löschen/deaktivieren. Du kannst dieses Verhalten in den Einstellungen ändern.",
+        "disabled": "Deaktiviert",
+        "admin": "Admin",
+        "download": "Herunterladen",
+        "update": "Aktualisieren",
+        "updates": "Aktualisierungen",
+        "expiry": "Ablaufdatum",
+        "extendExpiry": "Ablaufdatum verlängern"
     },
     "notifications": {
         "changedEmailAddress": "E-Mail-Adresse von {n} geändert.",
@@ -94,7 +116,15 @@
         "errorFailureCheckLogs": "Fehlgeschlagen (überprüfe die Konsole/Logs)",
         "errorPartialFailureCheckLogs": "Teilweiser Fehlschlag (überprüfe die Konsole/Logs)",
         "errorUserCreated": "Fehler beim Erstellen des Benutzers {n}.",
-        "errorSendWelcomeEmail": "Fehler beim Senden der Willkommens-E-Mail (überprüfe die Konsole/Logs)"
+        "errorSendWelcomeEmail": "Fehler beim Senden der Willkommens-E-Mail (überprüfe die Konsole/Logs)",
+        "saveEmail": "E-Mail gespeichert.",
+        "errorSaveEmail": "Fehler beim Speichern der E-Mail.",
+        "sentAnnouncement": "Ankündigung gesendet.",
+        "updateApplied": "Aktualisierung angewendet, bitte neu starten.",
+        "errorApplyUpdate": "Fehler beim Anwenden der Aktualisierung, versuche es manuell.",
+        "errorCheckUpdate": "Fehler beim Suchen nach Aktualisierungen.",
+        "updateAvailable": "Eine neue Aktualisierung ist verfügbar, überprüfe die Einstellungen.",
+        "noUpdatesAvailable": "Keinen neuen Aktualisierungen verfügbar."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -120,6 +150,18 @@
         "appliedSettings": {
             "singular": "Einstellungen auf {n} Benutzer angewendet.",
             "plural": "Einstellungen auf {n} Benutzer angewendet."
+        },
+        "announceTo": {
+            "singular": "{n} Benutzer mitteilen",
+            "plural": "{n} Benutzern mitteilen"
+        },
+        "extendExpiry": {
+            "singular": "Ablaufdatum für {n} Benutzer verlängern",
+            "plural": "Ablaufdatum für {n} Benutzer verlängern"
+        },
+        "extendedExpiry": {
+            "singular": "Ablaufdatum für {n} Benutzer verlängern.",
+            "plural": "Ablaufdatum für {n} Benutzer verlängern."
         }
     }
 }

lang/admin/el-gr.json

@@ -58,14 +58,39 @@
         "inviteNoUsersCreated": "Τίποτα ακόμα!",
         "inviteUsersCreated": "Δημιουργηθέντες χρήστες",
         "inviteNoProfile": "Κανένα Προφίλ",
-        "copy": "Αντιγραφή",
         "inviteDateCreated": "Δημιουργηθέντα",
         "inviteRemainingUses": "Εναπομείναντες χρήσεις",
         "inviteNoInvites": "Καμία",
         "inviteExpiresInTime": "Λήγει σε {n}",
         "notifyEvent": "Ενημέρωση όταν:",
         "notifyInviteExpiry": "Στην λήξη",
-        "notifyUserCreation": "Στην δημιουργία χρήστη"
+        "notifyUserCreation": "Στην δημιουργία χρήστη",
+        "variables": "Μεταβλητές",
+        "preview": "Προεπισκόπηση",
+        "reset": "Επαναφορά",
+        "edit": "Επεξεργασία",
+        "customizeMessages": "Παραμετροποίηση Emails",
+        "advancedSettings": "Προχωρημένες Ρυθμίσεις",
+        "customizeMessagesDescription": "Αν δεν θέλετε να ζρησιμοποιήσετε τα πρότυπα email του jfa-go, μπορείτε να δημιουργήσετε τα δικά σας με χρήση Markdown.",
+        "updates": "Ενημερώσεις",
+        "update": "Ενημέρωση",
+        "download": "Λήψη",
+        "search": "Αναζήτηση",
+        "inviteDuration": "Διάρκεια Πρόσκλησης",
+        "enabled": "Ενεργοποιημένο",
+        "disabled": "Απενεργοποιημένο",
+        "admin": "Διαχειριστής",
+        "expiry": "Λήξη",
+        "userExpiry": "Λήξη Χρήστη",
+        "userExpiryDescription": "Μετά απο ένα καθορισμένο χρόνο μετά απο κάθε εγγραφή, το jfa-go θα διαγράφει/απενεργοποιεί τον λογαριασμό. Μπορείτε να αλλάξετε αυτή την συμπεριφορά στις ρυθμίσεις.",
+        "announce": "Ανακοίνωση",
+        "subject": "Θέμα Email",
+        "message": "Μήνυμα",
+        "extendExpiry": "Παράταση λήξης",
+        "markdownSupported": "Το Markdown υποστυρίζεται.",
+        "reEnable": "Επανα-ενεργοποίηση",
+        "disable": "Απενεργοποίηση",
+        "inviteMonths": "Μήνες"
     },
     "notifications": {
         "changedEmailAddress": "Αλλαγή {n} διεύθυνσεων email.",
@@ -94,7 +119,15 @@
         "errorFailureCheckLogs": "Αποτυχία (ελέγξτε κονσόλα/καταγραφές)",
         "errorPartialFailureCheckLogs": "Μερική αποτυχία (ελέγξτε κονσόλα/καταγραφές)",
         "errorUserCreated": "Αποτυχία δημιουργίας του χρήστη {n}.",
-        "errorSendWelcomeEmail": "Αποτυχία αποστολής email καλωσορίσματος (ελέγξτε κονσόλα/καταγραφές)"
+        "errorSendWelcomeEmail": "Αποτυχία αποστολής email καλωσορίσματος (ελέγξτε κονσόλα/καταγραφές)",
+        "saveEmail": "Το email αποθηκεύτηκε.",
+        "sentAnnouncement": "Ανακοίνωση εστάλη.",
+        "updateApplied": "Η ενημέρωση εφαρμόστηκε, παρακαλώ επανεκκινήστε.",
+        "errorSaveEmail": "Αποτυχία αποθήκευσης του email.",
+        "errorApplyUpdate": "Αποτυχία εγκατάστασης ενημέρωσης, προσπαθήστε χειροκίνητα.",
+        "errorCheckUpdate": "Αποτυχία ελέγχου για ενημερώσεις.",
+        "updateAvailable": "Μια νέα ενημέρωση είναι διαθέσιμη, ελέγξτε τις ρυθμίσεις.",
+        "noUpdatesAvailable": "Δεν υπάρχουν διαθέσιμες ενημερώσεις."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -120,6 +153,34 @@
         "appliedSettings": {
             "singular": "Εφαρμογή ρυθμίσεων σε {n} χρήστη.",
             "plural": "Εφαρμογή ρυθμίσεων σε {n} χρήστες."
+        },
+        "announceTo": {
+            "singular": "Ανακοίνωση σε {n} χρήστη",
+            "plural": "Ανακοίνωση σε {n} χρήστες"
+        },
+        "extendExpiry": {
+            "plural": "Επέκταση λήξης σε {n} χρήστες",
+            "singular": "Επέκταση λήξης σε {n} χρήστη"
+        },
+        "extendedExpiry": {
+            "singular": "Εκτεταμένη λήξη για {n} χρήστη.",
+            "plural": "Εκτεταμένη λήξη για {n} χρήστες."
+        },
+        "disableUsers": {
+            "singular": "Απενεργοποίηση {n} χρήστη",
+            "plural": "Απενεργοποίηση {n} χρηστών"
+        },
+        "reEnableUsers": {
+            "singular": "Εκ νέου ενεργοποίηση {n} χρήστη",
+            "plural": "Εκ νέου ενεργοποίηση {n} χρηστών"
+        },
+        "disabledUser": {
+            "singular": "Απενεργοποιήθηκε {n} χρήστης.",
+            "plural": "Απενεργοποιήθηκαν {n} χρήστες."
+        },
+        "enabledUser": {
+            "singular": "Εργοποιήθηκε {n} χρήστης.",
+            "plural": "Εργοποιήθηκαν {n} χρήστες."
         }
     }
 }

lang/admin/en-gb.json

@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "name": "English (GB)"
+    }
+}

lang/admin/en-us.json

@@ -6,10 +6,12 @@
         "invites": "Invites",
         "accounts": "Accounts",
         "settings": "Settings",
+        "inviteMonths": "Months",
         "inviteDays": "Days",
         "inviteHours": "Hours",
         "inviteMinutes": "Minutes",
         "inviteNumberOfUses": "Number of uses",
+        "inviteDuration": "Invite Duration",
         "warning": "Warning",
         "inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively",
         "inviteSendToEmail": "Send to",
@@ -20,9 +22,22 @@
         "delete": "Delete",
         "name": "Name",
         "date": "Date",
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "reEnable": "Re-enable",
+        "disable": "Disable",
+        "admin": "Admin",
+        "updates": "Updates",
+        "update": "Update",
+        "download": "Download",
+        "search": "Search",
+        "advancedSettings": "Advanced Settings",
         "lastActiveTime": "Last Active",
         "from": "From",
         "user": "User",
+        "expiry": "Expiry",
+        "userExpiry": "User Expiry",
+        "userExpiryDescription": "A specified amount of time after each signup, jfa-go will delete/disable the account. You can change this behaviour in settings.",
         "aboutProgram": "About",
         "version": "Version",
         "commitNoun": "Commit",
@@ -30,10 +45,24 @@
         "profile": "Profile",
         "unknown": "Unknown",
         "label": "Label",
+        "announce": "Announce",
+        "subject": "Subject",
+        "message": "Message",
+        "variables": "Variables",
+        "conditionals": "Conditionals",
+        "preview": "Preview",
+        "reset": "Reset",
+        "edit": "Edit",
+        "donate": "Donate",
+        "contactThrough": "Contact through:",
+        "extendExpiry": "Extend expiry",
+        "customizeMessages": "Customize Messages",
+        "customizeMessagesDescription": "If you don't want to use jfa-go's message templates, you can create your own using Markdown.",
+        "markdownSupported": "Markdown is supported.",
         "modifySettings": "Modify Settings",
         "modifySettingsDescription": "Apply settings from an existing profile, or source them directly from a user.",
         "applyHomescreenLayout": "Apply homescreen layout",
-        "sendDeleteNotificationEmail": "Send notification email",
+        "sendDeleteNotificationEmail": "Send notification message",
         "sendDeleteNotifiationExample": "Your account has been deleted.",
         "settingsRestart": "Restart",
         "settingsRestarting": "Restarting…",
@@ -58,21 +87,26 @@
         "inviteNoUsersCreated": "None yet!",
         "inviteUsersCreated": "Created users",
         "inviteNoProfile": "No Profile",
-        "copy": "Copy",
         "inviteDateCreated": "Created",
         "inviteRemainingUses": "Remaining uses",
         "inviteNoInvites": "None",
         "inviteExpiresInTime": "Expires in {n}",
         "notifyEvent": "Notify on:",
         "notifyInviteExpiry": "On expiry",
-        "notifyUserCreation": "On user creation"
+        "notifyUserCreation": "On user creation",
+        "sendPIN": "Ask the user to send the PIN below to the bot."
     },
     "notifications": {
         "changedEmailAddress": "Changed email address of {n}.",
         "userCreated": "User {n} created.",
         "createProfile": "Created profile {n}.",
         "saveSettings": "Settings were saved",
+        "saveEmail": "Email saved.",
+        "sentAnnouncement": "Announcement sent.",
         "setOmbiDefaults": "Stored ombi defaults.",
+        "updateApplied": "Update applied, please restart.",
+        "updateAppliedRefresh": "Update applied, please refresh.",
+        "telegramVerified": "Telegram account verified.",
         "errorConnection": "Couldn't connect to jfa-go.",
         "error401Unauthorized": "Unauthorized. Try refreshing the page.",
         "errorSettingsAppliedNoHomescreenLayout": "Settings were applied, but applying homescreen layout may have failed.",
@@ -80,6 +114,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.",
@@ -94,7 +129,11 @@
         "errorFailureCheckLogs": "Failed (check console/logs)",
         "errorPartialFailureCheckLogs": "Partial failure (check console/logs)",
         "errorUserCreated": "Failed to create user {n}.",
-        "errorSendWelcomeEmail": "Failed to send welcome email (check console/logs)"
+        "errorSendWelcomeEmail": "Failed to send welcome message (check console/logs)",
+        "errorApplyUpdate": "Failed to apply update, try manually.",
+        "errorCheckUpdate": "Failed to check for update.",
+        "updateAvailable": "A new update is available, check settings.",
+        "noUpdatesAvailable": "No new updates available."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -105,6 +144,14 @@
             "singular": "Delete {n} user",
             "plural": "Delete {n} users"
         },
+        "disableUsers": {
+            "singular": "Disable {n} user",
+            "plural": "Disable {n} users"
+        },
+        "reEnableUsers": {
+            "singular": "Re-enable {n} user",
+            "plural": "Re-enable {n} users"
+        },
         "addUser": {
             "singular": "Add user",
             "plural": "Add users"
@@ -117,9 +164,29 @@
             "singular": "Deleted {n} user.",
             "plural": "Deleted {n} users."
         },
+        "disabledUser": {
+            "singular": "Disabled {n} user.",
+            "plural": "Disabled {n} users."
+        },
+        "enabledUser": {
+            "singular": "Enabled {n} user.",
+            "plural": "Enabled {n} users."
+        },
+        "announceTo": {
+            "singular": "Announce to {n} user",
+            "plural": "Announce to {n} users"
+        },
         "appliedSettings": {
             "singular": "Applied settings to {n} user.",
             "plural": "Applied settings to {n} users."
+        },
+        "extendExpiry": {
+            "singular": "Extend expiry for {n} user",
+            "plural": "Extend expiry for {n} users"
+        },
+        "extendedExpiry": {
+            "singular": "Extended expiry for {n} user.",
+            "plural": "Extended expiry for {n} users."
         }
     }
 }

lang/admin/es-es.json

@@ -0,0 +1,187 @@
+{
+    "meta": {
+        "name": "Español(ES)"
+    },
+    "strings": {
+        "invites": "Invitaciones",
+        "accounts": "Cuentas",
+        "settings": "Ajustes",
+        "inviteMonths": "Meses",
+        "inviteDays": "Días",
+        "inviteHours": "Horas",
+        "inviteMinutes": "Minutos",
+        "inviteNumberOfUses": "Números de usos",
+        "inviteDuration": "Duración de invitación",
+        "warning": "Advertencia",
+        "inviteInfiniteUsesWarning": "Las invitaciones con usos infinitos pueden usarse abusivamente",
+        "inviteSendToEmail": "Enviar a",
+        "login": "Acceso",
+        "logout": "Cerrar sesión",
+        "create": "Cerrar sesión",
+        "apply": "Aplicar",
+        "delete": "Eliminar",
+        "name": "Nombre",
+        "date": "Fecha",
+        "enabled": "Activado",
+        "disabled": "Desactivado",
+        "reEnable": "Reactivar",
+        "disable": "Desactivar",
+        "admin": "Administrador",
+        "updates": "Actualizaciones",
+        "update": "Actualizar",
+        "download": "Descargar",
+        "search": "Buscar",
+        "advancedSettings": "Ajustes avanzados",
+        "lastActiveTime": "Último activo",
+        "from": "De",
+        "user": "Usuario",
+        "expiry": "Expiración",
+        "userExpiry": "Caducidad del usuario",
+        "userExpiryDescription": "Una cantidad específica de tiempo después de cada registro, jfa-go eliminará/deshabilitará la cuenta. Puede cambiar este comportamiento en la configuración.",
+        "aboutProgram": "Acerca de",
+        "version": "Versión",
+        "commitNoun": "Cometer",
+        "newUser": "Nuevo usuario",
+        "profile": "Perfil",
+        "unknown": "Desconocido",
+        "label": "Etiqueta",
+        "announce": "Anunciar",
+        "subject": "Asunto del email",
+        "message": "Mensaje",
+        "variables": "Variables",
+        "preview": "Previsualizar",
+        "reset": "Reiniciar",
+        "edit": "Editar",
+        "extendExpiry": "Extender el vencimiento",
+        "customizeMessages": "Personalizar emails",
+        "customizeMessagesDescription": "Si no desea utilizar las plantillas de correo electrónico de jfa-go, puede crear las suyas propias con Markdown.",
+        "markdownSupported": "Se admite Markdown.",
+        "modifySettings": "Modificar configuración",
+        "modifySettingsDescription": "Aplique la configuración de un perfil existente u obténgalos directamente de un usuario.",
+        "applyHomescreenLayout": "Aplicar el diseño de la pantalla de inicio",
+        "sendDeleteNotificationEmail": "Enviar notificación a correo",
+        "sendDeleteNotifiationExample": "Tu cuenta ha sido eliminada.",
+        "settingsRestart": "Reiniciar",
+        "settingsRestarting": "Reiniciando…",
+        "settingsRestartRequired": "Reinicio necesario",
+        "settingsRestartRequiredDescription": "Es necesario reiniciar para aplicar algunas configuraciones que cambió. ¿Reiniciar ahora o más tarde?",
+        "settingsApplyRestartLater": "Aplicar, reiniciar más tarde",
+        "settingsApplyRestartNow": "Aplicar, reiniciar más tarde",
+        "settingsApplied": "Se aplicó la configuración.",
+        "settingsRefreshPage": "Actualiza la página en unos segundos.",
+        "settingsRequiredOrRestartMessage": "Nota: {n} indica un campo obligatorio, {n} indica que los cambios requieren un reinicio.",
+        "settingsSave": "Guardar",
+        "ombiUserDefaults": "Valores predeterminados de usuario de Ombi",
+        "ombiUserDefaultsDescription": "Cree un usuario Ombi y configúrelo, luego selecciónelo a continuación. Sus configuraciones / permisos se almacenarán y aplicarán a los nuevos usuarios de Ombi creados por jfa-go",
+        "userProfiles": "Perfiles de usuario",
+        "userProfilesDescription": "Los perfiles se aplican a los usuarios cuando crean una cuenta. Un perfil incluye los derechos de acceso a la biblioteca y el diseño de la pantalla de inicio.",
+        "userProfilesIsDefault": "Defecto",
+        "userProfilesLibraries": "Bibliotecas",
+        "addProfile": "Agregar perfil",
+        "addProfileDescription": "Cree un usuario de Jellyfin y configúrelo, luego selecciónelo a continuación. Cuando este perfil se aplica a una invitación, se crearán nuevos usuarios con la configuración.",
+        "addProfileNameOf": "Nombre de perfil",
+        "addProfileStoreHomescreenLayout": "Diseño de la pantalla de inicio de la tienda",
+        "inviteNoUsersCreated": "¡Ninguno todavía!",
+        "inviteUsersCreated": "Usuarios creados",
+        "inviteNoProfile": "Sin perfil",
+        "inviteDateCreated": "Creado",
+        "inviteRemainingUses": "Usos restantes",
+        "inviteNoInvites": "Ninguno",
+        "inviteExpiresInTime": "Caduca en {n}",
+        "notifyEvent": "Notificar en:",
+        "notifyInviteExpiry": "Al vencimiento",
+        "notifyUserCreation": "Sobre la creación de usuarios",
+        "conditionals": "Condicionales"
+    },
+    "notifications": {
+        "changedEmailAddress": "Se cambió la dirección de correo electrónico de {n}.",
+        "userCreated": "Usuario {n} creado.",
+        "createProfile": "Perfil creado {n}.",
+        "saveSettings": "Se guardaron las configuraciones",
+        "saveEmail": "Correo electrónico guardado.",
+        "sentAnnouncement": "Anuncio enviado.",
+        "setOmbiDefaults": "Valores predeterminados de ombi almacenados.",
+        "updateApplied": "Actualización aplicada, por favor reinicie.",
+        "errorConnection": "No se pudo conectar a jfa-go.",
+        "error401Unauthorized": "No autorizado. Intente actualizar la página.",
+        "errorSettingsAppliedNoHomescreenLayout": "Se aplicó la configuración, pero es posible que no se haya aplicado el diseño de la pantalla de inicio.",
+        "errorHomescreenAppliedNoSettings": "Se aplicó el diseño de la pantalla de inicio, pero es posible que no se haya aplicado la configuración.",
+        "errorSettingsFailed": "La aplicación falló.",
+        "errorLoginBlank": "El nombre de usuario y/o la contraseña se dejaron en blanco.",
+        "errorUnknown": "Error desconocido.",
+        "errorSaveEmail": "No se pudo guardar el correo electrónico.",
+        "errorBlankFields": "Los campos se dejaron en blanco",
+        "errorDeleteProfile": "No se pudo borrar el perfil {n}",
+        "errorLoadProfiles": "No se pudieron cargar los perfiles.",
+        "errorCreateProfile": "No se pudo crear el perfil {n}",
+        "errorSetDefaultProfile": "No se pudo establecer el perfil predeterminado.",
+        "errorLoadUsers": "No se pudieron cargar los usuarios.",
+        "errorSaveSettings": "No se pudo guardar la configuración.",
+        "errorLoadSettings": "No se pudo cargar la configuración.",
+        "errorSetOmbiDefaults": "No se pudieron almacenar los valores predeterminados de ombi.",
+        "errorLoadOmbiUsers": "No se pudieron cargar los usuarios de ombi.",
+        "errorChangedEmailAddress": "No se pudo cambiar la dirección de correo electrónico de {n}.",
+        "errorFailureCheckLogs": "Fallido (ver consola / registros)",
+        "errorPartialFailureCheckLogs": "Fallo parcial (ver consola / registros)",
+        "errorUserCreated": "No se pudo crear el usuario {n}.",
+        "errorSendWelcomeEmail": "No se pudo enviar el correo electrónico de bienvenida (verifique la consola / registros)",
+        "errorApplyUpdate": "No se pudo aplicar la actualización, intente manualmente.",
+        "errorCheckUpdate": "No se pudo comprobar la actualización.",
+        "updateAvailable": "Hay una nueva actualización disponible, verifique la configuración.",
+        "noUpdatesAvailable": "No hay nuevas actualizaciones disponibles."
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "Modificar la configuración de {n} usuario",
+            "plural": "Modificar la configuración de {n} usuarios"
+        },
+        "deleteNUsers": {
+            "singular": "Eliminar {n} usuario",
+            "plural": "Eliminar {n} usuarios"
+        },
+        "disableUsers": {
+            "singular": "Deshabilitar {n} usuario",
+            "plural": "Inhabilitar {n} usuarios"
+        },
+        "reEnableUsers": {
+            "singular": "Reactivar {n} usuario",
+            "plural": "Reactivar {n} usuarios"
+        },
+        "addUser": {
+            "singular": "Agregar usuario",
+            "plural": "Agregar usuarios"
+        },
+        "deleteUser": {
+            "singular": "Borrar usuario",
+            "plural": "Borrar usuarios"
+        },
+        "deletedUser": {
+            "singular": "Usuario eliminado {n}.",
+            "plural": "Usuarios eliminados {n}."
+        },
+        "disabledUser": {
+            "singular": "Usuario deshabilitado {n}.",
+            "plural": "Usuarios deshabilitados {n}."
+        },
+        "enabledUser": {
+            "singular": "Usuario {n} habilitado.",
+            "plural": "Usuarios {n} habilitados."
+        },
+        "announceTo": {
+            "singular": "Anunciar al usuario {n}",
+            "plural": "Anunciar a los usuarios {n}"
+        },
+        "appliedSettings": {
+            "singular": "Se aplicó la configuración al usuario {n}.",
+            "plural": "Se aplicó la configuración a los usuarios {n}."
+        },
+        "extendExpiry": {
+            "singular": "Extender la expiración para el usuario {n}",
+            "plural": "Extender la expiración para los usuarios {n}"
+        },
+        "extendedExpiry": {
+            "singular": "Caducidad extendida para el usuario {n}.",
+            "plural": "Caducidad extendida para los usuarios {n}."
+        }
+    }
+}

lang/admin/fr-fr.json

@@ -7,6 +7,7 @@
         "invites": "Invitations",
         "accounts": "Comptes",
         "settings": "Réglages",
+        "inviteMonths": "Mois",
         "inviteDays": "Jours",
         "inviteHours": "Heures",
         "inviteMinutes": "Minutes",
@@ -56,7 +57,6 @@
         "inviteNoUsersCreated": "Aucun pour l'instant !",
         "inviteUsersCreated": "Utilisateurs créer",
         "inviteNoProfile": "Aucun profil",
-        "copy": "Copier",
         "inviteDateCreated": "Créer",
         "inviteRemainingUses": "Utilisations restantes",
         "inviteNoInvites": "Aucune",
@@ -66,7 +66,31 @@
         "notifyUserCreation": "à la création de l'utilisateur",
         "label": "Etiquette",
         "settingsRestarting": "Redémarrage…",
-        "settingsRestart": "Redémarrer"
+        "settingsRestart": "Redémarrer",
+        "announce": "Annoncer",
+        "subject": "Sujet",
+        "message": "Message",
+        "markdownSupported": "Markdown est pris en charge.",
+        "customizeMessagesDescription": "Si vous ne souhaitez pas utiliser les modèles d'e-mails de jfa-go, vous pouvez créer les vôtres à l'aide de Markdown.",
+        "variables": "Variables",
+        "preview": "Aperçu",
+        "reset": "Réinitialiser",
+        "edit": "Éditer",
+        "customizeMessages": "Personnaliser les e-mails",
+        "inviteDuration": "Durée de l'invitation",
+        "enabled": "Activé",
+        "disabled": "Désactivé",
+        "reEnable": "Ré-activé",
+        "disable": "Désactivé",
+        "admin": "Administrateur",
+        "expiry": "Expiration",
+        "advancedSettings": "Paramètres avancés",
+        "userExpiry": "Expiration de l'utilisateur",
+        "updates": "Mises à jour",
+        "update": "Mise à jour",
+        "download": "Téléchargement",
+        "search": "Recherche",
+        "conditionals": "Conditions"
     },
     "notifications": {
         "changedEmailAddress": "Adresse e-mail modifiée de {n}.",
@@ -95,7 +119,11 @@
         "errorFailureCheckLogs": "Échec (vérifier la console / les journaux)",
         "errorPartialFailureCheckLogs": "Panne partielle (vérifier la console / les journaux)",
         "errorUserCreated": "Echec lors de la création de l'utilisateur {n}.",
-        "errorSendWelcomeEmail": "Echec lors de l'envoi du mail de bienvenue (vérifier la console/les journaux)"
+        "errorSendWelcomeEmail": "Echec lors de l'envoi du mail de bienvenue (vérifier la console/les journaux)",
+        "sentAnnouncement": "Annonce envoyée.",
+        "saveEmail": "Email enregistré.",
+        "errorSaveEmail": "Échec de l'enregistrement de l'e-mail.",
+        "updateApplied": "Mise à jour appliquée, veuillez redémarrer."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -121,6 +149,10 @@
         "appliedSettings": {
             "singular": "Appliquer le paramètre {n} utilisteur.",
             "plural": "Appliquer les paramètres {n} utilisteurs."
+        },
+        "announceTo": {
+            "singular": "Annonce à {n} utilisateur",
+            "plural": "Annonce à {n} utilisateurs"
         }
     }
 }

lang/admin/id-id.json

@@ -13,7 +13,7 @@
         "warning": "Peringatan",
         "inviteInfiniteUsesWarning": "Undangan dalam jumlah tak terbatas dapat disalahgunakan",
         "inviteSendToEmail": "Dikirim kepada",
-        "login": "Gabung",
+        "login": "Masuk",
         "logout": "Keluar",
         "create": "Buat",
         "apply": "Terapkan",
@@ -35,15 +35,15 @@
         "applyHomescreenLayout": "Terapkan tata letak layar beranda",
         "sendDeleteNotificationEmail": "Kirim email notifikasi",
         "sendDeleteNotifiationExample": "Akun anda telah dihapus.",
-        "settingsRestart": "Restart",
+        "settingsRestart": "Mulai ulang",
         "settingsRestarting": "Mengulang kembali…",
-        "settingsRestartRequired": "Perlu restart",
-        "settingsRestartRequiredDescription": "Restart diperlukan untuk menerapkan beberapa pengaturan yang Anda ubah. Mulai ulang sekarang atau nanti?",
+        "settingsRestartRequired": "Mulai ulang diperlukan",
+        "settingsRestartRequiredDescription": "Mulai ulang diperlukan untuk menerapkan beberapa pengaturan yang Anda ubah. Mulai ulang sekarang atau nanti?",
         "settingsApplyRestartLater": "Terapkan, mulai ulang nanti",
-        "settingsApplyRestartNow": "Terapkan dan mulai ulang kembali",
+        "settingsApplyRestartNow": "Terapkan & mulai ulang",
         "settingsApplied": "Pengaturan diterapkan.",
         "settingsRefreshPage": "Segarkan halaman dalam beberapa detik.",
-        "settingsRequiredOrRestartMessage": "Catatan: {n} harus diisi, {n} mengindikasikan perubahan memerlukan restart.",
+        "settingsRequiredOrRestartMessage": "Catatan: {n} harus diisi, {n} mengindikasikan perubahan memerlukan mulai ulang.",
         "settingsSave": "Simpan",
         "ombiUserDefaults": "Default pengguna Ombi",
         "ombiUserDefaultsDescription": "Buat pengguna Ombi dan konfigurasikan, lalu pilih di bawah. Pengaturan / izinnya akan disimpan dan diterapkan ke pengguna Ombi baru yang dibuat oleh jfa-go",
@@ -58,14 +58,23 @@
         "inviteNoUsersCreated": "Belum ada!",
         "inviteUsersCreated": "Pengguna yang telah dibuat",
         "inviteNoProfile": "Tidak ada profil",
-        "copy": "Salin",
         "inviteDateCreated": "Dibuat",
         "inviteRemainingUses": "Penggunaan yang tersisa",
         "inviteNoInvites": "Tidak ada",
         "inviteExpiresInTime": "Kadaluarsa dalam {n}",
         "notifyEvent": "Beritahu pada:",
         "notifyInviteExpiry": "Saat kadaluarsa",
-        "notifyUserCreation": "Saat pembuatan pengguna"
+        "notifyUserCreation": "Saat pembuatan pengguna",
+        "variables": "Variabel",
+        "preview": "Pratinjau",
+        "reset": "Setel ulang",
+        "edit": "Edit",
+        "customizeMessages": "Sesuaikan Email",
+        "customizeMessagesDescription": "Jika Anda tidak ingin menggunakan templat email jfa-go, Anda dapat membuatnya sendiri menggunakan Markdown.",
+        "announce": "Mengumumkan",
+        "subject": "Subjek Email",
+        "message": "Pesan",
+        "markdownSupported": "Markdown didukung."
     },
     "notifications": {
         "changedEmailAddress": "Alamat email {n} diubah.",
@@ -94,7 +103,10 @@
         "errorFailureCheckLogs": "Gagal (periksa konsol / log)",
         "errorPartialFailureCheckLogs": "Kegagalan sebagian (periksa konsol / log)",
         "errorUserCreated": "Gagal membuat pengguna {n}.",
-        "errorSendWelcomeEmail": "Gagal mengirim email selamat datang (periksa konsol / log)"
+        "errorSendWelcomeEmail": "Gagal mengirim email selamat datang (periksa konsol / log)",
+        "saveEmail": "Email disimpan.",
+        "sentAnnouncement": "Pengumuman dikirim.",
+        "errorSaveEmail": "Gagal menyimpan email."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -120,6 +132,10 @@
         "appliedSettings": {
             "singular": "Pengaturan diterapkan pada {n} pengguna.",
             "plural": "Pengaturan diterapkan pada {n} pengguna."
+        },
+        "announceTo": {
+            "singular": "Umumkan kepada {n} pengguna",
+            "plural": "Umumkan kepada {n} pengguna"
         }
     }
 }

lang/admin/nl-nl.json

@@ -55,7 +55,6 @@
         "inviteNoUsersCreated": "Nog geen!",
         "inviteUsersCreated": "Aangemaakte gebruikers",
         "inviteNoProfile": "Geen profiel",
-        "copy": "Kopiëer",
         "inviteDateCreated": "Aangemaakt",
         "inviteRemainingUses": "Resterend aantal keer te gebruiken",
         "inviteNoInvites": "Geen",
@@ -65,7 +64,34 @@
         "notifyUserCreation": "Bij aanmaken gebruiker",
         "label": "Label",
         "settingsRestart": "Herstart",
-        "settingsRestarting": "Aan het herstarten…"
+        "settingsRestarting": "Aan het herstarten…",
+        "announce": "Aankondiging",
+        "markdownSupported": "Markdown wordt ondersteund.",
+        "subject": "E-mailonderwerp",
+        "message": "Bericht",
+        "variables": "Variabelen",
+        "customizeMessagesDescription": "Als je de e-mailsjablonen van jfa-go niet wilt gebruiken, kun je met gebruik van Markdown je eigen aanmaken.",
+        "preview": "Voorbeeld",
+        "reset": "Resetten",
+        "edit": "Bewerken",
+        "customizeMessages": "E-mails aanpassen",
+        "inviteDuration": "Geldigheidsduur uitnodiging",
+        "userExpiryDescription": "Een bepaalde tijd na elke aanmelding, wordt de account verwijderd/uitgeschakeld door jfa-go. Dit kan aangepast worden in de instellingen.",
+        "enabled": "Ingeschakeld",
+        "disabled": "Uitgeschakeld",
+        "admin": "Beheerder",
+        "expiry": "Verloop",
+        "userExpiry": "Gebruikersverloop",
+        "extendExpiry": "Verleng verloop",
+        "updates": "Updates",
+        "update": "Bijwerken",
+        "download": "Download",
+        "search": "Zoeken",
+        "advancedSettings": "Geavanceerde instellingen",
+        "inviteMonths": "Maanden",
+        "reEnable": "Opnieuw inschakelen",
+        "disable": "Uitschakelen",
+        "conditionals": "Voorwaarden"
     },
     "notifications": {
         "changedEmailAddress": "E-mailadres van {n} gewijzigd.",
@@ -94,7 +120,15 @@
         "errorFailureCheckLogs": "Mislukt (controleer console/logbestanden)",
         "errorPartialFailureCheckLogs": "Gedeeltelijke fout (controleer console/logbestanden)",
         "errorSendWelcomeEmail": "Versturen van welkomste-mail is mislukt (zie console/logs)",
-        "errorUserCreated": "Aanmaken van gebruiker {n} is mislukt."
+        "errorUserCreated": "Aanmaken van gebruiker {n} is mislukt.",
+        "sentAnnouncement": "Aankondiging verzonden.",
+        "saveEmail": "E-mail opgeslagen.",
+        "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": {
@@ -120,6 +154,34 @@
         "appliedSettings": {
             "singular": "Instellingen toegepast op {n} gebruiker.",
             "plural": "Instellingen toegepast op {n} gebruikers."
+        },
+        "announceTo": {
+            "singular": "Aankondigen aan {n} gebruikers",
+            "plural": "aankondigen aan {n} gebruikerss"
+        },
+        "extendExpiry": {
+            "singular": "Verleng verloop voor {n} gebruiker",
+            "plural": "Verleng verloop voor {n} gebruikers"
+        },
+        "extendedExpiry": {
+            "singular": "Verloop uitgesteld voor {n} gebruiker.",
+            "plural": "Verloop uitgesteld voor {n} gebruikers."
+        },
+        "disableUsers": {
+            "singular": "Schakel {n} gebruiker uit",
+            "plural": "Schakel {n} gebruikers uit"
+        },
+        "reEnableUsers": {
+            "singular": "Schakel {n} gebruiker opnieuw in",
+            "plural": "Schakel {n} gebruikers opnieuw in"
+        },
+        "disabledUser": {
+            "singular": "{n} gebruiker uitgeschakeld.",
+            "plural": "{n} gebruikers uitgeschakeld."
+        },
+        "enabledUser": {
+            "singular": "{n} gebruiker ingeschakeld.",
+            "plural": "{n} gebruikers ingeschakeld."
         }
     }
 }

lang/admin/pt-br.json

@@ -56,7 +56,6 @@
         "inviteNoUsersCreated": "Nenhum ainda!",
         "inviteUsersCreated": "Usuários criado",
         "inviteNoProfile": "Sem Perfil",
-        "copy": "Copiar",
         "inviteDateCreated": "Criado",
         "inviteRemainingUses": "Uso restantes",
         "inviteNoInvites": "Nenhum",
@@ -65,7 +64,34 @@
         "notifyInviteExpiry": "No vencimento",
         "notifyUserCreation": "Na criação do usuário",
         "settingsRestart": "Reiniciar",
-        "settingsRestarting": "Reiniciando…"
+        "settingsRestarting": "Reiniciando…",
+        "announce": "Anunciar",
+        "subject": "Assunto do email",
+        "message": "Mensagem",
+        "markdownSupported": "Suporte a Markdown.",
+        "customizeMessagesDescription": "Se não quiser usar os modelos de email do jfa-go, você pode criar o seu próprio usando o Markdown.",
+        "variables": "Variáveis",
+        "preview": "Pre-visualizar",
+        "reset": "Reiniciar",
+        "edit": "Editar",
+        "customizeMessages": "Customizar Emails",
+        "disabled": "Desativado",
+        "userExpiryDescription": "Após um determinado período de tempo de cada inscrição, o jfa-go apagará/desabilitará a conta. Você pode alterar essa opção nas configurações.",
+        "inviteDuration": "Duração do Convite",
+        "enabled": "Habilitado",
+        "admin": "Admin",
+        "expiry": "Expira",
+        "userExpiry": "Vencimento do Usuário",
+        "extendExpiry": "Extender o vencimento",
+        "updates": "Atualizações",
+        "update": "Atualizar",
+        "download": "Download",
+        "search": "Procurar",
+        "advancedSettings": "Configurações Avançada",
+        "inviteMonths": "Meses",
+        "reEnable": "Reativar",
+        "disable": "Desativar",
+        "conditionals": "Condicionais"
     },
     "notifications": {
         "changedEmailAddress": "Endereço de e-mail alterado de {n}.",
@@ -94,7 +120,15 @@
         "errorFailureCheckLogs": "Falha (verificar console/logs)",
         "errorPartialFailureCheckLogs": "Falha parcial (verificar console/logs)",
         "errorUserCreated": "Falha ao criar o usuário {n}.",
-        "errorSendWelcomeEmail": "Falha ao enviar e-mail de boas-vindas (verifique console/logs)"
+        "errorSendWelcomeEmail": "Falha ao enviar e-mail de boas-vindas (verifique console/logs)",
+        "sentAnnouncement": "Comunicado enviado.",
+        "saveEmail": "Email salvo.",
+        "errorSaveEmail": "Falha ao salvar o email.",
+        "updateApplied": "Atualização aplicada, reinicie.",
+        "errorApplyUpdate": "Falha ao aplicar a atualização, tente manualmente.",
+        "updateAvailable": "Uma nova atualização está disponível, verifique as configurações.",
+        "errorCheckUpdate": "Falha ao verificar atualizações.",
+        "noUpdatesAvailable": "Nenhuma atualização disponível."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -120,6 +154,34 @@
         "appliedSettings": {
             "singular": "Configurações aplicada ao usuário {n}.",
             "plural": "Configurações aplicada ao usuários {n}."
+        },
+        "announceTo": {
+            "singular": "Comunicar o usuário {n}",
+            "plural": "Comunicar os usuários {n}"
+        },
+        "extendExpiry": {
+            "singular": "Extender o vencimento para {n}",
+            "plural": "Extender o vencimento para {n} usuários"
+        },
+        "extendedExpiry": {
+            "plural": "Extender o vencimento para {n} usuários.",
+            "singular": "Extender vencimento para {n}."
+        },
+        "disableUsers": {
+            "singular": "Desativar {n} usuário",
+            "plural": "Desativar {n} usuários"
+        },
+        "reEnableUsers": {
+            "singular": "Reativar {n} usuário",
+            "plural": "Reativar {n} usuários"
+        },
+        "disabledUser": {
+            "singular": "{n} Usuário desativado.",
+            "plural": "{n} usuários desativado."
+        },
+        "enabledUser": {
+            "singular": "{n} Usuário habilitado.",
+            "plural": "{n} Usuários habilitado."
         }
     }
 }

lang/admin/sv-se.json

@@ -0,0 +1,157 @@
+{
+    "meta": {
+        "name": "Svenska (SV)"
+    },
+    "strings": {
+        "invites": "Inbjudningar",
+        "accounts": "Konton",
+        "settings": "Inställningar",
+        "inviteDays": "Dagar",
+        "inviteHours": "Timmar",
+        "inviteMinutes": "Minuter",
+        "inviteNumberOfUses": "Antal användningar",
+        "warning": "Varning",
+        "inviteInfiniteUsesWarning": "inbjudningar med oändligt antal användningar kan missbrukas",
+        "inviteSendToEmail": "Skicka till",
+        "login": "Logga in",
+        "logout": "Logga ut",
+        "create": "Skapa",
+        "apply": "Tillämpa",
+        "delete": "Radera",
+        "name": "Namn",
+        "date": "Datum",
+        "lastActiveTime": "Senast aktiv",
+        "from": "Från",
+        "user": "Användare",
+        "aboutProgram": "Om",
+        "version": "Version",
+        "commitNoun": "Skicka",
+        "newUser": "Ny användare",
+        "profile": "Profil",
+        "unknown": "Okänd",
+        "label": "Etikett",
+        "announce": "Meddela",
+        "subject": "E-postämne",
+        "message": "Meddelande",
+        "variables": "Variabler",
+        "preview": "Förhandsvisning",
+        "reset": "Återställ",
+        "edit": "Redigera",
+        "customizeMessages": "Anpassa e-post",
+        "customizeMessagesDescription": "Om du inte vill använda jfa-go's e-postmallar, så kan du skapa dina egna med Markdown.",
+        "markdownSupported": "Markdown stöds.",
+        "modifySettings": "Ändra inställningar",
+        "modifySettingsDescription": "Tillämpa inställningar från en befintlig profil eller kopiera dem direkt från en användare.",
+        "applyHomescreenLayout": "Tillämpa hemskärmslayout",
+        "sendDeleteNotificationEmail": "Skicka notifikations e-postmeddelande",
+        "sendDeleteNotifiationExample": "Ditt konto har raderats.",
+        "settingsRestart": "Omstart",
+        "settingsRestarting": "Startar om…",
+        "settingsRestartRequired": "Omstart krävs",
+        "settingsRestartRequiredDescription": "En omstart är nödvändig för att tillämpa vissa inställningar du ändrat. Starta om nu eller senare?",
+        "settingsApplyRestartLater": "Tillämpa, men starta om senare",
+        "settingsApplyRestartNow": "Tillämpa och starta om",
+        "settingsApplied": "Inställningarna tillämpade.",
+        "settingsRefreshPage": "Uppdatera sidan om några sekunder.",
+        "settingsRequiredOrRestartMessage": "Notera: {n} anger ett obligatoriskt fält, {n} anger att ändringar kräver omstart.",
+        "settingsSave": "Spara",
+        "ombiUserDefaults": "Ombi standardanvändare",
+        "ombiUserDefaultsDescription": "Skapa en Ombi-användare och konfigurera denna, välj sedan denna här nedan. Inställningar/behörigheter lagras och tillämpas på nya Ombi-användare som skapats av jfa-go",
+        "userProfiles": "Användarprofiler",
+        "userProfilesDescription": "Profiler tillämpas på användare när de skapar ett konto. En profil inkluderar biblioteksåtkomsträttigheter och layout på hemskärmen.",
+        "userProfilesIsDefault": "Standard",
+        "userProfilesLibraries": "Bibliotek",
+        "addProfile": "Lägg till profil",
+        "addProfileDescription": "Skapa en Jellyfin-användare och konfigurera samt välj denna här nedan. När den här profilen tillämpas på en inbjudan skapas nya användare med inställningarna.",
+        "addProfileNameOf": "Profilnamn",
+        "addProfileStoreHomescreenLayout": "Lagra hemskärmslayout",
+        "inviteNoUsersCreated": "Ingen än!",
+        "inviteUsersCreated": "Skapade användare",
+        "inviteNoProfile": "Ingen profil",
+        "inviteDateCreated": "Skapad",
+        "inviteRemainingUses": "Återstående användningar",
+        "inviteNoInvites": "Ingen",
+        "inviteExpiresInTime": "Går ut om {n}",
+        "notifyEvent": "Meddela den:",
+        "notifyInviteExpiry": "Vid utgång",
+        "notifyUserCreation": "Vid användarskapande",
+        "disabled": "Inaktiverad",
+        "enabled": "Aktiverad",
+        "inviteDuration": "Varaktighet för inbjudan",
+        "admin": "Admin",
+        "expiry": "Löper ut",
+        "userExpiry": "Användarutgång",
+        "userExpiryDescription": "Efter en angiven tid efter varje registrering så tar jfa-go bort/inaktiverar kontot. Du kan ändra detta beteende i inställningarna.",
+        "extendExpiry": "Förläng utgång"
+    },
+    "notifications": {
+        "changedEmailAddress": "Ändrad e-postadress för {n}.",
+        "userCreated": "Användaren {n} har skapats.",
+        "createProfile": "Skapad profil {n}.",
+        "saveSettings": "Inställningar sparades",
+        "saveEmail": "E-post sparad.",
+        "sentAnnouncement": "Meddelande skickat.",
+        "setOmbiDefaults": "Lagrade ombi-standardvärden.",
+        "errorConnection": "Det gick inte att ansluta till jfa-go.",
+        "error401Unauthorized": "Obehörig. Prova att uppdatera sidan.",
+        "errorSettingsAppliedNoHomescreenLayout": "Inställningarna tillämpades, men tillämpningen av hemskärmslayout kan ha misslyckats.",
+        "errorHomescreenAppliedNoSettings": "Hemskärmslayout tillämpades, men tillämpningen av inställningar kan ha misslyckats.",
+        "errorSettingsFailed": "Tillämpning misslyckades.",
+        "errorLoginBlank": "Användarnamnet och/eller lösenordet lämnades tomt.",
+        "errorUnknown": "Okänt fel.",
+        "errorSaveEmail": "Det gick inte att spara e-postmeddelandet.",
+        "errorBlankFields": "Fält lämnades tomma",
+        "errorDeleteProfile": "Det gick inte att ta bort profilen {n}",
+        "errorLoadProfiles": "Det gick inte att läsa in profiler.",
+        "errorCreateProfile": "Det gick inte att skapa profilen {n}",
+        "errorSetDefaultProfile": "Det gick inte att ange standardprofil.",
+        "errorLoadUsers": "Det gick inte att läsa in användare.",
+        "errorSaveSettings": "Det gick inte att spara inställningarna.",
+        "errorLoadSettings": "Det gick inte att läsa in inställningarna.",
+        "errorSetOmbiDefaults": "Det gick inte att lagra ombi-standardvärden.",
+        "errorLoadOmbiUsers": "Det gick inte att ladda ombi-användare.",
+        "errorChangedEmailAddress": "Det gick inte att ändra e-postadressen för {n}.",
+        "errorFailureCheckLogs": "Misslyckades (kontrollera konsol/loggar)",
+        "errorPartialFailureCheckLogs": "Partiellt fel (kontrollera konsol/loggarna)",
+        "errorUserCreated": "Det gick inte att skapa användaren {n}.",
+        "errorSendWelcomeEmail": "Det gick inte att skicka välkomstmail (kontrollera konsol/loggar)"
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "Ändra inställningar för {n} användare",
+            "plural": "Ändra inställningar för {n} användare"
+        },
+        "deleteNUsers": {
+            "singular": "Ta bort {n} användare",
+            "plural": "Ta bort {n} användare"
+        },
+        "addUser": {
+            "singular": "Lägg till användare",
+            "plural": "Lägg till användare"
+        },
+        "deleteUser": {
+            "singular": "Radera användare",
+            "plural": "Radera användare"
+        },
+        "deletedUser": {
+            "singular": "{N} användare borttagen.",
+            "plural": "{N} användare har tagits bort."
+        },
+        "announceTo": {
+            "singular": "Meddela till {n} användare",
+            "plural": "Meddela till {n} användare"
+        },
+        "appliedSettings": {
+            "singular": "Tillämpade inställningar för {n} användare.",
+            "plural": "Tillämpade inställningar för {n} användare."
+        },
+        "extendExpiry": {
+            "plural": "Förläng utgången för {n} användare",
+            "singular": "Förläng utgången för {n} användare"
+        },
+        "extendedExpiry": {
+            "singular": "Utökad giltighetstid för {n} användare.",
+            "plural": "Utökad giltighetstid för {n} användare."
+        }
+    }
+}

lang/common/de-de.json

@@ -8,8 +8,12 @@
         "password": "Passwort",
         "emailAddress": "E-Mail-Adresse",
         "submit": "Absenden",
-        "success": "Erfolg",
+        "success": "Erfolgreich",
         "error": "Fehler",
-        "theme": "Thema"
+        "copy": "Kopieren",
+        "theme": "Thema",
+        "time24h": "24h-Format",
+        "time12h": "12h-Format",
+        "copied": "Kopiert"
     }
 }

lang/common/el-gr.json

@@ -10,6 +10,10 @@
         "submit": "Καταχώρηση",
         "success": "Επιτυχία",
         "error": "Σφάλμα",
-        "theme": "Θέμα"
+        "copy": "Αντιγραφή",
+        "theme": "Θέμα",
+        "time24h": "24 Ώρες",
+        "time12h": "12 Ώρες",
+        "copied": "Αντιγράφηκε"
     }
 }

lang/common/en-gb.json

@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "name": "English (GB)"
+    }
+}

lang/common/en-us.json

@@ -10,6 +10,13 @@
         "submit": "Submit",
         "success": "Success",
         "error": "Error",
+        "copy": "Copy",
+        "copied": "Copied",
+        "time24h": "24h Time",
+        "time12h": "12h Time",
+        "linkTelegram": "Link Telegram",
+        "contactEmail": "Contact through Email",
+        "contactTelegram": "Contact through Telegram",
         "theme": "Theme"
     }
 }

lang/common/es-es.json

@@ -0,0 +1,19 @@
+{
+    "meta": {
+        "name": "Español(ES)"
+    },
+    "strings": {
+        "username": "Nombre de usuario",
+        "password": "Contraseña",
+        "emailAddress": "Dirección de correo electrónico",
+        "name": "Nombre",
+        "submit": "Enviar",
+        "success": "Éxito",
+        "error": "Error",
+        "copy": "Copiar",
+        "copied": "Copiado",
+        "time24h": "24 horas",
+        "time12h": "24 horas",
+        "theme": "Tema"
+    }
+}

lang/common/fr-fr.json

@@ -11,6 +11,9 @@
         "submit": "Soumettre",
         "success": "Succès",
         "error": "Erreur",
+        "copy": "Copier",
+        "time24h": "Temps 24h",
+        "time12h": "Temps 12h",
         "theme": "Thème"
     }
 }

lang/common/id-id.json

@@ -10,6 +10,9 @@
         "submit": "Submit",
         "success": "Sukses",
         "error": "Error",
+        "copy": "Salin",
+        "time24h": "Waktu 24 jam",
+        "time12h": "Waktu 12 jam",
         "theme": "Tema"
     }
 }

lang/common/nl-nl.json

@@ -10,6 +10,10 @@
         "submit": "Verstuur",
         "success": "Success",
         "error": "Fout",
-        "theme": "Thema"
+        "copy": "Kopiëer",
+        "theme": "Thema",
+        "time24h": "24u-formaat",
+        "time12h": "12u-formaat",
+        "copied": "Gekopieerd"
     }
 }

lang/common/pt-br.json

@@ -10,6 +10,10 @@
         "submit": "Enviar",
         "success": "Sucesso",
         "error": "Erro",
-        "theme": "Tema"
+        "copy": "Copiar",
+        "theme": "Tema",
+        "time24h": "Horário 24h",
+        "time12h": "Horário 12h",
+        "copied": "Copiado"
     }
 }

lang/common/sv-se.json

@@ -0,0 +1,18 @@
+{
+    "meta": {
+        "name": "Svenska (SV)"
+    },
+    "strings": {
+        "username": "Användarnamn",
+        "password": "Lösenord",
+        "emailAddress": "E-postadress",
+        "name": "Namn",
+        "submit": "Skicka",
+        "success": "Lyckades",
+        "error": "Fel",
+        "copy": "Kopiera",
+        "time24h": "24 timmarsklocka",
+        "time12h": "12 timmarsklocka",
+        "theme": "Tema"
+    }
+}

lang/email/de-de.json

@@ -4,49 +4,62 @@
     },
     "strings": {
         "ifItWasNotYou": "Wenn du das nicht warst, ignoriere bitte diese E-Mail.",
-        "helloUser": "Hallo {n},"
+        "reason": "Grund",
+        "helloUser": "Hallo {username},"
     },
     "userCreated": {
         "title": "Mitteilung: Benutzer erstellt",
-        "aUserWasCreated": "Ein Benutzer wurde unter Verwendung des Codes {n] erstellt.",
+        "aUserWasCreated": "Ein Benutzer wurde unter Verwendung des Codes {code} erstellt.",
         "time": "Zeit",
-        "notificationNotice": "Hinweis: Benachrichtigungs-E-Mails können auf dem Administrator-Dashboard umgeschalten werden."
+        "notificationNotice": "Hinweis: Benachrichtigungs-E-Mails können auf dem Administrator-Dashboard umgeschalten werden.",
+        "name": "Benutzererstellung"
     },
     "inviteExpiry": {
         "title": "Mitteilung: Invite abgelaufen",
         "inviteExpired": "Invite abgelaufen.",
-        "expiredAt": "Code {n} lief um {n} ab.",
-        "notificationNotice": "Hinweis: Benachrichtigungs-E-Mails können auf dem Administrator-Dashboard umgeschalten werden."
+        "expiredAt": "Code {code} lief um {time} ab.",
+        "notificationNotice": "Hinweis: Benachrichtigungs-E-Mails können auf dem Administrator-Dashboard umgeschalten werden.",
+        "name": "Invite Ablaufdatum"
     },
     "passwordReset": {
         "title": "Passwortzurücksetzung angefordert - Jellyfin",
         "someoneHasRequestedReset": "Jemand hat vor kurzem eine Passwortzurücksetzung auf Jellyfin angefordert.",
         "ifItWasYou": "Wenn du das warst, gib die PIN unten in die Eingabeaufforderung ein.",
-        "codeExpiry": "Der Code wird am {n}, um [n} UTC ablaufen, was in {n} ist.",
-        "pin": "PIN"
+        "codeExpiry": "Der Code wird am {date}, um {time} UTC ablaufen, was in {expiresInMinutes} ist.",
+        "pin": "PIN",
+        "name": "Passwortzurücksetzung"
     },
     "userDeleted": {
         "title": "Dein Konto wurde gelöscht - Jellyfin",
         "yourAccountWasDeleted": "Dein Jellyfin-Konto wurde gelöscht.",
-        "reason": "Grund"
+        "name": "Benutzerlöschung"
     },
     "inviteEmail": {
         "title": "Invite - Jellyfin",
         "hello": "Hallo",
         "youHaveBeenInvited": "Du wurdest zu Jellyfin eingeladen.",
         "toJoin": "Um beizutreten, folge dem untenstehenden Link.",
-        "inviteExpiry": "Dieser Invite wird am {n}; um {n} ablaufen, was in {n} ist, also handle schnell.",
-        "linkButton": "Richte dein Konto ein"
+        "inviteExpiry": "Dieser Invite wird am {date}; um {time} ablaufen, was in {expiresInMinutes} ist, also handle schnell.",
+        "linkButton": "Richte dein Konto ein",
+        "name": "Einladungs-E-Mail"
     },
     "welcomeEmail": {
         "title": "Wilkommen bei Jellyfin",
         "welcome": "Willkommen bei Jellyfin!",
         "youCanLoginWith": "Du kannst dich mit den mit den untenstehenden Zugangsdaten anmelden",
-        "jellyfinURL": "URL"
+        "jellyfinURL": "URL",
+        "name": "Willkommens-E-Mail"
     },
     "emailConfirmation": {
         "title": "Bestätige deine E-Mail - Jellyfin",
         "clickBelow": "Klicke den untenstehenden Link, um deine E-Mail-Adresse zu bestätigen, und fange an, Jellyfin zu benutzen.",
-        "confirmEmail": "E-Mail bestätigen"
+        "confirmEmail": "E-Mail bestätigen",
+        "name": "Bestätigungs-E-Mail"
+    },
+    "userExpired": {
+        "name": "Benutzer Ablaufdatum",
+        "title": "Dein Konto ist abgelaufen - Jellyfin",
+        "yourAccountHasExpired": "Dein Konto ist abgelaufen.",
+        "contactTheAdmin": "Kontaktiere den Administrator für weitere Informationen."
     }
 }

lang/email/el-gr.json

@@ -4,49 +4,74 @@
     },
     "strings": {
         "ifItWasNotYou": "Αν δεν ήσασταν εσείς, παρακαλώ αγνοήστε αυτό το email.",
-        "helloUser": "Γεία σου {n},"
+        "reason": "Λόγος",
+        "helloUser": "Γεία σου {username},"
     },
     "userCreated": {
         "title": "Σημείωση: Δημιουργήθηκε χρήστης",
-        "aUserWasCreated": "Δημιουργήθηκε ένας χρήστης χρησιμοποιώντας τον κωδικό {n}.",
+        "aUserWasCreated": "Δημιουργήθηκε ένας χρήστης χρησιμοποιώντας τον κωδικό {code}.",
         "time": "Ώρα",
-        "notificationNotice": "Σημείωση: Τα email ειδοποιήσεων μπορούν να ενεργοποιηθούν στον πίνακα ελέγχου διαχειριστή."
+        "notificationNotice": "Σημείωση: Τα email ειδοποιήσεων μπορούν να ενεργοποιηθούν στον πίνακα ελέγχου διαχειριστή.",
+        "name": "Δημιουργία χρήστη"
     },
     "inviteExpiry": {
         "title": "Σημείωση: Η πρόσκληση έληξε",
         "inviteExpired": "Η πρόσκληση έληξε.",
-        "expiredAt": "Ο κωδικός {n} έληξε στις {n}.",
-        "notificationNotice": "Σημείωση: Τα email ειδοποιήσεων μπορούν να ενεργοποιηθούν στον πίνακα ελέγχου διαχειριστή."
+        "expiredAt": "Ο κωδικός {code} έληξε στις {time}.",
+        "notificationNotice": "Σημείωση: Τα email ειδοποιήσεων μπορούν να ενεργοποιηθούν στον πίνακα ελέγχου διαχειριστή.",
+        "name": "Λήξη πρόσκλησης"
     },
     "passwordReset": {
         "title": "Ζητήθηκε επαναφορά κωδικού πρόσβασης - Jellyfin",
         "someoneHasRequestedReset": "Κάποιος ζήτησε πρόσφατα επαναφορά κωδικού πρόσβασης στο Jellyfin.",
         "ifItWasYou": "Εάν ήσασταν εσείς, εισαγάγετε το πιν στο πεδίο.",
-        "codeExpiry": "Ο κωδικός θα λήξει στις {n}, στις {n} UTC, το οποίο είναι σε {n}.",
-        "pin": "PIN"
+        "codeExpiry": "Ο κωδικός θα λήξει στις {date}, στις {time} UTC, το οποίο είναι σε {expiresInMinutes}.",
+        "pin": "PIN",
+        "name": "Επαναφορά κωδικού πρόσβασης",
+        "ifItWasYouLink": "Εάν ήσασταν εσείς, κάντε κλικ στον παρακάτω σύνδεσμο."
     },
     "userDeleted": {
         "title": "Ο λογαριασμός σας διαγράφηκε - Jellyfin",
         "yourAccountWasDeleted": "Ο λογαριασμός σας Jellyfin διαγράφηκε.",
-        "reason": "Λόγος"
+        "name": "Διαγραφή χρήστη"
     },
     "inviteEmail": {
         "title": "Πρόσκληση - Jellyfin",
         "hello": "Γειά",
         "youHaveBeenInvited": "Έχετε προσκληθεί στο Jellyfin.",
         "toJoin": "Για να συμμετέχετε, ακολουθήστε τον παρακάτω σύνδεσμο.",
-        "inviteExpiry": "Αυτή η πρόσκληση θα λήξει στις {n} στις {n}, που είναι σε {n}, οπότε ενεργήστε γρήγορα.",
-        "linkButton": "Ρυθμίστε τον λογαριασμό σας"
+        "inviteExpiry": "Αυτή η πρόσκληση θα λήξει στις {date} στις {time}, που είναι σε {expiresInMinutes}, οπότε ενεργήστε γρήγορα.",
+        "linkButton": "Ρυθμίστε τον λογαριασμό σας",
+        "name": "Email πρόσκλησης"
     },
     "welcomeEmail": {
         "title": "Καλώς ήλθατε στο Jellyfin",
         "welcome": "Καλώς ήλθατε στο Jellyfin!",
         "youCanLoginWith": "Μπορείτε να συνδεθείτε με τα παρακάτω στοιχεία",
-        "jellyfinURL": "URL"
+        "jellyfinURL": "URL",
+        "name": "Email καλωσορίσματος",
+        "yourAccountWillExpire": "Ο λογαριασμός σας θα λήξει στις {date}."
     },
     "emailConfirmation": {
         "title": "Επιβεβαιώστε το email σας - Jellyfin",
         "clickBelow": "Κάντε κλικ στον παρακάτω σύνδεσμο για να επιβεβαιώσετε τη διεύθυνση email σας και ξεκινήστε να χρησιμοποιείτε το Jellyfin.",
-        "confirmEmail": "Επιβεβαίωση Email"
+        "confirmEmail": "Επιβεβαίωση Email",
+        "name": "Email επιβεβαίωσης"
+    },
+    "userExpired": {
+        "name": "Λήξη Χρήστη",
+        "title": "Ο λογαριασμός σας έληξε - Jellyfin",
+        "yourAccountHasExpired": "Ο λογαριασμός σας έχει λήξει.",
+        "contactTheAdmin": "Επικοινωνήστε με τον διαχειριστή για περισσότερες πληροφορίες."
+    },
+    "userDisabled": {
+        "name": "Ο χρήστης απενεργοποιήθηκε",
+        "title": "Ο λογαριασμός σας έχει απενεργοποιηθεί - Jellyfin",
+        "yourAccountWasDisabled": "Ο λογαριασμός σας απενεργοποιήθηκε."
+    },
+    "userEnabled": {
+        "title": "Ο λογαριασμός σας έχει ενεργοποιηθεί ξανά - Jellyfin",
+        "name": "Ο χρήστης ενεργοποιήθηκε",
+        "yourAccountWasEnabled": "Ο λογαριασμός σας ενεργοποιήθηκε εκ νέου."
     }
 }

lang/email/en-gb.json

@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "name": "English (GB)"
+    }
+}

lang/email/en-us.json

@@ -3,50 +3,75 @@
         "name": "English (US)"
     },
     "strings": {
-        "ifItWasNotYou": "If this wasn't you, please ignore this email.",
-        "helloUser": "Hi {n},"
+        "ifItWasNotYou": "If this wasn't you, please ignore this.",
+        "helloUser": "Hi {username},",
+        "reason": "Reason"
     },
     "userCreated": {
+        "name": "User creation",
         "title": "Notice: User created",
-        "aUserWasCreated": "A user was created using code {n}.",
+        "aUserWasCreated": "A user was created using code {code}.",
         "time": "Time",
         "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard."
     },
     "inviteExpiry": {
+        "name": "Invite expiry",
         "title": "Notice: Invite expired",
         "inviteExpired": "Invite expired.",
-        "expiredAt": "Code {n} expired at {n}.",
+        "expiredAt": "Code {code} expired at {time}.",
         "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard."
     },
     "passwordReset": {
+        "name": "Password reset",
         "title": "Password reset requested - Jellyfin",
         "someoneHasRequestedReset": "Someone has recently requested a password reset on Jellyfin.",
         "ifItWasYou": "If this was you, enter the pin below into the prompt.",
-        "codeExpiry": "The code will expire on {n}, at {n} UTC, which is in {n}.",
+        "ifItWasYouLink": "If this was you, click the link below.",
+        "codeExpiry": "The code will expire on {date}, at {time} UTC, which is in {expiresInMinutes}.",
         "pin": "PIN"
     },
     "userDeleted": {
+        "name": "User deletion",
         "title": "Your account was deleted - Jellyfin",
-        "yourAccountWasDeleted": "Your Jellyfin account was deleted.",
-        "reason": "Reason"
+        "yourAccountWasDeleted": "Your Jellyfin account was deleted."
+    },
+    "userDisabled": {
+        "name": "User disabled",
+        "title": "Your account has been disabled - Jellyfin",
+        "yourAccountWasDisabled": "Your account was disabled."
+    },
+    "userEnabled": {
+        "name": "User enabled",
+        "title": "Your account has been re-enabled - Jellyfin",
+        "yourAccountWasEnabled": "Your account was re-enabled."
     },
     "inviteEmail": {
+        "name": "Invite email",
         "title": "Invite - Jellyfin",
         "hello": "Hi",
         "youHaveBeenInvited": "You've been invited to Jellyfin.",
         "toJoin": "To join, follow the below link.",
-        "inviteExpiry": "This invite will expire on {n} at {n}, which is in {n}, so act quick.",
+        "inviteExpiry": "This invite will expire on {date} at {time}, which is in {expiresInMinutes}, so act quick.",
         "linkButton": "Setup your account"
     },
     "welcomeEmail": {
+        "name": "Welcome",
         "title": "Welcome to Jellyfin",
         "welcome": "Welcome to Jellyfin!",
         "youCanLoginWith": "You can login with the details below",
+        "yourAccountWillExpire": "Your account will expire on {date}.",
         "jellyfinURL": "URL"
     },
     "emailConfirmation": {
+        "name": "Confirmation email",
         "title": "Confirm your email - Jellyfin",
         "clickBelow": "Click the link below to confirm your email address and start using Jellyfin.",
         "confirmEmail": "Confirm Email"
+    },
+    "userExpired": {
+        "name": "User expiry",
+        "title": "Your account has expired - Jellyfin",
+        "yourAccountHasExpired": "Your account has expired.",
+        "contactTheAdmin": "Contact the administrator for more info."
     }
 }

lang/email/es-es.json

@@ -0,0 +1,77 @@
+{
+    "meta": {
+        "name": "Español(ES)"
+    },
+    "strings": {
+        "ifItWasNotYou": "Si no fue usted, ignore este correo electrónico.",
+        "helloUser": "Hola {username},",
+        "reason": "Razón"
+    },
+    "userCreated": {
+        "name": "Creación de usuarios",
+        "title": "Noticia: Usuario creado",
+        "aUserWasCreated": "Se creó un usuario con el código {code}.",
+        "time": "Hora",
+        "notificationNotice": "Nota: los correos electrónicos de notificación se pueden alternar en el panel de administración."
+    },
+    "inviteExpiry": {
+        "name": "Vencimiento de la invitación",
+        "title": "Aviso: Invitación caducada",
+        "inviteExpired": "Invitación caducada.",
+        "expiredAt": "El código {code} venció a las {time}.",
+        "notificationNotice": "Nota: Los correos electrónicos de notificación se pueden alternar en el panel de administración."
+    },
+    "passwordReset": {
+        "name": "Restablecimiento de contraseña",
+        "title": "Solicitud de restablecimiento de contraseña - Jellyfin",
+        "someoneHasRequestedReset": "Alguien ha solicitado recientemente un restablecimiento de contraseña en Jellyfin.",
+        "ifItWasYou": "Si era usted, ingrese el pin a continuación en el mensaje.",
+        "ifItWasYouLink": "Si fue usted, haga clic en el enlace de abajo.",
+        "codeExpiry": "El código vencerá el {date}, a las {time} UTC, que está en {expiresInMinutes}.",
+        "pin": "PIN"
+    },
+    "userDeleted": {
+        "name": "Eliminación de usuario",
+        "title": "Su cuenta fue eliminada - Jellyfin",
+        "yourAccountWasDeleted": "Su cuenta de Jellyfin fue eliminada."
+    },
+    "userDisabled": {
+        "name": "Usuario deshabilitado",
+        "title": "Su cuenta ha sido deshabilitada - Jellyfin",
+        "yourAccountWasDisabled": "Su cuenta fue inhabilitada."
+    },
+    "userEnabled": {
+        "name": "Usuario habilitado",
+        "title": "Su cuenta ha sido reactivada - Jellyfin",
+        "yourAccountWasEnabled": "Su cuenta se volvió a habilitar."
+    },
+    "inviteEmail": {
+        "name": "Correo electrónico",
+        "title": "Invitar - Jellyfin",
+        "hello": "Hola",
+        "youHaveBeenInvited": "Has sido invitado a Jellyfin.",
+        "toJoin": "Para unirse, siga el enlace a continuación.",
+        "inviteExpiry": "Esta invitación vencerá el {date} a las {time}, que está en {expiresInMinutes}, así que regístrese cuanto antes.",
+        "linkButton": "Configurar tu cuenta"
+    },
+    "welcomeEmail": {
+        "name": "Correo de bienvenida",
+        "title": "Bienvenido a Jellyfin",
+        "welcome": "¡Bienvenido a Jellyfin!",
+        "youCanLoginWith": "Puede iniciar sesión con los detalles a continuación",
+        "yourAccountWillExpire": "Su cuenta vencerá el {date}.",
+        "jellyfinURL": "URL"
+    },
+    "emailConfirmation": {
+        "name": "Email de confirmación",
+        "title": "Confirma tu correo electrónico - Jellyfin",
+        "clickBelow": "Haga clic en el enlace de abajo para confirmar su dirección de correo electrónico y comenzar a usar Jellyfin.",
+        "confirmEmail": "Confirmar correo electrónico"
+    },
+    "userExpired": {
+        "name": "Caducidad del usuario",
+        "title": "Tu cuenta ha caducado - Jellyfin",
+        "yourAccountHasExpired": "Tu cuenta ha expirado.",
+        "contactTheAdmin": "Comuníquese con el administrador para obtener más información."
+    }
+}

lang/email/fr-fr.json

@@ -5,49 +5,74 @@
     },
     "strings": {
         "ifItWasNotYou": "Si ce n'était pas toi, tu peux ignorer ce mail.",
-        "helloUser": "Salut {n},"
+        "reason": "Motif",
+        "helloUser": "Salut {username},"
     },
     "userCreated": {
         "title": "Notification : Utilisateur créé",
-        "aUserWasCreated": "Un utilisateur a été créé avec ce code {n}.",
+        "aUserWasCreated": "Un utilisateur a été créé avec ce code {code}.",
         "time": "Date",
-        "notificationNotice": "Note : Les emails de notification peuvent être activés sur le tableau de bord administrateur."
+        "notificationNotice": "Note : Les emails de notification peuvent être activés sur le tableau de bord administrateur.",
+        "name": "Création d'utilisateur"
     },
     "inviteExpiry": {
         "title": "Notification : Invitation expirée",
         "inviteExpired": "Invitation expirée.",
-        "expiredAt": "Le code {n} a expiré à {n}.",
-        "notificationNotice": "Note : Les emails de notification peuvent être activés sur le tableau de bord administrateur."
+        "expiredAt": "Le code {code} a expiré à {time}.",
+        "notificationNotice": "Note : Les emails de notification peuvent être activés sur le tableau de bord administrateur.",
+        "name": "Expiration de l'invitation"
     },
     "passwordReset": {
         "title": "Réinitialisation de mot du passe demandée - Jellyfin",
         "someoneHasRequestedReset": "Quelqu'un vient de demander une réinitialisation du mot de passe via Jellyfin.",
         "ifItWasYou": "Si c'était bien toi, renseigne le code PIN en dessous.",
-        "codeExpiry": "Ce code expirera le {n}, à {n} UTC, soit dans {n}.",
-        "pin": "PIN"
+        "codeExpiry": "Ce code expirera le {date}, à {time} UTC, soit dans {expiresInMinutes}.",
+        "pin": "PIN",
+        "name": "Réinitialisation du mot de passe",
+        "ifItWasYouLink": "Si c'était bien toi, clique sur le lien en dessous."
     },
     "userDeleted": {
         "title": "Ton compte a été désactivé - Jellyfin",
         "yourAccountWasDeleted": "Ton compte Jellyfin a été supprimé.",
-        "reason": "Motif"
+        "name": "Suppression de l'utilisateur"
     },
     "inviteEmail": {
         "title": "Invitation - Jellyfin",
         "hello": "Salut",
         "youHaveBeenInvited": "Tu as été invité à rejoindre Jellyfin.",
         "toJoin": "Pour continuer, suis le lien en dessous.",
-        "inviteExpiry": "L'invitation expirera le {n}, à {n}, soit dans {n}, alors fais vite !",
-        "linkButton": "Lien"
+        "inviteExpiry": "L'invitation expirera le {date}, à {time}, soit dans {expiresInMinutes}, alors fais vite.",
+        "linkButton": "Lien",
+        "name": "Courriel d'invitation"
     },
     "welcomeEmail": {
         "youCanLoginWith": "Tu peux te connecter avec les informations ci-dessous",
         "title": "Bienvenue sur Jellyfin",
         "welcome": "Bienvenue sur Jellyfin !",
-        "jellyfinURL": "URL"
+        "jellyfinURL": "URL",
+        "name": "Courriel de bienvenue",
+        "yourAccountWillExpire": "Ton compte expirera le {date}."
     },
     "emailConfirmation": {
         "title": "Confirmez votre adresse e-mail - Jellyfin",
         "clickBelow": "Clique sur le lien ci-dessous pour confirmer ton adresse e-mail et commencer à utiliser Jellyfin.",
-        "confirmEmail": "Confirmer l'adresse e-mail"
+        "confirmEmail": "Confirmer l'adresse e-mail",
+        "name": "Email de confirmation"
+    },
+    "userExpired": {
+        "contactTheAdmin": "Contacte l'administrateur pour plus d'informations.",
+        "name": "Utilisateur expiré",
+        "title": "Ton compte a expiré - Jellyfin",
+        "yourAccountHasExpired": "Ton compte a expiré."
+    },
+    "userDisabled": {
+        "name": "Utilisateur désactivé",
+        "title": "Ton compte a été désactivé - Jellyfin",
+        "yourAccountWasDisabled": "Ton compte a été désactivé."
+    },
+    "userEnabled": {
+        "name": "Utilisateur activé",
+        "title": "Ton compte a été ré-activé - Jellyfin",
+        "yourAccountWasEnabled": "Ton compte a été ré-activé."
     }
 }

lang/email/id-id.json

@@ -4,49 +4,56 @@
     },
     "strings": {
         "ifItWasNotYou": "Jika ini bukan kamu, silahkan mengabaikan email ini.",
-        "helloUser": "Halo {n},"
+        "reason": "Alasan",
+        "helloUser": "Halo {username},"
     },
     "userCreated": {
         "title": "Perhatian: User telah dibuat",
-        "aUserWasCreated": "User telah dibuat menggunakan kode {n}.",
+        "aUserWasCreated": "User telah dibuat menggunakan kode {code}.",
         "time": "Waktu",
-        "notificationNotice": "Catatan: Email notifikasi dapat diganti pada dasbor admin."
+        "notificationNotice": "Catatan: Email notifikasi dapat diganti pada dasbor admin.",
+        "name": "Pembuatan pengguna"
     },
     "inviteExpiry": {
         "title": "Perhatian: Undangan telah kadaluarsa",
         "inviteExpired": "Undangan telah kadaluarsa.",
-        "expiredAt": "Kode {n} kadaluarsa pada {n}.",
-        "notificationNotice": "Catatan: Email notifikasi dapat diganti pada dasbor admin."
+        "expiredAt": "Kode {code} kadaluarsa pada {time}.",
+        "notificationNotice": "Catatan: Email notifikasi dapat diganti pada dasbor admin.",
+        "name": "Waktu kedaluwarsa undangan"
     },
     "passwordReset": {
         "title": "Reset password telah di-request - Jellyfin",
         "someoneHasRequestedReset": "Seseorang baru saja me-request reset password pada Jellyfin.",
         "ifItWasYou": "Jika ini adalah benar anda, masukkan pin dibawah ke dalam tempat yang sudah disediakan.",
-        "codeExpiry": "Kode akan kadaluarsa pada {n}, pada waktu {n} UTC, yaitu dalam {n}.",
-        "pin": "PIN"
+        "codeExpiry": "Kode akan kadaluarsa pada {date}, pada waktu {time} UTC, yaitu dalam {expiresInMinutes}.",
+        "pin": "PIN",
+        "name": "Atur ulang kata sandi"
     },
     "userDeleted": {
         "title": "Akun anda telah dihapus - Jellyfin",
         "yourAccountWasDeleted": "Akun Jellyfin anda telah dihapus.",
-        "reason": "Alasan"
+        "name": "Penghapusan pengguna"
     },
     "inviteEmail": {
         "title": "Undangan - Jellyfin",
         "hello": "Halo",
         "youHaveBeenInvited": "Anda telah diundang ke Jellyfin.",
         "toJoin": "Untuk masuk, silahkan ikuti link dibawah ini.",
-        "inviteExpiry": "Undangan ini akan berakhir dalam {n} pada {n}, yaitu dalam {n}, jadi bergegaslah.",
-        "linkButton": "Persiapkan akunmu"
+        "inviteExpiry": "Undangan ini akan berakhir dalam {date} pada {time}, yaitu dalam {expiresInMinutes}, jadi bergegaslah.",
+        "linkButton": "Persiapkan akunmu",
+        "name": "Email Undangan"
     },
     "welcomeEmail": {
         "title": "Selamat datang di Jellyfin",
         "welcome": "Selamat datang di Jellyfin!",
         "youCanLoginWith": "Anda dapat masuk dengan menggunakan data dibawah ini",
-        "jellyfinURL": "URL"
+        "jellyfinURL": "URL",
+        "name": "Email selamat datang"
     },
     "emailConfirmation": {
         "title": "Konfirmasi emailmu - Jellyfin",
         "clickBelow": "Klik link dibawah ini untuk mengkonfirmasikan alamat emailmu untuk mulai menggunakan Jellyfin.",
-        "confirmEmail": "Konfirmasi Email"
+        "confirmEmail": "Konfirmasi Email",
+        "name": "Email konfirmasi"
     }
 }

lang/email/it-it.json

@@ -0,0 +1,52 @@
+{
+    "meta": {
+        "name": "Italiano (IT)"
+    },
+    "strings": {
+        "ifItWasNotYou": "Se non sei stato tu, puoi ignorare questa email.",
+        "helloUser": "Ciao {username},",
+        "reason": "Motivo"
+    },
+    "userCreated": {
+        "title": "Nota: Utente creato",
+        "aUserWasCreated": "Un utente è stato creato usando il codice {code}.",
+        "time": "Tempo",
+        "notificationNotice": "Nota: Le notifiche via email possono essere attivate nel pannello di admin."
+    },
+    "inviteExpiry": {
+        "title": "Nota: Invito scaduto",
+        "inviteExpired": "Invito scaduto.",
+        "expiredAt": "Il codice {code} è scaduto il {time}.",
+        "notificationNotice": "Nota: le e-mail di notifica possono essere attivate dal pannello di admin."
+    },
+    "passwordReset": {
+        "title": "Richiesto un reset della password - Jellyfin",
+        "someoneHasRequestedReset": "Qualcuno ha recentemente richiesto un reset della password su Jellyfin.",
+        "ifItWasYou": "Se sei stato tu, scrivi il PIN sotto alla richiesta.",
+        "codeExpiry": "Il codice scadrà in {date}, alle {time} UTC, che è alle {expiresInMinutes}.",
+        "pin": "PIN"
+    },
+    "userDeleted": {
+        "title": "Il tuo account è stato eliminato - Jellyfin",
+        "yourAccountWasDeleted": "Il tuo account di Jellyfin è stato eliminato."
+    },
+    "inviteEmail": {
+        "title": "Invita - Jellyfin",
+        "hello": "Salve",
+        "youHaveBeenInvited": "Sei stato inviatato su Jellyfin.",
+        "toJoin": "Per entrare, segui il link sotto.",
+        "inviteExpiry": "",
+        "linkButton": ""
+    },
+    "welcomeEmail": {
+        "title": "",
+        "welcome": "",
+        "youCanLoginWith": "",
+        "jellyfinURL": ""
+    },
+    "emailConfirmation": {
+        "title": "",
+        "clickBelow": "",
+        "confirmEmail": ""
+    }
+}

lang/email/nl-nl.json

@@ -4,49 +4,74 @@
     },
     "strings": {
         "ifItWasNotYou": "Als jij dit niet was, negeer dan alsjeblieft deze email.",
-        "helloUser": "Hoi {n},"
+        "reason": "Reden",
+        "helloUser": "Hoi {username},"
     },
     "userCreated": {
         "title": "Melding: Gebruiker aangemaakt",
-        "aUserWasCreated": "Er is een gebruiker aangemaakt door gebruik te maken van code {n}.",
+        "aUserWasCreated": "Er is een gebruiker aangemaakt door gebruik te maken van code {code}.",
         "time": "Tijdstip",
-        "notificationNotice": "Opmerking: Meldingsemails kunnen worden aan- of uitgezet via het admin dashboard."
+        "notificationNotice": "Opmerking: Meldingse-mails kunnen worden aan- of uitgezet via het beheerdersdashboard.",
+        "name": "Gebruiker aangemaakt"
     },
     "inviteExpiry": {
         "title": "Melding: Uitnodiging verlopen",
         "inviteExpired": "Uitnodiging verlopen.",
-        "expiredAt": "Code {n} is verlopen op {n}.",
-        "notificationNotice": "Opmerking: Meldingsemails kunnen worden aan- of uitgezet via het admin dashboard."
+        "expiredAt": "Code {code} is verlopen op {time}.",
+        "notificationNotice": "Opmerking: Meldingse-mails kunnen worden aan- of uitgezet via het beheerdersdashboard.",
+        "name": "Uitnodiging verlopen"
     },
     "passwordReset": {
         "title": "Wachtwoordreset aangevraagd - Jellyfin",
         "someoneHasRequestedReset": "Iemand heeft recentelijk een wachtwoordreset aangevraagd in Jellyfin.",
-        "ifItWasYou": "Als jij dit was, voor dan onderstaande PIN in.",
-        "codeExpiry": "De code verloopt op {n}, op {n} UTC, dat is over {n}.",
-        "pin": "PIN"
+        "ifItWasYou": "Als jij dit was, voer dan onderstaande PIN in.",
+        "codeExpiry": "De code verloopt op {date}, op {time} UTC, dat is over {expiresInMinutes}.",
+        "pin": "PIN",
+        "name": "Wachtwoordreset",
+        "ifItWasYouLink": "Als jij dit was, klik dan op onderstaande link."
     },
     "userDeleted": {
         "title": "Je account is verwijderd - Jellyfin",
         "yourAccountWasDeleted": "Je Jellyfin account is verwijderd.",
-        "reason": "Reden"
+        "name": "Gebruiker verwijderd"
     },
     "inviteEmail": {
         "title": "Uitnodiging - Jellyfin",
         "hello": "Hoi",
         "youHaveBeenInvited": "Je bent uitgenodigd voor Jellyfin.",
         "toJoin": "Volg onderstaande link om door te gaan.",
-        "inviteExpiry": "Deze uitnodiging verloopt op {n}, om {n}, dat is over {n}, dus wees er snel bij.",
-        "linkButton": "Maak account aan"
+        "inviteExpiry": "Deze uitnodiging verloopt op {date}, om {time}, dat is over {expiresInMinutes}, dus wees er snel bij.",
+        "linkButton": "Maak account aan",
+        "name": "Uitnodigingse-mail"
     },
     "welcomeEmail": {
         "title": "Welkom bij Jellyfin",
         "welcome": "Welkom bij Jellyfin!",
         "youCanLoginWith": "Je kunt inloggen met onderstaande gegevens",
-        "jellyfinURL": "URL"
+        "jellyfinURL": "URL",
+        "name": "Welkomste-mail",
+        "yourAccountWillExpire": "Je account verloopt op {date}."
     },
     "emailConfirmation": {
         "title": "Bevestig je e-mailadres - Jellyfin",
         "clickBelow": "Klik op onderstaande link om je e-mailadres te bevestigen en te beginnen met Jellyfin.",
-        "confirmEmail": "Bevestig e-mailadres"
+        "confirmEmail": "Bevestig e-mailadres",
+        "name": "Bevestingingse-mail"
+    },
+    "userExpired": {
+        "name": "Gebruikersverloop",
+        "title": "Je account is verlopen - Jellyfin",
+        "yourAccountHasExpired": "Je account is verlopen.",
+        "contactTheAdmin": "Neem contact op met de beheerder voor meer info."
+    },
+    "userDisabled": {
+        "title": "Je account is uitgeschakeld - Jellyfin",
+        "name": "Gebruiker uitgeschakeld",
+        "yourAccountWasDisabled": "Je account is uitgeschakeld."
+    },
+    "userEnabled": {
+        "yourAccountWasEnabled": "Je account is opnieuw ingeschakeld.",
+        "name": "Gebruiker ingeschakeld",
+        "title": "Je account is opnieuw ingeschakeld - Jellyfin"
     }
 }

lang/email/pt-br.json

@@ -4,49 +4,74 @@
     },
     "strings": {
         "ifItWasNotYou": "Se não foi você, ignore este e-mail.",
-        "helloUser": "Ola {n},"
+        "reason": "Razão",
+        "helloUser": "Ola {username},"
     },
     "userCreated": {
         "title": "Aviso: Usuário criado",
-        "aUserWasCreated": "Um usuário foi criado usando o código {n}.",
+        "aUserWasCreated": "Um usuário foi criado usando o código {code}.",
         "time": "Tempo",
-        "notificationNotice": "Nota: Os emails de notificação podem ser alternados no painel do administrador."
+        "notificationNotice": "Nota: Os emails de notificação podem ser alternados no painel do administrador.",
+        "name": "Criação de usuário"
     },
     "inviteExpiry": {
         "title": "Aviso: Convite expirado",
         "inviteExpired": "Convite expirado.",
-        "expiredAt": "O código {n} expirou em {n}.",
-        "notificationNotice": "Nota: Os emails de notificação podem ser alternados no painel do administrador."
+        "expiredAt": "O código {code} expirou em {time}.",
+        "notificationNotice": "Nota: Os emails de notificação podem ser alternados no painel do administrador.",
+        "name": "Convite Expirado"
     },
     "passwordReset": {
         "title": "Redefinir senha foi solicitada - Jellyfin",
         "someoneHasRequestedReset": "Alguém recentemente solicitou uma redefinição de senha no Jellyfin.",
         "ifItWasYou": "Se foi você, insira o PIN abaixo.",
-        "codeExpiry": "O código irá expirar em {n}, ás {n}, que está em {n}.",
-        "pin": "PIN"
+        "codeExpiry": "O código irá expirar em {date}, ás {time}, que está em {expiresInMinutes}.",
+        "pin": "PIN",
+        "name": "Redefinir senha",
+        "ifItWasYouLink": "Se foi você, clique no link abaixo."
     },
     "userDeleted": {
         "title": "Sua conta foi excluída - Jellyfin",
         "yourAccountWasDeleted": "Sua conta Jellyfin foi excluída.",
-        "reason": "Razão"
+        "name": "Exclusão do usuário"
     },
     "inviteEmail": {
         "title": "Convite - Jellyfin",
         "hello": "Ola",
         "youHaveBeenInvited": "Você recebeu um convite para o Jellyfin.",
         "toJoin": "Para participar, clique no link abaixo.",
-        "inviteExpiry": "Este convite expira em {n} às {n}, que é em {n}, então seja rápido.",
-        "linkButton": "Crie sua conta"
+        "inviteExpiry": "Este convite expira em {date} às {time}, que é em {expiresInMinutes}, então seja rápido.",
+        "linkButton": "Crie sua conta",
+        "name": "Convide por email"
     },
     "welcomeEmail": {
         "title": "Bem vindo ao Jellyfin",
         "welcome": "Bem vindo ao Jellyfin!",
-        "youCanLoginWith": "Você pode fazer o login com os detalhes abaixo",
-        "jellyfinURL": "URL"
+        "youCanLoginWith": "Abaixo está os detalhes para fazer o login",
+        "jellyfinURL": "URL",
+        "name": "Email de Boas vindas",
+        "yourAccountWillExpire": "Sua conta irá expirar em {date}."
     },
     "emailConfirmation": {
         "title": "Confirme seu email - Jellyfin",
         "clickBelow": "Clique no link abaixo para confirmar seu endereço de e-mail e começar a usar o Jellyfin.",
-        "confirmEmail": "Confirmar Email"
+        "confirmEmail": "Confirmar Email",
+        "name": "Email de Confirmação"
+    },
+    "userExpired": {
+        "name": "Vencimento do usuário",
+        "title": "Sua conta expirou - Jellyfin",
+        "yourAccountHasExpired": "Sua conta expirou.",
+        "contactTheAdmin": "Entre em contato com administrador para mais informações."
+    },
+    "userDisabled": {
+        "name": "Usuário desativado",
+        "title": "Sua conta foi desativada - Jellyfin",
+        "yourAccountWasDisabled": "Sua conta foi desativada."
+    },
+    "userEnabled": {
+        "title": "Sua conta foi reativada - Jellyfin",
+        "name": "Usuário ativado",
+        "yourAccountWasEnabled": "Sua conta foi reativada."
     }
 }

lang/email/sv-se.json

@@ -0,0 +1,65 @@
+{
+    "meta": {
+        "name": "Svenska (SV)"
+    },
+    "strings": {
+        "ifItWasNotYou": "Om detta inte var du, ignorera det här e-postmeddelandet.",
+        "helloUser": "Hej {username},",
+        "reason": "Anledning"
+    },
+    "userCreated": {
+        "name": "Användarskapande",
+        "title": "Meddelande: Användare skapad",
+        "aUserWasCreated": "En användare skapades med hjälp av koden {code}.",
+        "time": "Tid",
+        "notificationNotice": "Observera: E-postmeddelanden om avisering kan ändras på admin-instrumentpanelen."
+    },
+    "inviteExpiry": {
+        "name": "Utgångsdatum för inbjudan",
+        "title": "Meddelande: Inbjudan har upphört att gälla",
+        "inviteExpired": "Inbjudan har upphört att gälla.",
+        "expiredAt": "Koden {code} upphörde att gälla {time}.",
+        "notificationNotice": "Observera: Notifierings-e-postmeddelanden kan ändras på admin-instrumentpanelen."
+    },
+    "passwordReset": {
+        "name": "Återställning av lösenord",
+        "title": "Lösenordsåterställning begärd - Jellyfin",
+        "someoneHasRequestedReset": "Någon har nyligen begärt en återställning av lösenordet på Jellyfin.",
+        "ifItWasYou": "Om det var du, ange pinkoden nedan i prompten.",
+        "codeExpiry": "Koden upphör att gälla den {date}, vid {time} UTC, vilket är om {expiresInMinutes}.",
+        "pin": "Pinkod"
+    },
+    "userDeleted": {
+        "name": "Radering av användare",
+        "title": "Ditt konto raderades - Jellyfin",
+        "yourAccountWasDeleted": "Ditt Jellyfin-konto raderades."
+    },
+    "inviteEmail": {
+        "name": "Inbjudnings e-post",
+        "title": "Inbjudan - Jellyfin",
+        "hello": "Hej",
+        "youHaveBeenInvited": "Du har blivit inbjuden till Jellyfin.",
+        "toJoin": "För att gå med, följ länken nedan.",
+        "inviteExpiry": "Denna inbjudan upphör att gälla den {date} vid {time}, vilket är om {expiresInMinutes}, så agera snabbt.",
+        "linkButton": "Ställ in ditt konto"
+    },
+    "welcomeEmail": {
+        "name": "Välkomst e-post",
+        "title": "Välkommen till Jellyfin",
+        "welcome": "Välkommen till Jellyfin!",
+        "youCanLoginWith": "Du kan logga in med informationen nedan",
+        "jellyfinURL": "URL"
+    },
+    "emailConfirmation": {
+        "name": "Bekräftelse e-post",
+        "title": "Bekräfta din e-postadress - Jellyfin",
+        "clickBelow": "Klicka på länken nedan för att bekräfta din e-postadress och börja använda Jellyfin.",
+        "confirmEmail": "Bekräfta e-postadress"
+    },
+    "userExpired": {
+        "name": "Användarens upphörande",
+        "title": "Ditt konto har gått ut - Jellyfin",
+        "yourAccountHasExpired": "Ditt konto har gått ut.",
+        "contactTheAdmin": "Kontakta administratören för mer information."
+    }
+}

lang/form/de-de.json

@@ -13,10 +13,11 @@
         "reEnterPasswordInvalid": "Passwörter stimmen nicht überein.",
         "createAccountButton": "Konto erstellen",
         "passwordRequirementsHeader": "Passwortanforderungen",
-        "successHeader": "Erfolg!",
+        "successHeader": "Erfolgreich!",
         "successContinueButton": "Weiter",
         "confirmationRequired": "E-Mail-Bestätigung erforderlich",
-        "confirmationRequiredMessage": "Bitte überprüfe dein Posteingang und bestätige deine E-Mail-Adresse."
+        "confirmationRequiredMessage": "Bitte überprüfe dein Posteingang und bestätige deine E-Mail-Adresse.",
+        "yourAccountIsValidUntil": "Dein Konto wird bis zum {date} gültig sein."
     },
     "validationStrings": {
         "length": {

lang/form/el-gr.json

@@ -16,7 +16,8 @@
         "successHeader": "Επιτυχία!",
         "successContinueButton": "Συνέχεια",
         "confirmationRequired": "Απαιτείται επιβεβαίωση Email",
-        "confirmationRequiredMessage": "Παρακαλώ ελέγξτε το email σας για να επιβεβαιώσετε την διεύθυνση σας ."
+        "confirmationRequiredMessage": "Παρακαλώ ελέγξτε το email σας για να επιβεβαιώσετε την διεύθυνση σας .",
+        "yourAccountIsValidUntil": "Ο λογαριασμός σου θα ισχύει μέχρι {date}."
     },
     "notifications": {
         "errorUserExists": "Ο χρήστης υπάρχει ήδη.",

lang/form/en-gb.json

@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "name": "English (GB)"
+    }
+}

lang/form/en-us.json

@@ -16,11 +16,16 @@
         "successHeader": "Success!",
         "successContinueButton": "Continue",
         "confirmationRequired": "Email confirmation required",
-        "confirmationRequiredMessage": "Please check your email inbox to verify your address."
+        "confirmationRequiredMessage": "Please check your email inbox to verify your address.",
+        "yourAccountIsValidUntil": "Your account will be valid until {date}.",
+        "sendPIN": "Send the PIN below to the bot, then come back here to link your account."
     },
     "notifications": {
         "errorUserExists": "User already exists.",
-        "errorInvalidCode": "Invalid invite code."
+        "errorInvalidCode": "Invalid invite code.",
+        "errorTelegramVerification": "Telegram verification required.",
+        "errorInvalidPIN": "Telegram PIN is invalid.",
+        "telegramVerified": "Telegram account verified."
     },
     "validationStrings": {
         "length": {

lang/form/es-es.json

@@ -0,0 +1,48 @@
+{
+    "meta": {
+        "name": "Español (ES)"
+    },
+    "strings": {
+        "pageTitle": "Crear cuenta de Jellyfin",
+        "createAccountHeader": "Crear una cuenta",
+        "accountDetails": "Detalles",
+        "emailAddress": "Correo electrónico",
+        "username": "Nombre de usuario",
+        "password": "Contraseña",
+        "reEnterPassword": "Rescriba su contraseña",
+        "reEnterPasswordInvalid": "Las contraseñas no son coincidentes.",
+        "createAccountButton": "Crear una cuenta",
+        "passwordRequirementsHeader": "Requisitos de contraseña",
+        "successHeader": "¡Éxito!",
+        "successContinueButton": "Continuar",
+        "confirmationRequired": "Se requiere confirmación por correo electrónico",
+        "confirmationRequiredMessage": "Revise la bandeja de entrada de su correo electrónico para verificar su dirección.",
+        "yourAccountIsValidUntil": "Su cuenta será válida hasta el {date}."
+    },
+    "notifications": {
+        "errorUserExists": "El usuario ya existe.",
+        "errorInvalidCode": "Código de invitación no es válido."
+    },
+    "validationStrings": {
+        "length": {
+            "singular": "Debe tener al menos {n} carácter",
+            "plural": "Debe tener al menos {n} caracteres"
+        },
+        "uppercase": {
+            "singular": "Debe tener al menos {n} caracteres en mayúscula",
+            "plural": "Debe tener al menos {n} caracteres en mayúscula"
+        },
+        "lowercase": {
+            "singular": "Debe tener al menos {n} caracteres en minúscula",
+            "plural": "Debe tener al menos {n} caracteres en minúscula"
+        },
+        "number": {
+            "singular": "Debe tener al menos {n} número",
+            "plural": "Debe tener al menos {n} números"
+        },
+        "special": {
+            "singular": "Debe tener al menos {n} carácter especial",
+            "plural": "Debe tener al menos {n} caracteres especiales"
+        }
+    }
+}

lang/form/nl-nl.json

@@ -6,7 +6,7 @@
         "pageTitle": "Maak Jellyfin account aan",
         "createAccountHeader": "Account aanmaken",
         "accountDetails": "Details",
-        "emailAddress": "Email",
+        "emailAddress": "E-mail",
         "username": "Gebruikersnaam",
         "password": "Wachtwoord",
         "reEnterPassword": "Bevestig wachtwoord",
@@ -16,7 +16,8 @@
         "successHeader": "Succes!",
         "successContinueButton": "Doorgaan",
         "confirmationRequired": "Bevestiging van e-mailadres verplicht",
-        "confirmationRequiredMessage": "Controleer je e-mail inbox om je adres te bevestigen."
+        "confirmationRequiredMessage": "Controleer je e-mail inbox om je adres te bevestigen.",
+        "yourAccountIsValidUntil": "Je account zal geldig zijn tot {date}."
     },
     "validationStrings": {
         "length": {

lang/form/pt-br.json

@@ -16,7 +16,8 @@
         "successHeader": "Sucesso!",
         "successContinueButton": "Continuar",
         "confirmationRequired": "Necessária confirmação de e-mail",
-        "confirmationRequiredMessage": "Verifique sua caixa de entrada no e-mail para verificar seu endereço."
+        "confirmationRequiredMessage": "Verifique sua caixa de email para finalizar o cadastro.",
+        "yourAccountIsValidUntil": "Sua conta é válida até {date}."
     },
     "notifications": {
         "errorUserExists": "Esse usuário já existe.",

lang/form/sv-se.json

@@ -0,0 +1,48 @@
+{
+    "meta": {
+        "name": "Svenska (SV)"
+    },
+    "strings": {
+        "pageTitle": "Skapa Jellyfin-konto",
+        "createAccountHeader": "Skapa konto",
+        "accountDetails": "Detaljer",
+        "emailAddress": "E-post",
+        "username": "Användarnamn",
+        "password": "Lösenord",
+        "reEnterPassword": "Skriv lösenordet igen",
+        "reEnterPasswordInvalid": "Lösenorden är inte samma.",
+        "createAccountButton": "Skapa konto",
+        "passwordRequirementsHeader": "Lösenordskrav",
+        "successHeader": "Lyckades!",
+        "successContinueButton": "Fortsätt",
+        "confirmationRequired": "E-postbekräftelse krävs",
+        "confirmationRequiredMessage": "Kontrollera din e-postkorg för att verifiera din adress.",
+        "yourAccountIsValidUntil": "Ditt konto är giltigt fram tills {date}."
+    },
+    "notifications": {
+        "errorUserExists": "Användare finns redan.",
+        "errorInvalidCode": "Ogiltig inbjudningskod."
+    },
+    "validationStrings": {
+        "length": {
+            "singular": "Måste ha minst {n} tecken",
+            "plural": "Måste ha minst {n} tecken"
+        },
+        "uppercase": {
+            "singular": "Måste ha minst {n} versaler",
+            "plural": "Måste ha minst {n} versaler"
+        },
+        "lowercase": {
+            "singular": "Måste ha minst {n} gemener",
+            "plural": "Måste ha minst {n} gemener"
+        },
+        "number": {
+            "singular": "Måste ha minst {n} siffra",
+            "plural": "Måste ha minst {n} siffror"
+        },
+        "special": {
+            "singular": "Måste ha minst {n} specialtecken",
+            "plural": "Måste ha minst {n} specialtecken"
+        }
+    }
+}

lang/pwreset/en-us.json

@@ -0,0 +1,13 @@
+{
+    "meta": {
+        "name": "English (US)"
+    },
+    "strings": {
+        "passwordReset": "Password reset",
+        "resetFailed": "Password reset failed",
+        "tryAgain": "Please try again.",
+        "youCanLogin": "You can now log in with the below code as your password.",
+        "youCanLoginOmbi": "You can now log in to Jellyfin & Ombi with the below code as your password.",
+        "changeYourPassword": "Make sure to change your password after you log in."
+    }
+}

lang/pwreset/es-es.json

@@ -0,0 +1,12 @@
+{
+    "meta": {
+        "name": "Español (ES)"
+    },
+    "strings": {
+        "passwordReset": "Cambiar contraseña",
+        "resetFailed": "Error al cambiar contraseña",
+        "tryAgain": "Por favor intente nuevamente.",
+        "youCanLogin": "Ahora puedes logearte con el codigo como contraseña.",
+        "changeYourPassword": "Recuerda cambiar tu contraseña luego de iniciar sesión."
+    }
+}

lang/setup/de-de.json

@@ -31,9 +31,9 @@
     "language": {
         "title": "Sprache",
         "description": "Gemeinschaftsübersetzungen sind für die meisten Teile von jfa-go verfügbar. Du kannst unten die Standardsprachen auswählen, aber Benutzer können dies immer noch ändern, wenn sie wollen. Wenn du helfen willst zu übersetzen, melde dich bei {n} an, um anzufangen, etwas beizutragen!",
-        "defaultAdminLang": "Standardsprache Admin",
-        "defaultFormLang": "Standardsprache Kontoerstellung",
-        "defaultEmailLang": "Standardsprache E-Mail"
+        "defaultAdminLang": "Admin Standardsprache",
+        "defaultFormLang": "Kontoerstellung Standardsprache",
+        "defaultEmailLang": "E-Mail Standardsprache"
     },
     "general": {
         "title": "Allgemein",
@@ -82,8 +82,6 @@
         "senderName": "Absendername",
         "dateFormat": "Datumsformat",
         "dateFormatNotice": "Datum folgt dem strftime-Format. Für weitere Informationen, besuche {n}.",
-        "time24h": "24h-Format",
-        "time12h": "12h-Format",
         "encryption": "Verschlüsselung",
         "mailgunApiURL": "API-URL"
     },
@@ -125,5 +123,12 @@
         "successMessageNotice": "Wird angezeigt, wenn ein Benutzer sein Konto erstellt.",
         "emailMessage": "E-Mailnachricht",
         "emailMessageNotice": "Wird am Ende von E-Mails angezeigt."
+    },
+    "updates": {
+        "updateChannel": "Aktualisierungskanal",
+        "unstable": "Unstable",
+        "stable": "Stable",
+        "title": "Aktualisierungen",
+        "description": "Aktiviere, um informiert zu werden, wenn neue Aktualisierungen verfügbar sind. jfa-go wird {n} alle 30 Minuten überprüfen. Keine IP-Adressen oder personenbezogene Daten werden gesammelt."
     }
 }

lang/setup/el-gr.json

@@ -82,8 +82,6 @@
         "senderName": "Ονομα αποστολέα",
         "dateFormat": "Μορφή ημερομηνίας",
         "dateFormatNotice": "Η ημερομηνία ακολουθεί τη μορφή strftime. Για περισσότερες πληροφορίες, επισκεφτείτε το {n}.",
-        "time24h": "24 Ώρες",
-        "time12h": "12 Ώρες",
         "encryption": "Κρυπτογράφηση",
         "mailgunApiURL": "Διεύθυνση API"
     },
@@ -125,5 +123,12 @@
         "successMessageNotice": "Εμφανίζεται όταν ένας χρήστης δημιουργεί τον λογαριασμό του.",
         "emailMessage": "Μήνυμα Email",
         "emailMessageNotice": "Εμφανίζεται στο κάτω μέρος των email."
+    },
+    "updates": {
+        "title": "Ενημερώσεις",
+        "description": "Ενεργοποίηση ειδοποίησης όταν είναι διαθέσιμες νέες ενημερώσεις. Το jfa-go θα ελέγχει {n} κάθε 30 λεπτά. Δεν συλλέγονται IP ή προσωπικές πληροφορίες.",
+        "updateChannel": "Κανάλι Ενημερώσεων",
+        "stable": "Σταθερό",
+        "unstable": "Ασταθές"
     }
 }

lang/setup/en-gb.json

@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "name": "English (GB)"
+    }
+}

lang/setup/en-us.json

@@ -48,6 +48,13 @@
         "pathToCertificate": "Path to certificate",
         "pathToKeyFile": "Path to key file"
     },
+    "updates": {
+        "title": "Updates",
+        "description": "Enable to be notified when new updates are available. jfa-go will check {n} every 30 minutes. No IPs or personally identifiable information are collected.",
+        "updateChannel": "Update Channel",
+        "stable": "Stable",
+        "unstable": "Unstable"
+    },
     "login": {
         "title": "Login",
         "description": "To access the admin page, you need to login with a method below:",
@@ -69,7 +76,7 @@
     },
     "ombi": {
         "title": "Ombi",
-        "description": "By connecting to Ombi, both a Jellyfin and Ombi account will be created when a user joins through jfa-go. After setup if finished, go to Settings to set a default profile for new ombi users.",
+        "description": "By connecting to Ombi, both a Jellyfin and Ombi account will be created when a user joins through jfa-go. After setup is finished, go to Settings to set a default profile for new ombi users.",
         "apiKeyNotice": "Find this in the first tab of Ombi settings."
     },
     "email": {
@@ -82,8 +89,6 @@
         "senderName": "Sender Name",
         "dateFormat": "Date Format",
         "dateFormatNotice": "Date follows the strftime format. For more info, visit {n}.",
-        "time24h": "24h Time",
-        "time12h": "12h Time",
         "encryption": "Encryption",
         "mailgunApiURL": "API URL"
     },
@@ -103,7 +108,10 @@
         "title": "Password Resets",
         "description": "When a user tries to reset their password, Jellyfin creates a file named 'passwordreset-*.json' which contains a PIN. jfa-go reads the file and sends the PIN to the user.",
         "pathToJellyfin": "Path to Jellyfin configuration directory",
-        "pathToJellyfinNotice": "If you don't know where this is, try resetting your password in Jellyfin. A popup with '<path to jellyfin>/passwordreset-*.json' will appear."
+        "pathToJellyfinNotice": "If you don't know where this is, try resetting your password in Jellyfin. A popup with '<path to jellyfin>/passwordreset-*.json' will appear.",
+        "resetLinks": "Send a link instead of a PIN",
+        "resetLinksNotice": "If Ombi integration is enabled, use this to sync Jellyfin password resets with Ombi.",
+        "resetLinksLanguage": "Default reset link language"
     },
     "passwordValidation": {
         "title": "Password Validation",

lang/setup/es-es.json

@@ -0,0 +1,134 @@
+{
+    "meta": {
+        "name": "Español(ES)"
+    },
+    "strings": {
+        "pageTitle": "Configuración - jfa-go",
+        "next": "Siguiente",
+        "back": "Volver",
+        "optional": "Opcional",
+        "serverType": "Tipo de servidor",
+        "disabled": "Desactivado",
+        "enabled": "Activado",
+        "port": "Puerto",
+        "message": "Mensaje",
+        "serverAddress": "Dirección del servidor",
+        "emailSubject": "Asunto",
+        "URL": "URL",
+        "apiKey": "Llave de autorización (API)"
+    },
+    "startPage": {
+        "welcome": "¡Bienvenido!",
+        "pressStart": "Deberá hacer algunas cosas para configurar jfa-go. Presione comenzar para continuar.",
+        "httpsNotice": "Asegúrese de acceder a esta página a través de HTTPS o bien desde una red privada.",
+        "start": "Empezar"
+    },
+    "endPage": {
+        "finished": "¡Terminado!",
+        "restartMessage": "Hay más opciones que puede configurar en la página de administración. Haga clic a continuación para reiniciar, luego actualice la página.",
+        "refreshPage": "Actualizar"
+    },
+    "language": {
+        "title": "Lenguaje",
+        "description": "Las traducciones de la comunidad están disponibles para la mayor parte de jfa-go. Puede elegir los idiomas predeterminados a continuación, pero los usuarios aún pueden cambiarlo si lo desean. Si quieres ayudar a traducir, regístrate en {n} para empezar a contribuir!",
+        "defaultAdminLang": "Idioma de administrador predeterminado",
+        "defaultFormLang": "Idioma de creación de cuenta predeterminado",
+        "defaultEmailLang": "Idioma de correo electrónico predeterminado"
+    },
+    "general": {
+        "title": "General",
+        "listenAddress": "Dirección de recibidor (Listen Address)",
+        "urlBase": "Base de URL",
+        "urlBaseNotice": "Solo es necesario si se usa un proxy inverso en un subdominio (por ejemplo, 'jellyf.in/accounts').",
+        "lightTheme": "Claro",
+        "darkTheme": "Oscuro",
+        "useHTTPS": "Usar HTTPS (Conexión segura SSL)",
+        "httpsPort": "Puerto HTTPS",
+        "useHTTPSNotice": "Solo se recomienda si no está utilizando un proxy inverso.",
+        "pathToCertificate": "Ruta al certificado",
+        "pathToKeyFile": "Ruta al archivo de claves"
+    },
+    "updates": {
+        "title": "Actualizaciones",
+        "description": "Habilite para recibir notificaciones cuando haya nuevas actualizaciones disponibles. jfa-go comprobará {n} cada 30 minutos. No se recopilan IP ni información de identificación personal.",
+        "updateChannel": "Actualizar canal",
+        "stable": "Estable",
+        "unstable": "Inestable"
+    },
+    "login": {
+        "title": "Iniciar sesión",
+        "description": "Para acceder a la página de administración, debe iniciar sesión con un método a continuación:",
+        "authorizeWithJellyfin": "Autorizar con Jellyfin/Emby: los detalles de inicio de sesión se comparten con Jellyfin, lo que permite a varios usuarios.",
+        "authorizeManual": "Nombre de usuario y contraseña: establezca manualmente el nombre de usuario y la contraseña.",
+        "adminOnly": "Solo usuarios administradores (recomendado)",
+        "emailNotice": "Su dirección de correo electrónico se puede utilizar para recibir notificaciones."
+    },
+    "jellyfinEmby": {
+        "title": "Jellyfin/Emby",
+        "description": "Se necesita una cuenta de administrador porque la API no permite la creación de usuarios mediante una clave de API. Debe crear una cuenta separada y marcar 'Permitir que este usuario administre el servidor'. Puede desactivar todo lo demás. Una vez hecho esto, ingrese los detalles de inicio de sesión aquí.",
+        "embyNotice": "El soporte de Emby es limitado y no admite el restablecimiento de contraseñas.",
+        "internal": "Interno",
+        "external": "Externo",
+        "replaceJellyfin": "Nombre del servidor",
+        "replaceJellyfinNotice": "Si se proporciona, reemplazará cualquier aparición de 'Jellyfin' en la aplicación.",
+        "addressExternalNotice": "Déjelo en blanco para usar la misma dirección.",
+        "testConnection": "Probar conexión"
+    },
+    "ombi": {
+        "title": "Ombi.",
+        "description": "Al conectarse a Ombi, se creará una cuenta de Jellyfin y Ombi cuando un usuario se una a través de jfa-go. Una vez finalizada la configuración, vaya a Configuración para establecer un perfil predeterminado para los nuevos usuarios de ombi.",
+        "apiKeyNotice": "Encuentra esto en la primera pestaña de la configuración de Ombi."
+    },
+    "email": {
+        "title": "Correo electrónico",
+        "description": "jfa-go puede enviar PIN de restablecimiento de contraseña y varias notificaciones por correo electrónico. Puede conectarse a un servidor SMTP o utilizar la {n} API.",
+        "method": "Método de envío",
+        "useEmailAsUsername": "Utilice direcciones de correo electrónico como nombre de usuario",
+        "useEmailAsUsernameNotice": "Si está habilitado, los nuevos usuarios iniciarán sesión en Jellyfin / Emby con su dirección de correo electrónico en lugar de un nombre de usuario.",
+        "fromAddress": "Dirección de envío",
+        "senderName": "Nombre del remitente",
+        "dateFormat": "Formato de fecha",
+        "dateFormatNotice": "La fecha sigue el formato strftime. Para obtener más información, visite {n}.",
+        "encryption": "Cifrado",
+        "mailgunApiURL": "URL de API"
+    },
+    "notifications": {
+        "title": "Notificaciones",
+        "description": "Si está habilitado, puede elegir (por invitación) recibir un correo electrónico cuando una invitación caduque o se cree un usuario. Si no eligió el método de inicio de sesión de Jellyfin, asegúrese de proporcionar su dirección de correo electrónico."
+    },
+    "welcomeEmails": {
+        "title": "Correos de bienvenida",
+        "description": "Si está habilitado, se enviará un correo electrónico a los nuevos usuarios con la URL de Jellyfin/Emby y su nombre de usuario."
+    },
+    "inviteEmails": {
+        "title": "Correos de invitación",
+        "description": "Si está habilitado, puede enviar invitaciones directamente a la dirección de correo electrónico de un usuario. Debido a que es posible que esté utilizando un proxy inverso, debe proporcionar la URL desde la que se accede a las invitaciones. Escriba su base de URL y agregue '/ invite'."
+    },
+    "passwordResets": {
+        "title": "Restablecimiento de contraseña",
+        "description": "Cuando un usuario intenta restablecer su contraseña, Jellyfin crea un archivo llamado 'passwordreset - *. Json' que contiene un PIN. jfa-go lee el archivo y envía el PIN al usuario.",
+        "pathToJellyfin": "Ruta al directorio de configuración de Jellyfin",
+        "pathToJellyfinNotice": "Si no sabe dónde está, intente restablecer su contraseña en Jellyfin. Aparecerá una ventana emergente con '<ruta a jellyfin>/passwordreset-. Json'."
+    },
+    "passwordValidation": {
+        "title": "Validación de contraseña",
+        "description": "Si está habilitado, se mostrará un conjunto de requisitos de contraseña en la página de creación de la cuenta, como la longitud mínima, caracteres en mayúsculas/minúsculas, etc.",
+        "length": "Largo",
+        "uppercase": "Letras mayúsculas",
+        "lowercase": "Caracteres en minúscula",
+        "numbers": "Números",
+        "special": "Caracteres especiales (%, *, etc.)"
+    },
+    "helpMessages": {
+        "title": "Mensajes de ayuda",
+        "description": "Estos mensajes se mostrarán en la página de creación de la cuenta y en algunos correos electrónicos.",
+        "contactMessage": "Mensaje de contacto",
+        "contactMessageNotice": "Aparece en la parte inferior de todas las páginas excepto admin.",
+        "helpMessage": "Mensaje de ayuda",
+        "helpMessageNotice": "Aparece en la página de creación de cuenta.",
+        "successMessage": "Mensaje de éxito",
+        "successMessageNotice": "Se muestra cuando un usuario crea su cuenta.",
+        "emailMessage": "Mensaje de correo electrónico",
+        "emailMessageNotice": "Aparece en la parte inferior de los correos electrónicos."
+    }
+}

lang/setup/fr-fr.json

@@ -82,8 +82,6 @@
         "senderName": "Nom de l'envoyeur",
         "dateFormat": "Format de la date",
         "dateFormatNotice": "La date suis le format srtftime. Pour plus d'informations, consultez {n}.",
-        "time24h": "Temps 24h",
-        "time12h": "Temps 12h",
         "encryption": "Chiffrement",
         "mailgunApiURL": "URL de l'API"
     },

lang/setup/id-id.json

@@ -82,8 +82,6 @@
         "senderName": "Nama Pengirim",
         "dateFormat": "Format Tanggal",
         "dateFormatNotice": "Tanggal mengikuti format strftime. Untuk info lebih lanjut, kunjungi {n}.",
-        "time24h": "Waktu 24 jam",
-        "time12h": "Waktu 12 jam",
         "encryption": "Enkripsi",
         "mailgunApiURL": "URL API"
     },

lang/setup/nl-nl.json

@@ -25,13 +25,13 @@
     },
     "endPage": {
         "finished": "Klaar!",
-        "restartMessage": "Er staan meer instellingen op de adminpagina. Druk op de knop hieronder om opnieuw op te starten, en ververs daarna de pagina.",
+        "restartMessage": "Er staan meer instellingen op de beheerderspagina. Druk op de knop hieronder om opnieuw op te starten, en ververs daarna de pagina.",
         "refreshPage": "Verversen"
     },
     "language": {
         "title": "Taal",
         "description": "Er zijn gemeenschapsvertalingen beschikbaar voor de meeste onderdelen van jfa-go. Je kunt hieronder de standaardtaal instellen, maar gebruikers kunnen die aanpassen indien gewenst. Als je wilt helpen met vertalen, meld je dan aan bij {n} en begin met vertalen!",
-        "defaultAdminLang": "Standaardtaal (admin)",
+        "defaultAdminLang": "Standaardtaal (beheer)",
         "defaultFormLang": "Standaardtaal aanmaken nieuwe account",
         "defaultEmailLang": "Standaardtaal (e-mails)"
     },
@@ -50,15 +50,15 @@
     },
     "login": {
         "title": "Inloggen",
-        "description": "Om de admin-pagina te openen moet je inloggen met één van onderstaande methodes:",
+        "description": "Om de beheerderspagina te openen moet je inloggen met één van onderstaande methodes:",
         "authorizeWithJellyfin": "Jellyfin/Emby authorisatie: Inloggegevens worden gedeeld met Jellyfin, meerdere gebruikers mogelijk.",
         "authorizeManual": "Gebruikersnaam en wachtwoord: Stel handmatig een gebruikersnaam en wachtwoord in.",
-        "adminOnly": "Alleen admin-gebruikers (aanbevolen)",
+        "adminOnly": "Alleen beheerders (aanbevolen)",
         "emailNotice": "Je e-mailadres kan gebruikt worden om meldingen te ontvangen."
     },
     "jellyfinEmby": {
         "title": "Jellyfin/Emby",
-        "description": "Er is een admin-account nodig, omdat via de API geen gebruikers aangemaakt kunnen worden. Maak een aparte account aan en vink 'Deze gebruiker kan de server beheren' aan. Alle andere rechten kunnen uitgeschakeld worden. Vul daarna hier de inloggegevens in.",
+        "description": "Er is een beheerdersaccount nodig, omdat via de API geen gebruikers aangemaakt kunnen worden. Maak een aparte account aan en vink 'Deze gebruiker kan de server beheren' aan. Alle andere rechten kunnen uitgeschakeld worden. Vul daarna hier de inloggegevens in.",
         "embyNotice": "Ondersteuning voor Emby is beperkt en ondersteunt geen wachtwoordresets.",
         "internal": "Intern",
         "external": "Extern",
@@ -82,8 +82,6 @@
         "senderName": "Naam afzender",
         "dateFormat": "Datumformaat",
         "dateFormatNotice": "Datum volgend het strftime formaat. Meer info op {n}.",
-        "time24h": "24u-formaat",
-        "time12h": "12u-formaat",
         "encryption": "Versleuteling",
         "mailgunApiURL": "API-URL"
     },
@@ -118,12 +116,19 @@
         "title": "Uitleg",
         "description": "Deze teksten worden getoond bij de account-aanmaakpagina en in sommige e-mails.",
         "contactMessage": "Contacttekst",
-        "contactMessageNotice": "Getoond onderaan elke pagina behalve admin.",
+        "contactMessageNotice": "Getoond onderaan elke pagina behalve beheer.",
         "helpMessage": "Helpbericht",
         "helpMessageNotice": "Getoond op de account-aanmaakpagina.",
         "successMessage": "Succesbericht",
         "successMessageNotice": "Getoond wanneer een gebruiker een account aanmaakt.",
         "emailMessage": "E-mailtext",
         "emailMessageNotice": "Getoond onderaan e-mails."
+    },
+    "updates": {
+        "unstable": "Instabiel",
+        "updateChannel": "Update kanaal",
+        "stable": "Stabiel",
+        "title": "Updates",
+        "description": "Vink aan om een melding te krijgen wanneer nieuwe updates beschikbaar zijn. jfa-go controleert {n} elke 30 minuten. Er worden geen IPs of persoonsgegevens verzameld."
     }
 }

lang/setup/pt-br.json

@@ -8,8 +8,8 @@
         "back": "Voltar",
         "optional": "Opcional",
         "serverType": "Tipo de Servidor",
-        "disabled": "Desativar",
-        "enabled": "Ativado",
+        "disabled": "Desativado",
+        "enabled": "Habilitado",
         "port": "Porta",
         "message": "Mensagem",
         "serverAddress": "Endereço do Servidor",
@@ -82,8 +82,6 @@
         "senderName": "Nome do remetente",
         "dateFormat": "Formato da Data",
         "dateFormatNotice": "A data segue o formato strftime. Para obter mais informações, visite {n}.",
-        "time24h": "Horário 24h",
-        "time12h": "Horário 12h",
         "encryption": "Encriptação",
         "mailgunApiURL": "API URL"
     },
@@ -125,5 +123,12 @@
         "successMessageNotice": "Exibido quando um usuário cria sua conta.",
         "emailMessage": "Mensagem de Email",
         "emailMessageNotice": "Exibido na parte inferior dos emails."
+    },
+    "updates": {
+        "title": "Atualizações",
+        "description": "Ative para ser notificado quando novas atualizações estiverem disponíveis. jfa-go verificará {n} a cada 30 minutos. Nenhum IP ou informação de identificação pessoal é coletada.",
+        "updateChannel": "Canal de Atualização",
+        "stable": "Estável",
+        "unstable": "Instável"
     }
 }

lang/setup/sv-se.json

@@ -0,0 +1,127 @@
+{
+    "meta": {
+        "name": "Svenska (SV)"
+    },
+    "strings": {
+        "pageTitle": "Konfigurera - jfa-go",
+        "next": "Nästa",
+        "back": "Tillbaka",
+        "optional": "Valfri",
+        "serverType": "Servertyp",
+        "disabled": "Inaktiverad",
+        "enabled": "Aktiverad",
+        "port": "Port",
+        "message": "Meddelande",
+        "serverAddress": "Serveradress",
+        "emailSubject": "E-postämne",
+        "URL": "URL",
+        "apiKey": "API-nyckel"
+    },
+    "startPage": {
+        "welcome": "Välkommen!",
+        "pressStart": "Du måste göra några saker för att konfigurera jfa-go. Tryck på starta för att fortsätta.",
+        "httpsNotice": "Se till att du kommer åt den här sidan via HTTPS eller via ett privat nätverk.",
+        "start": "Starta"
+    },
+    "endPage": {
+        "finished": "Färdig!",
+        "restartMessage": "Det finns fler inställningar som du kan konfigurera på administratörssidan. Klicka nedan för att starta om och uppdatera sedan sidan.",
+        "refreshPage": "Uppdatera"
+    },
+    "language": {
+        "title": "Språk",
+        "description": "Gemensamma översättningar är tillgängliga för de flesta delar av jfa-go. Du kan välja standardspråken nedan, men användarna kan ändå ändra det om de vill. Om du vill hjälpa till med översättningen kan du registrera dig på {n} för att börja bidra!",
+        "defaultAdminLang": "Standard admin-språk",
+        "defaultFormLang": "Standardspråk för skapande av konto",
+        "defaultEmailLang": "Standard e-postspråk"
+    },
+    "general": {
+        "title": "Allmänt",
+        "listenAddress": "Lyssnar på adress",
+        "urlBase": "URL-bas",
+        "urlBaseNotice": "Behövs bara om du använder en omvänd proxy på en underdomän (t.ex. 'jellyf.in/accounts').",
+        "lightTheme": "Ljus",
+        "darkTheme": "Mörk",
+        "useHTTPS": "Använd HTTPS",
+        "httpsPort": "HTTPS port",
+        "useHTTPSNotice": "Rekommenderas endast om du inte använder en omvänd proxy.",
+        "pathToCertificate": "Sökväg till certifikat",
+        "pathToKeyFile": "Sökväg till privat nyckel"
+    },
+    "login": {
+        "title": "Logga in",
+        "description": "För att komma åt administratörssidan måste du logga in med en metod nedan:",
+        "authorizeWithJellyfin": "Auktorisera med Jellyfin/Emby: Inloggningsuppgifter delas med Jellyfin, vilket möjliggör flera användare.",
+        "authorizeManual": "Användarnamn och lösenord: Ange användarnamn och lösenord manuellt.",
+        "adminOnly": "Endast administratörsanvändare (rekommenderas)",
+        "emailNotice": "Din e-postadress kan användas för att ta emot aviseringar."
+    },
+    "jellyfinEmby": {
+        "title": "Jellyfin/Emby",
+        "description": "Ett administratörskonto behövs eftersom API: et inte tillåter användarskapande med en API-nyckel. Du bör skapa ett separat konto och markera \"Tillåt den här användaren att hantera servern\". Du kan inaktivera allt annat. När du är klar anger du inloggningsuppgifterna här.",
+        "embyNotice": "Emby-stöd är begränsat och stöder inte återställning av lösenord.",
+        "internal": "Intern",
+        "external": "Extern",
+        "replaceJellyfin": "Servernamn",
+        "replaceJellyfinNotice": "Om detta anges kommer det att ersätta alla förekomster av 'Jellyfin' i appen.",
+        "addressExternalNotice": "Lämna tomt för att använda samma adress.",
+        "testConnection": "Testa anslutning"
+    },
+    "ombi": {
+        "title": "Ombi",
+        "description": "Genom att ansluta till Ombi skapas både ett Jellyfin- och Ombi-konto när en användare går med genom jfa-go. Efter installationen, om du är klar, gå till Inställningar för att ställa in en standardprofil för nya ombi-användare.",
+        "apiKeyNotice": "Hitta detta i den första fliken i Ombi-inställningarna."
+    },
+    "email": {
+        "title": "E-post",
+        "description": "jfa-go kan skicka PIN-koder för återställning av lösenord och olika meddelanden via e-post. Du kan ansluta till en SMTP-server eller använda {n} API.",
+        "method": "Sändningsmetod",
+        "useEmailAsUsername": "Använd e-postadresser som användarnamn",
+        "useEmailAsUsernameNotice": "Om detta är aktiverat kommer nya användare att logga in på Jellyfin / Emby med sin e-postadress istället för ett användarnamn.",
+        "fromAddress": "Från adress",
+        "senderName": "Avsändarens namn",
+        "dateFormat": "Datumformat",
+        "dateFormatNotice": "Datum följer strftime-formatet. Mer information finns på {n}.",
+        "encryption": "Kryptering",
+        "mailgunApiURL": "API URL"
+    },
+    "notifications": {
+        "title": "Aviseringar",
+        "description": "Om detta är aktiverat kan du välja (per inbjudan) att få ett e-postmeddelande när en inbjudan upphör eller när en användare skapas. Om du inte valde inloggningsmetoden Jellyfin, se till att du angav din e-postadress."
+    },
+    "welcomeEmails": {
+        "title": "Välkomstmeddelanden",
+        "description": "Om aktiverat skickas ett e-postmeddelande till nya användare med Jellyfin/Emby URL och deras användarnamn."
+    },
+    "inviteEmails": {
+        "title": "Inbjudnings e-post",
+        "description": "Om detta är aktiverat kan du skicka inbjudningar direkt till en användares e-postadress. Eftersom du kanske använder en omvänd proxy måste du ange att webbadressinbjudningar nås från. Skriv din URL-bas och lägg till '/invite'."
+    },
+    "passwordResets": {
+        "title": "Lösenordsåterställningar",
+        "description": "När en användare försöker återställa sitt lösenord skapar Jellyfin en fil med namnet 'passwordreset-*.json' som innehåller en PIN-kod. jfa-go läser filen och skickar PIN-koden till användaren.",
+        "pathToJellyfin": "Sökväg till Jellyfin-konfigurationskatalogen",
+        "pathToJellyfinNotice": "Om du inte vet var det är, försök återställa lösenordet i Jellyfin. En popup med '<sökväg till jellyfin>/passwordreset-*.json' kommer då visas."
+    },
+    "passwordValidation": {
+        "title": "Validering av lösenord",
+        "description": "Om detta är aktiverat kommer en uppsättning lösenordskrav att visas på sidan för skapande av konto, till exempel minsta längd, stora/små bokstäver etc.",
+        "length": "Längd",
+        "uppercase": "Versaler",
+        "lowercase": "Gemener",
+        "numbers": "Nummer",
+        "special": "Specialtecken (%, *, etc.)"
+    },
+    "helpMessages": {
+        "title": "Hjälpmeddelanden",
+        "description": "Dessa meddelanden visas på sidan för skapande av konto och i vissa e-postmeddelanden.",
+        "contactMessage": "Kontaktmeddelande",
+        "contactMessageNotice": "Visas längst ner på alla sidor utom admin.",
+        "helpMessage": "Hjälpmeddelande",
+        "helpMessageNotice": "Visas på sidan för att skapa konto.",
+        "successMessage": "Meddelande om genomförd åtgärd",
+        "successMessageNotice": "Visas när en användare skapar sitt konto.",
+        "emailMessage": "E-postmeddelande",
+        "emailMessageNotice": "Visas längst ner i e-postmeddelanden."
+    }
+}

lang/telegram/en-gb.json

@@ -0,0 +1,5 @@
+{
+    "meta": {
+        "name": "English (GB)"
+    }
+}

lang/telegram/en-us.json

@@ -0,0 +1,11 @@
+{
+    "meta": {
+        "name": "English (US)"
+    },
+    "strings": {
+        "startMessage": "Hi!\nEnter your Jellyfin PIN code here to verify your account.",
+        "invalidPIN": "That PIN was invalid, try again.",
+        "pinSuccess": "Success! You can now return to the sign-up page.",
+        "languageMessage": "Note: See available languages with /lang, and set language with /lang <language code>."
+    }
+}

logger/go.mod

@@ -0,0 +1,5 @@
+module github.com/hrfee/jfa-go/logger
+
+go 1.16
+
+require github.com/fatih/color v1.10.0

logger/go.sum

@@ -0,0 +1,9 @@
+github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
+github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

logger/logger.go

@@ -0,0 +1,109 @@
+// Package logger provides a wrapper around log that adds color support with github.com/fatih/color.
+package logger
+
+import (
+	"io"
+	"log"
+	"runtime"
+	"strconv"
+
+	c "github.com/fatih/color"
+)
+
+type Logger interface {
+	Printf(format string, v ...interface{})
+	Print(v ...interface{})
+	Println(v ...interface{})
+	Fatal(v ...interface{})
+	Fatalf(format string, v ...interface{})
+}
+
+type logger struct {
+	logger    *log.Logger
+	shortfile bool
+	printer   *c.Color
+}
+
+func Lshortfile() string {
+	// 0 = This function, 1 = Print/Printf/Println, 2 = Caller of Print/Printf/Println
+	_, file, line, ok := runtime.Caller(2)
+	lineString := strconv.Itoa(line)
+	if !ok {
+		return ""
+	}
+	if file == "" {
+		return lineString
+	}
+	for i := len(file) - 1; i > 0; i-- {
+		if file[i] == '/' || file[i] == '\\' {
+			file = file[i+1:]
+			break
+		}
+	}
+	return file + ":" + lineString + ":"
+}
+
+func NewLogger(out io.Writer, prefix string, flag int, color c.Attribute) (l logger) {
+	// Use reimplemented Lshortfile since wrapping the log functions messes them up
+	if flag&log.Lshortfile != 0 {
+		flag -= log.Lshortfile
+		l.shortfile = true
+	}
+
+	l.logger = log.New(out, prefix, flag)
+	l.printer = c.New(color)
+	return l
+}
+
+func (l logger) Printf(format string, v ...interface{}) {
+	var out string
+	if l.shortfile {
+		out = Lshortfile()
+	}
+	out += " " + l.printer.Sprintf(format, v...)
+	l.logger.Print(out)
+}
+
+func (l logger) Print(v ...interface{}) {
+	var out string
+	if l.shortfile {
+		out = Lshortfile()
+	}
+	out += " " + l.printer.Sprint(v...)
+	l.logger.Print(out)
+}
+
+func (l logger) Println(v ...interface{}) {
+	var out string
+	if l.shortfile {
+		out = Lshortfile()
+	}
+	out += " " + l.printer.Sprintln(v...)
+	l.logger.Print(out)
+}
+
+func (l logger) Fatal(v ...interface{}) {
+	var out string
+	if l.shortfile {
+		out = Lshortfile()
+	}
+	out += " " + l.printer.Sprint(v...)
+	l.logger.Fatal(out)
+}
+
+func (l logger) Fatalf(format string, v ...interface{}) {
+	var out string
+	if l.shortfile {
+		out = Lshortfile()
+	}
+	out += " " + l.printer.Sprintf(format, v...)
+	l.logger.Fatal(out)
+}
+
+type EmptyLogger bool
+
+func (l EmptyLogger) Printf(format string, v ...interface{}) {}
+func (l EmptyLogger) Print(v ...interface{})                 {}
+func (l EmptyLogger) Println(v ...interface{})               {}
+func (l EmptyLogger) Fatal(v ...interface{})                 {}
+func (l EmptyLogger) Fatalf(format string, v ...interface{}) {}

mail/confirmation.mjml

@@ -1,9 +1,49 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsc] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsb] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsc] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsb] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
-      <mj-class name="text" color="rgba(255,255,255,0.8)" />
+      <mj-class name="text" color="#cacaca" />
       <mj-class name="bold" color="rgba(255,255,255,0.87)" />
       <mj-class name="secondary" color="rgb(153,153,153)" />
       <mj-class name="blue" background-color="rgb(0,164,220)" />
@@ -14,7 +54,7 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">
@@ -24,7 +64,7 @@
             <p>{{ .clickBelow }}</p>
             <p>{{ .ifItWasNotYou }}</p>
         </mj-text>
-        <mj-button mj-class="blue bold" href="{{ .urlVal }}">{{ .confirmEmail }}</mj-button>
+        <mj-button mj-class="blue bold" href="{{ .confirmationURL }}">{{ .confirmEmail }}</mj-button>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg2">

mail/confirmation.txt

@@ -3,6 +3,6 @@
 {{ .clickBelow }}
 {{ .ifItWasNotYou }}
 
-{{ .urlVal }}
+{{ .confirmationURL }}
 
 {{ .message }}

mail/created.mjml

@@ -1,9 +1,49 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsc] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsb] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsc] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsb] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
-      <mj-class name="text" color="rgba(255,255,255,0.8)" />
+      <mj-class name="text" color="#cacaca" />
       <mj-class name="bold" color="rgba(255,255,255,0.87)" />
       <mj-class name="secondary" color="rgb(153,153,153)" />
       <mj-class name="blue" background-color="rgb(0,164,220)" />
@@ -24,14 +64,14 @@
         </mj-text>
         <mj-table mj-class="text" container-background-color="#242424">
           <tr style="text-align: left;">
-              <th>{{ .name }}</th>
-              <th>{{ .address }}</th>
-              <th>{{ .time }}</th>
+              <th>{{ .nameString }}</th>
+              <th>{{ .addressString }}</th>
+              <th>{{ .timeString }}</th>
           </tr>
           <tr style="font-style: italic; text-align: left; color: rgb(153,153,153);">
-            <th>{{ .nameVal }}</th>
-            <th>{{ .addressVal }}</th>
-            <th>{{ .timeVal }}</th>
+            <th>{{ .name }}</th>
+            <th>{{ .address }}</th>
+            <th>{{ .time }}</th>
         </mj-table>
       </mj-column>
     </mj-section>

mail/created.txt

@@ -1,7 +1,9 @@
 {{ .aUserWasCreated }}
 
-{{ .name }}: {{ .nameVal }}
-{{ .address }}: {{ .addressVal }}
-{{ .time }}: {{ .timeVal }}
+{{ .nameString }}: {{ .name }}
+
+{{ .addressString }}: {{ .address }}
+
+{{ .timeString }}: {{ .time }}
 
 {{ .notificationNotice }}

mail/deleted.mjml

@@ -1,9 +1,49 @@
 <mjml>
   <mj-head>
+    <mj-raw>
+      <meta name="color-scheme" content="light dark">
+      <meta name="supported-color-schemes" content="light dark">
+    </mj-raw>
+    <mj-style>
+        :root {
+            Color-scheme: light dark;
+            supported-color-schemes: light dark;
+        }
+        @media (prefers-color-scheme: light) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsc] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsb] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+        @media (prefers-color-scheme: dark) {
+            Color-scheme: dark;
+            .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsc] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+            [data-ogsb] .body {
+                background: #242424 !important;
+                background-color: #242424 !important;
+            }
+        }
+    </mj-style>
     <mj-attributes>
       <mj-class name="bg" background-color="#101010" />
       <mj-class name="bg2" background-color="#242424" />
-      <mj-class name="text" color="rgba(255,255,255,0.8)" />
+      <mj-class name="text" color="#cacaca" />
       <mj-class name="bold" color="rgba(255,255,255,0.87)" />
       <mj-class name="secondary" color="rgb(153,153,153)" />
       <mj-class name="blue" background-color="rgb(0,164,220)" />
@@ -14,14 +54,14 @@
   <mj-body>
     <mj-section mj-class="bg2">
       <mj-column>
-        <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> Jellyfin </mj-text>
+          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
       </mj-column>
     </mj-section>
     <mj-section mj-class="bg">
       <mj-column>
         <mj-text mj-class="text" font-size="16px" font-family="Noto Sans, Helvetica, Arial, sans-serif">
-            <h3>{{ .yourAccountWasDeleted }}</h3>
-            <p>{{ .reason }}: <i>{{ .reasonVal }}</i></p>
+            <h3>{{ .yourAccountWas }}</h3>
+            <p>{{ .reasonString }}: <i>{{ .reason }}</i></p>
         </mj-text>
       </mj-column>
     </mj-section>

mail/deleted.txt

@@ -1,4 +1,5 @@
-{{ .yourAccountWasDeleted }}
-{{ .reason }}: {{ .reasonVal }}
+{{ .yourAccountWas }}
+
+{{ .reasonString }}: {{ .reason }}
 
 {{ .message }}