matrix: remove crypto dep in main file

since this is so broken and requires CGO deps, E2EE support is now only
included with "make E2EE=on ...". The option to enable will then appear
in settings.

.drone.yml

@@ -9,16 +9,28 @@ steps:
       commands:
           - git fetch --tags
     - name: release
-      image: golang:latest
+      image: hrfee/jfa-go-build-docker:latest
+      volumes:
+        - name: ssh_key
+          path: /id_rsa
       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
-        - (curl -sL https://deb.nodesource.com/setup_14.x | bash -)
-        - apt install nodejs
-        - curl -sL https://git.io/goreleaser | bash
+        - 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 'sftp -P 2022 -i /id_rsa -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"'
+        - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "repo-process-deb trusty"'
+        - bash -c 'python3 ../upload.py https://builds.hrfee.pw hrfee jfa-go --tag internal=true'
+volumes:
+    - name: ssh_key
+      host:
+          path: /root/.ssh/id_rsa_packaging
 trigger:
     event:
         - tag
@@ -46,6 +58,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
@@ -60,22 +76,29 @@ type: docker
 
 steps:
     - name: build
-      image: golang:latest
+      image: hrfee/jfa-go-build-docker:latest
+      volumes:
+        - name: ssh_key
+          path: /id_rsa
       commands:
-        - apt update -y
-        - apt 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
+        - 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 'sftp -P 2022 -i /id_rsa -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"'
+          # - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "reprepro -Vb /repo remove trusty-unstable jfa-go"'
+          # - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "reprepro -Vb /repo remove trusty-unstable jfa-go-tray"'
+        - bash -c 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "repo-process-deb trusty"'
+        - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --upload ./dist/*.zip ./dist/*.rpm ./dist/*.apk --tag internal-git=true'
       environment:
           BUILDRONE_KEY:
               from_secret: BUILDRONE_KEY
 
+volumes:
+    - name: ssh_key
+      host:
+          path: /root/.ssh/id_rsa_packaging
 trigger:
     branch:
         - main
@@ -108,6 +131,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
@@ -126,15 +153,11 @@ type: docker
 
 steps:
     - name: build
-      image: golang:latest
+      image: hrfee/jfa-go-build-docker:latest
       commands:
-        - apt update -y
-        - apt 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
+        - 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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,8 +19,11 @@ What to do to reproduce the problem.
 
 **Logs**
 
+**If you're using a build with a tray icon, right-click on it and press "Open logs" to access your logs.**
+
 When you notice the problem, check the output of `jfa-go`. If the problem is not obvious (e.g a panic (red text) or 'ERROR' log), re-run jfa-go with the `-debug` argument and reproduce the problem. You should then take a screenshot of the output, or paste it here, preferably between \`\`\` tags (e.g \`\`\``Log here`\`\`\`). Remember to censor any personal information.
 
+
 If nothing catches your eye in the log, access the admin page via your browser, go into the console (Right click > Inspect Element > Console), refresh, reproduce the problem then paste the output here in the same way as above.
 
 **Configuration**

.gitignore

@@ -1,10 +1,11 @@
 node_modules/
+site/node_modules/
+site/out/
 mail/*.html
 dist/
 build/
 data/
 version.go
-embed.go
 notes
 docs/*
 lang/langtostruct.py
@@ -13,3 +14,8 @@ config-payload.json
 server.key
 server.pem
 server.crt
+instructions-debian.txt
+cl.md
+./telegram/
+mautrix/
+matacc.txt

.goreleaser.yml

@@ -17,30 +17,89 @@ 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
+    - npx esbuild --bundle ts/crash.ts --outfile=./data/crash.js --minify
+    - cp html/crash.html data/
+    - npx uncss data/crash.html --csspath web/css --output data/bundle.css
+    - npx inline-source --root data data/crash.html data/crash.html
+    - rm data/bundle.css
+    - mv data/crash.html data/html/
     - go get -u github.com/swaggo/swag/cmd/swag
     - swag init -g main.go
-    - python3 scripts/embed.py internal
 builds:
-    - dir: ./
+    - id: notray
+      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
         - darwin
       goarch:
-        - amd64
         - arm
         - arm64
+        - amd64
+    - id: windows-tray
+      dir: ./
+      env:
+        - CGO_ENABLED=1
+        - CC=x86_64-w64-mingw32-gcc
+        - CXX=x86_64-w64-mingw32-g++
+      flags:
+        - -tags=tray
+      ldflags:
+        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary -H=windowsgui
+      goos:
+        - windows
+      goarch:
+        - amd64
+    - id: linux-tray
+      dir: ./
+      env:
+        - CGO_ENABLED=1
+      flags:
+        - -tags=tray
+      ldflags:
+        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary
+      goos:
+        - linux
+      goarch:
+        - amd64
 archives:
-  - replacements:
+  - id: windows-tray
+    builds:
+        - windows-tray
+    format: zip
+    name_template: "{{ .ProjectName }}_{{ .Version }}_TrayIcon_{{ .Os }}_{{ .Arch }}"
+    replacements:
+        darwin: macOS
+        linux: Linux
+        windows: Windows
+        amd64: x86_64
+  - id: linux-tray
+    builds:
+        - linux-tray
+    format: zip
+    name_template: "{{ .ProjectName }}_{{ .Version }}_TrayIcon_{{ .Os }}_{{ .Arch }}"
+    replacements:
+        darwin: macOS
+        linux: Linux
+        windows: Windows
+        amd64: x86_64
+  - id: notray
+    builds:
+        - notray
+    format: zip
+    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    replacements:
         darwin: macOS
         linux: Linux
         windows: Windows
@@ -48,10 +107,61 @@ archives:
 checksum:
     name_template: 'checksums.txt'
 snapshot:
-    name_template: "git-{{.ShortCommit}}"
+    name_template: "0.0.0-{{ .Env.JFA_GO_NFPM_EPOCH }}"
 changelog:
     sort: asc
     filters:
         exclude:
             - '^docs:'
             - '^test:'
+nfpms:
+  - id: notray
+    file_name_template: '{{ .ProjectName }}{{ if .IsSnapshot }}-git{{ end }}_{{ .Arch }}_{{ if .IsSnapshot }}{{ .ShortCommit }}{{ else }}v{{ .Version }}{{ end }}'
+    package_name: jfa-go
+    homepage: https://github.com/hrfee/jfa-go
+    description: A web app for managing users on Jellyfin
+    maintainer: Harvey Tindall <hrfee@hrfee.dev>
+    license: MIT
+    vendor: hrfee.dev
+    version_metadata: git
+    builds:
+      - notray
+    contents:
+      - src: ./LICENSE
+        dst: /usr/share/licenses/jfa-go
+    formats:
+      - apk
+      - deb
+      - rpm
+  - id: tray
+    file_name_template: '{{ .ProjectName }}{{ if .IsSnapshot }}-git{{ end }}_TrayIcon_{{ .Arch }}_{{ if .IsSnapshot }}{{ .ShortCommit }}{{ else }}v{{ .Version }}{{ end }}'
+    package_name: jfa-go-tray
+    homepage: https://github.com/hrfee/jfa-go
+    description: A web app for managing users on Jellyfin
+    maintainer: Harvey Tindall <hrfee@hrfee.dev>
+    license: MIT
+    vendor: hrfee.dev
+    version_metadata: git
+    builds:
+      - linux-tray
+    contents:
+      - src: ./LICENSE
+        dst: /usr/share/licenses/jfa-go
+    formats:
+      - apk
+      - deb
+      - rpm
+    overrides:
+        deb:
+            conflicts:
+                - jfa-go
+            replaces:
+                - jfa-go
+            dependencies:
+                - libappindicator3-1
+        rpm:
+            dependencies:
+                - libappindicator-gtk3
+        apk:
+            dependencies:
+                - libappindicator

CONTRIBUTING.md

@@ -1,8 +1,20 @@
 #### 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`.
+Code in Go should ideally use `PascalCase` for exported values, and `camelCase` for non-exported, JSON for transferring data should use `snake_case`, and Typescript should use `camelCase`. Forgive me for my many inconsistencies in this, and feel free to fix them if you want.
+
+Functions in Go that need to access `*appContext` should be generally be receivers, except when the behaviour could be seen as somewhat independent from it (`email.go` is the best example, its behaviour is broadly independent from the main app except from a couple config values).
+
+
+#### 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://wiki.jfa-go.com/docs/build/binary/) 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 inline 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
 

LICENSE

@@ -1,3 +1,5 @@
+---jfa-go---
+
 MIT License
 
 Copyright (c) 2021 Harvey Tindall
@@ -19,3 +21,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+

Makefile

@@ -6,6 +6,69 @@ 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
+TRAY ?= off
+E2EE ?= off
+TAGS := -tags "
+
+ifeq ($(INTERNAL), on)
+	DATA := data
+else
+	DATA := build/data
+	TAGS := $(TAGS) external
+endif
+
+ifeq ($(TRAY), on)
+	TAGS := $(TAGS) tray
+endif
+
+ifeq ($(E2EE), on)
+	TAGS := $(TAGS) e2ee
+endif
+
+TAGS := $(TAGS)"
+
+OS := $(shell go env GOOS)
+ifeq ($(TRAY)$(OS), onwindows)
+	LDFLAGS := $(LDFLAGS) -H=windowsgui
+endif
+
+DEBUG ?= off
+ifeq ($(DEBUG), on)
+	SOURCEMAP := --sourcemap
+	TYPECHECK := tsc -noEmit --project ts/tsconfig.json
+	# jank
+	COPYTS := rm -r $(DATA)/web/js/ts; cp -r ts $(DATA)/web/js
+	UNCSS := cp $(DATA)/web/css/bundle.css $(DATA)/bundle.css
+else
+	LDFLAGS := -s -w $(LDFLAGS)
+	SOURCEMAP :=
+	COPYTS :=
+	TYPECHECK :=
+	UNCSS := npx uncss $(DATA)/crash.html --csspath web/css --output $(DATA)/bundle.css
+endif
+
+RACE ?= off
+ifeq ($(RACE), on)
+	RACEDETECTOR := -race
+else
+	RACEDETECTOR :=
+endif
+
 npm:
 	$(info installing npm dependencies)
 	npm install
@@ -17,84 +80,83 @@ 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
+	-$(ESBUILD) --bundle ts/crash.ts --outfile=./$(DATA)/crash.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
+	$(GOBINARY) build $(RACEDETECTOR) -ldflags="$(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
+
+inline:
+	cp html/crash.html $(DATA)/crash.html
+	$(UNCSS)
+	npx inline-source --root $(DATA) $(DATA)/crash.html $(DATA)/crash.html
+	rm $(DATA)/bundle.css
 
 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)/
+	mv $(DATA)/crash.html $(DATA)/html/
 	$(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 inline swagger copy compile

README.md

@@ -1,27 +1,36 @@
 ![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/)
+[![Translation status](https://weblate.jfa-go.com/widgets/jfa-go/-/svg-badge.svg)](https://weblate.jfa-go.com/engage/jfa-go/)
+[![Docs/Wiki](https://img.shields.io/static/v1?label=documentation&message=jfa-go.com&color=informational)](https://wiki.jfa-go.com)
+
+##### Downloads:
+##### [docker](#docker) | [debian/ubuntu](#debian) | [arch (aur)](#aur) | [other platforms](#other-platforms)
 ---
 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.
+a rewrite of [jellyfin-accounts](https://github.com/hrfee/jellyfin-accounts) (original naming for both, ik 
+😂).
 
 #### 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.
+* 🧑 Invite based account creation: Send 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/Discord/Matrix Integration: Verify users via a chat bot, 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,57 +40,106 @@ 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/).
+**Note**: `TrayIcon` builds include a tray icon to start/stop/restart, and an option to automatically start when you log-in to your computer. For Linux users, these builds depend on the `libappindicator3-1`/`libappindicator-gtk3`/`libappindicator` package for Debian/Ubuntu, Fedora, and Alpine respectively.
 
-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: 
-```
+##### [Docker](https://hub.docker.com/r/hrfee/jfa-go)
+```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
 ```
 
+##### [Debian/Ubuntu](https://apt.hrfee.dev)
+```sh
+sudo apt-get update && sudo apt-get install curl apt-transport-https gnupg
+curl https://apt.hrfee.dev/hrfee.pubkey.gpg | sudo apt-key add -
+
+# For stable releases
+echo "deb https://apt.hrfee.dev trusty main" | sudo tee /etc/apt/sources.list.d/hrfee.list
+# ------
+# For unstable releases
+echo "deb https://apt.hrfee.dev trusty-unstable main" | sudo tee /etc/apt/sources.list.d/hrfee.list
+# ------
+
+sudo apt-get update
+
+# For servers
+sudo apt-get install jfa-go
+# ------
+# For desktops/servers with GUI (has dependencies)
+sudo apt-get install jfa-go-tray
+# ------
+```
+
+##### Arch
+Available on the AUR as:
+* [jfa-go](https://aur.archlinux.org/packages/jfa-go/) (stable)
+* [jfa-go-bin](https://aur.archlinux.org/packages/jfa-go) (pre-compiled, stable)
+* [jfa-go-git](https://aur.archlinux.org/packages/jfa-go-git/) (nightly)
+
+##### Other platforms
+Download precompiled binaries from:
+ * [The releases section](https://github.com/hrfee/jfa-go/releases) (stable)
+ * [Buildrone](https://builds.hrfee.dev/view/hrfee/jfa-go) (nightly)
+
+unzip the `jfa-go`/`jfa-go.exe` 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.
 
-Otherwise, full build instructions can be found [here](https://github.com/hrfee/jfa-go/wiki/Build).
+Otherwise, full build instructions can be found [here](https://wiki.jfa-go.com/docs/build/).
 
 #### 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
-    	alternate path to config file. (default "~/.config/jfa-go/config.ini")
-  -data string
-    	alternate path to data directory. (default "~/.config/jfa-go")
+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.
+
+  -config, -c string
+    	alternate path to config file. (default "/home/hrfee/.config/jfa-go/config.ini")
+  -data, -d string
+    	alternate path to data directory. (default "/home/hrfee/.config/jfa-go")
   -debug
-    	Enables debug logging and exposes pprof.
+    	Enables debug logging.
+  -help, -h
+    	prints this message.
   -host string
     	alternate address to host web ui on.
-  -port int
+  -port, -p int
     	alternate port to host web ui on.
+  -pprof
+    	Exposes pprof profiler on /debug/pprof.
   -swagger
     	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, 
@@ -93,6 +151,6 @@ If you're switching from jellyfin-accounts, copy your existing `~/.jf-accounts`
 #### Contributing
 See [CONTRIBUTING.md](https://github.com/hrfee/jfa-go/blob/main/CONTRIBUTING.md).
 ##### Translation
-[![Translation status](https://weblate.hrfee.pw/widgets/jfa-go/-/multi-auto.svg)](https://weblate.hrfee.pw/engage/jfa-go/)
+[![Translation status](https://weblate.jfa-go.com/widgets/jfa-go/-/multi-auto.svg)](https://weblate.jfa-go.com/engage/jfa-go/)
 
-For translations, use the weblate instance [here](https://weblate.hrfee.pw/engage/jfa-go/). You can login with github.
+For translations, use the weblate instance [here](https://weblate.jfa-go.com/engage/jfa-go/). You can login with github.

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

autostart.go

@@ -0,0 +1,69 @@
+// +build tray
+
+package main
+
+import (
+	"log"
+	"os"
+	"path/filepath"
+
+	"github.com/emersion/go-autostart"
+	"github.com/getlantern/systray"
+)
+
+type Autostart struct {
+	as       *autostart.App
+	enabled  bool
+	menuitem *systray.MenuItem
+	clicked  chan bool
+}
+
+func NewAutostart(name, displayname, trayName, trayTooltip string) *Autostart {
+	a := &Autostart{
+		as: &autostart.App{
+			Name:        name,
+			DisplayName: displayname,
+		},
+		enabled: true,
+		clicked: make(chan bool),
+	}
+	a.menuitem = systray.AddMenuItemCheckbox(trayName, trayTooltip, a.as.IsEnabled())
+	command := os.Args
+	command[0], _ = filepath.Abs(command[0])
+	// Make sure to replace any relative paths with absolute ones
+	pathArgs := []string{"-d", "-data", "-c", "-config"}
+	for i := 1; i < len(command); i++ {
+		isPath := false
+		for _, p := range pathArgs {
+			if command[i-1] == p {
+				isPath = true
+				break
+			}
+		}
+		if isPath {
+			command[i], _ = filepath.Abs(command[i])
+		}
+	}
+	a.as.Exec = command
+	return a
+}
+
+func (a *Autostart) HandleCheck() {
+	for range a.menuitem.ClickedCh {
+		if !a.menuitem.Checked() {
+			if err := a.as.Enable(); err != nil {
+				log.Printf("Failed to enable autostart on login: %v", err)
+			} else {
+				a.menuitem.Check()
+				log.Printf("Enabled autostart")
+			}
+		} else {
+			if err := a.as.Disable(); err != nil {
+				log.Printf("Failed to disable autostart on login: %v", err)
+			} else {
+				a.menuitem.Uncheck()
+				log.Printf("Disabled autostart")
+			}
+		}
+	}
+}

common/common.go

@@ -5,14 +5,14 @@ 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.
 func NewTimeoutHandler(name, addr string, noFail bool) TimeoutHandler {
 	return func() {
 		if r := recover(); r != nil {
-			out := fmt.Sprintf("Failed to authenticate with %s @ %s: Timed out", name, addr)
+			out := fmt.Sprintf("Failed to authenticate with %s @ \"%s\": Timed out", name, addr)
 			if noFail {
 				log.Print(out)
 			} else {

config.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"io/fs"
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -11,13 +12,22 @@ import (
 )
 
 var emailEnabled = false
+var messagesEnabled = false
+var telegramEnabled = false
+var discordEnabled = false
+var matrixEnabled = 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 +37,108 @@ 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", "discord_users", "matrix_users", "announcements"} {
 		app.config.Section("files").Key(key).SetValue(app.config.Section("files").Key(key).MustString(filepath.Join(app.dataPath, (key + ".json"))))
 	}
+	for _, key := range []string{"matrix_sql"} {
+		app.config.Section("files").Key(key).SetValue(app.config.Section("files").Key(key).MustString(filepath.Join(app.dataPath, (key + ".db"))))
+	}
 	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"))
+	jfUrl := app.config.Section("jellyfin").Key("server").String()
+	if !(strings.HasPrefix(jfUrl, "http://") || strings.HasPrefix(jfUrl, "https://")) {
+		app.config.Section("jellyfin").Key("server").SetValue("http://" + jfUrl)
+	}
 
-	app.config.Section("jellyfin").Key("version").SetValue(VERSION)
+	// 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.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.MustSetValue("matrix", "topic", "Jellyfin notifications")
+
+	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)
+	discordEnabled = app.config.Section("discord").Key("enabled").MustBool(false)
+	matrixEnabled = app.config.Section("matrix").Key("enabled").MustBool(false)
+	if !messagesEnabled {
+		emailEnabled = false
+		telegramEnabled = false
+		discordEnabled = false
+		matrixEnabled = false
+	} else if app.config.Section("email").Key("method").MustString("") == "" {
 		emailEnabled = false
 	} else {
 		emailEnabled = true
 	}
+	if !emailEnabled && !telegramEnabled && !discordEnabled && !matrixEnabled {
+		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,6 +152,8 @@ 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)
 

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/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

@@ -30,15 +30,20 @@
     }
 }
 
-@media screen and (max-width: 750px) {
+@media screen and (max-width: 1000px) {
     :root {
         font-size: 0.9rem;
     }
     .table-responsive table {
-        min-width: 660px;
+        min-width: 800px;
     }
 }
 
+.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,18 @@ div.card:contains(section.banner.footer) {
     text-align: right;
 }
 
+.ac {
+    text-align: center;
+}
+
+.w-100 {
+    width: 100%;
+}
+
+.h-100 {
+    height: 100%;
+}
+
 .inline-block {
     display: inline-block;
 }
@@ -149,6 +179,21 @@ div.card:contains(section.banner.footer) {
     margin: 0.5rem;
 }
 
+p.sm,
+span.sm:not(.heading) {
+    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 +209,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 +314,10 @@ sup.\~critical, .text-critical {
     width: 100%;
 }
 
+.flex-auto {
+    flex: auto;
+}
+
 .center {
     justify-content: center;
 }
@@ -382,6 +432,7 @@ p.top {
 
 .table-responsive {
     overflow-x: auto;
+    font-size: 0.9rem;
 }
 
 #notification-box {
@@ -395,3 +446,94 @@ p.top {
     padding-bottom: 0.5rem;
     margin-bottom: -0.5rem;
 }
+
+.dropdown-display.lg {
+    white-space: nowrap;
+}
+
+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;
+}
+
+td.img-circle {
+    width: 32px;
+    height: 32px;
+}
+
+span.img-circle.lg {
+    width: 64px;
+    height: 64px;
+}
+
+span.shield.img-circle {
+    padding: 0.2rem;
+}
+
+img.img-circle {
+    border-radius: 50%;
+    vertical-align: middle;
+}
+
+.table td.sm {
+    padding-top: 0.1rem;
+    padding-bottom: 0.1rem;
+}
+
+.table-inline {
+    display: flex !important;
+    align-items: center;
+}
+
+div.card:contains(section.banner.footer) {
+    padding-bottom: 0px;
+}
+
+.card.sectioned {
+    padding: 0px;
+}
+
+.card.sectioned .section {
+    padding: var(--spacing-4, 1rem);
+}

css/dark.css

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

discord.go

@@ -0,0 +1,410 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	dg "github.com/bwmarrin/discordgo"
+)
+
+type DiscordDaemon struct {
+	Stopped                                                    bool
+	ShutdownChannel                                            chan string
+	bot                                                        *dg.Session
+	username                                                   string
+	tokens                                                     []string
+	verifiedTokens                                             map[string]DiscordUser // Map of tokens to discord users.
+	channelID, channelName, inviteChannelID, inviteChannelName string
+	guildID                                                    string
+	serverChannelName, serverName                              string
+	users                                                      map[string]DiscordUser // Map of user IDs to users. Added to on first interaction, and loaded from app.storage.discord on start.
+	app                                                        *appContext
+}
+
+func newDiscordDaemon(app *appContext) (*DiscordDaemon, error) {
+	token := app.config.Section("discord").Key("token").String()
+	if token == "" {
+		return nil, fmt.Errorf("token was blank")
+	}
+	bot, err := dg.New("Bot " + token)
+	if err != nil {
+		return nil, err
+	}
+	dd := &DiscordDaemon{
+		Stopped:         false,
+		ShutdownChannel: make(chan string),
+		bot:             bot,
+		tokens:          []string{},
+		verifiedTokens:  map[string]DiscordUser{},
+		users:           map[string]DiscordUser{},
+		app:             app,
+	}
+	for _, user := range app.storage.discord {
+		dd.users[user.ID] = user
+	}
+
+	return dd, nil
+}
+
+// NewAuthToken generates an 8-character pin in the form "A1-2B-CD".
+func (d *DiscordDaemon) NewAuthToken() string {
+	pin := genAuthToken()
+	d.tokens = append(d.tokens, pin)
+	return pin
+}
+
+func (d *DiscordDaemon) NewUnknownUser(channelID, userID, discrim, username string) DiscordUser {
+	user := DiscordUser{
+		ChannelID:     channelID,
+		ID:            userID,
+		Username:      username,
+		Discriminator: discrim,
+	}
+	return user
+}
+
+func (d *DiscordDaemon) MustGetUser(channelID, userID, discrim, username string) DiscordUser {
+	if user, ok := d.users[userID]; ok {
+		return user
+	}
+	return d.NewUnknownUser(channelID, userID, discrim, username)
+}
+
+func (d *DiscordDaemon) run() {
+	d.bot.AddHandler(d.messageHandler)
+	d.bot.Identify.Intents = dg.IntentsGuildMessages | dg.IntentsDirectMessages | dg.IntentsGuildMembers | dg.IntentsGuildInvites
+	if err := d.bot.Open(); err != nil {
+		d.app.err.Printf("Discord: Failed to start daemon: %v", err)
+		return
+	}
+	// Wait for everything to populate, it's slow sometimes.
+	for d.bot.State == nil {
+		continue
+	}
+	for d.bot.State.User == nil {
+		continue
+	}
+	d.username = d.bot.State.User.Username
+	for d.bot.State.Guilds == nil {
+		continue
+	}
+	// Choose the last guild (server), for now we don't really support multiple anyway
+	d.guildID = d.bot.State.Guilds[len(d.bot.State.Guilds)-1].ID
+	guild, err := d.bot.Guild(d.guildID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to get guild: %v", err)
+	}
+	d.serverChannelName = guild.Name
+	d.serverName = guild.Name
+	if channel := d.app.config.Section("discord").Key("channel").String(); channel != "" {
+		d.channelName = channel
+		d.serverChannelName += "/" + channel
+	}
+	if d.app.config.Section("discord").Key("provide_invite").MustBool(false) {
+		if invChannel := d.app.config.Section("discord").Key("invite_channel").String(); invChannel != "" {
+			d.inviteChannelName = invChannel
+		}
+	}
+	defer d.bot.Close()
+	<-d.ShutdownChannel
+	d.ShutdownChannel <- "Down"
+	return
+}
+
+// NewTempInvite creates an invite link, and returns the invite URL, as well as the URL for the server icon.
+func (d *DiscordDaemon) NewTempInvite(ageSeconds, maxUses int) (inviteURL, iconURL string) {
+	var inv *dg.Invite
+	var err error
+	if d.inviteChannelName == "" {
+		d.app.err.Println("Discord: Cannot create invite without channel specified in settings.")
+		return
+	}
+	if d.inviteChannelID == "" {
+		channels, err := d.bot.GuildChannels(d.guildID)
+		if err != nil {
+			d.app.err.Printf("Discord: Couldn't get channel list: %v", err)
+			return
+		}
+		found := false
+		for _, channel := range channels {
+			// channel, err := d.bot.Channel(ch.ID)
+			// if err != nil {
+			// 	d.app.err.Printf("Discord: Couldn't get channel: %v", err)
+			// 	return
+			// }
+			if channel.Name == d.inviteChannelName {
+				d.inviteChannelID = channel.ID
+				found = true
+				break
+			}
+		}
+		if !found {
+			d.app.err.Printf("Discord: Couldn't find invite channel \"%s\"", d.inviteChannelName)
+			return
+		}
+	}
+	// channel, err := d.bot.Channel(d.inviteChannelID)
+	// if err != nil {
+	// 	d.app.err.Printf("Discord: Couldn't get invite channel: %v", err)
+	// 	return
+	// }
+	inv, err = d.bot.ChannelInviteCreate(d.inviteChannelID, dg.Invite{
+		// Guild:   d.bot.State.Guilds[len(d.bot.State.Guilds)-1],
+		// Channel: channel,
+		// Inviter: d.bot.State.User,
+		MaxAge:    ageSeconds,
+		MaxUses:   maxUses,
+		Temporary: false,
+	})
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to create invite: %v", err)
+		return
+	}
+	inviteURL = "https://discord.gg/" + inv.Code
+	guild, err := d.bot.Guild(d.guildID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to get guild: %v", err)
+		return
+	}
+	iconURL = guild.IconURL()
+	return
+}
+
+// Returns the user(s) roughly corresponding to the username (if they are in the guild).
+// if no discriminator (#xxxx) is given in the username and there are multiple corresponding users, a list of all matching users is returned.
+func (d *DiscordDaemon) GetUsers(username string) []*dg.Member {
+	members, err := d.bot.GuildMembers(
+		d.guildID,
+		"",
+		1000,
+	)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to get members: %v", err)
+		return nil
+	}
+	hasDiscriminator := strings.Contains(username, "#")
+	var users []*dg.Member
+	for _, member := range members {
+		if hasDiscriminator {
+			if member.User.Username+"#"+member.User.Discriminator == username {
+				return []*dg.Member{member}
+			}
+		}
+		if strings.Contains(member.User.Username, username) {
+			users = append(users, member)
+		}
+	}
+	return users
+}
+
+func (d *DiscordDaemon) NewUser(ID string) (user DiscordUser, ok bool) {
+	u, err := d.bot.User(ID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to get user: %v", err)
+		return
+	}
+	user.ID = ID
+	user.Username = u.Username
+	user.Contact = true
+	user.Discriminator = u.Discriminator
+	channel, err := d.bot.UserChannelCreate(ID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to create DM channel: %v", err)
+		return
+	}
+	user.ChannelID = channel.ID
+	ok = true
+	return
+}
+
+func (d *DiscordDaemon) Shutdown() {
+	d.Stopped = true
+	d.ShutdownChannel <- "Down"
+	<-d.ShutdownChannel
+	close(d.ShutdownChannel)
+}
+
+func (d *DiscordDaemon) messageHandler(s *dg.Session, m *dg.MessageCreate) {
+	if m.GuildID != "" && d.channelName != "" {
+		if d.channelID == "" {
+			channel, err := s.Channel(m.ChannelID)
+			if err != nil {
+				d.app.err.Printf("Discord: Couldn't get channel, will monitor all: %v", err)
+				d.channelName = ""
+			}
+			if channel.Name == d.channelName {
+				d.channelID = channel.ID
+			}
+		}
+		if d.channelID != m.ChannelID {
+			d.app.debug.Printf("Discord: Ignoring message as not in specified channel")
+			return
+		}
+	}
+	if m.Author.ID == s.State.User.ID {
+		return
+	}
+	sects := strings.Split(m.Content, " ")
+	if len(sects) == 0 {
+		return
+	}
+	lang := d.app.storage.lang.chosenTelegramLang
+	if user, ok := d.users[m.Author.ID]; ok {
+		if _, ok := d.app.storage.lang.Telegram[user.Lang]; ok {
+			lang = user.Lang
+		}
+	}
+	switch msg := sects[0]; msg {
+	case d.app.config.Section("discord").Key("start_command").MustString("!start"):
+		d.commandStart(s, m, lang)
+	case "!lang":
+		d.commandLang(s, m, sects, lang)
+	default:
+		d.commandPIN(s, m, sects, lang)
+	}
+}
+
+func (d *DiscordDaemon) commandStart(s *dg.Session, m *dg.MessageCreate, lang string) {
+	channel, err := s.UserChannelCreate(m.Author.ID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to create private channel with \"%s\": %v", m.Author.Username, err)
+		return
+	}
+	user := d.MustGetUser(channel.ID, m.Author.ID, m.Author.Discriminator, m.Author.Username)
+	d.users[m.Author.ID] = user
+	content := d.app.storage.lang.Telegram[lang].Strings.get("startMessage") + "\n"
+	content += d.app.storage.lang.Telegram[lang].Strings.template("languageMessage", tmpl{"command": "!lang"})
+	_, err = s.ChannelMessageSend(channel.ID, content)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", m.Author.Username, err)
+		return
+	}
+}
+
+func (d *DiscordDaemon) commandLang(s *dg.Session, m *dg.MessageCreate, sects []string, lang string) {
+	if len(sects) == 1 {
+		list := "!lang <lang>\n"
+		for code := range d.app.storage.lang.Telegram {
+			list += fmt.Sprintf("%s: %s\n", code, d.app.storage.lang.Telegram[code].Meta.Name)
+		}
+		_, err := s.ChannelMessageSendReply(
+			m.ChannelID,
+			list,
+			m.Reference(),
+		)
+		if err != nil {
+			d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", m.Author.Username, err)
+		}
+		return
+	}
+	if _, ok := d.app.storage.lang.Telegram[sects[1]]; ok {
+		var user DiscordUser
+		for jfID, user := range d.app.storage.discord {
+			if user.ID == m.Author.ID {
+				user.Lang = sects[1]
+				d.app.storage.discord[jfID] = user
+				if err := d.app.storage.storeDiscordUsers(); err != nil {
+					d.app.err.Printf("Failed to store Discord users: %v", err)
+				}
+				break
+			}
+		}
+		d.users[m.Author.ID] = user
+	}
+}
+
+func (d *DiscordDaemon) commandPIN(s *dg.Session, m *dg.MessageCreate, sects []string, lang string) {
+	if _, ok := d.users[m.Author.ID]; ok {
+		channel, err := s.Channel(m.ChannelID)
+		if err != nil {
+			d.app.err.Printf("Discord: Failed to get channel: %v", err)
+			return
+		}
+		if channel.Type != dg.ChannelTypeDM {
+			d.app.debug.Println("Discord: Ignoring message as not a DM")
+			return
+		}
+	} else {
+		d.app.debug.Println("Discord: Ignoring message as user was not found")
+		return
+	}
+	tokenIndex := -1
+	for i, token := range d.tokens {
+		if sects[0] == token {
+			tokenIndex = i
+			break
+		}
+	}
+	if tokenIndex == -1 {
+		_, err := s.ChannelMessageSend(
+			m.ChannelID,
+			d.app.storage.lang.Telegram[lang].Strings.get("invalidPIN"),
+		)
+		if err != nil {
+			d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", m.Author.Username, err)
+		}
+		return
+	}
+	_, err := s.ChannelMessageSend(
+		m.ChannelID,
+		d.app.storage.lang.Telegram[lang].Strings.get("pinSuccess"),
+	)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", m.Author.Username, err)
+	}
+	d.verifiedTokens[sects[0]] = d.users[m.Author.ID]
+	d.tokens[len(d.tokens)-1], d.tokens[tokenIndex] = d.tokens[tokenIndex], d.tokens[len(d.tokens)-1]
+	d.tokens = d.tokens[:len(d.tokens)-1]
+}
+
+func (d *DiscordDaemon) SendDM(message *Message, userID ...string) error {
+	channels := make([]string, len(userID))
+	for i, id := range userID {
+		channel, err := d.bot.UserChannelCreate(id)
+		if err != nil {
+			return err
+		}
+		channels[i] = channel.ID
+	}
+	return d.Send(message, channels...)
+}
+
+func (d *DiscordDaemon) Send(message *Message, channelID ...string) error {
+	msg := ""
+	var embeds []*dg.MessageEmbed
+	if message.Markdown != "" {
+		msg, embeds = StripAltText(message.Markdown, true)
+	} else {
+		msg = message.Text
+	}
+	for _, id := range channelID {
+		var err error
+		if len(embeds) != 0 {
+			_, err = d.bot.ChannelMessageSendComplex(
+				id,
+				&dg.MessageSend{
+					Content: msg,
+					Embed:   embeds[0],
+				},
+			)
+			if err != nil {
+				return err
+			}
+			for i := 1; i < len(embeds); i++ {
+				_, err := d.bot.ChannelMessageSendEmbed(id, embeds[i])
+				if err != nil {
+					return err
+				}
+			}
+		} else {
+			_, err := d.bot.ChannelMessageSend(
+				id,
+				msg,
+			)
+			if err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}

email.go

@@ -4,20 +4,39 @@ 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"
 )
 
+var renderer = html.NewRenderer(html.RendererOptions{Flags: html.Smartypants})
+
 // 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 +44,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 +63,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 +151,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 +178,176 @@ 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) {
+	// x509.SystemCertPool is unavailable on windows
+	if PLATFORM == "windows" {
+		emailer.sender = &SMTP{
+			auth:   smtp.PlainAuth("", username, password, server),
+			server: server,
+			port:   port,
+			sslTLS: sslTLS,
+			tlsConfig: &tls.Config{
+				InsecureSkipVerify: false,
+				ServerName:         server,
+			},
+		}
+		return
+	}
+	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)
+	if plaintext {
+		if telegramEnabled || discordEnabled {
+			keys = []string{"text"}
+			text, markdown = "", ""
+		} else {
+			keys = []string{"text"}
+			text = ""
+		}
+	} else {
+		if telegramEnabled || discordEnabled {
+			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}
+	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 +355,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.TrimSuffix(inviteLink, "/invite"), 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 +799,53 @@ 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)
+			if err != nil {
+				return err
+			}
+		}
+		if dcChat, ok := app.storage.discord[id]; ok && dcChat.Contact && discordEnabled {
+			err = app.discord.Send(email, dcChat.ChannelID)
+			if err != nil {
+				return err
+			}
+		}
+		if mxChat, ok := app.storage.matrix[id]; ok && mxChat.Contact && matrixEnabled {
+			err = app.matrix.Send(email, mxChat)
+			if err != nil {
+				return err
+			}
+		}
+		if address, ok := app.storage.emails[id]; ok && address.Contact && emailEnabled {
+			err = app.email.send(email, address.Addr)
+			if err != nil {
+				return err
+			}
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (app *appContext) getAddressOrName(jfID string) string {
+	if dcChat, ok := app.storage.discord[jfID]; ok && dcChat.Contact && discordEnabled {
+		return dcChat.Username + "#" + dcChat.Discriminator
+	}
+	if tgChat, ok := app.storage.telegram[jfID]; ok && tgChat.Contact && telegramEnabled {
+		return "@" + tgChat.Username
+	}
+	if addr, ok := app.storage.emails[jfID]; ok {
+		return addr.Addr
+	}
+	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"))
-}

exit.go

@@ -0,0 +1,44 @@
+package main
+
+import (
+	"html/template"
+	"log"
+	"os"
+	"path/filepath"
+	"time"
+
+	"github.com/pkg/browser"
+)
+
+// Exit dumps the last 100 lines of output to a crash file in /tmp (or equivalent), and generates a prettier HTML file containing it that is opened in the browser if possible.
+func Exit(err interface{}) {
+	tmpl, err2 := template.ParseFS(localFS, "html/crash.html", "html/header.html")
+	if err2 != nil {
+		log.Fatalf("Failed to load template: %v", err)
+	}
+	logCache := lineCache.String()
+	sanitized := sanitizeLog(logCache)
+	data := map[string]interface{}{
+		"Log":          logCache,
+		"SanitizedLog": sanitized,
+	}
+	if err != nil {
+		data["Err"] = err
+	}
+	fpath := filepath.Join(temp, "jfa-go-crash-"+time.Now().Local().Format("2006-01-02T15:04:05"))
+	err2 = os.WriteFile(fpath+".txt", []byte(logCache), 0666)
+	if err2 != nil {
+		log.Fatalf("Failed to write crash dump file: %v", err2)
+	}
+	log.Printf("\n------\nA crash report has been saved to \"%s\".\n------", fpath+".txt")
+	f, err2 := os.OpenFile(fpath+".html", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
+	if err2 != nil {
+		log.Fatalf("Failed to open crash dump file: %v", err2)
+	}
+	defer f.Close()
+	err2 = tmpl.Execute(f, data)
+	if err2 != nil {
+		log.Fatalf("Failed to execute template: %v", err2)
+	}
+	browser.OpenFile(fpath + ".html")
+}

external.go

@@ -0,0 +1,51 @@
+// +build external
+
+package main
+
+import (
+	"io/fs"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+const binaryType = "external"
+
+var localFS dirFS
+var langFS dirFS
+
+// 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)
+}
+
+type dirFS string
+
+func (dir dirFS) Open(name string) (fs.File, error) {
+	return os.Open(string(dir) + "/" + name)
+}
+
+func (dir dirFS) ReadFile(name string) ([]byte, error) {
+	return os.ReadFile(string(dir) + "/" + name)
+}
+
+func (dir dirFS) ReadDir(name string) ([]fs.DirEntry, error) {
+	return os.ReadDir(string(dir) + "/" + name)
+}
+
+func loadFilesystems() {
+	log.Println("Using external storage")
+	executable, _ := os.Executable()
+	localFS = dirFS(filepath.Join(filepath.Dir(executable), "data"))
+	langFS = dirFS(filepath.Join(filepath.Dir(executable), "data", "lang"))
+}

go.mod

@@ -4,42 +4,58 @@ 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
+
+replace github.com/hrfee/jfa-go/linecache => ./linecache
+
 require (
+	github.com/bwmarrin/discordgo v0.23.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/emersion/go-autostart v0.0.0-20210130080809-00ed301c8e9a
+	github.com/fatih/color v1.10.0
 	github.com/fsnotify/fsnotify v1.4.9
+	github.com/getlantern/systray v1.1.0
 	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/jsonreference v0.19.6 // 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
 	github.com/golang/protobuf v1.4.3 // indirect
+	github.com/gomarkdown/markdown v0.0.0-20210408062403-ad838ccf8cdd
+	github.com/google/go-cmp v0.5.3 // indirect
 	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/linecache v0.0.0-00010101000000-000000000000
+	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.5
+	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/mattn/go-sqlite3 v1.14.7 // indirect
+	github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32
+	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	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
-	golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect
-	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
-	golang.org/x/tools v0.1.0 // indirect
+	github.com/writeas/go-strip-markdown v2.0.1+incompatible
+	golang.org/x/net v0.0.0-20210610132358-84b48f89b13b // indirect
+	golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 // indirect
+	golang.org/x/tools v0.1.3 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 	gopkg.in/ini.v1 v1.62.0
+	maunium.net/go/mautrix v0.9.14
 )

go.sum

@@ -1,6 +1,4 @@
-cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
@@ -9,26 +7,35 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
+github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
+github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
+github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2uts=
+github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
+github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
+github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
+github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
+github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
+github.com/bwmarrin/discordgo v0.23.2 h1:BzrtTktixGHIu9Tt7dEE6diysEF9HWnXeHuoJEt2fH4=
+github.com/bwmarrin/discordgo v0.23.2/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473 h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w=
+github.com/emersion/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:M88ob4TyDnEqNuL3PgsE/p3bDujfspnulR+0dQWNYZs=
+github.com/emersion/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:buzQsO8HHkZX2Q45fdfGH1xejPjuDQaXH8btcYMFzPM=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
@@ -36,9 +43,25 @@ 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.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 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=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
+github.com/getlantern/context v0.0.0-20190109183933-c447772a6520/go.mod h1:L+mq6/vvYHKjCX2oez0CgEAJmbq1fbb/oNJIWQkBybY=
+github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7 h1:6uJ+sZ/e03gkbqZ0kUG6mfKoqDb4XMAzMIwlajq19So=
+github.com/getlantern/errors v0.0.0-20190325191628-abdb3e3e36f7/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7 h1:guBYzEaLz0Vfc/jv0czrr2z7qyzTOGC9hiQ0VC+hKjk=
+github.com/getlantern/golog v0.0.0-20190830074920-4ef2e798c2d7/go.mod h1:zx/1xUUeYPy3Pcmet8OSXLbF47l+3y6hIPpyLWoR9oc=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7 h1:micT5vkcr9tOVk1FiH8SWKID8ultN44Z+yzd2y/Vyb0=
+github.com/getlantern/hex v0.0.0-20190417191902-c6586a6fe0b7/go.mod h1:dD3CgOrwlzca8ed61CsZouQS5h5jIzkK9ZWrTcf0s+o=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55 h1:XYzSdCbkzOC0FDNrgJqGRo8PCMFOBFL9py72DRs7bmc=
+github.com/getlantern/hidden v0.0.0-20190325191715-f02dbb02be55/go.mod h1:6mmzY2kW1TOOrVy+r41Za2MxXM+hhqTtY3oBKd2AgFA=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f h1:wrYrQttPS8FHIRSlsrcuKazukx/xqO/PpLZzZXsF+EA=
+github.com/getlantern/ops v0.0.0-20190325191751-d70cb0d6f85f/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
+github.com/getlantern/systray v1.1.0 h1:U0wCEqseLi2ok1fE6b88gJklzriavPJixZysZPkZd/Y=
+github.com/getlantern/systray v1.1.0/go.mod h1:AecygODWIsBquJCJFop8MEQcJbWFfw/1yWbVabNgpCM=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/gzip v0.0.1 h1:ezvKOL6jH+jlzdHNE4h9h8q8uMpDQjyl0NN0Jd7jozc=
 github.com/gin-contrib/gzip v0.0.1/go.mod h1:fGBJBCdt6qCZuCAOwWuFhBB4OOq9EFqlo5dEaFhhu5w=
@@ -56,9 +79,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=
@@ -69,8 +89,9 @@ github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3Hfo
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
-github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM=
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
+github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs=
+github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
 github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA=
@@ -80,8 +101,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,9 +115,11 @@ 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/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+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/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1 h1:G5FRp8JnTd7RQH5kemVNlMeyXQAztQ3mOWV95KxsXH8=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -109,23 +133,37 @@ 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=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/hrfee/mediabrowser v0.3.5 h1:bOJlI2HLvw7v0c7mcRw5XDRMUHReQzk5z0EJYRyYjpo=
+github.com/hrfee/mediabrowser v0.3.5/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/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+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/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -134,12 +172,9 @@ 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/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -147,24 +182,29 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 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/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8=
+github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 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=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA=
+github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -173,25 +213,29 @@ 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/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
+github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
+github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32 h1:K3WnH8Ka32vWygzmjKEhz1zAVqckNoWDqX3azMxuiSA=
+github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32/go.mod h1:yvwcBfzEX4m+eTgxPBbNYytaWFv4PSQzBaeYjxp8Iik=
+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=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -207,6 +251,16 @@ 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/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
+github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
+github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
+github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
+github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/tidwall/sjson v1.1.5 h1:wsUceI/XDyZk3J1FUvuuYlK62zJv2HO2Pzb8A5EWdUE=
+github.com/tidwall/sjson v1.1.5/go.mod h1:VuJzsZnTowhSxWdOgsAnb886i4AjEyTkk7tNtsL7EYE=
 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=
@@ -219,29 +273,33 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY
 github.com/ugorji/go/codec v1.1.13/go.mod h1:oNVt3Dq+FO91WNQ/9JnHKQP2QJxTzoN7wCBFCq1OeuU=
 github.com/ugorji/go/codec v1.2.0 h1:As6RccOIlbm9wHuWYMlB30dErcI+4WiKWsYsmPkyrUw=
 github.com/ugorji/go/codec v1.2.0/go.mod h1:dXvG35r7zTX6QImXOSFhGMmKtX+wJ7VTWzGvYQGIjBs=
-github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 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/yuin/goldmark v1.2.1 h1:ruQGxdhGHe7FWOJPT0mKs5+pD2Xs1Bm/kdGlHO04FmM=
+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/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
+golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 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=
+golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 h1:umElSU9WZirRdgu2yFHY0ayQkEnKiOC1TtM3fWXFnoU=
-golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4 h1:c2HOrn5iMezYjSlGPncknSEr/8x5LELb/ilJbXi9DEA=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 h1:XQyxROzUlZH+WIQwySDgnISgOivlhjIEwaQaJEJrrN0=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -254,17 +312,21 @@ 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/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
+golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
+golang.org/x/net v0.0.0-20210610132358-84b48f89b13b h1:k+E048sYJHyVnsr1GDrRZWQ32D2C7lWs9JRc0bel53A=
+golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 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=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -273,20 +335,28 @@ golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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-20191026070338-33540a1f6037/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-20200515095857-1151b9dac4a9/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/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210611083646-a4fc73990273 h1:faDu4veV+8pcThn4fewv6TVlNCezafGoC1gM/mxQLbQ=
+golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 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=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -298,23 +368,20 @@ golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.3 h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -330,14 +397,13 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
-gopkg.in/go-playground/validator.v9 v9.29.1 h1:SvGtYmN60a5CVKTOzMSyfzWDeZRxRuGvRQyEAKbw1xc=
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -349,5 +415,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc h1:/hemPrYIhOhy8zYrNj+069zDB68us2sMGsfkFJO0iZs=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+maunium.net/go/maulogger/v2 v2.2.4/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
+maunium.net/go/mautrix v0.9.14 h1:2MMJ630VM+xfa4Q5AooMAhPG1+wQnQybSr/z8PlRZ8A=
+maunium.net/go/mautrix v0.9.14/go.mod h1:7IzKfWvpQtN+W2Lzxc0rLvIxFM3ryKX6Ys3S/ZoWbg8=

html/admin.html

@@ -5,10 +5,14 @@
         <script>
             window.URLBase = "{{ .urlBase }}";
             window.notificationsEnabled = {{ .notifications }};
-            window.emailEnabled = {{ .email_enabled }};
+            window.emailEnabled = {{ .emailEnabled }};
+            window.telegramEnabled = {{ .telegramEnabled }};
+            window.discordEnabled = {{ .discordEnabled }};
+            window.matrixEnabled = {{ .matrixEnabled }};
             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 +43,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 +111,128 @@
                 </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">
+                        <div id="announce-details">
+                            <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>
+                        </div>
+                        <label class="label unfocused" id="announce-name"><p class="supra">{{ .strings.name }}</p>
+                            <input type="text" class="input ~neutral !normal mb-1 mt-half">
+                            <p class="support">{{ .strings.templateEnterName }}</p>
+                        </label>
+                        <div class="row flex-expand">
+                            <label>
+                                <input type="submit" class="unfocused">
+                                <span class="button ~urge !normal center supra submit">{{ .strings.send }}</span>
+                            </label>
+                            <span class="button ~info !normal center supra" id="save-announce">{{ .strings.saveAsTemplate }}</span>
+                        </div>
+                    </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 +305,64 @@
                 </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 .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" 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 }}
+        {{ if .discordEnabled }}
+        <div id="modal-discord" class="modal">
+            <div class="modal-content card">
+                <span class="heading mb-1"><span id="discord-header"></span><span class="modal-close">&times;</span></span>
+                <p class="content mb-1" id="discord-description"></p>
+                <div class="row">
+                    <input type="search" class="col sm field ~neutral !normal input" id="discord-search" placeholder="user#1234">
+                </div>
+                <table class="table"><tbody id="discord-list"></tbody></table>
+            </div>
+        </div>
+        {{ end }}
+        <div id="modal-matrix" class="modal">
+            <form class="modal-content card" id="form-matrix" href="">
+                <span class="heading">{{ .strings.linkMatrix }}</span>
+                <p class="content">{{ .strings.linkMatrixDescription }}</p>
+                <input type="text" class="field input ~neutral !high mt-half mb-1" placeholder="{{ .strings.matrixHomeServer }}" id="matrix-homeserver">
+                <input type="text" class="field input ~neutral !high mt-half mb-1" placeholder="{{ .strings.username }}" id="matrix-user">
+                <input type="password" class="field input ~neutral !high mt-half mb-1" placeholder="{{ .strings.password }}" id="matrix-password">
+                <label>
+                    <input type="submit" class="unfocused">
+                    <span class="button ~urge !normal full-width center supra submit">{{ .strings.submit }}</span>
+                </label>
+            </form>
+        </div>
         <div id="notification-box"></div>
         <span class="dropdown" tabindex="0" id="lang-dropdown">
             <span class="button ~urge dropdown-button">
@@ -172,7 +370,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 +408,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>
@@ -240,7 +524,14 @@
                             <div id="create-send-to-container">
                                 <label class="label supra">{{ .strings.inviteSendToEmail }}</label>
                                 <div class="flex-expand mb-1 mt-half">
+                                    {{ if .discordEnabled }}
+                                    <input type="text" id="create-send-to" class="input ~neutral !normal mr-1" placeholder="example@example.com | user#1234">
+                                    <span id="create-send-to-search" class="button ~neutral !normal mr-1">
+                                        <i class="icon ri-search-2-line" title="{{ .strings.search }}"></i>
+                                    </span>
+                                    {{ else }}
                                     <input type="email" id="create-send-to" class="input ~neutral !normal mr-1" placeholder="example@example.com">
+                                    {{ end }}
                                     <label for="create-send-to-enabled" class="button ~neutral !normal">
                                         <input type="checkbox" id="create-send-to-enabled" aria-label="Send to address enabled">
                                     </label>
@@ -253,11 +544,27 @@
             </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>
+                            <div id="accounts-announce-dropdown" class="col sm dropdown" tabindex="0">
+                                <span class="h-100 sm button ~info !normal center mb-half" id="accounts-announce">{{ .strings.announce }}</span>
+                                <div class="dropdown-display">
+                                    <div class="card ~neutral !low">
+                                        <span class="supra sm">{{ .strings.templates }}</span>
+                                        <div id="accounts-announce-templates"></div>
+                                    </div>
+                                </div>
+                            </div>
+                            <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 +573,16 @@
                                     <th><input type="checkbox" value="" id="accounts-select-all"></th>
                                     <th>{{ .strings.username }}</th>
                                     <th>{{ .strings.emailAddress }}</th>
+                                    {{ if .telegramEnabled }}
+                                    <th>Telegram</th>
+                                    {{ end }}
+                                    {{ if .matrixEnabled }}
+                                    <th>Matrix</th>
+                                    {{ end }}
+                                    {{ if .discordEnabled }}
+                                    <th>Discord</th>
+                                    {{ end }}
+                                    <th>{{ .strings.expiry }}</th>
                                     <th>{{ .strings.lastActiveTime }}</th>
                                 </tr>
                             </thead>
@@ -276,10 +593,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/crash.html

@@ -0,0 +1,49 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <link inline rel="stylesheet" type="text/css" href="bundle.css">
+        {{ template "header.html" . }}
+        <title>Crash report</title>
+    </head>
+    <body>
+        <div class="page-container">
+            <div class="row">
+                <div class="col">
+                    <div class="card ~critical sectioned">
+                        <section class="section ~critical">
+                            <span class="heading">Crash report for jfa-go</span>
+                            {{ if .Err }}
+                            <div class="monospace pre-line mt-1 mb-1">
+                            Error: {{ .Err }}
+                            </div>
+                            {{ end }}
+                            <a class="button ~critical mb-1" target="_blank" href="https://github.com/hrfee/jfa-go/issues/new/choose">Create an Issue</a>
+                        </section>
+                        <section class="section ~neutral !low">
+                            <div class="flex-expand">
+                                <span class="subheading">Full Log</span>
+                                <span class="button ~urge ml-half" id="copy-log">Copy</span>
+                            </div>
+                            <div class="row mb-1">
+                                <label class="col mr-1">
+                                    <span class="button ~neutral !high supra full-width center" id="button-log-normal">Normal</span>
+                                </label>
+                                <label class="col mr-1">
+                                    <span class="button ~neutral !normal supra full-width center" id="button-log-sanitized">Sanitized</span>
+                                </label>
+                            </div>
+                            <div id="log-normal">
+                                <pre class="monospace pre-line">{{ .Log }}</pre>
+                            </div>
+                            <div id="log-sanitized" class="unfocused">
+                                <p class="subheading">An attempt has been made to remove sensitive info, but make sure to check yourself.</p>
+                                <pre class="monospace pre-line">{{ .SanitizedLog }}</pre>
+                            </div>
+                        </section>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script inline src="crash.js"></script>
+    </body>
+</html>

html/form-base.html

@@ -5,8 +5,30 @@
     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 }}";
+    window.discordEnabled = {{ .discordEnabled }};
+    window.discordRequired = {{ .discordRequired }};
+    window.discordPIN = "{{ .discordPIN }}";
+    window.discordInviteLink = {{ .discordInviteLink }};
+    window.discordServerName = "{{ .discordServerName }}";
+    window.matrixEnabled = {{ .matrixEnabled }};
+    window.matrixRequired = {{ .matrixRequired }};
+    window.matrixUserID = "{{ .matrixUser }}";
 </script>
+{{ if .passwordReset }}
+<script src="js/pwr.js" type="module"></script>
+{{ else }}
 <script src="js/form.js" type="module"></script>
 {{ end }}
+{{ end }}

html/form.html

@@ -3,7 +3,13 @@
     <head>
         <link rel="stylesheet" type="text/css" href="css/bundle.css">
         {{ template "header.html" . }}
-        <title>{{ .strings.pageTitle }}</title>
+        <title>
+            {{ if .passwordReset }}
+            {{ .strings.passwordReset }}
+            {{ else }}
+            {{ .strings.pageTitle }}
+            {{ end }}
+        </title>
     </head>
     <body class="max-w-full overflow-x-hidden section">
         <div id="modal-success" class="modal">
@@ -19,6 +25,53 @@
                 <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 }}
+        {{ if .discordEnabled }}
+        <div id="modal-discord" class="modal">
+            <div class="modal-content card">
+                <span class="heading mb-1">{{ .strings.linkDiscord }}</span>
+                <p class="content mb-1"> {{ .discordSendPINMessage }}</p>
+                <h1 class="ac">{{ .discordPIN }}</h1>
+                <a id="discord-invite"></a>
+                <span class="button ~info !normal full-width center mt-1" id="discord-waiting">{{ .strings.success }}</span>
+            </div>
+        </div>
+        {{ end }}
+        {{ if .matrixEnabled }}
+        <div id="modal-matrix" class="modal">
+            <div class="modal-content card">
+                <span class="heading mb-1">{{ .strings.linkMatrix }}</span>
+                <p class="content mb-1"> {{ .strings.matrixEnterUser }}</p>
+                <input type="text" class="input ~neutral !high" placeholder="@user:riot.im" id="matrix-userid">
+                <div class="subheading link-center mt-1">
+                    <span class="shield ~info mr-1">
+                        <span class="icon">
+                            <i class="ri-chat-3-line"></i>
+                        </span>
+                    </span>
+                    {{ .matrixUser }}
+                </div>
+                <span class="button ~info !normal full-width center mt-1" id="matrix-send">{{ .strings.submit }}</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,31 +82,85 @@
                 </div>
             </div>
         </span>
+        <div id="notification-box"></div>
         <div class="page-container">
             <div class="card ~neutral !low">
                 <div class="row baseline">
-                    <span class="col heading">{{ .strings.createAccountHeader }}</span>
-                    <span class="col subheading"> {{ .helpMessage }}</span>
+                    <span class="col heading">
+                        {{ if .passwordReset }}
+                        {{ .strings.passwordReset }}
+                        {{ else }}
+                        {{ .strings.createAccountHeader }}
+                        {{ end }}
+                    </span>
+                    <span class="col subheading"> 
+                        {{ if .passwordReset }}
+                        {{ .strings.enterYourPassword }}
+                        {{ else }}
+                        {{ .helpMessage }}
+                        {{ end }}
+                    </span>
                 </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="">
+                            {{ if not .passwordReset }}
                             <label class="label supra">
                                 {{ .strings.username }}
                                 <input type="text" class="input ~neutral !high mt-half mb-1" placeholder="{{ .strings.username }}" id="create-username" aria-label="{{ .strings.username }}">
                             </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>
+                            {{ end }}
+                            {{ if .discordEnabled }}
+                            <span class="button ~info !normal full-width center mb-1" id="link-discord">{{ .strings.linkDiscord }}</span>
+                            {{ end }}
+                            {{ if .matrixEnabled }}
+                            <span class="button ~info !normal full-width center mb-1" id="link-matrix">{{ .strings.linkMatrix }}</span>
+                            {{ end }}
+                            {{ if or (.telegramEnabled) (or .discordEnabled .matrixEnabled) }}
+                            <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>
+                                {{ if .telegramEnabled }}
+                                <label class="row switch pb-1">
+                                    <input type="radio" name="contact-via" value="telegram" id="contact-via-telegram"><span>Contact through Telegram</span>
+                                </label>
+                                {{ end }}
+                                {{ if .discordEnabled }}
+                                <label class="row switch pb-1">
+                                    <input type="radio" name="contact-via" value="discord" id="contact-via-discord"><span>Contact through Discord</span>
+                                </label>
+                                {{ end }}
+                                {{ if .matrixEnabled }}
+                                <label class="row switch pb-1">
+                                    <input type="radio" name="contact-via" value="matrix" id="contact-via-matrix"><span>Contact through Matrix</span>
+                                </label>
+                                {{ end }}
+                            </div>
+                            {{ end }}
+                            {{ 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>
+                                <span class="button ~urge !normal full-width center supra submit">
+                                    {{ if .passwordReset }}
+                                    {{ .strings.reset }}
+                                    {{ else }}
+                                    {{ .strings.createAccountButton }}
+                                    {{ end }}
+                                </span>
                             </label>
                         </form>
                     </div>
@@ -78,4 +185,3 @@
         {{ template "form-base" . }}
     </body>
 </html>
-

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-pin.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">
@@ -219,85 +233,92 @@
                 </section>
             </div>
             <div class="card ~neutral !low mb-1 unfocused">
-                <span class="heading">{{ .lang.Email.title }}</span>
-                <p class="content" id="email-description"></p>
-                <div class="row">
-                    <div class="col">
-                        <label class="label">
-                            <span>{{ .lang.Email.method }}</span>
-                            <div class="select ~neutral !normal mt-half mb-1">
-                                <select id="email-method">
-                                    <option value="">{{ .lang.Strings.disabled }}</option>
-                                    <option value="smtp">SMTP</option>
-                                    <option value="mailgun">Mailgun</option>
-                                </select>
-                            </div>
-                        </label>
-                        <label class="row switch">
-                            <input type="checkbox" id="email-no_username"><span>{{ .lang.Email.useEmailAsUsername }}</span>
-                        </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">
-                        </label>
-                        <label class="label">
-                            <span class="mt-half">{{ .lang.Email.senderName }}</span>
-                            <input type="text" class="input ~neutral !normal mt-half mb-1" id="email-from" value="Jellyfin">
-                        </label>
-                        <label class="label">
-                            <span class="mt-half">{{ .lang.Email.dateFormat }}</span>
-                            <input type="text" class="input ~neutral !normal mt-half" id="email-date_format" value="%d/%m/%y">
-                            <p class="support mb-1" id="email-dateformat-notice"></p>
-                        </label>
-                        <div>
-                            <label class="row switch pb-1">
-                                <input type="radio" name="email-24h" value="true" checked><span>{{ .lang.Email.time24h }}</span>
-                            </label>
-                            <label class="row switch pb-1">
-                                <input type="radio" name="email-24h" value="false"><span>{{ .lang.Email.time12h }}</span>
-                            </label>
-                        </div>
-                    </div>
-                    <div class="col">
-                        <div id="email-smtp">
-                            <p class="subheading">SMTP</p>
+                <span class="heading">{{ .lang.Messages.title }}</span>
+                <p class="content" id="messages-description"></p>
+                <label class="row switch pb-1">
+                    <input type="checkbox" id="messages-enabled" checked><span>{{ .lang.Strings.enabled }}</span>
+                </label>
+                <label class="label">
+                    <span class="mt-half">{{ .lang.Email.dateFormat }}</span>
+                    <input type="text" class="input ~neutral !normal mt-half" id="email-date_format" value="%d/%m/%y">
+                    <p class="support mb-1" id="email-dateformat-notice"></p>
+                </label>
+                <div>
+                    <label class="row switch pb-1">
+                        <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.Strings.time12h }}</span>
+                    </label>
+                </div>
+                <div id="email-sect">
+                    <span class="heading">{{ .lang.Email.title }}</span>
+                    <p class="content" id="email-description"></p>
+                    <div class="row">
+                        <div class="col">
                             <label class="label">
-                                <span>{{ .lang.Email.encryption }}</span>
+                                <span>{{ .lang.Email.method }}</span>
                                 <div class="select ~neutral !normal mt-half mb-1">
-                                    <select id="smtp-encryption">
-                                        <option value="starttls">STARTTLS ({{ .lang.Strings.port }} 587)</option>
-                                        <option value="ssl_tls">SSL/TLS ({{ .lang.Strings.port }} 465)</option>
+                                    <select id="email-method">
+                                        <option value="">{{ .lang.Strings.disabled }}</option>
+                                        <option value="smtp">SMTP</option>
+                                        <option value="mailgun">Mailgun</option>
                                     </select>
                                 </div>
                             </label>
-                            <label class="label">
-                                <span class="mt-half">{{ .lang.Strings.serverAddress }}</span>
-                                <input type="url" class="input ~neutral !normal mt-half mb-1" id="smtp-server" placeholder="smtp.jellyf.in">
+                            <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>
                             <label class="label">
-                                <span class="mt-half">{{ .lang.Strings.port }}</span>
-                                <input type="number" class="input ~neutral !normal mt-half mb-1" id="smtp-port" placeholder="587">
+                                <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">
                             </label>
                             <label class="label">
-                                <span class="mt-half">{{ .lang.Strings.username }}</span>
-                                <input type="text" class="input ~neutral !normal mt-half mb-1" id="smtp-username">
-                            </label>
-                            <label class="label">
-                                <span class="mt-half">{{ .lang.Strings.password }}</span>
-                                <input type="password" class="input ~neutral !normal mt-half mb-1" id="smtp-password">
+                                <span class="mt-half">{{ .lang.Email.senderName }}</span>
+                                <input type="text" class="input ~neutral !normal mt-half mb-1" id="email-from" value="Jellyfin">
                             </label>
                         </div>
-                        <div id="email-mailgun">
-                            <p class="subheading">Mailgun</p>
-                            <label class="label">
-                                <span class="mt-half">{{ .lang.Email.mailgunApiURL }}</span>
-                                <input type="url" class="input ~neutral !normal mt-half mb-1" id="mailgun-api_url" placeholder="https://api.eu.mailgun.net/v3/mail.jellyf.in/messages">
-                            </label>
-                            <label class="label">
-                                <span class="mt-half">{{ .lang.Strings.apiKey }}</span>
-                                <input type="text" class="input ~neutral !normal mt-half mb-1" id="mailgun-api_key">
-                            </label>
+                        <div class="col">
+                            <div id="email-smtp">
+                                <p class="subheading">SMTP</p>
+                                <label class="label">
+                                    <span>{{ .lang.Email.encryption }}</span>
+                                    <div class="select ~neutral !normal mt-half mb-1">
+                                        <select id="smtp-encryption">
+                                            <option value="starttls">STARTTLS ({{ .lang.Strings.port }} 587)</option>
+                                            <option value="ssl_tls">SSL/TLS ({{ .lang.Strings.port }} 465)</option>
+                                        </select>
+                                    </div>
+                                </label>
+                                <label class="label">
+                                    <span class="mt-half">{{ .lang.Strings.serverAddress }}</span>
+                                    <input type="url" class="input ~neutral !normal mt-half mb-1" id="smtp-server" placeholder="smtp.jellyf.in">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-half">{{ .lang.Strings.port }}</span>
+                                    <input type="number" class="input ~neutral !normal mt-half mb-1" id="smtp-port" placeholder="587">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-half">{{ .lang.Strings.username }}</span>
+                                    <input type="text" class="input ~neutral !normal mt-half mb-1" id="smtp-username">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-half">{{ .lang.Strings.password }}</span>
+                                    <input type="password" class="input ~neutral !normal mt-half mb-1" id="smtp-password">
+                                </label>
+                            </div>
+                            <div id="email-mailgun">
+                                <p class="subheading">Mailgun</p>
+                                <label class="label">
+                                    <span class="mt-half">{{ .lang.Email.mailgunApiURL }}</span>
+                                    <input type="url" class="input ~neutral !normal mt-half mb-1" id="mailgun-api_url" placeholder="https://api.eu.mailgun.net/v3/mail.jellyf.in/messages">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-half">{{ .lang.Strings.apiKey }}</span>
+                                    <input type="text" class="input ~neutral !normal mt-half mb-1" id="mailgun-api_key">
+                                </label>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -351,7 +372,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 +383,22 @@
                     <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="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="switch">
+                    <input type="checkbox" id="password_resets-set_password"><span>{{ .lang.PasswordResets.setPassword }}</span>
+                    <p class="support mb-1">{{ .lang.PasswordResets.setPasswordNotice }}</p>
+                </label>
                 <label class="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

invdaemon.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

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,11 +111,13 @@ 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"`
 	Ombi               langSection `json:"ombi"`
 	Email              langSection `json:"email"`
+	Messages           langSection `json:"messages"`
 	Notifications      langSection `json:"notifications"`
 	WelcomeEmails      langSection `json:"welcomeEmails"`
 	PasswordResets     langSection `json:"passwordResets"`
@@ -117,14 +137,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/da-dk.json

@@ -0,0 +1,199 @@
+{
+    "meta": {
+        "name": "Dansk"
+    },
+    "strings": {
+        "invites": "Invitationer",
+        "accounts": "Konti",
+        "settings": "Indstillinger",
+        "inviteMonths": "Måneder",
+        "inviteDays": "Dage",
+        "inviteHours": "Timer",
+        "inviteMinutes": "Minutter",
+        "inviteNumberOfUses": "Antal anvendelser",
+        "inviteDuration": "Invitations varighed",
+        "warning": "Advarsel",
+        "inviteInfiniteUsesWarning": "invitationer med uendelig brug kan blive misbrugt",
+        "inviteSendToEmail": "Send til",
+        "login": "Log på",
+        "logout": "Log ud",
+        "create": "Opret",
+        "apply": "Anvend",
+        "delete": "Slet",
+        "add": "Tilføj",
+        "select": "Vælg",
+        "name": "Navn",
+        "date": "Dato",
+        "enabled": "Aktiveret",
+        "disabled": "Deaktiveret",
+        "reEnable": "Genaktiver",
+        "disable": "Deaktiver",
+        "admin": "Administrator",
+        "updates": "Opdateringer",
+        "update": "Opdatering",
+        "download": "Hent",
+        "search": "Søg",
+        "advancedSettings": "Avanceret Indstillinger",
+        "lastActiveTime": "Sidst Aktiv",
+        "from": "Fra",
+        "user": "Bruger",
+        "expiry": "Udløb",
+        "userExpiry": "Brugerens Udløb",
+        "userExpiryDescription": "En specificeret tid efter hver tilmelding, sletter/deaktiverer jfa-go kontoen. Du kan ændre denne adfærd i indstillingerne.",
+        "aboutProgram": "Om",
+        "version": "Version",
+        "commitNoun": "Commit",
+        "newUser": "Ny Bruger",
+        "profile": "Profil",
+        "unknown": "Ukendt",
+        "label": "Etiket",
+        "announce": "Annoncere",
+        "subject": "Emne",
+        "message": "Meddelelse",
+        "variables": "Variabler",
+        "conditionals": "Betingelser",
+        "preview": "Eksempel",
+        "reset": "Nulstil",
+        "edit": "Rediger",
+        "donate": "Doner",
+        "contactThrough": "Kontakt gennem:",
+        "extendExpiry": "Forlæng udløb",
+        "customizeMessages": "Tilpas Meddelelser",
+        "customizeMessagesDescription": "Hvis du ikke vil bruge jfa-go's meddelelses skabeloner, kan du oprette din egen ved hjælp af Markdown.",
+        "markdownSupported": "Markdown understøttes.",
+        "modifySettings": "Rediger indstillinger",
+        "modifySettingsDescription": "Anvend indstillinger fra en eksisterende profil, eller hent dem direkte fra en bruger.",
+        "applyHomescreenLayout": "Anvend startskærmens layout",
+        "sendDeleteNotificationEmail": "Send notifikations meddelelse",
+        "sendDeleteNotifiationExample": "Din konto er blevet slettet.",
+        "settingsRestart": "Genstart",
+        "settingsRestarting": "Genstarter…",
+        "settingsRestartRequired": "Genstart nødvendig",
+        "settingsRestartRequiredDescription": "En genstart er nødvendig for at anvende nogle indstillinger du har ændret. Genstart nu eller senere?",
+        "settingsApplyRestartLater": "Anvend, genstart senere",
+        "settingsApplyRestartNow": "Anvend & genstart",
+        "settingsApplied": "Indstillingerne anvendt.",
+        "settingsRefreshPage": "Opdater siden om få sekunder.",
+        "settingsRequiredOrRestartMessage": "Bemærk: {n} angiver et obligatorisk felt, {n} angiver at ændringer kræver genstart.",
+        "settingsSave": "Gem",
+        "ombiUserDefaults": "Ombi bruger standarder",
+        "ombiUserDefaultsDescription": "Opret en Ombi bruger og konfigurer den, vælg den derefter nedenfor. Brugerens indstillinger/tilladelser gemmes og anvendes på nye Ombi brugere oprettet af jfa-go",
+        "userProfiles": "Bruger Profiler",
+        "userProfilesDescription": "Profiler anvendes på brugere når de opretter en konto. En profil inkluderer adgangsrettigheder til biblioteket og layout på startskærmen.",
+        "userProfilesIsDefault": "Standard",
+        "userProfilesLibraries": "Biblioteker",
+        "addProfile": "Tilføj Profil",
+        "addProfileDescription": "Opret en Jellyfin bruger og konfigurer den, vælg den derefter nedenfor. Når denne profil anvendes på en invitation, oprettes nye brugere med indstillingerne.",
+        "addProfileNameOf": "Profil Navn",
+        "addProfileStoreHomescreenLayout": "Gem startskærmens layout",
+        "inviteNoUsersCreated": "Ingen endnu!",
+        "inviteUsersCreated": "Oprettet brugere",
+        "inviteNoProfile": "Ingen Profil",
+        "inviteDateCreated": "Oprettet",
+        "inviteRemainingUses": "Resterende anvendelser",
+        "inviteNoInvites": "Ingen",
+        "inviteExpiresInTime": "Udløber om {n}",
+        "notifyEvent": "Meddel den:",
+        "notifyInviteExpiry": "Ved udløb",
+        "notifyUserCreation": "Ved oprettelse af brugere",
+        "sendPIN": "Bed brugeren om at sende pinkoden nedenfor til boten.",
+        "searchDiscordUser": "Begynd at skrive Discord brugernavnet for at finde brugeren.",
+        "findDiscordUser": "Find Discord bruger",
+        "linkMatrixDescription": "Indtast brugernavnet og adgangskoden til den bruger der skal bruges som en bot. Når indsendt, genstarter appen.",
+        "matrixHomeServer": "Hjemme server adresse"
+    },
+    "notifications": {
+        "changedEmailAddress": "Ændret e-mail adresse på {n}.",
+        "userCreated": "Bruger {n} oprettet.",
+        "createProfile": "Oprettede profil {n}.",
+        "saveSettings": "Indstillingerne blev gemt",
+        "saveEmail": "E-mail gemt.",
+        "sentAnnouncement": "Meddelelse sendt.",
+        "setOmbiDefaults": "Ombi standarder gemt.",
+        "updateApplied": "Opdatering anvendt, genstart.",
+        "updateAppliedRefresh": "Opdatering anvendt, genindlæs venligst siden.",
+        "telegramVerified": "Telegram konto verificeret.",
+        "accountConnected": "Konto tilsluttet.",
+        "errorConnection": "Kunne ikke oprette forbindelse til jfa-go.",
+        "error401Unauthorized": "Adgang nægtet. Prøv at genindlæse siden.",
+        "errorSettingsAppliedNoHomescreenLayout": "Indstillingerne blev anvendt, men anvendelse af startskærmens layout mislykkedes muligvis.",
+        "errorHomescreenAppliedNoSettings": "Startskærmens layout blev anvendt, men anvendelsen af indstillingerne mislykkedes muligvis.",
+        "errorSettingsFailed": "Ansøgningen mislykkedes.",
+        "errorLoginBlank": "Brugernavnet og/eller adgangskoden blev efterladt tomme.",
+        "errorUnknown": "Ukendt fejl.",
+        "errorSaveEmail": "Kunne ikke gemme e-mail.",
+        "errorBlankFields": "Felter blev efterladt tomme",
+        "errorDeleteProfile": "Kunne ikke slette profilen {n}",
+        "errorLoadProfiles": "Profiler kunne ikke indlæses.",
+        "errorCreateProfile": "Kunne ikke oprette profilen {n}",
+        "errorSetDefaultProfile": "Standard profilen kunne ikke indstilles.",
+        "errorLoadUsers": "Kunne ikke indlæse brugere.",
+        "errorSaveSettings": "Kunne ikke gemme indstillingerne.",
+        "errorLoadSettings": "Indstillingerne kunne ikke indlæses.",
+        "errorSetOmbiDefaults": "Ombi standarderne kunne ikke gemmes.",
+        "errorLoadOmbiUsers": "Kunne ikke indlæse ombi brugere.",
+        "errorChangedEmailAddress": "Kunne ikke ændre e-mail adressen på {n}.",
+        "errorFailureCheckLogs": "Mislykkedes (tjek konsol/logfiler)",
+        "errorPartialFailureCheckLogs": "Delvis fejl (tjek konsol/logfiler)",
+        "errorUserCreated": "Kunne ikke oprette bruger {n}.",
+        "errorSendWelcomeEmail": "Kunne ikke sende velkomst meddelelse (tjek konsol/logfiler",
+        "errorApplyUpdate": "Kunne ikke anvende opdateringen, prøv manuelt.",
+        "errorCheckUpdate": "Kunne ikke kontrollere for opdatering.",
+        "updateAvailable": "En ny opdatering er tilgængelig, tjek indstillingerne.",
+        "noUpdatesAvailable": "Ingen nye opdateringer tilgængelige."
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "Rediger indstillinger for {n} bruger",
+            "plural": "Rediger indstillinger for {n} brugere"
+        },
+        "deleteNUsers": {
+            "singular": "Slet {n} bruger",
+            "plural": "Slet {n} brugere"
+        },
+        "disableUsers": {
+            "singular": "Deaktiver {n} bruger",
+            "plural": "Deaktiver {n} brugere"
+        },
+        "reEnableUsers": {
+            "singular": "Genaktiver {n} bruger",
+            "plural": "Genaktiver {n} brugere"
+        },
+        "addUser": {
+            "singular": "Tilføj bruger",
+            "plural": "Tilføj brugere"
+        },
+        "deleteUser": {
+            "singular": "Slet bruger",
+            "plural": "Slet brugere"
+        },
+        "deletedUser": {
+            "singular": "Slettede {n} bruger.",
+            "plural": "Slettede {n} brugere."
+        },
+        "disabledUser": {
+            "singular": "Deaktiveret {n} bruger.",
+            "plural": "Deaktiverede {n} brugere."
+        },
+        "enabledUser": {
+            "singular": "Aktiveret {n} bruger.",
+            "plural": "Aktiveret {n} brugere."
+        },
+        "announceTo": {
+            "singular": "Annoncer til {n} bruger",
+            "plural": "Annoncer til {n} brugere"
+        },
+        "appliedSettings": {
+            "singular": "Anvendte indstillinger til {n} bruger.",
+            "plural": "Anvendte indstillinger til {n} brugere."
+        },
+        "extendExpiry": {
+            "singular": "Forlæng udløbet for {n} bruger",
+            "plural": "Forlæng udløbet for {n} brugere"
+        },
+        "extendedExpiry": {
+            "singular": "Forlængede udløb for {n} bruger.",
+            "plural": "Forlængede udløb for {n} brugere."
+        }
+    }
+}

lang/admin/de-de.json

@@ -32,7 +32,7 @@
         "modifySettings": "Einstellungen ändern",
         "modifySettingsDescription": "Wende Einstellungen von einem bestehenden Profil an, oder beziehe sie direkt von einem Benutzer.",
         "applyHomescreenLayout": "Startbildschirmlayout anwenden",
-        "sendDeleteNotificationEmail": "Benachrichtigungs-E-Mail senden",
+        "sendDeleteNotificationEmail": "Benachrichtigung senden",
         "sendDeleteNotifiationExample": "Dein Konto wurde gelöscht.",
         "settingsRestartRequired": "Neustart erforderlich",
         "settingsRestartRequiredDescription": "Ein Neustart ist notwendig, um einige Einstellungen anzuwenden, die du geändert hast. Jetzt oder später neu starten?",
@@ -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,43 @@
         "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": "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",
+        "reEnable": "Wieder aktivieren",
+        "disable": "Deaktivieren",
+        "donate": "Spenden",
+        "conditionals": "Bedingungen",
+        "contactThrough": "Kontakt über:",
+        "sendPIN": "Bitte den Benutzer, die unten stehende PIN an den Bot zu senden.",
+        "inviteMonths": "Monate",
+        "add": "Hinzufügen",
+        "select": "Auswählen",
+        "searchDiscordUser": "Gib den Discord-Benutzername ein, um den Benutzer zu finden.",
+        "findDiscordUser": "Suche Discord-Benutzer",
+        "linkMatrixDescription": "Gib den Benutzernamen und das Passwort des Benutzers ein, der als Bot verwendet werden soll. Nach dem Absenden wird die App neu gestartet.",
+        "matrixHomeServer": "Adresse des Homeservers"
     },
     "notifications": {
         "changedEmailAddress": "E-Mail-Adresse von {n} geändert.",
@@ -94,7 +129,18 @@
         "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 Willkommensnachricht (ü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.",
+        "updateAppliedRefresh": "Update angewendet, bitte aktualisieren.",
+        "telegramVerified": "Telegram-Konto verifiziert.",
+        "accountConnected": "Konto verbunden."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -120,6 +166,34 @@
         "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."
+        },
+        "disabledUser": {
+            "plural": "Benutzer {n} Deaktiviert.",
+            "singular": "Benutzer {n} Deaktiviert."
+        },
+        "enabledUser": {
+            "singular": "Benutzer {n} Aktiviert.",
+            "plural": "Benutzer {n} Aktiviert."
+        },
+        "disableUsers": {
+            "singular": "Benutzer {n} deaktivieren",
+            "plural": "Deaktiviere {n} Benutzer"
+        },
+        "reEnableUsers": {
+            "singular": "Benutzer {n} wieder aktivieren",
+            "plural": "Benutzer {n} wieder aktivieren"
         }
     }
 }

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",
@@ -18,11 +20,26 @@
         "create": "Create",
         "apply": "Apply",
         "delete": "Delete",
+        "add": "Add",
+        "select": "Select",
         "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 +47,25 @@
         "profile": "Profile",
         "unknown": "Unknown",
         "label": "Label",
+        "announce": "Announce",
+        "templates": "Templates",
+        "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 +90,35 @@
         "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.",
+        "searchDiscordUser": "Start typing the Discord username to find the user.",
+        "findDiscordUser": "Find Discord user",
+        "linkMatrixDescription": "Enter the username and password of the user to use as a bot. Once submitted, the app will restart.",
+        "matrixHomeServer": "Home server address",
+        "saveAsTemplate": "Save as template",
+        "deleteTemplate": "Delete template",
+        "templateEnterName": "Enter a name to save this template."
     },
     "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.",
+        "savedAnnouncement": "Announcement saved.",
         "setOmbiDefaults": "Stored ombi defaults.",
+        "updateApplied": "Update applied, please restart.",
+        "updateAppliedRefresh": "Update applied, please refresh.",
+        "telegramVerified": "Telegram account verified.",
+        "accountConnected": "Account connected.",
         "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 +126,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 +141,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 +156,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 +176,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,188 @@
+{
+    "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",
+        "donate": "Donar"
+    },
+    "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",
@@ -33,7 +34,7 @@
         "modifySettings": "Modifier les paramètres",
         "modifySettingsDescription": "Appliquez les paramètres à partir d'un profil existant ou obtenez-les directement auprès d'un utilisateur.",
         "applyHomescreenLayout": "Appliquer la disposition de l'écran d'accueil",
-        "sendDeleteNotificationEmail": "Envoyer un e-mail de notification",
+        "sendDeleteNotificationEmail": "Envoyer un message de notification",
         "sendDeleteNotifiationExample": "Votre compte a été supprimé.",
         "settingsRestartRequired": "Redémarrage nécessaire",
         "settingsRestartRequiredDescription": "Un redémarrage est nécessaire pour appliquer certains paramètres que vous avez modifiés. Redémarrer maintenant ou plus tard ?",
@@ -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,42 @@
         "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éinitialisation",
+        "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",
+        "userExpiryDescription": "Un laps de temps spécifié après chaque inscription, jfa-go supprimera / désactivera le compte. Vous pouvez modifier ce comportement dans les paramètres.",
+        "donate": "Faire un don",
+        "extendExpiry": "Prolonger l'expiration",
+        "contactThrough": "Contacté par :",
+        "sendPIN": "Demandez à l'utilisateur d'envoyer le code PIN ci-dessous au bot.",
+        "add": "Ajouter",
+        "select": "Sélectionner",
+        "findDiscordUser": "Trouver l'utilisateur Discord",
+        "linkMatrixDescription": "Entrez le nom d'utilisateur et le mot de passe de l'utilisateur pour l’utilisateur comme bot. Une fois soumis, l'application va redémarrer.",
+        "searchDiscordUser": "Commencez à taper le nom d'utilisateur Discord pour trouver l'utilisateur.",
+        "matrixHomeServer": "Adresse du serveur"
     },
     "notifications": {
         "changedEmailAddress": "Adresse e-mail modifiée de {n}.",
@@ -95,7 +130,18 @@
         "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 message 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.",
+        "errorApplyUpdate": "Échec de l'application de la mise à jour, essayez manuellement.",
+        "errorCheckUpdate": "Échec de la vérification de la mise à jour.",
+        "updateAvailable": "Une nouvelle mise à jour est disponible, vérifiez les paramètres.",
+        "noUpdatesAvailable": "Aucune nouvelle mise à jour disponible.",
+        "telegramVerified": "Compte Telegram vérifié.",
+        "updateAppliedRefresh": "Mise à jour appliquée, veuillez actualiser.",
+        "accountConnected": "Compte connecté."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -121,6 +167,34 @@
         "appliedSettings": {
             "singular": "Appliquer le paramètre {n} utilisteur.",
             "plural": "Appliquer les paramètres {n} utilisteurs."
+        },
+        "announceTo": {
+            "singular": "Annonce à {n} utilisateur",
+            "plural": "Annonce à {n} utilisateurs"
+        },
+        "enabledUser": {
+            "plural": "{n} utilisateurs activés.",
+            "singular": "{n} utilisateur activé."
+        },
+        "extendExpiry": {
+            "singular": "Prolonger l'expiration pour {n} utilisateur",
+            "plural": "Prolonger l'expiration pour {n} utilisateurs"
+        },
+        "extendedExpiry": {
+            "singular": "Expiration prolongée pour {n} utilisateur.",
+            "plural": "Expiration prolongée pour {n} utilisateurs."
+        },
+        "disableUsers": {
+            "singular": "Désactiver {n} utilisateur",
+            "plural": "Désactiver {n} utilisateurs"
+        },
+        "reEnableUsers": {
+            "singular": "Ré-activer {n} utilisateur",
+            "plural": "Ré-activer {n} utilisateurs"
+        },
+        "disabledUser": {
+            "singular": "{n} utilisateur désactivé.",
+            "plural": "{n} utilisateurs désactivés."
         }
     }
 }

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

@@ -32,7 +32,7 @@
         "modifySettings": "Instellingen aanpassen",
         "modifySettingsDescription": "Pas instellingen van een bestaand profiel toe, of neem ze direct over van een gebruiker.",
         "applyHomescreenLayout": "Sla startpagina indeling op",
-        "sendDeleteNotificationEmail": "Stuur meldingse-mail",
+        "sendDeleteNotificationEmail": "Stuur melding",
         "sendDeleteNotifiationExample": "Je account is verwijderd.",
         "settingsRestartRequired": "Herstart nodig",
         "settingsRestartRequiredDescription": "Er is een herstart nodig om de wijzigingen door te voeren. Herstart nu of later?",
@@ -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,43 @@
         "notifyUserCreation": "Bij aanmaken gebruiker",
         "label": "Label",
         "settingsRestart": "Herstart",
-        "settingsRestarting": "Aan het herstarten…"
+        "settingsRestarting": "Aan het herstarten…",
+        "announce": "Aankondiging",
+        "markdownSupported": "Markdown wordt ondersteund.",
+        "subject": "Onderwerp",
+        "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",
+        "donate": "Doneer",
+        "contactThrough": "Stuur bericht via:",
+        "sendPIN": "Vraag de gebruiker om onderstaande pincode naar de bot te sturen.",
+        "add": "Voeg toe",
+        "searchDiscordUser": "Begin de Discord gebruikersnaam te typen om de gebruiker te vinden.",
+        "linkMatrixDescription": "Vul de gebruikersnaam en wachtwoord in van de gebruiker om als bot te gebruiken. De app start zodra ze zijn verstuurd.",
+        "select": "Selecteer",
+        "findDiscordUser": "Zoek Discord gebruiker",
+        "matrixHomeServer": "Adres home server"
     },
     "notifications": {
         "changedEmailAddress": "E-mailadres van {n} gewijzigd.",
@@ -93,8 +128,19 @@
         "errorChangedEmailAddress": "Wijzigen van e-mailadres van {n} mislukt.",
         "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."
+        "errorSendWelcomeEmail": "Versturen van welkomstbericht is mislukt (zie console/logs)",
+        "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.",
+        "telegramVerified": "Telegram-account goedgekeurd.",
+        "updateAppliedRefresh": "Update toegepast, ververs alsjeblieft.",
+        "accountConnected": "Account gekoppeld."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -120,6 +166,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

@@ -33,7 +33,7 @@
         "modifySettings": "Modificar configurações",
         "modifySettingsDescription": "Aplique as configurações de um perfil existente ou obtenha-as diretamente de um usuário.",
         "applyHomescreenLayout": "Aplicar layout na tela inicial",
-        "sendDeleteNotificationEmail": "Enviar email de notificação",
+        "sendDeleteNotificationEmail": "Enviar mensagem de notificação",
         "sendDeleteNotifiationExample": "Sua conta foi deletada.",
         "settingsRestartRequired": "Necessário reiniciar",
         "settingsRestartRequiredDescription": "É necessário reiniciar para aplicar algumas configurações alteradas. Deseja reiniciar agora ou mais tarde?",
@@ -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,42 @@
         "notifyInviteExpiry": "No vencimento",
         "notifyUserCreation": "Na criação do usuário",
         "settingsRestart": "Reiniciar",
-        "settingsRestarting": "Reiniciando…"
+        "settingsRestarting": "Reiniciando…",
+        "announce": "Anunciar",
+        "subject": "Assunto",
+        "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",
+        "donate": "Doar",
+        "contactThrough": "Contato através:",
+        "sendPIN": "Peça ao usuário para enviar o PIN abaixo para o bot.",
+        "searchDiscordUser": "Digite o nome de usuário do Discord.",
+        "findDiscordUser": "Encontrar usuário Discord",
+        "add": "Adicionar",
+        "linkMatrixDescription": "Digite o nome de usuário e a senha para usar como bot. Depois de enviado, o aplicativo será reiniciado.",
+        "select": "Selecionar"
     },
     "notifications": {
         "changedEmailAddress": "Endereço de e-mail alterado de {n}.",
@@ -94,7 +128,18 @@
         "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 mensagem 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.",
+        "telegramVerified": "Conta do Telegram verificada.",
+        "updateAppliedRefresh": "Atualização instalada, atualize.",
+        "accountConnected": "Conta conectada."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -120,6 +165,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/da-dk.json

@@ -0,0 +1,26 @@
+{
+    "meta": {
+        "name": "Dansk"
+    },
+    "strings": {
+        "username": "Brugernavn",
+        "password": "Adgangskode",
+        "emailAddress": "E-mail Adresse",
+        "name": "Navn",
+        "submit": "Indsend",
+        "send": "Send",
+        "success": "Succes",
+        "error": "Fejl",
+        "copy": "Kopiér",
+        "copied": "Kopiret",
+        "time24h": "24 timers tid",
+        "time12h": "12 timers tid",
+        "linkTelegram": "Link Telegram",
+        "contactEmail": "Kontakt gennem E-mail",
+        "contactTelegram": "Kontakt gennem Telegram",
+        "linkDiscord": "Link Discord",
+        "linkMatrix": "Link Matrix",
+        "contactDiscord": "Kontakt gennem Discord",
+        "theme": "Tema"
+    }
+}

lang/common/de-de.json

@@ -8,8 +8,19 @@
         "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",
+        "linkTelegram": "Link Telegram",
+        "contactEmail": "Kontakt über E-Mail",
+        "contactTelegram": "Kontakt über Telegram",
+        "linkDiscord": "Link Discord",
+        "linkMatrix": "Link Matrix",
+        "send": "Senden",
+        "contactDiscord": "Kontakt über Discord"
     }
 }

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

@@ -8,8 +8,19 @@
         "emailAddress": "Email Address",
         "name": "Name",
         "submit": "Submit",
+        "send": "Send",
         "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",
+        "linkDiscord": "Link Discord",
+        "linkMatrix": "Link Matrix",
+        "contactDiscord": "Contact through Discord",
         "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,17 @@
         "submit": "Soumettre",
         "success": "Succès",
         "error": "Erreur",
-        "theme": "Thème"
+        "copy": "Copier",
+        "time24h": "Temps 24h",
+        "time12h": "Temps 12h",
+        "theme": "Thème",
+        "copied": "Copié",
+        "linkTelegram": "Lien Telegram",
+        "contactEmail": "Contact par e-mail",
+        "contactTelegram": "Contact par Telegram",
+        "linkDiscord": "Lier Discord",
+        "linkMatrix": "Lier Matrix",
+        "send": "Envoyer",
+        "contactDiscord": "Contacter par Discord"
     }
 }

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

@@ -8,8 +8,19 @@
         "password": "Wachtwoord",
         "emailAddress": "E-mailadres",
         "submit": "Verstuur",
-        "success": "Success",
+        "success": "Succes",
         "error": "Fout",
-        "theme": "Thema"
+        "copy": "Kopiëer",
+        "theme": "Thema",
+        "time24h": "24u-formaat",
+        "time12h": "12u-formaat",
+        "copied": "Gekopieerd",
+        "linkTelegram": "Koppel Telegram",
+        "contactEmail": "Stuur e-mailbericht",
+        "contactTelegram": "Stuur Telegram-bericht",
+        "send": "Verstuur",
+        "linkDiscord": "Koppel Discord",
+        "linkMatrix": "Koppel Matrix",
+        "contactDiscord": "Stuur Discord bericht"
     }
 }

lang/common/pt-br.json

@@ -10,6 +10,17 @@
         "submit": "Enviar",
         "success": "Sucesso",
         "error": "Erro",
-        "theme": "Tema"
+        "copy": "Copiar",
+        "theme": "Tema",
+        "time24h": "Horário 24h",
+        "time12h": "Horário 12h",
+        "copied": "Copiado",
+        "linkTelegram": "Link do Telegram",
+        "contactEmail": "Contato por Email",
+        "contactTelegram": "Contato pelo Telegram",
+        "send": "Enviar",
+        "linkDiscord": "Link do Discord",
+        "linkMatrix": "Link do Matrix",
+        "contactDiscord": "Contato através do Discord"
     }
 }

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/da-dk.json

@@ -0,0 +1,77 @@
+{
+    "meta": {
+        "name": "Dansk"
+    },
+    "strings": {
+        "ifItWasNotYou": "Ignorer venligst hvis dette ikke var dig.",
+        "helloUser": "Hej {username},",
+        "reason": "Grund"
+    },
+    "userCreated": {
+        "name": "Bruger oprettet",
+        "title": "Meddelelse: Bruger oprettet",
+        "aUserWasCreated": "En bruger blev oprettet med koden {code}.",
+        "time": "Tid",
+        "notificationNotice": "Meddelelse: Notifikations e-mails kan blive ændret på admin-siden."
+    },
+    "inviteExpiry": {
+        "name": "Invitationens udløb",
+        "title": "Meddelelse: Invitation udløbet",
+        "inviteExpired": "Invitation udløbet.",
+        "expiredAt": "Koden {code} udløber om {time}.",
+        "notificationNotice": "Meddelelse: Notifikations e-mails kan blive ændret på admin-siden."
+    },
+    "passwordReset": {
+        "name": "Nulstil Adgangskode",
+        "title": "Nulstilling af adgangskode anmodet - Jellyfin",
+        "someoneHasRequestedReset": "Nogen har for nylig anmodet om nulstilling af din adgangskode på Jellyfin.",
+        "ifItWasYou": "Hvis dette var dig, så indtast venligst pinkoden nedenunder ind i prompten.",
+        "ifItWasYouLink": "Hvis dette var dig, så tryk på linket nedenunder.",
+        "codeExpiry": "Koden udløber den {date}, klokken {time} UTC, hvilket er om {expiresInMinutes}.",
+        "pin": "PINKODE"
+    },
+    "userDeleted": {
+        "name": "Sletning af bruger",
+        "title": "Din konto blev slettet - Jellyfin",
+        "yourAccountWasDeleted": "Din Jellyfin konto blev slettet."
+    },
+    "userDisabled": {
+        "name": "Bruger deaktiveret",
+        "title": "Din konto er blevet deaktiveret - Jellyfin",
+        "yourAccountWasDisabled": "Din konto blev deaktiveret."
+    },
+    "userEnabled": {
+        "name": "Bruger aktiveret",
+        "title": "Din konto er blevet genaktiveret - Jellyfin",
+        "yourAccountWasEnabled": "Din konto blev genaktiveret."
+    },
+    "inviteEmail": {
+        "name": "Invitations e-mail",
+        "title": "Invitation - Jellyfin",
+        "hello": "Hej",
+        "youHaveBeenInvited": "Du er blevet inviteret til Jellyfin.",
+        "toJoin": "Tilmeld dig med linket nedenfor.",
+        "inviteExpiry": "Invitationen vil udløbe den {date} kl. {time}, hvilket er om {expiresInMinutes}, så skynd dig.",
+        "linkButton": "Opsæt din konto"
+    },
+    "welcomeEmail": {
+        "name": "Velkommen",
+        "title": "Velkommen til Jellyfin",
+        "welcome": "Velkommen til Jellyfin!",
+        "youCanLoginWith": "Du kan logge ind med nedenstående oplysninger",
+        "yourAccountWillExpire": "Din konto udløber den {date}.",
+        "jellyfinURL": "URL"
+    },
+    "emailConfirmation": {
+        "name": "Bekræftelses e-mail",
+        "title": "Bekræft din e-mail - Jellyfin",
+        "clickBelow": "Klik på linket nedenunder for at bekræfte din e-mail adresse og start med at bruge Jellyfin.",
+        "confirmEmail": "Bekræft E-mail"
+    },
+    "userExpired": {
+        "name": "Brugerens udløb",
+        "title": "Din konto er udløbet - Jellyfin",
+        "yourAccountHasExpired": "Din konto er udløbet.",
+        "contactTheAdmin": "Kontakt administratoren for mere information."
+    }
+}

lang/email/de-de.json

@@ -3,50 +3,75 @@
         "name": "Deutsch (DE)"
     },
     "strings": {
-        "ifItWasNotYou": "Wenn du das nicht warst, ignoriere bitte diese E-Mail.",
-        "helloUser": "Hallo {n},"
+        "ifItWasNotYou": "Wenn du das nicht warst, ignoriere bitte dies.",
+        "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",
+        "ifItWasYouLink": "Wenn du das warst, klick auf den Link unten."
     },
     "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": "Willkommen",
+        "yourAccountWillExpire": "Dein Konto läuft am {date} ab."
     },
     "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."
+    },
+    "userDisabled": {
+        "name": "Benutzer deaktiviert",
+        "title": "Dein Konto wurde deaktiviert - Jellyfin",
+        "yourAccountWasDisabled": "Dein Konto wurde deaktiviert."
+    },
+    "userEnabled": {
+        "name": "Benutzer aktiviert",
+        "title": "Dein Konto wurde wieder freigeschaltet - Jellyfin",
+        "yourAccountWasEnabled": "Dein Konto wurde wieder aktiviert."
     }
 }

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

@@ -4,50 +4,75 @@
         "author": "https://github.com/Cornichon420"
     },
     "strings": {
-        "ifItWasNotYou": "Si ce n'était pas toi, tu peux ignorer ce mail.",
-        "helloUser": "Salut {n},"
+        "ifItWasNotYou": "Si ce n'était pas toi, tu peux ignorer ceci.",
+        "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": "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

@@ -3,50 +3,75 @@
         "name": "Nederlands (NL)"
     },
     "strings": {
-        "ifItWasNotYou": "Als jij dit niet was, negeer dan alsjeblieft deze email.",
-        "helloUser": "Hoi {n},"
+        "ifItWasNotYou": "Als jij dit niet was, negeer dit dan alsjeblieft.",
+        "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": "Welkom",
+        "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

@@ -3,50 +3,75 @@
         "name": "Português (BR)"
     },
     "strings": {
-        "ifItWasNotYou": "Se não foi você, ignore este e-mail.",
-        "helloUser": "Ola {n},"
+        "ifItWasNotYou": "Se não foi você, ignore.",
+        "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": "Bem-vindo",
+        "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/da-dk.json

@@ -0,0 +1,57 @@
+{
+    "meta": {
+        "name": "Dansk"
+    },
+    "strings": {
+        "pageTitle": "Opret en Jellyfin Konto",
+        "createAccountHeader": "Opret Konto",
+        "accountDetails": "Detaljer",
+        "emailAddress": "E-mail",
+        "username": "Brugernavn",
+        "password": "Adgangskode",
+        "reEnterPassword": "Genindtast Adgangskode",
+        "reEnterPasswordInvalid": "Adgangskoderne er ikke ens.",
+        "createAccountButton": "Opret Konto",
+        "passwordRequirementsHeader": "Adgangskodekrav",
+        "successHeader": "Succes!",
+        "successContinueButton": "Fortsæt",
+        "confirmationRequired": "E-mail bekræftelse er påkrævet",
+        "confirmationRequiredMessage": "Tjek venligst din e-mail indbakke for at verificere din adresse.",
+        "yourAccountIsValidUntil": "Din konto er gyldig indtil {date}.",
+        "sendPIN": "Send nedenstående pinkode til boten, og kom derefter tilbage her for at linke din konto.",
+        "sendPINDiscord": "Skriv {command} i {server_channel} på Discord, og send PIN-koden nedenfor via. DM til boten.",
+        "matrixEnterUser": "Skriv dit Bruger ID, tryk Indsend, og en PIN-kode vil blive sendt til dig. Skriv den her efter for at fortsætte."
+    },
+    "notifications": {
+        "errorUserExists": "Brugeren eksistere allerede.",
+        "errorInvalidCode": "Ugyldig invitations kode.",
+        "errorTelegramVerification": "Telegram verifikation påkrævet.",
+        "errorDiscordVerification": "Discord verifikation påkrævet.",
+        "errorMatrixVerification": "Matrix verifikation påkrævet.",
+        "errorInvalidPIN": "PIN-koden er ugyldig.",
+        "errorUnknown": "Ukendt fejl.",
+        "verified": "konto verificeret."
+    },
+    "validationStrings": {
+        "length": {
+            "singular": "Skal mindst have {n} tegn",
+            "plural": "Skal mindst have {n} tegn"
+        },
+        "uppercase": {
+            "singular": "Skal mindst have {n} store bogstaver",
+            "plural": "Skal mindst have {n} store bogstaver"
+        },
+        "lowercase": {
+            "singular": "Skal mindst have {n} små bogstaver",
+            "plural": "Skal mindst have {n} små bogstaver"
+        },
+        "number": {
+            "singular": "Skal mindst have {n} tal",
+            "plural": "Skal mindst have {n} tal"
+        },
+        "special": {
+            "singular": "Skal mindst have {n} specialtegn",
+            "plural": "Skal mindst have {n} specialtegn"
+        }
+    }
+}

lang/form/de-de.json

@@ -13,10 +13,14 @@
         "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.",
+        "sendPIN": "Sende die untenstehende PIN an den Bot und komm dann hierher zurück, um dein Konto zu verbinden.",
+        "sendPINDiscord": "Gib auf Discord {command} in {server_channel} ein und sende die untenstehende PIN als DM an den Bot.",
+        "matrixEnterUser": "Gib deine Benutzer-ID ein und drücke auf Absenden. Anschließend erhälst du ein PIN, die hier eingegeben wird um fortzufahren."
     },
     "validationStrings": {
         "length": {
@@ -42,6 +46,13 @@
     },
     "notifications": {
         "errorUserExists": "Benutzer existiert bereits.",
-        "errorInvalidCode": "Ungültiger Invite-Code."
+        "errorInvalidCode": "Ungültiger Invite-Code.",
+        "telegramVerified": "Telegram-Konto verifiziert.",
+        "errorTelegramVerification": "Verifizierung von Telegram erforderlich.",
+        "errorInvalidPIN": "PIN ist ungültig.",
+        "errorDiscordVerification": "Discord-Verifizierung erforderlich.",
+        "errorMatrixVerification": "Matrix-Verifizierung erforderlich.",
+        "errorUnknown": "Unbekannter Fehler.",
+        "verified": "Konto verifiziert."
     }
 }

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,21 @@
         "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.",
+        "sendPINDiscord": "Type {command} in {server_channel} on Discord, then send the PIN below via DM to the bot.",
+        "matrixEnterUser": "Enter your User ID, press submit, and a PIN will be sent to you. Enter it here to continue."
     },
     "notifications": {
         "errorUserExists": "User already exists.",
-        "errorInvalidCode": "Invalid invite code."
+        "errorInvalidCode": "Invalid invite code.",
+        "errorTelegramVerification": "Telegram verification required.",
+        "errorDiscordVerification": "Discord verification required.",
+        "errorMatrixVerification": "Matrix verification required.",
+        "errorInvalidPIN": "PIN is invalid.",
+        "errorUnknown": "Unknown error.",
+        "verified": "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/fr-fr.json

@@ -14,10 +14,14 @@
         "reEnterPasswordInvalid": "Les mots de passe ne correspondent pas.",
         "createAccountButton": "Créer le compte",
         "passwordRequirementsHeader": "Mot de passe requis",
-        "successHeader": "Succes!",
+        "successHeader": "Succès !",
         "successContinueButton": "Continuer",
         "confirmationRequired": "Confirmation de l'adresse e-mail requise",
-        "confirmationRequiredMessage": "Veuillez vérifier votre boite de réception pour confirmer votre adresse e-mail."
+        "confirmationRequiredMessage": "Veuillez vérifier votre boite de réception pour confirmer votre adresse e-mail.",
+        "yourAccountIsValidUntil": "Votre compte sera valide jusqu'au {date}.",
+        "sendPIN": "Envoyez le code PIN ci-dessous au bot, puis revenez ici pour lier votre compte.",
+        "sendPINDiscord": "Écrivez {command} dans le salon {server_channel} sur Discord puis envoyez le PIN en message privé au bot.",
+        "matrixEnterUser": "Entrez votre nom d'utilisateur, appuyez sur soumettre et un code PIN vous sera envoyé. Cliquez ici pour continuez."
     },
     "validationStrings": {
         "length": {
@@ -43,6 +47,13 @@
     },
     "notifications": {
         "errorUserExists": "Utilisateur déjà existant.",
-        "errorInvalidCode": "Code d’invitation non valide."
+        "errorInvalidCode": "Code d’invitation non valide.",
+        "errorTelegramVerification": "Vérification Telegram requise.",
+        "errorInvalidPIN": "PIN Telegram invalide.",
+        "telegramVerified": "Compte Telegram vérifié.",
+        "errorDiscordVerification": "Vérification Discord requise.",
+        "errorMatrixVerification": "Vérification Matrix requise.",
+        "errorUnknown": "Erreur inconnue.",
+        "verified": "Compte vérifié."
     }
 }

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,11 @@
         "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}.",
+        "sendPIN": "Stuur onderstaande pincode naar de bot, en kom daarna hier terug om je account te koppelen.",
+        "matrixEnterUser": "Voer je gebruikers ID in, druk op versturen, en er wordt je een pincode toegestuurd. Vul die hier in om door te gaan.",
+        "sendPINDiscord": "Typ {command} in {server_channel} op Discord, stuur daarna onderstaande pincode via DM naar de bot."
     },
     "validationStrings": {
         "length": {
@@ -42,6 +46,13 @@
     },
     "notifications": {
         "errorUserExists": "Gebruiker bestaat al.",
-        "errorInvalidCode": "Ongeldige uitnodigingscode."
+        "errorInvalidCode": "Ongeldige uitnodigingscode.",
+        "telegramVerified": "Telegram-account goedgekeurd.",
+        "errorTelegramVerification": "Telegram-verificatie nodig.",
+        "errorInvalidPIN": "Pincode is ongeldig.",
+        "errorDiscordVerification": "Discord-verificatie vereist.",
+        "errorUnknown": "Onbekende fout.",
+        "errorMatrixVerification": "Matrix-verificatie vereist.",
+        "verified": "Account geverifieerd."
     }
 }