db: remove remaining storage.loadX calls

put it in loadLegacyData in migrations, which is only called by
migrateToBadger.

.drone.yml

@@ -18,6 +18,8 @@ steps:
               from_secret: BUILDRONE_KEY
           GITHUB_TOKEN:
               from_secret: github_token
+          JFA_GO_BUILT_BY:
+              from_secret: BUILT_BY
       commands:
         - curl -sL https://git.io/goreleaser > ../goreleaser
         - chmod +x ../goreleaser
@@ -26,6 +28,7 @@ steps:
         - 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 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "rm /repo/incoming/*.deb"'
         - bash -c 'python3 ../upload.py https://builds.hrfee.pw hrfee jfa-go --tag internal=true'
 volumes:
     - name: ssh_key
@@ -80,25 +83,34 @@ steps:
       volumes:
         - name: ssh_key
           path: /id_rsa
+        - name: ssh_key2
+          path: /id_rsa2
       commands:
         - curl -sL https://git.io/goreleaser > goreleaser
         - chmod +x goreleaser
-        - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --rm-dist
+        - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --clean
         - wget https://builds.hrfee.pw/upload.py
         - pip3 install requests
+        - bash -c 'sftp -i /id_rsa2 -o StrictHostKeyChecking=no root@161.97.102.153:/mnt/redoc <<< $"put docs/swagger.json jfa-go.json"'
         - 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 'ssh -i /id_rsa root@161.97.102.153 -p 2022 "rm /repo/incoming/*.deb"'
         - 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
+          JFA_GO_BUILT_BY:
+              from_secret: BUILT_BY
 
 volumes:
     - name: ssh_key
       host:
           path: /root/.ssh/id_rsa_packaging
+    - name: ssh_key2
+      host:
+          path: /root/.ssh/docker-build
 trigger:
     branch:
         - main
@@ -153,15 +165,11 @@ type: docker
 
 steps:
     - name: build
-      image: golang:latest
+      image: hrfee/jfa-go-build-docker:latest
       commands:
-        - apt-get update -y
-        - apt-get install build-essential python3-pip curl software-properties-common sed upx gcc libgtk-3-dev libappindicator3-dev gcc-mingw-w64-x86-64 -y
-        - (curl -sL https://deb.nodesource.com/setup_14.x | bash -)
-        - apt-get install nodejs
         - curl -sL https://git.io/goreleaser > goreleaser
         - chmod +x goreleaser
-        - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --rm-dist
+        - ./scripts/version.sh ./goreleaser --snapshot --skip-publish --clean
 
 trigger:
     event:

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-#### Read the [FAQ](https://github.com/hrfee/jfa-go/wiki/FAQ) first!
+#### Read the [FAQ](https://wiki.jfa-go.com/docs/faq/) first!
 
 **Describe the bug**
 
@@ -21,7 +21,7 @@ What to do to reproduce the problem.
 
 **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.
+When you notice the problem, check the output of `jfa-go` or get the logs by pressing the "Logs" button in the Settings tab. 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.

.gitignore

@@ -1,4 +1,7 @@
 node_modules/
+site/node_modules/
+site/out/
+site/tempts/
 mail/*.html
 dist/
 build/
@@ -15,3 +18,9 @@ server.crt
 instructions-debian.txt
 cl.md
 ./telegram/
+mautrix/
+tempts/
+matacc.txt
+scripts/langmover/lang
+scripts/langmover/lang2
+scripts/langmover/out

.goreleaser.yml

@@ -8,38 +8,48 @@ before:
   hooks:
     - go mod download
     - rm -rf data/web
-    - mkdir -p data
-    - cp -r static data/web
+    - mkdir -p data/web/css
+    - bash -c 'cp -r static/* data/web/'
     - npm install
     - npm install esbuild
-    - mkdir -p data/web/css
-    - npx esbuild --bundle css/base.css --outfile=./data/web/css/bundle.css --external:remixicon.css --minify
     - cp node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 data/web/css/
     - cp -r html data/
+    - node scripts/missing-colors.js html data/html
     - cp -r lang data/
     - cp LICENSE data/
+    - cp jfa-go.service 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/
-    - 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
+    - rm -rf tempts
+    - cp -r ts tempts
+    - scripts/dark-variant.sh tempts
+    - scripts/dark-variant.sh tempts/modules
+    - mkdir -p data/web/js
+    - npx esbuild --target=es6 --bundle tempts/admin.ts --outfile=./data/web/js/admin.js --minify
+    - npx esbuild --target=es6 --bundle tempts/user.ts --outfile=./data/web/js/user.js --minify
+    - npx esbuild --target=es6 --bundle tempts/pwr.ts --outfile=./data/web/js/pwr.js --minify
+    - npx esbuild --target=es6 --bundle tempts/form.ts --outfile=./data/web/js/form.js --minify
+    - npx esbuild --target=es6 --bundle tempts/setup.ts --outfile=./data/web/js/setup.js --minify
+    - npx esbuild --target=es6 --bundle tempts/crash.ts --outfile=./data/crash.js --minify
+    - rm -r tempts
+    - npx esbuild --bundle css/base.css --outfile=./data/web/css/bundle.css --external:remixicon.css --external:../fonts/hanken* --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
+    - npx tailwindcss -i data/web/css/bundle.css -o data/bundle.css --content "html/crash.html"
+    - node scripts/inline.js root data data/crash.html data/crash.html
     - rm data/bundle.css
+    - npx tailwindcss -i data/web/css/bundle.css -o data/web/css/bundle.css
     - mv data/crash.html data/html/
-    - go get -u github.com/swaggo/swag/cmd/swag
+    - go install github.com/swaggo/swag/cmd/swag@latest
     - swag init -g main.go
+    - mv data/web/css/bundle.css data/web/css/{{.Env.JFA_GO_CSS_VERSION}}bundle.css
 builds:
     - 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
+        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}"
       goos:
         - linux
         - darwin
@@ -56,7 +66,7 @@ builds:
       flags:
         - -tags=tray
       ldflags:
-        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary -H=windowsgui
+        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}" -H=windowsgui
       goos:
         - windows
       goarch:
@@ -68,7 +78,7 @@ builds:
       flags:
         - -tags=tray
       ldflags:
-        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary
+        - -s -w -X main.version={{.Env.JFA_GO_VERSION}} -X main.commit={{.ShortCommit}} -X main.updater=binary -X main.cssVersion={{.Env.JFA_GO_CSS_VERSION}} -X main.buildTimeUnix={{.Env.JFA_GO_BUILD_TIME}} -X main.builtBy="{{.Env.JFA_GO_BUILT_BY}}"
       goos:
         - linux
       goarch:
@@ -78,32 +88,32 @@ archives:
     builds:
         - windows-tray
     format: zip
-    name_template: "{{ .ProjectName }}_{{ .Version }}_TrayIcon_{{ .Os }}_{{ .Arch }}"
-    replacements:
-        darwin: macOS
-        linux: Linux
-        windows: Windows
-        amd64: x86_64
+    name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_TrayIcon_
+      {{- if eq .Os "darwin" }}macOS
+      {{- else }}{{- title .Os }}{{ end }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else }}{{ .Arch }}{{ end }}
   - 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
+    name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_TrayIcon_
+      {{- if eq .Os "darwin" }}macOS
+      {{- else }}{{- title .Os }}{{ end }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else }}{{ .Arch }}{{ end }}
   - id: notray
     builds:
         - notray
     format: zip
-    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
-    replacements:
-        darwin: macOS
-        linux: Linux
-        windows: Windows
-        amd64: x86_64
+    name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_
+      {{- if eq .Os "darwin" }}macOS
+      {{- else }}{{- title .Os }}{{ end }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else }}{{ .Arch }}{{ end }}
 checksum:
     name_template: 'checksums.txt'
 snapshot:
@@ -158,10 +168,10 @@ nfpms:
             replaces:
                 - jfa-go
             dependencies:
-                - libappindicator3-1
+                - libayatana-appindicator
         rpm:
             dependencies:
                 - libappindicator-gtk3
         apk:
             dependencies:
-                - libappindicator
+                - libayatana-appindicator

CONTRIBUTING.md

@@ -1,4 +1,9 @@
-#### Code
+---
+title: "Building/Contributing for developers"
+date: 2021-07-25T00:33:36+01:00
+draft: false
+---
+# 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.
 
 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.
@@ -6,15 +11,34 @@ Code in Go should ideally use `PascalCase` for exported values, and `camelCase`
 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
+# Compiling
 
-Prefix each of these with `make DEBUG=on INTERNAL=off `:
+The Makefile is more suited towards development than other build methods, and provides separate build stages to speed up compilation when only making changes to specific aspects of the project.
+
+Prefix each of these with `make DEBUG=on `:
 * `all` will download deps and build everything. The executable and data will be placed in `build`. This is only necessary the first time.
+* `npm` will download all node.js build-time dependencies.
 * `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`.
+  * `inline` will inline the css and javascript used in the single-file crash report webpage.
 * `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`.
+* `swagger`: generates swagger documentation for the API.
 * `copy` will copy iconography, html, language files and static data into `build/data`.
 
-See the [wiki](https://github.com/hrfee/jfa-go/wiki/Build) for more info.
+## Environment variables
+
+* `DEBUG=on/off`: If on, compiles with type-checking for typescript, sourcemaps, non-minified css and no symbol stripping.
+* `INTERNAL=on/off`: Whether or not to embed file assets into the binary itself, or store them separately beside the binary.
+* `UPDATER=on/off/docker`: Enable/Disable the updater, or set a special update type (currently only docker, which disables self-updating the binary).
+* `TRAY=on/off`: Enable/disable the tray icon, which lets you start/stop/autostart on login. For linux, requires `libappindicator3-dev` for debian or the equivalent on other distributions.
+* `GOESBUILD=on`: Use a locally installed `esbuild` binary. NPM doesn't provide builds for all os/architectures, so `npx esbuild` might not work for you, so the binary is compiled/installed with `go get`.
+* `GOBINARY=<path to go>`: Alternative path to go executable. Useful for testing with unstable go releases.
+* `VERSION=v<semver>`: Alternative verision number, useful to test update functionality.
+* `COMMIT=<short commit>`: Self explanatory.
+* `LDFLAGS=<ldflags>`: Passed to `go build -ldflags`.
+* `E2EE=on/off`: Enable/disable end-to-end encryption support for Matrix, which is currently very broken. Must subsequently be enabled (with Advanced settings enabled) in Settings > Matrix.
+* `TAGS=<tags>`: Passed to `go build -tags`.
+* `OS=<os>`: Unrelated to GOOS, if set to `windows`, `-H=windowsgui` is passed to ldflags, which stops a windows terminal popping up when run.
+* `RACE=on/off`: If on, compiles with the go race detector included.

Dockerfile

@@ -4,9 +4,9 @@ COPY . /opt/build
 
 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 -) \
+    && (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \
     && apt-get install nodejs \
-    && (cd /opt/build; make configuration npm email typescript bundle-css swagger copy INTERNAL=off GOESBUILD=on) \
+    && (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \
     && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html
 
 

LICENSE

@@ -1,6 +1,8 @@
+---jfa-go---
+
 MIT License
 
-Copyright (c) 2021 Harvey Tindall
+Copyright (c) 2023 Harvey Tindall
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -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,34 +6,45 @@ else
 endif
 GOBINARY ?= go
 
+CSSVERSION ?= v3
+
 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)
+BUILDTIME ?= $(shell date +%s)
 
 UPDATER ?= off
-LDFLAGS := -X main.version=$(VERSION) -X main.commit=$(COMMIT)
+LDFLAGS := -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.cssVersion=$(CSSVERSION) -X main.buildTimeUnix=$(BUILDTIME) $(if $(BUILTBY),-X 'main.builtBy=$(BUILTBY)',)
 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)
-	TAGS :=
 	DATA := data
 else
 	DATA := build/data
-	TAGS := -tags external
+	TAGS := $(TAGS) external
 endif
 
-TRAY ?= off
-ifeq ($(INTERNAL)$(TRAY), offon)
+ifeq ($(TRAY), on)
 	TAGS := $(TAGS) tray
-else ifeq ($(INTERNAL)$(TRAY), onon)
-	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
@@ -42,16 +53,19 @@ endif
 DEBUG ?= off
 ifeq ($(DEBUG), on)
 	SOURCEMAP := --sourcemap
-	TYPECHECK := tsc -noEmit --project ts/tsconfig.json
+	TYPECHECK := npx tsc -noEmit --project ts/tsconfig.json
 	# jank
-	COPYTS := rm -r $(DATA)/web/js/ts; cp -r ts $(DATA)/web/js
+	COPYTS := rm -r $(DATA)/web/js/ts; cp -r tempts $(DATA)/web/js/ts
 	UNCSS := cp $(DATA)/web/css/bundle.css $(DATA)/bundle.css
+	# TAILWIND := --content ""
 else
 	LDFLAGS := -s -w $(LDFLAGS)
 	SOURCEMAP :=
 	COPYTS :=
 	TYPECHECK :=
-	UNCSS := npx uncss $(DATA)/crash.html --csspath web/css --output $(DATA)/bundle.css
+	UNCSS := npx tailwindcss -i $(DATA)/web/css/bundle.css -o $(DATA)/bundle.css --content "html/crash.html"
+	# UNCSS := npx uncss $(DATA)/crash.html --csspath web/css --output $(DATA)/bundle.css
+	TAILWIND :=
 endif
 
 RACE ?= off
@@ -61,14 +75,23 @@ else
 	RACEDETECTOR :=
 endif
 
+ifeq (, $(shell which esbuild))
+	ESBUILDINSTALL := go install github.com/evanw/esbuild/cmd/esbuild@latest
+else
+	ESBUILDINSTALL :=
+endif
+
+ifeq ($(GOESBUILD), on)
+	NPMIGNOREOPTIONAL := --no-optional
+	NPMOPTS := $(NPMIGNOREOPTIONAL); $(ESBUILDINSTALL)
+else
+	NPMOPTS :=
+endif
+
+
 npm:
 	$(info installing npm dependencies)
-	npm install
-	@if [ "$(GOESBUILD)" = "off" ]; then\
-		npm install esbuild;\
-	else\
-		go get -u github.com/evanw/esbuild/cmd/esbuild;\
-	fi
+	npm install $(NPMOPTS)
 
 configuration:
 	$(info Fixing config-base)
@@ -83,17 +106,23 @@ email:
 
 typescript:
 	$(TYPECHECK)
+	$(adding dark variants to typescript)
+	rm -rf tempts
+	cp -r ts tempts
+	scripts/dark-variant.sh tempts
+	scripts/dark-variant.sh tempts/modules
 	$(info compiling typescript)
-	-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
+	mkdir -p $(DATA)/web/js
+	$(ESBUILD) --target=es6 --bundle tempts/admin.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/admin.js --minify
+	$(ESBUILD) --target=es6 --bundle tempts/user.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/user.js --minify
+	$(ESBUILD) --target=es6 --bundle tempts/pwr.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/pwr.js --minify
+	$(ESBUILD) --target=es6 --bundle tempts/form.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/form.js --minify
+	$(ESBUILD) --target=es6 --bundle tempts/setup.ts $(SOURCEMAP) --outfile=./$(DATA)/web/js/setup.js --minify
+	$(ESBUILD) --target=es6 --bundle tempts/crash.ts --outfile=./$(DATA)/crash.js --minify
 	$(COPYTS)
 
 swagger:
-	$(GOBINARY) get github.com/swaggo/swag/cmd/swag
+	$(GOBINARY) install github.com/swaggo/swag/cmd/swag@latest
 	swag init -g main.go
 
 compile:
@@ -107,30 +136,38 @@ compress:
 	upx --lzma build/jfa-go
 
 bundle-css:
-	-mkdir -p $(DATA)/web/css
-	$(info bundling css)
-	$(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:
+	mkdir -p $(DATA)/web/css
 	$(info copying fonts)
 	cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 $(DATA)/web/css/
+	$(info bundling css)
+	$(ESBUILD) --bundle css/base.css --outfile=$(DATA)/web/css/bundle.css --external:remixicon.css --external:../fonts/hanken* --minify
+	npx tailwindcss -i $(DATA)/web/css/bundle.css -o $(DATA)/web/css/bundle.css $(TAILWIND)
+	# npx postcss -o $(DATA)/web/css/bundle.css $(DATA)/web/css/bundle.css
+
+inline-css:
+	cp html/crash.html $(DATA)/crash.html
+	$(UNCSS)
+	node scripts/inline.js root $(DATA) $(DATA)/crash.html $(DATA)/crash.html
+	rm $(DATA)/bundle.css
+
+variants-html:
 	$(info copying html)
 	cp -r html $(DATA)/
+	$(info adding dark variants to html)
+	node scripts/missing-colors.js html $(DATA)/html
+
+copy:
+	$(info copying crash page)
 	mv $(DATA)/crash.html $(DATA)/html/
 	$(info copying static data)
-	-mkdir -p $(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 LICENSE $(DATA)/
+	mv $(DATA)/web/css/bundle.css $(DATA)/web/css/$(CSSVERSION)bundle.css
 
 # internal-files:
 # 	python3 scripts/embed.py internal
@@ -151,4 +188,6 @@ clean:
 	-rm docs/docs.go docs/swagger.json docs/swagger.yaml
 	go clean
 
-all: configuration npm email typescript bundle-css inline swagger copy compile
+quick: configuration typescript variants-html bundle-css inline-css copy compile
+
+all: configuration npm email typescript variants-html bundle-css inline-css swagger copy compile

README.md

@@ -1,10 +1,26 @@
 ![jfa-go](images/banner.svg)
 [![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)
+[![Discord](https://img.shields.io/discord/922842034170122321?color=%235865F2&label=discord)](https://discord.com/invite/MrtvuQmyhP)
 
 ##### Downloads:
 ##### [docker](#docker) | [debian/ubuntu](#debian) | [arch (aur)](#aur) | [other platforms](#other-platforms)
+
+---
+##  Project Status: Active-ish
+Studies mean I can't work on this project a lot outside of breaks, however I hope i'll be able to fit in general support and things like bug fixes into my time. New features and such will likely come in short bursts throughout the year (if they do at all).
+
+#### Does/Will it still work?
+jfa-go currently works on Jellyfin 10.8.9, the latest version. I should be able to maintain compatability in the future, unless any big changes occur.
+
+#### Alternatives
+If you want a bit more of a guarantee of support, I've seen these projects mentioned although haven't tried them myself.
+
+* [Wizarr](https://github.com/Wizarrrr/wizarr) focuses on invites, and also includes some Discord & Ombi integration.
+* [Jellyseerr](https://github.com/Fallenbagel/jellyseerr) is a fork of Overseerr, which can manage users and mainly acts as an Ombi alternative.
+* [Organizr](https://github.com/causefx/Organizr) doesn't focus on Jellyfin, but allows putting self-hosted services into "tabs" on a central page, and allows creating users, which lets one control who can access what.
 ---
 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.
 
@@ -17,14 +33,15 @@ a rewrite of [jellyfin-accounts](https://github.com/hrfee/jellyfin-accounts) (or
     * 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.
+    * CAPTCHAs can be enabled to avoid bots
 * ⌛ 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 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.
+* 🔑 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 them via email/telegram.
+* Admin 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
@@ -102,7 +119,7 @@ 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.
@@ -148,8 +165,13 @@ If you're switching from jellyfin-accounts, copy your existing `~/.jf-accounts`
 (or specify config/data path  with `-config/-data` respectively.)
 
 #### Contributing
-See [CONTRIBUTING.md](https://github.com/hrfee/jfa-go/blob/main/CONTRIBUTING.md).
+See [the wiki page](https://wiki.jfa-go.com/docs/dev/) or [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.
+
+#### Sponsors
+Big thanks to those who sponsor me. You can see them below:
+
+[<img src="https://sponsors-endpoint.hrfee.pw/sponsor/avatar/0" width="35">](https://sponsors-endpoint.hrfee.pw/sponsor/profile/0)

api-invites.go

@@ -0,0 +1,409 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/itchyny/timefmt-go"
+	"github.com/lithammer/shortuuid/v3"
+	"github.com/timshannon/badgerhold/v4"
+)
+
+func (app *appContext) checkInvites() {
+	currentTime := time.Now()
+	for _, data := range app.storage.GetInvites() {
+		expiry := data.ValidTill
+		if !currentTime.After(expiry) {
+			continue
+		}
+		app.debug.Printf("Housekeeping: Deleting old invite %s", data.Code)
+		notify := data.Notify
+		if emailEnabled && app.config.Section("notifications").Key("enabled").MustBool(false) && len(notify) != 0 {
+			app.debug.Printf("%s: Expiry notification", data.Code)
+			var wait sync.WaitGroup
+			for address, settings := range notify {
+				if !settings["notify-expiry"] {
+					continue
+				}
+				wait.Add(1)
+				go func(addr string) {
+					defer wait.Done()
+					msg, err := app.email.constructExpiry(data.Code, data, app, false)
+					if err != nil {
+						app.err.Printf("%s: Failed to construct expiry notification: %v", data.Code, err)
+					} else {
+						// Check whether notify "address" is an email address of Jellyfin ID
+						if strings.Contains(addr, "@") {
+							err = app.email.send(msg, addr)
+						} else {
+							err = app.sendByID(msg, addr)
+						}
+						if err != nil {
+							app.err.Printf("%s: Failed to send expiry notification: %v", data.Code, err)
+						} else {
+							app.info.Printf("Sent expiry notification to %s", addr)
+						}
+					}
+				}(address)
+			}
+			wait.Wait()
+		}
+		app.storage.DeleteInvitesKey(data.Code)
+	}
+}
+
+func (app *appContext) checkInvite(code string, used bool, username string) bool {
+	currentTime := time.Now()
+	inv, match := app.storage.GetInvitesKey(code)
+	if !match {
+		return false
+	}
+	expiry := inv.ValidTill
+	if currentTime.After(expiry) {
+		app.debug.Printf("Housekeeping: Deleting old invite %s", code)
+		notify := inv.Notify
+		if emailEnabled && app.config.Section("notifications").Key("enabled").MustBool(false) && len(notify) != 0 {
+			app.debug.Printf("%s: Expiry notification", code)
+			var wait sync.WaitGroup
+			for address, settings := range notify {
+				if !settings["notify-expiry"] {
+					continue
+				}
+				wait.Add(1)
+				go func(addr string) {
+					defer wait.Done()
+					msg, err := app.email.constructExpiry(code, inv, app, false)
+					if err != nil {
+						app.err.Printf("%s: Failed to construct expiry notification: %v", code, err)
+					} else {
+						// Check whether notify "address" is an email address of Jellyfin ID
+						if strings.Contains(addr, "@") {
+							err = app.email.send(msg, addr)
+						} else {
+							err = app.sendByID(msg, addr)
+						}
+						if err != nil {
+							app.err.Printf("%s: Failed to send expiry notification: %v", code, err)
+						} else {
+							app.info.Printf("Sent expiry notification to %s", addr)
+						}
+					}
+				}(address)
+			}
+			wait.Wait()
+		}
+		match = false
+		app.storage.DeleteInvitesKey(code)
+	} else if used {
+		del := false
+		newInv := inv
+		if newInv.RemainingUses == 1 {
+			del = true
+			app.storage.DeleteInvitesKey(code)
+		} else if newInv.RemainingUses != 0 {
+			// 0 means infinite i guess?
+			newInv.RemainingUses--
+		}
+		newInv.UsedBy = append(newInv.UsedBy, []string{username, strconv.FormatInt(currentTime.Unix(), 10)})
+		if !del {
+			app.storage.SetInvitesKey(code, newInv)
+		}
+	}
+	return match
+}
+
+// @Summary Create a new invite.
+// @Produce json
+// @Param generateInviteDTO body generateInviteDTO true "New invite request object"
+// @Success 200 {object} boolResponse
+// @Router /invites [post]
+// @Security Bearer
+// @tags Invites
+func (app *appContext) GenerateInvite(gc *gin.Context) {
+	var req generateInviteDTO
+	app.debug.Println("Generating new invite")
+	gc.BindJSON(&req)
+	currentTime := time.Now()
+	validTill := currentTime.AddDate(0, req.Months, req.Days)
+	validTill = validTill.Add(time.Hour*time.Duration(req.Hours) + time.Minute*time.Duration(req.Minutes))
+	// make sure code doesn't begin with number
+	inviteCode := shortuuid.New()
+	_, err := strconv.Atoi(string(inviteCode[0]))
+	for err == nil {
+		inviteCode = shortuuid.New()
+		_, err = strconv.Atoi(string(inviteCode[0]))
+	}
+	var invite Invite
+	if req.Label != "" {
+		invite.Label = req.Label
+	}
+	invite.Created = currentTime
+	if req.MultipleUses {
+		if req.NoLimit {
+			invite.NoLimit = true
+		} else {
+			invite.RemainingUses = req.RemainingUses
+		}
+	} else {
+		invite.RemainingUses = 1
+	}
+	invite.UserExpiry = req.UserExpiry
+	if invite.UserExpiry {
+		invite.UserMonths = req.UserMonths
+		invite.UserDays = req.UserDays
+		invite.UserHours = req.UserHours
+		invite.UserMinutes = req.UserMinutes
+	}
+	invite.ValidTill = validTill
+	if req.SendTo != "" && app.config.Section("invite_emails").Key("enabled").MustBool(false) {
+		addressValid := false
+		discord := ""
+		app.debug.Printf("%s: Sending invite message", inviteCode)
+		if discordEnabled && !strings.Contains(req.SendTo, "@") {
+			users := app.discord.GetUsers(req.SendTo)
+			if len(users) == 0 {
+				invite.SendTo = fmt.Sprintf("Failed: User not found: \"%s\"", req.SendTo)
+			} else if len(users) > 1 {
+				invite.SendTo = fmt.Sprintf("Failed: Multiple users found: \"%s\"", req.SendTo)
+			} else {
+				invite.SendTo = req.SendTo
+				addressValid = true
+				discord = users[0].User.ID
+			}
+		} else if emailEnabled {
+			addressValid = true
+			invite.SendTo = req.SendTo
+		}
+		if addressValid {
+			msg, err := app.email.constructInvite(inviteCode, invite, app, false)
+			if err != nil {
+				invite.SendTo = fmt.Sprintf("Failed to send to %s", req.SendTo)
+				app.err.Printf("%s: Failed to construct invite message: %v", inviteCode, err)
+			} else {
+				var err error
+				if discord != "" {
+					err = app.discord.SendDM(msg, discord)
+				} else {
+					err = app.email.send(msg, req.SendTo)
+				}
+				if err != nil {
+					invite.SendTo = fmt.Sprintf("Failed to send to %s", req.SendTo)
+					app.err.Printf("%s: %s: %v", inviteCode, invite.SendTo, err)
+				} else {
+					app.info.Printf("%s: Sent invite email to \"%s\"", inviteCode, req.SendTo)
+				}
+			}
+		}
+	}
+	if req.Profile != "" {
+		if _, ok := app.storage.GetProfileKey(req.Profile); ok {
+			invite.Profile = req.Profile
+		} else {
+			invite.Profile = "Default"
+		}
+	}
+	app.storage.SetInvitesKey(inviteCode, invite)
+	respondBool(200, true, gc)
+}
+
+// @Summary Get invites.
+// @Produce json
+// @Success 200 {object} getInvitesDTO
+// @Router /invites [get]
+// @Security Bearer
+// @tags Invites
+func (app *appContext) GetInvites(gc *gin.Context) {
+	app.debug.Println("Invites requested")
+	currentTime := time.Now()
+	app.checkInvites()
+	var invites []inviteDTO
+	for _, inv := range app.storage.GetInvites() {
+		_, months, days, hours, minutes, _ := timeDiff(inv.ValidTill, currentTime)
+		invite := inviteDTO{
+			Code:        inv.Code,
+			Months:      months,
+			Days:        days,
+			Hours:       hours,
+			Minutes:     minutes,
+			UserExpiry:  inv.UserExpiry,
+			UserMonths:  inv.UserMonths,
+			UserDays:    inv.UserDays,
+			UserHours:   inv.UserHours,
+			UserMinutes: inv.UserMinutes,
+			Created:     inv.Created.Unix(),
+			Profile:     inv.Profile,
+			NoLimit:     inv.NoLimit,
+			Label:       inv.Label,
+		}
+		if len(inv.UsedBy) != 0 {
+			invite.UsedBy = map[string]int64{}
+			for _, pair := range inv.UsedBy {
+				// These used to be stored formatted instead of as a unix timestamp.
+				unix, err := strconv.ParseInt(pair[1], 10, 64)
+				if err != nil {
+					date, err := timefmt.Parse(pair[1], app.datePattern+" "+app.timePattern)
+					if err != nil {
+						app.err.Printf("Failed to parse usedBy time: %v", err)
+					}
+					unix = date.Unix()
+				}
+				invite.UsedBy[pair[0]] = unix
+			}
+		}
+		invite.RemainingUses = 1
+		if inv.RemainingUses != 0 {
+			invite.RemainingUses = inv.RemainingUses
+		}
+		if inv.SendTo != "" {
+			invite.SendTo = inv.SendTo
+		}
+		if len(inv.Notify) != 0 {
+			// app.err.Printf("%s has notify section: %+v, you are %s\n", inv.Code, inv.Notify, gc.GetString("jfId"))
+			var addressOrID string
+			if app.config.Section("ui").Key("jellyfin_login").MustBool(false) {
+				addressOrID = gc.GetString("jfId")
+			} else {
+				addressOrID = app.config.Section("ui").Key("email").String()
+			}
+			if _, ok := inv.Notify[addressOrID]; ok {
+				if _, ok = inv.Notify[addressOrID]["notify-expiry"]; ok {
+					invite.NotifyExpiry = inv.Notify[addressOrID]["notify-expiry"]
+				}
+				if _, ok = inv.Notify[addressOrID]["notify-creation"]; ok {
+					invite.NotifyCreation = inv.Notify[addressOrID]["notify-creation"]
+				}
+			}
+		}
+		invites = append(invites, invite)
+	}
+	fullProfileList := app.storage.GetProfiles()
+	profiles := make([]string, len(fullProfileList))
+	if len(profiles) != 0 {
+		defaultProfile := app.storage.GetDefaultProfile()
+		profiles[0] = defaultProfile.Name
+		i := 1
+		if len(fullProfileList) > 1 {
+			app.storage.db.ForEach(badgerhold.Where("Name").Ne(profiles[0]), func(p *Profile) error {
+				profiles[i] = p.Name
+				i++
+				return nil
+			})
+		}
+	}
+	resp := getInvitesDTO{
+		Profiles: profiles,
+		Invites:  invites,
+	}
+	gc.JSON(200, resp)
+}
+
+// @Summary Set profile for an invite
+// @Produce json
+// @Param inviteProfileDTO body inviteProfileDTO true "Invite profile object"
+// @Success 200 {object} boolResponse
+// @Failure 500 {object} stringResponse
+// @Router /invites/profile [post]
+// @Security Bearer
+// @tags Profiles & Settings
+func (app *appContext) SetProfile(gc *gin.Context) {
+	var req inviteProfileDTO
+	gc.BindJSON(&req)
+	app.debug.Printf("%s: Setting profile to \"%s\"", req.Invite, req.Profile)
+	// "" means "Don't apply profile"
+	if _, ok := app.storage.GetProfileKey(req.Profile); !ok && req.Profile != "" {
+		app.err.Printf("%s: Profile \"%s\" not found", req.Invite, req.Profile)
+		respond(500, "Profile not found", gc)
+		return
+	}
+	inv, _ := app.storage.GetInvitesKey(req.Invite)
+	inv.Profile = req.Profile
+	app.storage.SetInvitesKey(req.Invite, inv)
+	respondBool(200, true, gc)
+}
+
+// @Summary Set notification preferences for an invite.
+// @Produce json
+// @Param setNotifyDTO body setNotifyDTO true "Map of invite codes to notification settings objects"
+// @Success 200
+// @Failure 400 {object} stringResponse
+// @Failure 500 {object} stringResponse
+// @Router /invites/notify [post]
+// @Security Bearer
+// @tags Other
+func (app *appContext) SetNotify(gc *gin.Context) {
+	var req map[string]map[string]bool
+	gc.BindJSON(&req)
+	changed := false
+	for code, settings := range req {
+		app.debug.Printf("%s: Notification settings change requested", code)
+		invite, ok := app.storage.GetInvitesKey(code)
+		if !ok {
+			app.err.Printf("%s Notification setting change failed: Invalid code", code)
+			respond(400, "Invalid invite code", gc)
+			return
+		}
+		var address string
+		jellyfinLogin := app.config.Section("ui").Key("jellyfin_login").MustBool(false)
+		if jellyfinLogin {
+			var addressAvailable bool = app.getAddressOrName(gc.GetString("jfId")) != ""
+			if !addressAvailable {
+				app.err.Printf("%s: Couldn't find contact method for admin. Make sure one is set.", code)
+				app.debug.Printf("%s: User ID \"%s\"", code, gc.GetString("jfId"))
+				respond(500, "Missing user contact method", gc)
+				return
+			}
+			address = gc.GetString("jfId")
+		} else {
+			address = app.config.Section("ui").Key("email").String()
+		}
+		if invite.Notify == nil {
+			invite.Notify = map[string]map[string]bool{}
+		}
+		if _, ok := invite.Notify[address]; !ok {
+			invite.Notify[address] = map[string]bool{}
+		} /*else {
+		if _, ok := invite.Notify[address]["notify-expiry"]; !ok {
+		*/
+		if _, ok := settings["notify-expiry"]; ok && invite.Notify[address]["notify-expiry"] != settings["notify-expiry"] {
+			invite.Notify[address]["notify-expiry"] = settings["notify-expiry"]
+			app.debug.Printf("%s: Set \"notify-expiry\" to %t for %s", code, settings["notify-expiry"], address)
+			changed = true
+		}
+		if _, ok := settings["notify-creation"]; ok && invite.Notify[address]["notify-creation"] != settings["notify-creation"] {
+			invite.Notify[address]["notify-creation"] = settings["notify-creation"]
+			app.debug.Printf("%s: Set \"notify-creation\" to %t for %s", code, settings["notify-creation"], address)
+			changed = true
+		}
+		if changed {
+			app.storage.SetInvitesKey(code, invite)
+		}
+	}
+}
+
+// @Summary Delete an invite.
+// @Produce json
+// @Param deleteInviteDTO body deleteInviteDTO true "Delete invite object"
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} stringResponse
+// @Router /invites [delete]
+// @Security Bearer
+// @tags Invites
+func (app *appContext) DeleteInvite(gc *gin.Context) {
+	var req deleteInviteDTO
+	gc.BindJSON(&req)
+	app.debug.Printf("%s: Deletion requested", req.Code)
+	var ok bool
+	_, ok = app.storage.GetInvitesKey(req.Code)
+	if ok {
+		app.storage.DeleteInvitesKey(req.Code)
+		app.info.Printf("%s: Invite deleted", req.Code)
+		respondBool(200, true, gc)
+		return
+	}
+	app.err.Printf("%s: Deletion failed: Invalid code", req.Code)
+	respond(400, "Code doesn't exist", gc)
+}

api-messages.go

@@ -0,0 +1,737 @@
+package main
+
+import (
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"gopkg.in/ini.v1"
+)
+
+// @Summary Get a list of email names and IDs.
+// @Produce json
+// @Param lang query string false "Language for email titles."
+// @Success 200 {object} emailListDTO
+// @Router /config/emails [get]
+// @Security Bearer
+// @tags Configuration
+func (app *appContext) GetCustomContent(gc *gin.Context) {
+	lang := gc.Query("lang")
+	if _, ok := app.storage.lang.Email[lang]; !ok {
+		lang = app.storage.lang.chosenEmailLang
+	}
+	adminLang := lang
+	if _, ok := app.storage.lang.Admin[lang]; !ok {
+		adminLang = app.storage.lang.chosenAdminLang
+	}
+	list := emailListDTO{
+		"UserCreated":       {Name: app.storage.lang.Email[lang].UserCreated["name"], Enabled: app.storage.MustGetCustomContentKey("UserCreated").Enabled},
+		"InviteExpiry":      {Name: app.storage.lang.Email[lang].InviteExpiry["name"], Enabled: app.storage.MustGetCustomContentKey("InviteExpiry").Enabled},
+		"PasswordReset":     {Name: app.storage.lang.Email[lang].PasswordReset["name"], Enabled: app.storage.MustGetCustomContentKey("PasswordReset").Enabled},
+		"UserDeleted":       {Name: app.storage.lang.Email[lang].UserDeleted["name"], Enabled: app.storage.MustGetCustomContentKey("UserDeleted").Enabled},
+		"UserDisabled":      {Name: app.storage.lang.Email[lang].UserDisabled["name"], Enabled: app.storage.MustGetCustomContentKey("UserDisabled").Enabled},
+		"UserEnabled":       {Name: app.storage.lang.Email[lang].UserEnabled["name"], Enabled: app.storage.MustGetCustomContentKey("UserEnabled").Enabled},
+		"InviteEmail":       {Name: app.storage.lang.Email[lang].InviteEmail["name"], Enabled: app.storage.MustGetCustomContentKey("InviteEmail").Enabled},
+		"WelcomeEmail":      {Name: app.storage.lang.Email[lang].WelcomeEmail["name"], Enabled: app.storage.MustGetCustomContentKey("WelcomeEmail").Enabled},
+		"EmailConfirmation": {Name: app.storage.lang.Email[lang].EmailConfirmation["name"], Enabled: app.storage.MustGetCustomContentKey("EmailConfirmation").Enabled},
+		"UserExpired":       {Name: app.storage.lang.Email[lang].UserExpired["name"], Enabled: app.storage.MustGetCustomContentKey("UserExpired").Enabled},
+		"UserLogin":         {Name: app.storage.lang.Admin[adminLang].Strings["userPageLogin"], Enabled: app.storage.MustGetCustomContentKey("Login").Enabled},
+		"UserPage":          {Name: app.storage.lang.Admin[adminLang].Strings["userPagePage"], Enabled: app.storage.MustGetCustomContentKey("Page").Enabled},
+	}
+
+	filter := gc.Query("filter")
+	if filter == "user" {
+		list = emailListDTO{"UserLogin": list["UserLogin"], "UserPage": list["UserPage"]}
+	} else {
+		delete(list, "UserLogin")
+		delete(list, "UserPage")
+	}
+
+	gc.JSON(200, list)
+}
+
+// No longer needed, these are stored by string keys in the database now.
+/* func (app *appContext) getCustomMessage(id string) *CustomContent {
+	switch id {
+	case "Announcement":
+		return &CustomContent{}
+	case "UserCreated":
+		return &app.storage.customEmails.UserCreated
+	case "InviteExpiry":
+		return &app.storage.customEmails.InviteExpiry
+	case "PasswordReset":
+		return &app.storage.customEmails.PasswordReset
+	case "UserDeleted":
+		return &app.storage.customEmails.UserDeleted
+	case "UserDisabled":
+		return &app.storage.customEmails.UserDisabled
+	case "UserEnabled":
+		return &app.storage.customEmails.UserEnabled
+	case "InviteEmail":
+		return &app.storage.customEmails.InviteEmail
+	case "WelcomeEmail":
+		return &app.storage.customEmails.WelcomeEmail
+	case "EmailConfirmation":
+		return &app.storage.customEmails.EmailConfirmation
+	case "UserExpired":
+		return &app.storage.customEmails.UserExpired
+	case "UserLogin":
+		return &app.storage.userPage.Login
+	case "UserPage":
+		return &app.storage.userPage.Page
+	}
+	return nil
+} */
+
+// @Summary Sets the corresponding custom content.
+// @Produce json
+// @Param CustomContent body CustomContent true "Content = email (in markdown)."
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param id path string true "ID of content"
+// @Router /config/emails/{id} [post]
+// @Security Bearer
+// @tags Configuration
+func (app *appContext) SetCustomMessage(gc *gin.Context) {
+	var req CustomContent
+	gc.BindJSON(&req)
+	id := gc.Param("id")
+	if req.Content == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	message, ok := app.storage.GetCustomContentKey(id)
+	if !ok {
+		respondBool(400, false, gc)
+		return
+	}
+	message.Content = req.Content
+	message.Enabled = true
+	app.storage.SetCustomContentKey(id, message)
+	respondBool(200, true, gc)
+}
+
+// @Summary Enable/Disable custom content.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param enable/disable path string true "enable/disable"
+// @Param id path string true "ID of email"
+// @Router /config/emails/{id}/state/{enable/disable} [post]
+// @Security Bearer
+// @tags Configuration
+func (app *appContext) SetCustomMessageState(gc *gin.Context) {
+	id := gc.Param("id")
+	s := gc.Param("state")
+	enabled := false
+	if s == "enable" {
+		enabled = true
+	} else if s != "disable" {
+		respondBool(400, false, gc)
+	}
+	message, ok := app.storage.GetCustomContentKey(id)
+	if !ok {
+		respondBool(400, false, gc)
+		return
+	}
+	message.Enabled = enabled
+	app.storage.SetCustomContentKey(id, message)
+	respondBool(200, true, gc)
+}
+
+// @Summary Returns the custom content/message (generating it if not set) and list of used variables in it.
+// @Produce json
+// @Success 200 {object} customEmailDTO
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param id path string true "ID of email"
+// @Router /config/emails/{id} [get]
+// @Security Bearer
+// @tags Configuration
+func (app *appContext) GetCustomMessageTemplate(gc *gin.Context) {
+	lang := app.storage.lang.chosenEmailLang
+	id := gc.Param("id")
+	var content string
+	var err error
+	var msg *Message
+	var variables []string
+	var conditionals []string
+	var values map[string]interface{}
+	username := app.storage.lang.Email[lang].Strings.get("username")
+	emailAddress := app.storage.lang.Email[lang].Strings.get("emailAddress")
+	customMessage, ok := app.storage.GetCustomContentKey(id)
+	if !ok {
+		app.err.Printf("Failed to get custom message with ID \"%s\"", id)
+		respondBool(400, false, gc)
+		return
+	}
+	if id == "WelcomeEmail" {
+		conditionals = []string{"{yourAccountWillExpire}"}
+		customMessage.Conditionals = conditionals
+	} else if id == "UserPage" {
+		variables = []string{"{username}"}
+		customMessage.Variables = variables
+	} else if id == "UserLogin" {
+		variables = []string{}
+		customMessage.Variables = variables
+	}
+	content = customMessage.Content
+	noContent := content == ""
+	if !noContent {
+		variables = customMessage.Variables
+	}
+	switch id {
+	case "Announcement":
+		// Just send the email html
+		content = ""
+	case "UserCreated":
+		if noContent {
+			msg, err = app.email.constructCreated("", "", "", Invite{}, app, true)
+		}
+		values = app.email.createdValues("xxxxxx", username, emailAddress, Invite{}, app, false)
+	case "InviteExpiry":
+		if noContent {
+			msg, err = app.email.constructExpiry("", Invite{}, app, true)
+		}
+		values = app.email.expiryValues("xxxxxx", Invite{}, app, false)
+	case "PasswordReset":
+		if noContent {
+			msg, err = app.email.constructReset(PasswordReset{}, app, true)
+		}
+		values = app.email.resetValues(PasswordReset{Pin: "12-34-56", Username: username}, app, false)
+	case "UserDeleted":
+		if noContent {
+			msg, err = app.email.constructDeleted("", app, true)
+		}
+		values = app.email.deletedValues(app.storage.lang.Email[lang].Strings.get("reason"), app, false)
+	case "UserDisabled":
+		if noContent {
+			msg, err = app.email.constructDisabled("", app, true)
+		}
+		values = app.email.deletedValues(app.storage.lang.Email[lang].Strings.get("reason"), app, false)
+	case "UserEnabled":
+		if noContent {
+			msg, err = app.email.constructEnabled("", app, true)
+		}
+		values = app.email.deletedValues(app.storage.lang.Email[lang].Strings.get("reason"), app, false)
+	case "InviteEmail":
+		if noContent {
+			msg, err = app.email.constructInvite("", Invite{}, app, true)
+		}
+		values = app.email.inviteValues("xxxxxx", Invite{}, app, false)
+	case "WelcomeEmail":
+		if noContent {
+			msg, err = app.email.constructWelcome("", time.Time{}, app, true)
+		}
+		values = app.email.welcomeValues(username, time.Now(), app, false, true)
+	case "EmailConfirmation":
+		if noContent {
+			msg, err = app.email.constructConfirmation("", "", "", app, true)
+		}
+		values = app.email.confirmationValues("xxxxxx", username, "xxxxxx", app, false)
+	case "UserExpired":
+		if noContent {
+			msg, err = app.email.constructUserExpired(app, true)
+		}
+		values = app.email.userExpiredValues(app, false)
+	case "UserLogin", "UserPage":
+		values = map[string]interface{}{}
+	}
+	if err != nil {
+		respondBool(500, false, gc)
+		return
+	}
+	if noContent && id != "Announcement" && id != "UserPage" && id != "UserLogin" {
+		content = msg.Text
+		variables = make([]string, strings.Count(content, "{"))
+		i := 0
+		found := false
+		buf := ""
+		for _, c := range content {
+			if !found && c != '{' && c != '}' {
+				continue
+			}
+			found = true
+			buf += string(c)
+			if c == '}' {
+				found = false
+				variables[i] = buf
+				buf = ""
+				i++
+			}
+		}
+		customMessage.Variables = variables
+	}
+	if variables == nil {
+		variables = []string{}
+	}
+	app.storage.SetCustomContentKey(id, customMessage)
+	var mail *Message
+	if id != "UserLogin" && id != "UserPage" {
+		mail, err = app.email.constructTemplate("", "<div class=\"preview-content\"></div>", app)
+		if err != nil {
+			respondBool(500, false, gc)
+			return
+		}
+	} else {
+		mail = &Message{
+			HTML:     "<div class=\"card ~neutral dark:~d_neutral @low preview-content\"></div>",
+			Markdown: "<div class=\"card ~neutral dark:~d_neutral @low preview-content\"></div>",
+		}
+	}
+	gc.JSON(200, customEmailDTO{Content: content, Variables: variables, Conditionals: conditionals, Values: values, HTML: mail.HTML, Plaintext: mail.Text})
+}
+
+// @Summary Returns a new Telegram verification PIN, and the bot username.
+// @Produce json
+// @Success 200 {object} telegramPinDTO
+// @Router /telegram/pin [get]
+// @Security Bearer
+// @tags Other
+func (app *appContext) TelegramGetPin(gc *gin.Context) {
+	gc.JSON(200, telegramPinDTO{
+		Token:    app.telegram.NewAuthToken(),
+		Username: app.telegram.username,
+	})
+}
+
+// @Summary Link a Jellyfin & Telegram user together via a verification PIN.
+// @Produce json
+// @Param telegramSetDTO body telegramSetDTO true "Token and user's Jellyfin ID."
+// @Success 200 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Router /users/telegram [post]
+// @Security Bearer
+// @tags Other
+func (app *appContext) TelegramAddUser(gc *gin.Context) {
+	var req telegramSetDTO
+	gc.BindJSON(&req)
+	if req.Token == "" || req.ID == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	tgToken, ok := app.telegram.TokenVerified(req.Token)
+	app.telegram.DeleteVerifiedToken(req.Token)
+	if !ok {
+		respondBool(500, false, gc)
+		return
+	}
+	tgUser := TelegramUser{
+		ChatID:   tgToken.ChatID,
+		Username: tgToken.Username,
+		Contact:  true,
+	}
+	if lang, ok := app.telegram.languages[tgToken.ChatID]; ok {
+		tgUser.Lang = lang
+	}
+	app.storage.SetTelegramKey(req.ID, tgUser)
+	linkExistingOmbiDiscordTelegram(app)
+	respondBool(200, true, gc)
+}
+
+// @Summary Sets whether to notify a user through telegram/discord/matrix/email or not.
+// @Produce json
+// @Param SetContactMethodsDTO body SetContactMethodsDTO true "User's Jellyfin ID and whether or not to notify then through Telegram."
+// @Success 200 {object} boolResponse
+// @Success 400 {object} boolResponse
+// @Success 500 {object} boolResponse
+// @Router /users/contact [post]
+// @Security Bearer
+// @tags Other
+func (app *appContext) SetContactMethods(gc *gin.Context) {
+	var req SetContactMethodsDTO
+	gc.BindJSON(&req)
+	if req.ID == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	app.setContactMethods(req, gc)
+}
+
+func (app *appContext) setContactMethods(req SetContactMethodsDTO, gc *gin.Context) {
+	if tgUser, ok := app.storage.GetTelegramKey(req.ID); ok {
+		change := tgUser.Contact != req.Telegram
+		tgUser.Contact = req.Telegram
+		app.storage.SetTelegramKey(req.ID, tgUser)
+		if change {
+			msg := ""
+			if !req.Telegram {
+				msg = " not"
+			}
+			app.debug.Printf("Telegram: User \"%s\" will%s be notified through Telegram.", tgUser.Username, msg)
+		}
+	}
+	if dcUser, ok := app.storage.GetDiscordKey(req.ID); ok {
+		change := dcUser.Contact != req.Discord
+		dcUser.Contact = req.Discord
+		app.storage.SetDiscordKey(req.ID, dcUser)
+		if change {
+			msg := ""
+			if !req.Discord {
+				msg = " not"
+			}
+			app.debug.Printf("Discord: User \"%s\" will%s be notified through Discord.", dcUser.Username, msg)
+		}
+	}
+	if mxUser, ok := app.storage.GetMatrixKey(req.ID); ok {
+		change := mxUser.Contact != req.Matrix
+		mxUser.Contact = req.Matrix
+		app.storage.SetMatrixKey(req.ID, mxUser)
+		if change {
+			msg := ""
+			if !req.Matrix {
+				msg = " not"
+			}
+			app.debug.Printf("Matrix: User \"%s\" will%s be notified through Matrix.", mxUser.UserID, msg)
+		}
+	}
+	if email, ok := app.storage.GetEmailsKey(req.ID); ok {
+		change := email.Contact != req.Email
+		email.Contact = req.Email
+		app.storage.SetEmailsKey(req.ID, email)
+		if change {
+			msg := ""
+			if !req.Email {
+				msg = " not"
+			}
+			app.debug.Printf("\"%s\" will%s be notified via Email.", email.Addr, msg)
+		}
+	}
+	respondBool(200, true, gc)
+}
+
+// @Summary Returns true/false on whether or not a telegram PIN was verified. Requires bearer auth.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Param pin path string true "PIN code to check"
+// @Router /telegram/verified/{pin} [get]
+// @Security Bearer
+// @tags Other
+func (app *appContext) TelegramVerified(gc *gin.Context) {
+	pin := gc.Param("pin")
+	_, ok := app.telegram.TokenVerified(pin)
+	respondBool(200, ok, gc)
+}
+
+// @Summary Returns true/false on whether or not a telegram PIN was verified. Requires invite code.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Success 401 {object} boolResponse
+// @Param pin path string true "PIN code to check"
+// @Param invCode path string true "invite Code"
+// @Router /invite/{invCode}/telegram/verified/{pin} [get]
+// @tags Other
+func (app *appContext) TelegramVerifiedInvite(gc *gin.Context) {
+	code := gc.Param("invCode")
+	if _, ok := app.storage.GetInvitesKey(code); !ok {
+		respondBool(401, false, gc)
+		return
+	}
+	pin := gc.Param("pin")
+	token, ok := app.telegram.TokenVerified(pin)
+	if ok && app.config.Section("telegram").Key("require_unique").MustBool(false) && app.telegram.UserExists(token.Username) {
+		app.discord.DeleteVerifiedUser(pin)
+		respondBool(400, false, gc)
+		return
+	}
+	respondBool(200, ok, gc)
+}
+
+// @Summary Returns true/false on whether or not a discord PIN was verified. Requires invite code.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 401 {object} boolResponse
+// @Param pin path string true "PIN code to check"
+// @Param invCode path string true "invite Code"
+// @Router /invite/{invCode}/discord/verified/{pin} [get]
+// @tags Other
+func (app *appContext) DiscordVerifiedInvite(gc *gin.Context) {
+	code := gc.Param("invCode")
+	if _, ok := app.storage.GetInvitesKey(code); !ok {
+		respondBool(401, false, gc)
+		return
+	}
+	pin := gc.Param("pin")
+	user, ok := app.discord.UserVerified(pin)
+	if ok && app.config.Section("discord").Key("require_unique").MustBool(false) && app.discord.UserExists(user.ID) {
+		delete(app.discord.verifiedTokens, pin)
+		respondBool(400, false, gc)
+		return
+	}
+	respondBool(200, ok, gc)
+}
+
+// @Summary Returns a 10-minute, one-use Discord server invite
+// @Produce json
+// @Success 200 {object} DiscordInviteDTO
+// @Failure 400 {object} boolResponse
+// @Failure 401 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param invCode path string true "invite Code"
+// @Router /invite/{invCode}/discord/invite [get]
+// @tags Other
+func (app *appContext) DiscordServerInvite(gc *gin.Context) {
+	if app.discord.inviteChannelName == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	code := gc.Param("invCode")
+	if _, ok := app.storage.GetInvitesKey(code); !ok {
+		respondBool(401, false, gc)
+		return
+	}
+	invURL, iconURL := app.discord.NewTempInvite(10*60, 1)
+	if invURL == "" {
+		respondBool(500, false, gc)
+		return
+	}
+	gc.JSON(200, DiscordInviteDTO{invURL, iconURL})
+}
+
+// @Summary Generate and send a new PIN to a specified Matrix user.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} stringResponse
+// @Failure 401 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param invCode path string true "invite Code"
+// @Param MatrixSendPINDTO body MatrixSendPINDTO true "User's Matrix ID."
+// @Router /invite/{invCode}/matrix/user [post]
+// @tags Other
+func (app *appContext) MatrixSendPIN(gc *gin.Context) {
+	code := gc.Param("invCode")
+	if _, ok := app.storage.GetInvitesKey(code); !ok {
+		respondBool(401, false, gc)
+		return
+	}
+	var req MatrixSendPINDTO
+	gc.BindJSON(&req)
+	if req.UserID == "" {
+		respond(400, "errorNoUserID", gc)
+		return
+	}
+	if app.config.Section("matrix").Key("require_unique").MustBool(false) {
+		for _, u := range app.storage.GetMatrix() {
+			if req.UserID == u.UserID {
+				respondBool(400, false, gc)
+				return
+			}
+		}
+	}
+
+	ok := app.matrix.SendStart(req.UserID)
+	if !ok {
+		respondBool(500, false, gc)
+		return
+	}
+	respondBool(200, true, gc)
+}
+
+// @Summary Check whether a matrix PIN is valid, and mark the token as verified if so. Requires invite code.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 401 {object} boolResponse
+// @Param pin path string true "PIN code to check"
+// @Param invCode path string true "invite Code"
+// @Param userID path string true "Matrix User ID"
+// @Router /invite/{invCode}/matrix/verified/{userID}/{pin} [get]
+// @tags Other
+func (app *appContext) MatrixCheckPIN(gc *gin.Context) {
+	code := gc.Param("invCode")
+	if _, ok := app.storage.GetInvitesKey(code); !ok {
+		app.debug.Println("Matrix: Invite code was invalid")
+		respondBool(401, false, gc)
+		return
+	}
+	userID := gc.Param("userID")
+	pin := gc.Param("pin")
+	user, ok := app.matrix.tokens[pin]
+	if !ok {
+		app.debug.Println("Matrix: PIN not found")
+		respondBool(200, false, gc)
+		return
+	}
+	if user.User.UserID != userID {
+		app.debug.Println("Matrix: User ID of PIN didn't match")
+		respondBool(200, false, gc)
+		return
+	}
+	user.Verified = true
+	app.matrix.tokens[pin] = user
+	respondBool(200, true, gc)
+}
+
+// @Summary Generates a Matrix access token from a username and password.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} stringResponse
+// @Failure 401 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param MatrixLoginDTO body MatrixLoginDTO true "Username & password."
+// @Router /matrix/login [post]
+// @tags Other
+func (app *appContext) MatrixLogin(gc *gin.Context) {
+	var req MatrixLoginDTO
+	gc.BindJSON(&req)
+	if req.Username == "" || req.Password == "" {
+		respond(400, "errorLoginBlank", gc)
+		return
+	}
+	token, err := app.matrix.generateAccessToken(req.Homeserver, req.Username, req.Password)
+	if err != nil {
+		app.err.Printf("Matrix: Failed to generate token: %v", err)
+		respond(401, "Unauthorized", gc)
+		return
+	}
+	tempConfig, _ := ini.Load(app.configPath)
+	matrix := tempConfig.Section("matrix")
+	matrix.Key("enabled").SetValue("true")
+	matrix.Key("homeserver").SetValue(req.Homeserver)
+	matrix.Key("token").SetValue(token)
+	matrix.Key("user_id").SetValue(req.Username)
+	if err := tempConfig.SaveTo(app.configPath); err != nil {
+		app.err.Printf("Failed to save config to \"%s\": %v", app.configPath, err)
+		respondBool(500, false, gc)
+		return
+	}
+	respondBool(200, true, gc)
+}
+
+// @Summary Links a Matrix user to a Jellyfin account via user IDs. Notifications are turned on by default.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param MatrixConnectUserDTO body MatrixConnectUserDTO true "User's Jellyfin ID & Matrix user ID."
+// @Router /users/matrix [post]
+// @tags Other
+func (app *appContext) MatrixConnect(gc *gin.Context) {
+	var req MatrixConnectUserDTO
+	gc.BindJSON(&req)
+	if app.storage.GetMatrix() == nil {
+		app.storage.deprecatedMatrix = matrixStore{}
+	}
+	roomID, encrypted, err := app.matrix.CreateRoom(req.UserID)
+	if err != nil {
+		app.err.Printf("Matrix: Failed to create room: %v", err)
+		respondBool(500, false, gc)
+		return
+	}
+	app.storage.SetMatrixKey(req.JellyfinID, MatrixUser{
+		UserID:    req.UserID,
+		RoomID:    string(roomID),
+		Lang:      "en-us",
+		Contact:   true,
+		Encrypted: encrypted,
+	})
+	app.matrix.isEncrypted[roomID] = encrypted
+	respondBool(200, true, gc)
+}
+
+// @Summary Returns a list of matching users from a Discord guild, given a username (discriminator optional).
+// @Produce json
+// @Success 200 {object} DiscordUsersDTO
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param username path string true "username to search."
+// @Router /users/discord/{username} [get]
+// @tags Other
+func (app *appContext) DiscordGetUsers(gc *gin.Context) {
+	name := gc.Param("username")
+	if name == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	users := app.discord.GetUsers(name)
+	resp := DiscordUsersDTO{Users: make([]DiscordUserDTO, len(users))}
+	for i, u := range users {
+		resp.Users[i] = DiscordUserDTO{
+			Name:      RenderDiscordUsername(u.User),
+			ID:        u.User.ID,
+			AvatarURL: u.User.AvatarURL("32"),
+		}
+	}
+	gc.JSON(200, resp)
+}
+
+// @Summary Links a Discord account to a Jellyfin account via user IDs. Notifications are turned on by default.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param DiscordConnectUserDTO body DiscordConnectUserDTO true "User's Jellyfin ID & Discord ID."
+// @Router /users/discord [post]
+// @tags Other
+func (app *appContext) DiscordConnect(gc *gin.Context) {
+	var req DiscordConnectUserDTO
+	gc.BindJSON(&req)
+	if req.JellyfinID == "" || req.DiscordID == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	user, ok := app.discord.NewUser(req.DiscordID)
+	if !ok {
+		respondBool(500, false, gc)
+		return
+	}
+	app.storage.SetDiscordKey(req.JellyfinID, user)
+	linkExistingOmbiDiscordTelegram(app)
+	respondBool(200, true, gc)
+}
+
+// @Summary unlink a Discord account from a Jellyfin user. Always succeeds.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
+// @Router /users/discord [delete]
+// @Tags Users
+func (app *appContext) UnlinkDiscord(gc *gin.Context) {
+	var req forUserDTO
+	gc.BindJSON(&req)
+	/* user, status, err := app.jf.UserByID(req.ID, false)
+	if req.ID == "" || status != 200 || err != nil {
+		respond(400, "User not found", gc)
+		return
+	} */
+	app.storage.DeleteDiscordKey(req.ID)
+	respondBool(200, true, gc)
+}
+
+// @Summary unlink a Telegram account from a Jellyfin user. Always succeeds.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
+// @Router /users/telegram [delete]
+// @Tags Users
+func (app *appContext) UnlinkTelegram(gc *gin.Context) {
+	var req forUserDTO
+	gc.BindJSON(&req)
+	/* user, status, err := app.jf.UserByID(req.ID, false)
+	if req.ID == "" || status != 200 || err != nil {
+		respond(400, "User not found", gc)
+		return
+	} */
+	app.storage.DeleteTelegramKey(req.ID)
+	respondBool(200, true, gc)
+}
+
+// @Summary unlink a Matrix account from a Jellyfin user. Always succeeds.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
+// @Router /users/matrix [delete]
+// @Tags Users
+func (app *appContext) UnlinkMatrix(gc *gin.Context) {
+	var req forUserDTO
+	gc.BindJSON(&req)
+	/* user, status, err := app.jf.UserByID(req.ID, false)
+	if req.ID == "" || status != 200 || err != nil {
+		respond(400, "User not found", gc)
+		return
+	} */
+	app.storage.DeleteMatrixKey(req.ID)
+	respondBool(200, true, gc)
+}

api-ombi.go

@@ -0,0 +1,109 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func (app *appContext) getOmbiUser(jfID string) (map[string]interface{}, int, error) {
+	ombiUsers, code, err := app.ombi.GetUsers()
+	if err != nil || code != 200 {
+		return nil, code, err
+	}
+	jfUser, code, err := app.jf.UserByID(jfID, false)
+	if err != nil || code != 200 {
+		return nil, code, err
+	}
+	username := jfUser.Name
+	email := ""
+	if e, ok := app.storage.GetEmailsKey(jfID); ok {
+		email = e.Addr
+	}
+	for _, ombiUser := range ombiUsers {
+		ombiAddr := ""
+		if a, ok := ombiUser["emailAddress"]; ok && a != nil {
+			ombiAddr = a.(string)
+		}
+		if ombiUser["userName"].(string) == username || (ombiAddr == email && email != "") {
+			return ombiUser, code, err
+		}
+	}
+	return nil, 400, fmt.Errorf("Couldn't find user")
+}
+
+// @Summary Get a list of Ombi users.
+// @Produce json
+// @Success 200 {object} ombiUsersDTO
+// @Failure 500 {object} stringResponse
+// @Router /ombi/users [get]
+// @Security Bearer
+// @tags Ombi
+func (app *appContext) OmbiUsers(gc *gin.Context) {
+	app.debug.Println("Ombi users requested")
+	users, status, err := app.ombi.GetUsers()
+	if err != nil || status != 200 {
+		app.err.Printf("Failed to get users from Ombi (%d): %v", status, err)
+		respond(500, "Couldn't get users", gc)
+		return
+	}
+	userlist := make([]ombiUser, len(users))
+	for i, data := range users {
+		userlist[i] = ombiUser{
+			Name: data["userName"].(string),
+			ID:   data["id"].(string),
+		}
+	}
+	gc.JSON(200, ombiUsersDTO{Users: userlist})
+}
+
+// @Summary Store Ombi user template in an existing profile.
+// @Produce json
+// @Param ombiUser body ombiUser true "User to source settings from"
+// @Param profile path string true "Name of profile to store in"
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} stringResponse
+// @Router /profiles/ombi/{profile} [post]
+// @Security Bearer
+// @tags Ombi
+func (app *appContext) SetOmbiProfile(gc *gin.Context) {
+	var req ombiUser
+	gc.BindJSON(&req)
+	profileName := gc.Param("profile")
+	profile, ok := app.storage.GetProfileKey(profileName)
+	if !ok {
+		respondBool(400, false, gc)
+		return
+	}
+	template, code, err := app.ombi.TemplateByID(req.ID)
+	if err != nil || code != 200 || len(template) == 0 {
+		app.err.Printf("Couldn't get user from Ombi (%d): %v", code, err)
+		respond(500, "Couldn't get user", gc)
+		return
+	}
+	profile.Ombi = template
+	app.storage.SetProfileKey(profileName, profile)
+	respondBool(204, true, gc)
+}
+
+// @Summary Remove ombi user template from a profile.
+// @Produce json
+// @Param profile path string true "Name of profile to store in"
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} stringResponse
+// @Router /profiles/ombi/{profile} [delete]
+// @Security Bearer
+// @tags Ombi
+func (app *appContext) DeleteOmbiProfile(gc *gin.Context) {
+	profileName := gc.Param("profile")
+	profile, ok := app.storage.GetProfileKey(profileName)
+	if !ok {
+		respondBool(400, false, gc)
+		return
+	}
+	profile.Ombi = nil
+	app.storage.SetProfileKey(profileName, profile)
+	respondBool(204, true, gc)
+}

api-profiles.go

@@ -0,0 +1,112 @@
+package main
+
+import (
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/timshannon/badgerhold/v4"
+)
+
+// @Summary Get a list of profiles
+// @Produce json
+// @Success 200 {object} getProfilesDTO
+// @Router /profiles [get]
+// @Security Bearer
+// @tags Profiles & Settings
+func (app *appContext) GetProfiles(gc *gin.Context) {
+	app.debug.Println("Profiles requested")
+	out := getProfilesDTO{
+		DefaultProfile: app.storage.GetDefaultProfile().Name,
+		Profiles:       map[string]profileDTO{},
+	}
+	for _, p := range app.storage.GetProfiles() {
+		out.Profiles[p.Name] = profileDTO{
+			Admin:         p.Admin,
+			LibraryAccess: p.LibraryAccess,
+			FromUser:      p.FromUser,
+			Ombi:          p.Ombi != nil,
+		}
+	}
+	gc.JSON(200, out)
+}
+
+// @Summary Set the default profile to use.
+// @Produce json
+// @Param profileChangeDTO body profileChangeDTO true "Default profile object"
+// @Success 200 {object} boolResponse
+// @Failure 500 {object} stringResponse
+// @Router /profiles/default [post]
+// @Security Bearer
+// @tags Profiles & Settings
+func (app *appContext) SetDefaultProfile(gc *gin.Context) {
+	req := profileChangeDTO{}
+	gc.BindJSON(&req)
+	app.info.Printf("Setting default profile to \"%s\"", req.Name)
+	if _, ok := app.storage.GetProfileKey(req.Name); !ok {
+		app.err.Printf("Profile not found: \"%s\"", req.Name)
+		respond(500, "Profile not found", gc)
+		return
+	}
+	app.storage.db.ForEach(&badgerhold.Query{}, func(profile *Profile) error {
+		if profile.Name == req.Name {
+			profile.Default = true
+		} else {
+			profile.Default = false
+		}
+		app.storage.SetProfileKey(profile.Name, *profile)
+		return nil
+	})
+	respondBool(200, true, gc)
+}
+
+// @Summary Create a profile based on a Jellyfin user's settings.
+// @Produce json
+// @Param newProfileDTO body newProfileDTO true "New profile object"
+// @Success 200 {object} boolResponse
+// @Failure 500 {object} stringResponse
+// @Router /profiles [post]
+// @Security Bearer
+// @tags Profiles & Settings
+func (app *appContext) CreateProfile(gc *gin.Context) {
+	app.info.Println("Profile creation requested")
+	var req newProfileDTO
+	gc.BindJSON(&req)
+	app.jf.CacheExpiry = time.Now()
+	user, status, err := app.jf.UserByID(req.ID, false)
+	if !(status == 200 || status == 204) || err != nil {
+		app.err.Printf("Failed to get user from Jellyfin (%d): %v", status, err)
+		respond(500, "Couldn't get user", gc)
+		return
+	}
+	profile := Profile{
+		FromUser: user.Name,
+		Policy:   user.Policy,
+	}
+	app.debug.Printf("Creating profile from user \"%s\"", user.Name)
+	if req.Homescreen {
+		profile.Configuration = user.Configuration
+		profile.Displayprefs, status, err = app.jf.GetDisplayPreferences(req.ID)
+		if !(status == 200 || status == 204) || err != nil {
+			app.err.Printf("Failed to get DisplayPrefs (%d): %v", status, err)
+			respond(500, "Couldn't get displayprefs", gc)
+			return
+		}
+	}
+	app.storage.SetProfileKey(req.Name, profile)
+	respondBool(200, true, gc)
+}
+
+// @Summary Delete an existing profile
+// @Produce json
+// @Param profileChangeDTO body profileChangeDTO true "Delete profile object"
+// @Success 200 {object} boolResponse
+// @Router /profiles [delete]
+// @Security Bearer
+// @tags Profiles & Settings
+func (app *appContext) DeleteProfile(gc *gin.Context) {
+	req := profileChangeDTO{}
+	gc.BindJSON(&req)
+	name := req.Name
+	app.storage.DeleteProfileKey(name)
+	respondBool(200, true, gc)
+}

api-userpage.go

@@ -0,0 +1,623 @@
+package main
+
+import (
+	"net/http"
+	"os"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/golang-jwt/jwt"
+)
+
+// @Summary Returns the logged-in user's Jellyfin ID & Username, and other details.
+// @Produce json
+// @Success 200 {object} MyDetailsDTO
+// @Router /my/details [get]
+// @tags User Page
+func (app *appContext) MyDetails(gc *gin.Context) {
+	resp := MyDetailsDTO{
+		Id: gc.GetString("jfId"),
+	}
+
+	user, status, err := app.jf.UserByID(resp.Id, false)
+	if status != 200 || err != nil {
+		app.err.Printf("Failed to get Jellyfin user (%d): %+v\n", status, err)
+		respond(500, "Failed to get user", gc)
+		return
+	}
+	resp.Username = user.Name
+	resp.Admin = user.Policy.IsAdministrator
+	resp.AccountsAdmin = false
+	if !app.config.Section("ui").Key("allow_all").MustBool(false) {
+		adminOnly := app.config.Section("ui").Key("admin_only").MustBool(true)
+		if emailStore, ok := app.storage.GetEmailsKey(resp.Id); ok {
+			resp.AccountsAdmin = emailStore.Admin
+		}
+		resp.AccountsAdmin = resp.AccountsAdmin || (adminOnly && resp.Admin)
+	}
+	resp.Disabled = user.Policy.IsDisabled
+
+	if exp, ok := app.storage.GetUserExpiryKey(user.ID); ok {
+		resp.Expiry = exp.Expiry.Unix()
+	}
+
+	if emailEnabled {
+		resp.Email = &MyDetailsContactMethodsDTO{}
+		if email, ok := app.storage.GetEmailsKey(user.ID); ok && email.Addr != "" {
+			resp.Email.Value = email.Addr
+			resp.Email.Enabled = email.Contact
+		}
+	}
+
+	if discordEnabled {
+		resp.Discord = &MyDetailsContactMethodsDTO{}
+		if discord, ok := app.storage.GetDiscordKey(user.ID); ok {
+			resp.Discord.Value = RenderDiscordUsername(discord)
+			resp.Discord.Enabled = discord.Contact
+		}
+	}
+
+	if telegramEnabled {
+		resp.Telegram = &MyDetailsContactMethodsDTO{}
+		if telegram, ok := app.storage.GetTelegramKey(user.ID); ok {
+			resp.Telegram.Value = telegram.Username
+			resp.Telegram.Enabled = telegram.Contact
+		}
+	}
+
+	if matrixEnabled {
+		resp.Matrix = &MyDetailsContactMethodsDTO{}
+		if matrix, ok := app.storage.GetMatrixKey(user.ID); ok {
+			resp.Matrix.Value = matrix.UserID
+			resp.Matrix.Enabled = matrix.Contact
+		}
+	}
+
+	gc.JSON(200, resp)
+}
+
+// @Summary Sets whether to notify yourself through telegram/discord/matrix/email or not.
+// @Produce json
+// @Param SetContactMethodsDTO body SetContactMethodsDTO true "User's Jellyfin ID and whether or not to notify then through Telegram."
+// @Success 200 {object} boolResponse
+// @Success 400 {object} boolResponse
+// @Success 500 {object} boolResponse
+// @Router /my/contact [post]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) SetMyContactMethods(gc *gin.Context) {
+	var req SetContactMethodsDTO
+	gc.BindJSON(&req)
+	req.ID = gc.GetString("jfId")
+	if req.ID == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	app.setContactMethods(req, gc)
+}
+
+// @Summary Logout by deleting refresh token from cookies.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 500 {object} stringResponse
+// @Router /my/logout [post]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) LogoutUser(gc *gin.Context) {
+	cookie, err := gc.Cookie("user-refresh")
+	if err != nil {
+		app.debug.Printf("Couldn't get cookies: %s", err)
+		respond(500, "Couldn't fetch cookies", gc)
+		return
+	}
+	app.invalidTokens = append(app.invalidTokens, cookie)
+	gc.SetCookie("refresh", "invalid", -1, "/my", gc.Request.URL.Hostname(), true, true)
+	respondBool(200, true, gc)
+}
+
+// @Summary confirm an action (e.g. changing an email address.)
+// @Produce json
+// @Param jwt path string true "jwt confirmation code"
+// @Router /my/confirm/{jwt} [post]
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} stringResponse
+// @Failure 404
+// @Success 303
+// @Failure 500 {object} stringResponse
+// @tags User Page
+func (app *appContext) ConfirmMyAction(gc *gin.Context) {
+	app.confirmMyAction(gc, "")
+}
+
+func (app *appContext) confirmMyAction(gc *gin.Context, key string) {
+	var claims jwt.MapClaims
+	var target ConfirmationTarget
+	var id string
+	fail := func() {
+		gcHTML(gc, 404, "404.html", gin.H{
+			"cssClass":       app.cssClass,
+			"cssVersion":     cssVersion,
+			"contactMessage": app.config.Section("ui").Key("contact_message").String(),
+		})
+	}
+
+	// Validate key
+	if key == "" {
+		key = gc.Param("jwt")
+	}
+	token, err := jwt.Parse(key, checkToken)
+	if err != nil {
+		app.err.Printf("Failed to parse key: %s", err)
+		fail()
+		// respond(500, "unknownError", gc)
+		return
+	}
+	claims, ok := token.Claims.(jwt.MapClaims)
+	if !ok {
+		app.err.Printf("Failed to parse key: %s", err)
+		fail()
+		// respond(500, "unknownError", gc)
+		return
+	}
+	expiry := time.Unix(int64(claims["exp"].(float64)), 0)
+	if !(ok && token.Valid && claims["type"].(string) == "confirmation" && expiry.After(time.Now())) {
+		app.err.Printf("Invalid key")
+		fail()
+		// respond(400, "invalidKey", gc)
+		return
+	}
+	target = ConfirmationTarget(int(claims["target"].(float64)))
+	id = claims["id"].(string)
+
+	// Perform an Action
+	if target == NoOp {
+		gc.Redirect(http.StatusSeeOther, "/my/account")
+		return
+	} else if target == UserEmailChange {
+		emailStore, ok := app.storage.GetEmailsKey(id)
+		if !ok {
+			emailStore = EmailAddress{
+				Contact: true,
+			}
+		}
+		emailStore.Addr = claims["email"].(string)
+		app.storage.SetEmailsKey(id, emailStore)
+		if app.config.Section("ombi").Key("enabled").MustBool(false) {
+			ombiUser, code, err := app.getOmbiUser(id)
+			if code == 200 && err == nil {
+				ombiUser["emailAddress"] = claims["email"].(string)
+				code, err = app.ombi.ModifyUser(ombiUser)
+				if code != 200 || err != nil {
+					app.err.Printf("%s: Failed to change ombi email address (%d): %v", ombiUser["userName"].(string), code, err)
+				}
+			}
+		}
+
+		app.info.Println("Email list modified")
+		gc.Redirect(http.StatusSeeOther, "/my/account")
+		return
+	}
+}
+
+// @Summary Modify your email address.
+// @Produce json
+// @Param ModifyMyEmailDTO body ModifyMyEmailDTO true "New email address."
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} stringResponse
+// @Failure 401 {object} stringResponse
+// @Failure 500 {object} stringResponse
+// @Router /my/email [post]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) ModifyMyEmail(gc *gin.Context) {
+	var req ModifyMyEmailDTO
+	gc.BindJSON(&req)
+	app.debug.Println("Email modification requested")
+	if !strings.ContainsRune(req.Email, '@') {
+		respond(400, "Invalid Email Address", gc)
+		return
+	}
+	id := gc.GetString("jfId")
+
+	// We'll use the ConfirmMyAction route to do the work, even if we don't need to confirm the address.
+	claims := jwt.MapClaims{
+		"valid":  true,
+		"id":     id,
+		"email":  req.Email,
+		"type":   "confirmation",
+		"target": UserEmailChange,
+		"exp":    time.Now().Add(time.Hour).Unix(),
+	}
+	tk := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
+	key, err := tk.SignedString([]byte(os.Getenv("JFA_SECRET")))
+
+	if err != nil {
+		app.err.Printf("Failed to generate confirmation token: %v", err)
+		respond(500, "errorUnknown", gc)
+		return
+	}
+
+	if emailEnabled && app.config.Section("email_confirmation").Key("enabled").MustBool(false) {
+		user, status, err := app.jf.UserByID(id, false)
+		name := ""
+		if status == 200 && err == nil {
+			name = user.Name
+		}
+		app.debug.Printf("%s: Email confirmation required", id)
+		respond(401, "confirmEmail", gc)
+		msg, err := app.email.constructConfirmation("", name, key, app, false)
+		if err != nil {
+			app.err.Printf("%s: Failed to construct confirmation email: %v", name, err)
+		} else if err := app.email.send(msg, req.Email); err != nil {
+			app.err.Printf("%s: Failed to send user confirmation email: %v", name, err)
+		} else {
+			app.info.Printf("%s: Sent user confirmation email to \"%s\"", name, req.Email)
+		}
+		return
+	}
+
+	app.confirmMyAction(gc, key)
+	return
+}
+
+// @Summary Returns a 10-minute, one-use Discord server invite
+// @Produce json
+// @Success 200 {object} DiscordInviteDTO
+// @Failure 400 {object} boolResponse
+// @Failure 401 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param invCode path string true "invite Code"
+// @Router /my/discord/invite [get]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) MyDiscordServerInvite(gc *gin.Context) {
+	if app.discord.inviteChannelName == "" {
+		respondBool(400, false, gc)
+		return
+	}
+	invURL, iconURL := app.discord.NewTempInvite(10*60, 1)
+	if invURL == "" {
+		respondBool(500, false, gc)
+		return
+	}
+	gc.JSON(200, DiscordInviteDTO{invURL, iconURL})
+}
+
+// @Summary Returns a linking PIN for discord/telegram
+// @Produce json
+// @Success 200 {object} GetMyPINDTO
+// @Failure 400 {object} stringResponse
+// Param service path string true "discord/telegram"
+// @Router /my/pin/{service} [get]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) GetMyPIN(gc *gin.Context) {
+	service := gc.Param("service")
+	resp := GetMyPINDTO{}
+	switch service {
+	case "discord":
+		resp.PIN = app.discord.NewAssignedAuthToken(gc.GetString("jfId"))
+		break
+	case "telegram":
+		resp.PIN = app.telegram.NewAssignedAuthToken(gc.GetString("jfId"))
+		break
+	default:
+		respond(400, "invalid service", gc)
+		return
+	}
+	gc.JSON(200, resp)
+}
+
+// @Summary Returns true/false on whether or not your discord PIN was verified, and assigns the discord user to you.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 401 {object} boolResponse
+// @Param pin path string true "PIN code to check"
+// @Router /my/discord/verified/{pin} [get]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) MyDiscordVerifiedInvite(gc *gin.Context) {
+	pin := gc.Param("pin")
+	dcUser, ok := app.discord.AssignedUserVerified(pin, gc.GetString("jfId"))
+	app.discord.DeleteVerifiedUser(pin)
+	if !ok {
+		respondBool(200, false, gc)
+		return
+	}
+	if app.config.Section("discord").Key("require_unique").MustBool(false) && app.discord.UserExists(dcUser.ID) {
+		respondBool(400, false, gc)
+		return
+	}
+	existingUser, ok := app.storage.GetDiscordKey(gc.GetString("jfId"))
+	if ok {
+		dcUser.Lang = existingUser.Lang
+		dcUser.Contact = existingUser.Contact
+	}
+	app.storage.SetDiscordKey(gc.GetString("jfId"), dcUser)
+	respondBool(200, true, gc)
+}
+
+// @Summary Returns true/false on whether or not your telegram PIN was verified, and assigns the telegram user to you.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 401 {object} boolResponse
+// @Param pin path string true "PIN code to check"
+// @Router /my/telegram/verified/{pin} [get]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) MyTelegramVerifiedInvite(gc *gin.Context) {
+	pin := gc.Param("pin")
+	token, ok := app.telegram.AssignedTokenVerified(pin, gc.GetString("jfId"))
+	app.telegram.DeleteVerifiedToken(pin)
+	if !ok {
+		respondBool(200, false, gc)
+		return
+	}
+	if app.config.Section("telegram").Key("require_unique").MustBool(false) && app.telegram.UserExists(token.Username) {
+		respondBool(400, false, gc)
+		return
+	}
+	tgUser := TelegramUser{
+		ChatID:   token.ChatID,
+		Username: token.Username,
+		Contact:  true,
+	}
+	if lang, ok := app.telegram.languages[tgUser.ChatID]; ok {
+		tgUser.Lang = lang
+	}
+
+	existingUser, ok := app.storage.GetTelegramKey(gc.GetString("jfId"))
+	if ok {
+		tgUser.Lang = existingUser.Lang
+		tgUser.Contact = existingUser.Contact
+	}
+	app.storage.SetTelegramKey(gc.GetString("jfId"), tgUser)
+	respondBool(200, true, gc)
+}
+
+// @Summary Generate and send a new PIN to your given matrix user.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 400 {object} stringResponse
+// @Failure 401 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Param MatrixSendPINDTO body MatrixSendPINDTO true "User's Matrix ID."
+// @Router /my/matrix/user [post]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) MatrixSendMyPIN(gc *gin.Context) {
+	var req MatrixSendPINDTO
+	gc.BindJSON(&req)
+	if req.UserID == "" {
+		respond(400, "errorNoUserID", gc)
+		return
+	}
+	if app.config.Section("matrix").Key("require_unique").MustBool(false) {
+		for _, u := range app.storage.GetMatrix() {
+			if req.UserID == u.UserID {
+				respondBool(400, false, gc)
+				return
+			}
+		}
+	}
+
+	ok := app.matrix.SendStart(req.UserID)
+	if !ok {
+		respondBool(500, false, gc)
+		return
+	}
+	respondBool(200, true, gc)
+}
+
+// @Summary Check whether your matrix PIN is valid, and link the account to yours if so.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Failure 401 {object} boolResponse
+// @Param pin path string true "PIN code to check"
+// @Param invCode path string true "invite Code"
+// @Param userID path string true "Matrix User ID"
+// @Router /my/matrix/verified/{userID}/{pin} [get]
+// @Security Bearer
+// @tags User Page
+func (app *appContext) MatrixCheckMyPIN(gc *gin.Context) {
+	userID := gc.Param("userID")
+	pin := gc.Param("pin")
+	user, ok := app.matrix.tokens[pin]
+	if !ok {
+		app.debug.Println("Matrix: PIN not found")
+		respondBool(200, false, gc)
+		return
+	}
+	if user.User.UserID != userID {
+		app.debug.Println("Matrix: User ID of PIN didn't match")
+		respondBool(200, false, gc)
+		return
+	}
+
+	mxUser := *user.User
+	mxUser.Contact = true
+	existingUser, ok := app.storage.GetMatrixKey(gc.GetString("jfId"))
+	if ok {
+		mxUser.Lang = existingUser.Lang
+		mxUser.Contact = existingUser.Contact
+	}
+
+	app.storage.SetMatrixKey(gc.GetString("jfId"), mxUser)
+	delete(app.matrix.tokens, pin)
+	respondBool(200, true, gc)
+}
+
+// @Summary unlink the Discord account from your Jellyfin user. Always succeeds.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Router /my/discord [delete]
+// @Security Bearer
+// @Tags User Page
+func (app *appContext) UnlinkMyDiscord(gc *gin.Context) {
+	app.storage.DeleteDiscordKey(gc.GetString("jfId"))
+	respondBool(200, true, gc)
+}
+
+// @Summary unlink the Telegram account from your Jellyfin user. Always succeeds.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Router /my/telegram [delete]
+// @Security Bearer
+// @Tags User Page
+func (app *appContext) UnlinkMyTelegram(gc *gin.Context) {
+	app.storage.DeleteTelegramKey(gc.GetString("jfId"))
+	respondBool(200, true, gc)
+}
+
+// @Summary unlink the Matrix account from your Jellyfin user. Always succeeds.
+// @Produce json
+// @Success 200 {object} boolResponse
+// @Router /my/matrix [delete]
+// @Security Bearer
+// @Tags User Page
+func (app *appContext) UnlinkMyMatrix(gc *gin.Context) {
+	app.storage.DeleteMatrixKey(gc.GetString("jfId"))
+	respondBool(200, true, gc)
+}
+
+// @Summary Generate & send a password reset link if the given username/email/contact method exists. Doesn't give you any info about it's success.
+// @Produce json
+// @Param address path string true "address/contact method associated w/ your account."
+// @Success 204 {object} boolResponse
+// @Failure 400 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Router /my/password/reset/{address} [post]
+// @Tags User Page
+func (app *appContext) ResetMyPassword(gc *gin.Context) {
+	// All requests should take 1 second, to make it harder to tell if a success occured or not.
+	timerWait := make(chan bool)
+	cancel := time.AfterFunc(1*time.Second, func() {
+		timerWait <- true
+	})
+	address := gc.Param("address")
+	if address == "" {
+		app.debug.Println("Ignoring empty request for PWR")
+		cancel.Stop()
+		respondBool(400, false, gc)
+		return
+	}
+	var pwr InternalPWR
+	var err error
+
+	jfUser, ok := app.ReverseUserSearch(address)
+	if !ok {
+		app.debug.Printf("Ignoring PWR request: User not found")
+
+		for range timerWait {
+			respondBool(204, true, gc)
+			return
+		}
+		return
+	}
+	pwr, err = app.GenInternalReset(jfUser.ID)
+	if err != nil {
+		app.err.Printf("Failed to get user from Jellyfin: %v", err)
+		for range timerWait {
+			respondBool(204, true, gc)
+			return
+		}
+		return
+	}
+	if app.internalPWRs == nil {
+		app.internalPWRs = map[string]InternalPWR{}
+	}
+	app.internalPWRs[pwr.PIN] = pwr
+	// FIXME: Send to all contact methods
+	msg, err := app.email.constructReset(
+		PasswordReset{
+			Pin:      pwr.PIN,
+			Username: pwr.Username,
+			Expiry:   pwr.Expiry,
+			Internal: true,
+		}, app, false,
+	)
+	if err != nil {
+		app.err.Printf("Failed to construct password reset message for \"%s\": %v", pwr.Username, err)
+		for range timerWait {
+			respondBool(204, true, gc)
+			return
+		}
+		return
+	} else if err := app.sendByID(msg, jfUser.ID); err != nil {
+		app.err.Printf("Failed to send password reset message to \"%s\": %v", address, err)
+	} else {
+		app.info.Printf("Sent password reset message to \"%s\"", address)
+	}
+	for range timerWait {
+		respondBool(204, true, gc)
+		return
+	}
+}
+
+// @Summary Change your password, given the old one and the new one.
+// @Produce json
+// @Param ChangeMyPasswordDTO body ChangeMyPasswordDTO true "User's old & new passwords."
+// @Success 204 {object} boolResponse
+// @Failure 400 {object} PasswordValidation
+// @Failure 401 {object} boolResponse
+// @Failure 500 {object} boolResponse
+// @Router /my/password [post]
+// @Security Bearer
+// @Tags User Page
+func (app *appContext) ChangeMyPassword(gc *gin.Context) {
+	var req ChangeMyPasswordDTO
+	gc.BindJSON(&req)
+	if req.Old == "" || req.New == "" {
+		respondBool(400, false, gc)
+	}
+	validation := app.validator.validate(req.New)
+	for _, val := range validation {
+		if !val {
+			app.debug.Printf("%s: Change password failed: Invalid password", gc.GetString("jfId"))
+			gc.JSON(400, validation)
+			return
+		}
+	}
+	user, status, err := app.jf.UserByID(gc.GetString("jfId"), false)
+	if status != 200 || err != nil {
+		app.err.Printf("Failed to change password: couldn't find user (%d): %+v", status, err)
+		respondBool(500, false, gc)
+		return
+	}
+	// Authenticate as user to confirm old password.
+	user, status, err = app.authJf.Authenticate(user.Name, req.Old)
+	if status != 200 || err != nil {
+		respondBool(401, false, gc)
+		return
+	}
+	status, err = app.jf.SetPassword(gc.GetString("jfId"), req.Old, req.New)
+	if (status != 200 && status != 204) || err != nil {
+		respondBool(500, false, gc)
+		return
+	}
+	if app.config.Section("ombi").Key("enabled").MustBool(false) {
+		func() {
+			ombiUser, status, err := app.getOmbiUser(gc.GetString("jfId"))
+			if status != 200 || err != nil {
+				app.err.Printf("Failed to get user \"%s\" from ombi (%d): %v", user.Name, status, err)
+				return
+			}
+			ombiUser["password"] = req.New
+			status, err = app.ombi.ModifyUser(ombiUser)
+			if status != 200 || err != nil {
+				app.err.Printf("Failed to set password for ombi user \"%s\" (%d): %v", ombiUser["userName"], status, err)
+				return
+			}
+			app.debug.Printf("Reset password for ombi user \"%s\"", ombiUser["userName"])
+		}()
+	}
+	cookie, err := gc.Cookie("user-refresh")
+	if err == nil {
+		app.invalidTokens = append(app.invalidTokens, cookie)
+		gc.SetCookie("refresh", "invalid", -1, "/my", gc.Request.URL.Hostname(), true, true)
+	} else {
+		app.debug.Printf("Couldn't get cookies: %s", err)
+	}
+	respondBool(204, true, gc)
+}

args.go

@@ -75,18 +75,23 @@ func (app *appContext) loadArgs(firstCall bool) {
 	os.Setenv("JFA_DATAPATH", app.dataPath)
 }
 
-/* Adds start/stop/systemd to help message, and
+/*
+	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:
+	fmt.Fprint(stderr, `Usage of jfa-go:
   start
 	start jfa-go as a daemon and run in the background.
   stop
@@ -99,7 +104,7 @@ func helpFunc() {
 	// Write defaults into buffer then remove any shorthands
 	flag.CommandLine.SetOutput(&b)
 	flag.PrintDefaults()
-	flag.CommandLine.SetOutput(os.Stderr)
+	flag.CommandLine.SetOutput(stderr)
 	scanner := bufio.NewScanner(&b)
 	out := ""
 	line := scanner.Text()
@@ -150,5 +155,5 @@ func helpFunc() {
 			lastLine = true
 		}
 	}
-	fmt.Fprint(os.Stderr, out)
+	fmt.Fprint(stderr, out)
 }

auth.go

@@ -4,36 +4,41 @@ import (
 	"encoding/base64"
 	"fmt"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 
-	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
+	"github.com/golang-jwt/jwt"
+	"github.com/hrfee/mediabrowser"
 	"github.com/lithammer/shortuuid/v3"
 )
 
+const (
+	TOKEN_VALIDITY_SEC         = 20 * 60
+	REFRESH_TOKEN_VALIDITY_SEC = 3600 * 24
+)
+
 func (app *appContext) webAuth() gin.HandlerFunc {
 	return app.authenticate
 }
 
 // CreateToken returns a web token as well as a refresh token, which can be used to obtain new tokens.
-func CreateToken(userId, jfId string) (string, string, error) {
+func CreateToken(userId, jfId string, admin bool) (string, string, error) {
 	var token, refresh string
 	claims := jwt.MapClaims{
 		"valid": true,
 		"id":    userId,
-		"exp":   strconv.FormatInt(time.Now().Add(time.Minute*20).Unix(), 10),
+		"exp":   time.Now().Add(time.Second * TOKEN_VALIDITY_SEC).Unix(),
 		"jfid":  jfId,
+		"admin": admin,
 		"type":  "bearer",
 	}
-
 	tk := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
 	token, err := tk.SignedString([]byte(os.Getenv("JFA_SECRET")))
 	if err != nil {
 		return "", "", err
 	}
-	claims["exp"] = strconv.FormatInt(time.Now().Add(time.Hour*24).Unix(), 10)
+	claims["exp"] = time.Now().Add(time.Second * REFRESH_TOKEN_VALIDITY_SEC).Unix()
 	claims["type"] = "refresh"
 	tk = jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
 	refresh, err = tk.SignedString([]byte(os.Getenv("JFA_SECRET")))
@@ -43,8 +48,9 @@ func CreateToken(userId, jfId string) (string, string, error) {
 	return token, refresh, nil
 }
 
-// Check header for token
-func (app *appContext) authenticate(gc *gin.Context) {
+// Caller should return if this returns false.
+func (app *appContext) decodeValidateAuthHeader(gc *gin.Context) (claims jwt.MapClaims, ok bool) {
+	ok = false
 	header := strings.SplitN(gc.Request.Header.Get("Authorization"), " ", 2)
 	if header[0] != "Bearer" {
 		app.debug.Println("Invalid authorization header")
@@ -57,23 +63,48 @@ func (app *appContext) authenticate(gc *gin.Context) {
 		respond(401, "Unauthorized", gc)
 		return
 	}
-	claims, ok := token.Claims.(jwt.MapClaims)
-	expiryUnix, err := strconv.ParseInt(claims["exp"].(string), 10, 64)
+	claims, ok = token.Claims.(jwt.MapClaims)
+	if !ok {
+		app.debug.Println("Invalid JWT")
+		respond(401, "Unauthorized", gc)
+		return
+	}
+	expiryUnix := int64(claims["exp"].(float64))
 	if err != nil {
 		app.debug.Printf("Auth denied: %s", err)
 		respond(401, "Unauthorized", gc)
+		ok = false
 		return
 	}
 	expiry := time.Unix(expiryUnix, 0)
 	if !(ok && token.Valid && claims["type"].(string) == "bearer" && expiry.After(time.Now())) {
 		app.debug.Printf("Auth denied: Invalid token")
+		// app.debug.Printf("Expiry: %+v, OK: %t, Valid: %t, ClaimType: %s\n", expiry, ok, token.Valid, claims["type"].(string))
+		respond(401, "Unauthorized", gc)
+		ok = false
+		return
+	}
+	ok = true
+	return
+}
+
+// Check header for token
+func (app *appContext) authenticate(gc *gin.Context) {
+	claims, ok := app.decodeValidateAuthHeader(gc)
+	if !ok {
+		return
+	}
+	isAdminToken := claims["admin"].(bool)
+	if !isAdminToken {
+		app.debug.Printf("Auth denied: Token was not for admin access")
 		respond(401, "Unauthorized", gc)
 		return
 	}
+
 	userID := claims["id"].(string)
 	jfID := claims["jfid"].(string)
 	match := false
-	for _, user := range app.users {
+	for _, user := range app.adminUsers {
 		if user.UserID == userID {
 			match = true
 			break
@@ -86,6 +117,7 @@ func (app *appContext) authenticate(gc *gin.Context) {
 	}
 	gc.Set("jfId", jfID)
 	gc.Set("userId", userID)
+	gc.Set("userMode", false)
 	app.debug.Println("Auth succeeded")
 	gc.Next()
 }
@@ -101,8 +133,46 @@ type getTokenDTO struct {
 	Token string `json:"token" example:"kjsdklsfdkljfsjsdfklsdfkldsfjdfskjsdfjklsdf"` // API token for use with everything else.
 }
 
+func (app *appContext) decodeValidateLoginHeader(gc *gin.Context) (username, password string, ok bool) {
+	header := strings.SplitN(gc.Request.Header.Get("Authorization"), " ", 2)
+	auth, _ := base64.StdEncoding.DecodeString(header[1])
+	creds := strings.SplitN(string(auth), ":", 2)
+	username = creds[0]
+	password = creds[1]
+	ok = false
+	if username == "" || password == "" {
+		app.debug.Println("Auth denied: blank username/password")
+		respond(401, "Unauthorized", gc)
+		return
+	}
+	ok = true
+	return
+}
+
+func (app *appContext) validateJellyfinCredentials(username, password string, gc *gin.Context) (user mediabrowser.User, ok bool) {
+	ok = false
+	user, status, err := app.authJf.Authenticate(username, password)
+	if status != 200 || err != nil {
+		if status == 401 || status == 400 {
+			app.info.Println("Auth denied: Invalid username/password (Jellyfin)")
+			respond(401, "Unauthorized", gc)
+			return
+		}
+		if status == 403 {
+			app.info.Println("Auth denied: Jellyfin account disabled")
+			respond(403, "yourAccountWasDisabled", gc)
+			return
+		}
+		app.err.Printf("Auth failed: Couldn't authenticate with Jellyfin (%d/%s)", status, err)
+		respond(500, "Jellyfin error", gc)
+		return
+	}
+	ok = true
+	return
+}
+
 // @Summary Grabs an API token using username & password.
-// @description Click the lock icon next to this, login with your normal jfa-go credentials. Click 'try it out', then 'execute' and an API Key will be returned, copy it (not including quotes). On any of the other routes, click the lock icon and set the API key as "Bearer `your api key`".
+// @description If viewing docs locally, click the lock icon next to this, login with your normal jfa-go credentials. Click 'try it out', then 'execute' and an API Key will be returned, copy it (not including quotes). On any of the other routes, click the lock icon and set the API key as "Bearer `your api key`".
 // @Produce json
 // @Success 200 {object} getTokenDTO
 // @Failure 401 {object} stringResponse
@@ -111,18 +181,14 @@ type getTokenDTO struct {
 // @Security getTokenAuth
 func (app *appContext) getTokenLogin(gc *gin.Context) {
 	app.info.Println("Token requested (login attempt)")
-	header := strings.SplitN(gc.Request.Header.Get("Authorization"), " ", 2)
-	auth, _ := base64.StdEncoding.DecodeString(header[1])
-	creds := strings.SplitN(string(auth), ":", 2)
-	var userID, jfID string
-	if creds[0] == "" || creds[1] == "" {
-		app.debug.Println("Auth denied: blank username/password")
-		respond(401, "Unauthorized", gc)
+	username, password, ok := app.decodeValidateLoginHeader(gc)
+	if !ok {
 		return
 	}
+	var userID, jfID string
 	match := false
-	for _, user := range app.users {
-		if user.Username == creds[0] && user.Password == creds[1] {
+	for _, user := range app.adminUsers {
+		if user.Username == username && user.Password == password {
 			match = true
 			app.debug.Println("Found existing user")
 			userID = user.UserID
@@ -135,21 +201,20 @@ func (app *appContext) getTokenLogin(gc *gin.Context) {
 		return
 	}
 	if !match {
-		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)")
-				respond(401, "Unauthorized", gc)
-				return
-			}
-			app.err.Printf("Auth failed: Couldn't authenticate with Jellyfin (%d/%s)", status, err)
-			respond(500, "Jellyfin error", gc)
+		user, ok := app.validateJellyfinCredentials(username, password, gc)
+		if !ok {
 			return
 		}
 		jfID = user.ID
-		if app.config.Section("ui").Key("admin_only").MustBool(true) {
-			if !user.Policy.IsAdministrator {
-				app.debug.Printf("Auth denied: Users \"%s\" isn't admin", creds[0])
+		if !app.config.Section("ui").Key("allow_all").MustBool(false) {
+			accountsAdmin := false
+			adminOnly := app.config.Section("ui").Key("admin_only").MustBool(true)
+			if emailStore, ok := app.storage.GetEmailsKey(jfID); ok {
+				accountsAdmin = emailStore.Admin
+			}
+			accountsAdmin = accountsAdmin || (adminOnly && user.Policy.IsAdministrator)
+			if !accountsAdmin {
+				app.debug.Printf("Auth denied: Users \"%s\" isn't admin", username)
 				respond(401, "Unauthorized", gc)
 				return
 			}
@@ -159,10 +224,10 @@ func (app *appContext) getTokenLogin(gc *gin.Context) {
 		newUser := User{
 			UserID: userID,
 		}
-		app.debug.Printf("Token generated for user \"%s\"", creds[0])
-		app.users = append(app.users, newUser)
+		app.debug.Printf("Token generated for user \"%s\"", username)
+		app.adminUsers = append(app.adminUsers, newUser)
 	}
-	token, refresh, err := CreateToken(userID, jfID)
+	token, refresh, err := CreateToken(userID, jfID, true)
 	if err != nil {
 		app.err.Printf("getToken failed: Couldn't generate token (%s)", err)
 		respond(500, "Couldn't generate token", gc)
@@ -172,15 +237,9 @@ func (app *appContext) getTokenLogin(gc *gin.Context) {
 	gc.JSON(200, getTokenDTO{token})
 }
 
-// @Summary Grabs an API token using a refresh token from cookies.
-// @Produce json
-// @Success 200 {object} getTokenDTO
-// @Failure 401 {object} stringResponse
-// @Router /token/refresh [get]
-// @tags Auth
-func (app *appContext) getTokenRefresh(gc *gin.Context) {
-	app.debug.Println("Token requested (refresh token)")
-	cookie, err := gc.Cookie("refresh")
+func (app *appContext) decodeValidateRefreshCookie(gc *gin.Context, cookieName string) (claims jwt.MapClaims, ok bool) {
+	ok = false
+	cookie, err := gc.Cookie(cookieName)
 	if err != nil || cookie == "" {
 		app.debug.Printf("getTokenRefresh denied: Couldn't get token: %s", err)
 		respond(400, "Couldn't get token", gc)
@@ -199,27 +258,45 @@ func (app *appContext) getTokenRefresh(gc *gin.Context) {
 		respond(400, "Invalid token", gc)
 		return
 	}
-	claims, ok := token.Claims.(jwt.MapClaims)
-	expiryUnix, err := strconv.ParseInt(claims["exp"].(string), 10, 64)
+	claims, ok = token.Claims.(jwt.MapClaims)
+	expiryUnix := int64(claims["exp"].(float64))
 	if err != nil {
 		app.debug.Printf("getTokenRefresh: Invalid token expiry: %s", err)
 		respond(401, "Invalid token", gc)
+		ok = false
 		return
 	}
 	expiry := time.Unix(expiryUnix, 0)
 	if !(ok && token.Valid && claims["type"].(string) == "refresh" && expiry.After(time.Now())) {
-		app.debug.Printf("getTokenRefresh: Invalid token: %s", err)
+		app.debug.Printf("getTokenRefresh: Invalid token: %+v", err)
 		respond(401, "Invalid token", gc)
+		ok = false
+		return
+	}
+	ok = true
+	return
+}
+
+// @Summary Grabs an API token using a refresh token from cookies.
+// @Produce json
+// @Success 200 {object} getTokenDTO
+// @Failure 401 {object} stringResponse
+// @Router /token/refresh [get]
+// @tags Auth
+func (app *appContext) getTokenRefresh(gc *gin.Context) {
+	app.debug.Println("Token requested (refresh token)")
+	claims, ok := app.decodeValidateRefreshCookie(gc, "refresh")
+	if !ok {
 		return
 	}
 	userID := claims["id"].(string)
 	jfID := claims["jfid"].(string)
-	jwt, refresh, err := CreateToken(userID, jfID)
+	jwt, refresh, err := CreateToken(userID, jfID, true)
 	if err != nil {
 		app.err.Printf("getTokenRefresh failed: Couldn't generate token (%s)", err)
 		respond(500, "Couldn't generate token", gc)
 		return
 	}
-	gc.SetCookie("refresh", refresh, (3600 * 24), "/", gc.Request.URL.Hostname(), true, true)
+	gc.SetCookie("refresh", refresh, REFRESH_TOKEN_VALIDITY_SEC, "/", gc.Request.URL.Hostname(), true, true)
 	gc.JSON(200, getTokenDTO{jwt})
 }

config.go

@@ -39,14 +39,19 @@ func (app *appContext) loadConfig() error {
 
 	app.MustSetValue("jellyfin", "public_server", app.config.Section("jellyfin").Key("server").String())
 
+	app.MustSetValue("ui", "redirect_url", app.config.Section("jellyfin").Key("public_server").String())
+
 	for _, key := range app.config.Section("files").Keys() {
 		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", "custom_emails", "users", "telegram_users", "discord_users", "matrix_users"} {
+	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", "custom_user_page_content"} {
 		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)))
 
@@ -68,6 +73,17 @@ func (app *appContext) loadConfig() error {
 	app.MustSetValue("deletion", "email_html", "jfa-go:"+"deleted.html")
 	app.MustSetValue("deletion", "email_text", "jfa-go:"+"deleted.txt")
 
+	app.MustSetValue("smtp", "hello_hostname", "localhost")
+	app.MustSetValue("smtp", "cert_validation", "true")
+
+	sc := app.config.Section("discord").Key("start_command").MustString("start")
+	app.config.Section("discord").Key("start_command").SetValue(strings.TrimPrefix(strings.TrimPrefix(sc, "/"), "!"))
+
+	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)
+	}
+
 	// 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")
@@ -85,10 +101,22 @@ func (app *appContext) loadConfig() error {
 	app.MustSetValue("user_expiry", "email_text", "jfa-go:"+"user-expired.txt")
 
 	app.MustSetValue("matrix", "topic", "Jellyfin notifications")
+	app.MustSetValue("matrix", "show_on_reg", "true")
+
+	app.MustSetValue("discord", "show_on_reg", "true")
+
+	app.MustSetValue("telegram", "show_on_reg", "true")
 
 	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))
+
+	// These two settings are pretty much the same
+	url1 := app.config.Section("invite_emails").Key("url_base").String()
+	url2 := app.config.Section("password_resets").Key("url_base").String()
+	app.MustSetValue("password_resets", "url_base", strings.TrimSuffix(url1, "/invite"))
+	app.MustSetValue("invite_emails", "url_base", url2)
+
 	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)
@@ -129,18 +157,20 @@ func (app *appContext) loadConfig() error {
 		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("")
 
+	if substituteStrings != "" {
+		v := app.config.Section("ui").Key("success_message")
+		v.SetValue(strings.ReplaceAll(v.String(), "Jellyfin", substituteStrings))
+	}
+
 	oldFormLang := app.config.Section("ui").Key("language").MustString("")
 	if oldFormLang != "" {
-		app.storage.lang.chosenFormLang = oldFormLang
+		app.storage.lang.chosenUserLang = oldFormLang
 	}
 	newFormLang := app.config.Section("ui").Key("language-form").MustString("")
 	if newFormLang != "" {
-		app.storage.lang.chosenFormLang = newFormLang
+		app.storage.lang.chosenUserLang = newFormLang
 	}
 	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")

config/config-base.json

@@ -124,7 +124,7 @@
                         ["en-us", "English (US)"]
                     ],
                     "value": "en-us",
-                    "description": "Default Account Form Language. Visit weblate.hrfee.dev if you'd like to translate."
+                    "description": "Default Account Form Language. Visit weblate.jfa-go.com if you'd like to translate."
                 },
                 "language-admin": {
                     "name": "Default Admin Language",
@@ -135,7 +135,7 @@
                         ["en-us", "English (US)"]
                     ],
                     "value": "en-us",
-                    "description": "Default Admin page Language. Settings has not been translated. Visit weblate.hrfee.dev if you'd like to translate."
+                    "description": "Default Admin page Language. Settings has not been translated. Visit weblate.jfa-go.com if you'd like to translate."
                 },
                 "theme": {
                     "name": "Default Look",
@@ -181,6 +181,15 @@
                     "value": true,
                     "description": "Allows only admin users on Jellyfin to access the admin page."
                 },
+                "allow_all": {
+                    "name": "Allow all users to login",
+                    "required": false,
+                    "requires_restart": true,
+                    "depends_true": "jellyfin_login",
+                    "type": "bool",
+                    "value": false,
+                    "description": "Allow all Jellyfin users to access jfa-go. Not recommended, add individual users in the Accounts tab instead."
+                },
                 "username": {
                     "name": "Web Username",
                     "required": true,
@@ -241,12 +250,30 @@
                     "description": "Displayed when a user creates an account"
                 },
                 "url_base": {
-                    "name": "URL Base",
+                    "name": "Reverse Proxy subfolder",
                     "required": false,
                     "requires_restart": true,
                     "type": "text",
                     "value": "",
-                    "description": "URL base for when running jfa-go with a reverse proxy in a subfolder."
+                    "description": "URL base for when running jfa-go with a reverse proxy in a subfolder. include preceding /, e.g \"/accounts\"."
+                },
+                "redirect_url": {
+                    "name": "Form success redirect URL",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "advanced": true,
+                    "description": "Set a different URL for the sign-up form to redirect the user to when they've signed up. Default to 'Public Server' or 'Server' in the Jellyfin tab."
+                },
+                "auto_redirect": {
+                    "name": "Auto redirect on success",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "advanced": true,
+                    "description": "Navigate directly to the above URL instead of needing the user to click \"Continue\"."
                 }
             }
         },
@@ -294,6 +321,92 @@
                 }
             }
         },
+        "captcha": {
+            "order": [],
+            "meta": {
+                "name": "Captcha",
+                "description": "Settings related to user creation CAPTCHAs."
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Enable a CAPTCHA on the account creation form."
+                },
+                "recaptcha": {
+                    "name": "Use Google reCAPTCHA",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "More reliable, but requires some setup. See jfa-go wiki for more info."
+                },
+                "recaptcha_site_key": {
+                    "name": "reCAPTCHA Site Key",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "text",
+                    "depends_true": "recaptcha",
+                    "value": "",
+                    "description": "Site Key, see jfa-go wiki for how to acquire one."
+                },
+                "recaptcha_secret_key": {
+                    "name": "reCAPTCHA Secret Key",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "text",
+                    "depends_true": "recaptcha",
+                    "value": "",
+                    "description": "Secret Key, see jfa-go wiki for how to acquire one."
+                },
+                "recaptcha_hostname": {
+                    "name": "Hostname",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "text",
+                    "depends_true": "recaptcha",
+                    "value": "",
+                    "description": "Public host-name of jfa-go, e.g. \"site.com\". Don't include any subpaths."
+                }
+            }
+        },
+        "user_page": {
+            "order": [],
+            "meta": {
+                "name": "User Page",
+                "description": "The User Page (My Account) allows users to access and modify info directly, such as changing/adding contact methods, seeing their expiry date, or changing their password. Password resets can also be initiated from here, given a contact method or username. ",
+                "depends_true": "ui|jellyfin_login"
+            },
+            "settings": {
+                "enabled": {
+                    "name": "Enabled",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "bool",
+                    "value": true
+                },
+                "jellyfin_login_note": {
+                    "name": "Note:",
+                    "type": "note",
+                    "value": "",
+                    "depends_true": "enabled",
+                    "required": "false",
+                    "description": "Jellyfin Login must be enabled to use this feature, and password resets with a link must be enabled for self-service.",
+                    "style": "critical"
+                },
+                "edit_note": {
+                    "name": "Message Cards:",
+                    "type": "note",
+                    "value": "",
+                    "depends_true": "enabled",
+                    "required": "false",
+                    "description": "Click the edit icon next to the \"User Page\" Setting to add custom Markdown messages that will be shown to the user. Note message cards are not private, little effort is required for anyone to view them."
+                }
+            }
+        },
         "password_validation": {
             "order": [],
             "meta": {
@@ -386,6 +499,14 @@
                     "type": "text",
                     "value": "Need help? contact me.",
                     "description": "Message displayed at bottom of emails."
+                },
+                "edit_note": {
+                    "name": "Customize Messages:",
+                    "type": "note",
+                    "value": "",
+                    "depends_true": "enabled",
+                    "required": "false",
+                    "description": "Click the edit icon next to the \"Messages/Notifications\" Setting to customize the messages sent to users with Markdown."
                 }
             }
         },
@@ -458,6 +579,23 @@
                     "type": "bool",
                     "value": false,
                     "description": "Send emails as plain text instead of HTML."
+                },
+                "required": {
+                    "name": "Require on sign-up",
+                    "required": false,
+                    "requires_restart": false,
+                    "depends_true": "method",
+                    "type": "bool",
+                    "value": false,
+                    "description": "Require an email address on sign-up."
+                },
+                "require_unique": {
+                    "name": "Require unique address",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Disables using the same address on multiple accounts."
                 }
             }
         },
@@ -535,6 +673,15 @@
                     "type": "password",
                     "value": "smtp password"
                 },
+                "hello_hostname": {
+                    "name": "HELLO Hostname",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "type": "text",
+                    "value": "localhost",
+                    "description": "Hostname sent when sending HELLO to the SMTP server. Some servers don't like the default \"localhost\" value, such as smtp-relay.gmail.com."
+                },
                 "ssl_cert": {
                     "name": "Path to custom SSL certificate",
                     "required": false,
@@ -543,6 +690,15 @@
                     "type": "text",
                     "value": "",
                     "description": "Use if your SMTP server's SSL Certificate is not trusted by the system."
+                },
+                "cert_validation": {
+                    "name": "Verify certificate",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "type": "bool",
+                    "value": true,
+                    "description": "Warning, disabling this makes you much more vulnerable to man-in-the-middle attacks"
                 }
             }
         },
@@ -561,15 +717,32 @@
                     "value": false,
                     "description": "Enable signup verification through Discord and the sending of notifications through it.\nSee the jfa-go wiki for setting up a bot."
                 },
+                "show_on_reg": {
+                    "name": "Show on user registration",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "depends_true": "enabled",
+                    "value": true,
+                    "description": "Allow users to link their Discord on the registration page."
+                },
                 "required": {
                     "name": "Require on sign-up",
                     "required": false,
-                    "required_restart": true,
+                    "requires_restart": true,
                     "depends_true": "enabled",
                     "type": "bool",
                     "value": false,
                     "description": "Require Discord connection on sign-up. See the jfa-go wiki for info on setting this up."
                 },
+                "require_unique": {
+                    "name": "Require unique user",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Disables using the same user on multiple Jellyfin accounts."
+                },
                 "token": {
                     "name": "API Token",
                     "required": false,
@@ -585,7 +758,7 @@
                     "requires_restart": true,
                     "depends_true": "enabled",
                     "type": "text",
-                    "value": "!start",
+                    "value": "start",
                     "description": "Command to start the user verification process."
                 },
                 "channel": {
@@ -615,6 +788,18 @@
                     "value": "",
                     "description": "Channel to invite new users to."
                 },
+                "apply_role": {
+                    "name": "Apply Role on connection",
+                    "required": false,
+                    "requires_restart": true,
+                    "depends_true": "enabled",
+                    "type": "select",
+                    "options": [
+                        ["", "None"]
+                    ],
+                    "value": "",
+                    "description": "Add the selected role to a user when they sign up."
+                },
                 "language": {
                     "name": "Language",
                     "required": false,
@@ -644,6 +829,15 @@
                     "value": false,
                     "description": "Enable signup verification through Telegram and the sending of notifications through it.\nSee the jfa-go wiki for setting up a bot."
                 },
+                "show_on_reg": {
+                    "name": "Show on user registration",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "depends_true": "enabled",
+                    "value": true,
+                    "description": "Allow users to link their Telegram on the registration page."
+                },
                 "required": {
                     "name": "Require on sign-up",
                     "required": false,
@@ -653,6 +847,14 @@
                     "value": false,
                     "description": "Require telegram connection on sign-up."
                 },
+                "require_unique": {
+                    "name": "Require unique user",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Disables using the same user on multiple Jellyfin accounts."
+                },
                 "token": {
                     "name": "API Token",
                     "required": false,
@@ -691,6 +893,15 @@
                     "value": false,
                     "description": "Enable signup verification through Matrix and the sending of notifications through it.\nSee the jfa-go wiki for setting up a bot."
                 },
+                "show_on_reg": {
+                    "name": "Show on user registration",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "depends_true": "enabled",
+                    "value": true,
+                    "description": "Allow users to link their Matrix on the registration page."
+                },
                 "required": {
                     "name": "Require on sign-up",
                     "required": false,
@@ -700,6 +911,14 @@
                     "value": false,
                     "description": "Require Matrix connection on sign-up."
                 },
+                "require_unique": {
+                    "name": "Require unique user",
+                    "required": false,
+                    "requires_restart": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Disables using the same user on multiple Jellyfin accounts."
+                },
                 "homeserver": {
                     "name": "Home Server URL",
                     "required": false,
@@ -747,6 +966,16 @@
                     ],
                     "value": "en-us",
                     "description": "Default Matrix message language. Visit weblate if you'd like to translate."
+                },
+                "encryption": {
+                    "name": "End-to-end encryption (experimental)",
+                    "required": false,
+                    "requires_restart": true,
+                    "depends_true": "enabled",
+                    "advanced": true,
+                    "type": "bool",
+                    "value": false,
+                    "description": "Enable end-to-end encryption for messages. Very experimental, currently does not support receiving commands (e.g !lang)."
                 }
             }
         },
@@ -793,6 +1022,15 @@
                     "value": false,
                     "description": "Instead of automatically setting the user's password to the PIN, allow them to set a new password through the reset link."
                 },
+                "url_base": {
+                    "name": "URL Base",
+                    "required": true,
+                    "requires_restart": false,
+                    "depends_true": "link_reset",
+                    "type": "text",
+                    "value": "http://accounts.jellyf.in:8056",
+                    "description": "Base URL for jfa-go. You can leave this if you have one set in \"Invite Emails\". This is necessary because using a reverse proxy means the program has no way of knowing the URL itself."
+                },
                 "language": {
                     "name": "Default reset link language",
                     "required": false,
@@ -886,11 +1124,41 @@
                     "requires_restart": false,
                     "depends_true": "enabled",
                     "type": "text",
-                    "value": "http://accounts.jellyf.in:8056/invite",
+                    "value": "http://accounts.jellyf.in:8056",
                     "description": "Base URL for jfa-go. This is necessary because using a reverse proxy means the program has no way of knowing the URL itself."
                 }
             }
         },
+        "template_email": {
+            "order": [],
+            "meta": {
+                "name": "Custom email template",
+                "description": "Settings for the template used for announcements & custom messages. HTML should include {{ .text }}, Plaintext should include {{ .plaintext }}, and either can have {{ .message }} to include the contact message.",
+                "advanced": true
+            },
+            "settings": {
+                "email_html": {
+                    "name": "Custom template email (HTML)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email HTML template for announcements/custom messages."
+                },
+                "email_text": {
+                    "name": "Custom template email (plaintext)",
+                    "required": false,
+                    "requires_restart": false,
+                    "advanced": true,
+                    "depends_true": "enabled",
+                    "type": "text",
+                    "value": "",
+                    "description": "Path to custom email text template for announcements/custom messages."
+                }
+            }
+        },
         "notifications": {
             "order": [],
             "meta": {
@@ -953,7 +1221,7 @@
             "order": [],
             "meta": {
                 "name": "Ombi Integration",
-                "description": "Connect to Ombi to automatically create both Ombi and Jellyfin accounts for new users. You'll need to create a user template for this to work. Once enabled, refresh to see an option in settings for this. To handle password resets for Ombi & Jellyfin, enable \"Use reset link instead of PIN\"."
+                "description": "Connect to Ombi to automatically create both Ombi and Jellyfin accounts for new users. You'll need to add a ombi template to an existing User Profile for accounts to be created, which you can do by refreshing then checking Settings > User Profiles. To handle password resets for Ombi & Jellyfin, enable \"Use reset link instead of PIN\"."
             },
             "settings": {
                 "enabled": {
@@ -1308,6 +1576,14 @@
                     "value": "",
                     "description": "JSON file generated by program in settings, different from email_html/email_text. See wiki for more info."
                 },
+                "custom_user_page_content": {
+                    "name": "Custom user page content",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "JSON file generated by program in settings, containing user page messages. See wiki for more info."
+                },
                 "telegram_users": {
                     "name": "Telegram users",
                     "required": false,
@@ -1324,6 +1600,14 @@
                     "value": "",
                     "description": "Stores matrix user IDs and language preferences."
                 },
+                "matrix_sql": {
+                    "name": "Matrix encryption DB",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "Stores cryptographic material for Matrix end-to-end encryption."
+                },
                 "discord_users": {
                     "name": "Discord users",
                     "required": false,
@@ -1331,6 +1615,14 @@
                     "type": "text",
                     "value": "",
                     "description": "Stores discord user IDs and language preferences."
+                },
+                "announcements": {
+                    "name": "Announcement templates",
+                    "required": false,
+                    "requires_restart": false,
+                    "type": "text",
+                    "value": "",
+                    "description": "Stores custom announcement templates."
                 }
             }
         }

css/base.css

@@ -1,25 +1,64 @@
-@import "../node_modules/a17t/dist/a17t.css";
 @import "remixicon.css";
 @import "./modal.css";
 @import "./dark.css";
 @import "./tooltip.css";
 @import "./loader.css";
+@import "./fonts.css";
+
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
 
 :root {
     --border-width-default: 2px;
     --border-width-2: 3px;
     --border-width-4: 5px;
     --border-width-8: 8px;
+    font-family: 'Hanken Grotesk', ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
 }
 
-.light-theme {
+.light {
     --settings-section-button-filter: 90%;
 }
 
-.body {
+.dark {
+    --settings-section-button-filter: 80%;
+}
+
+.dark body {
     background-color: #101010;
 }
 
+html:not(.dark) body {
+    background-color: #fff;
+}
+
+.dark select, .dark option, .dark input {
+    background: #202020;
+}
+
+html:not(.dark) .card.\@low:not(.\~neutral):not(.\~positive):not(.\~urge):not(.\~warning):not(.\~info):not(.\~critical),
+html:not(.dark) .card.\@low:not(.\~neutral):not(.\~positive):not(.\~urge):not(.\~warning):not(.\~info):not(.\~critical) > * {
+    /* Colors from ~neutral */
+    --color-fill-high: #64748b;
+    --color-fill-low: #e2e8f0;
+    --color-content-high: #f8fafc;
+    --color-content-low: #1e293b;
+    --color-accent-high: #475569;
+    --color-accent-low: #cbd5e1;
+    --color-muted-high: #475569;
+    --color-muted-low: #f1f5f9;
+    background-color: #fff;
+}
+
+.light-only {
+  display: none;
+}
+
+.dark-only {
+  display: initial;
+}
+
 .page-container {
     margin: 5% 20% 5% 20%;
 }
@@ -27,6 +66,7 @@
 @media (max-width: 1100px) {
     .page-container {
         margin: 2%;
+        margin-top: 5rem;
     }
 }
 
@@ -50,6 +90,8 @@
 
 .banner.header {
     margin-bottom: var(--spacing-4,1rem);
+    max-width: calc(100% + 2.2rem); /* no idea why this works */
+    margin-left: -1.1rem;
 }
 
 .banner.footer {
@@ -57,11 +99,6 @@
     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;
 }
@@ -70,54 +107,6 @@ div.card:contains(section.banner.footer) {
     font-size: 2rem;
 }
 
-.mb-half {
-    margin-bottom: 0.5rem;
-}
-
-.mb-1 {
-    margin-bottom: 1rem;
-}
-
-.mb-2 {
-    margin-bottom: 2rem;
-}
-
-.mt-half {
-    margin-top: 0.5rem;
-}
-
-.mt-1 {
-    margin-top: 1rem;
-}
-
-.ml-1 {
-    margin-left: 1rem;
-}
-
-.ml-half {
-    margin-left: 0.5rem;
-}
-
-.mr-half {
-    margin-right: 0.5rem;
-}
-
-.mr-1 {
-    margin-right: 1rem;
-}
-
-.p-1 {
-    padding: 1rem;
-}
-
-.pb-1 {
-    padding-bottom: 1rem;
-}
-
-.pl-1 {
-    padding-left: 1rem;
-}
-
 .al {
     text-align: left;
 }
@@ -134,6 +123,10 @@ div.card:contains(section.banner.footer) {
     width: 100%;
 }
 
+.h-100 {
+    height: 100%;
+}
+
 .inline-block {
     display: inline-block;
 }
@@ -142,20 +135,11 @@ div.card:contains(section.banner.footer) {
     align-items: top;
 }
 
-.flex {
-    display: flex;
-}
-
 .flex-expand {
     display: flex;
     justify-content: space-between;
 }
 
-.flex-row {
-    display: flex;
-    flex-direction: row;
-}
-
 .flex-row-group {
     display: block;
     flex-grow: 1;
@@ -190,6 +174,18 @@ span.sm:not(.heading) {
     flex-direction: column;
 }
 
+.flex-form {
+    display: flex;
+    flex-direction: column;
+}
+
+@media screen and (min-width: 768px) {
+    .flex-form {
+        flex: 1;
+        margin: 0.5rem;
+    }
+}
+
 @media screen and (max-width: 400px) {
     .row {
         flex-direction: column;
@@ -199,15 +195,6 @@ span.sm:not(.heading) {
     }
 }
 
-.fr {
-    float: right;
-}
-
-.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 {
     color: var(--color-critical-normal-content);
 }
@@ -326,7 +313,7 @@ sup.\~critical, .text-critical {
     padding-left: 0px;
 }
 
-.block { 
+.block {
     display: block;
 }
 
@@ -373,10 +360,8 @@ sup.\~critical, .text-critical {
 }
 
 .settings-section-button {
-    box-sizing: border-box;
     width: 100%;
     height: 2.5rem;
-    background-color: rgba(0,0,0,0);
 }
 
 .settings-section-button:hover, .settings-section-button:focus {
@@ -388,8 +373,6 @@ sup.\~critical, .text-critical {
 }
 
 .settings-section-button.selected {
-    background-color: var(--color-neutral-normal-fill);
-    --buton-filter-brightness: var(--settings-section-button-filter);
     filter: brightness(var(--settings-section-button-filter)) !important;
 }
 
@@ -417,11 +400,21 @@ select, textarea {
     -moz-appearance: none;
 }
 
+html.dark textarea {
+    background-color: #202020
+}
+
 input {
     color: inherit;
     border: 0 solid var(--color-neutral-300);
 }
 
+table {
+    color: var(--color-content);
+}
+
+
+
 p.top {
     margin-top: 0px;
 }
@@ -443,16 +436,27 @@ p.top {
     margin-bottom: -0.5rem;
 }
 
+.dropdown.over-top {
+    position: absolute;
+}
+
 .dropdown-display.lg {
     white-space: nowrap;
 }
 
+.dropdown-display.above {
+    top: auto;
+    bottom: 115%;
+}
+
 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+ */
+    background-color: var(--color-content-high) !important;
+    overflow-x: scroll;
 }
 
 .circle {
@@ -483,15 +487,24 @@ a:hover:not(.lang-link):not(.\~urge), a:active:not(.lang-link):not(.\~urge) {
     color: var(--color-urge-200);
 }
 
+a.button,
+a.button:link,
+a.button:visited,
+a.button:focus,
+a.buton:hover {
+    color: var(--color-content) !important;
+}
+
+
 .link-center {
     display: block;
     text-align: center;
 }
 
-.search {
+/* .search {
     max-width: 15rem;
     min-width: 10rem;
-}
+} */
 
 td.img-circle {
     width: 32px;
@@ -533,3 +546,41 @@ div.card:contains(section.banner.footer) {
 .card.sectioned .section {
     padding: var(--spacing-4, 1rem);
 }
+
+.button.discord.\@low {
+    background-color: rgba(88, 101, 242,60%);
+}
+
+.button.discord.\@low:not(.lang-link) {
+    color: rgba(38, 51, 192, 90%);
+}
+
+.pb-0i {
+    padding-bottom: 0px !important
+}
+
+.mx-0i {
+    margin-left: 0px !important;
+    margin-right: 0px !important
+}
+
+.text-center-i {
+    text-align: center !important;
+}
+
+input[type="checkbox" i], [class^="ri-"], [class*=" ri-"], .ri-refresh-line:before, .modal-close {
+    cursor: pointer;
+}
+
+
+.g-recaptcha {
+    overflow: hidden;
+    width: 296px;
+    height: 72px;
+    transform: scale(1.1);
+    transform-origin: top left;
+}
+
+.g-recaptcha iframe {
+    margin: -2px 0px 0px -4px;
+}

css/dark.css

@@ -1,91 +0,0 @@
-.dark-theme {
-
-    --settings-section-button-filter: 110%;
-
-    --color-neutral-900: rgba(255, 255, 255, 0.87);
-    --color-neutral-800: rgba(255, 255, 255, 0.8);
-    --color-neutral-700: rgba(255, 255, 255, 0.73);
-    --color-neutral-600: rgba(255, 255, 255, 0.66);
-    --color-neutral-500: rgb(153, 153, 153);
-    --color-neutral-400: #383838;
-    --color-neutral-300: #303030;
-    --color-neutral-200: #292929;
-    --color-neutral-100: #242424;
-    --color-neutral-50: #202020;
-    --color-neutral-000: #101010;
-
-    --color-critical-900: #fef2f2;
-    --color-critical-800: #fee2e2;
-    --color-critical-700: #fecaca;
-    --color-critical-600: #fca5a5;
-    --color-critical-500: #f87171;
-    --color-critical-400: #ef4444;
-    --color-critical-300: #dc2626;
-    --color-critical-200: #b91c1c;
-    --color-critical-100: #991b1b;
-    --color-critical-50: #7f1d1d;
-    --color-critical-000: #441313;
-
-    --color-warning-900: #fffbeb;
-    --color-warning-800: #fef3c7;
-    --color-warning-700: #fde68a;
-    --color-warning-600: #fcd34d;
-    --color-warning-500: #fbbf24;
-    --color-warning-400: #f59e0b;
-    --color-warning-300: #d97706;
-    --color-warning-200: #b45309;
-    --color-warning-100: #92400e;
-    --color-warning-50: #783900;
-    --color-warning-000: #411e01;
-
-    --color-positive-900: #f0fdf4;
-    --color-positive-800: #dcfce7;
-    --color-positive-700: #bbf7d0;
-    --color-positive-600: #86efac;
-    --color-positive-500: #4ade80;
-    --color-positive-400: #22c55e;
-    --color-positive-300: #16a34a;
-    --color-positive-200: #15803d;
-    --color-positive-100: #166534;
-    --color-positive-50: #14532d;
-    --color-positive-000: #0f2e1b;
-
-    --color-urge-900: #e0ffff;
-    --color-urge-800: #c0fbff;
-    --color-urge-700: #a0f4ff;
-    --color-urge-600: #80e9ff;
-    --color-urge-500: #60dbfb;
-    --color-urge-400: #40cbf3;
-    --color-urge-300: #20b9e9;
-    --color-urge-200: #00a4dc; /* tab buttons */
-    --color-urge-100: #0054bc;
-    --color-urge-50: #00169a;
-    --color-urge-000: #050076;
-
-    --color-info-900: #f5f3ff;
-    --color-info-800: #ede9fe;
-    --color-info-700: #ddd6fe;
-    --color-info-600: #c4b5fd;
-    --color-info-500: #a78bfa;
-    --color-info-400: #8b5cf6;
-    --color-info-300: #7c3aed;
-    --color-info-200: #6d28d9;
-    --color-info-100: #5b21b6;
-    --color-info-50: #4c1d95;
-    --color-info-000: #240e44;
-
-
-    --color-neutral-normal-content: #ffffff;
-}
-
-.light-only {
-  display: none;
-}
-
-.dark-only {
-  display: initial;
-}
-
-.dark-theme select option {
-    background: #202020;
-}

css/dark.js

@@ -0,0 +1,351 @@
+var c = {
+    inherit: 'inherit',
+    current: 'currentColor',
+    transparent: 'transparent',
+    black: '#000',
+    white: '#fff',
+    d_neutral: {
+        900: "rgba(255, 255, 255, 0.87)",
+        800: "rgba(255, 255, 255, 0.8)",
+        700: "rgba(255, 255, 255, 0.73)",
+        600: "rgba(255, 255, 255, 0.66)",
+        500: "rgb(153, 153, 153)",
+        400: "#383838",
+        300: "#303030",
+        200: "#292929",
+        100: "#242424",
+        50: "#202020",
+        000: "#101010"
+    },
+    d_critical: {
+        900: "#fef2f2",
+        800: "#fee2e2",
+        700: "#fecaca",
+        600: "#fca5a5",
+        500: "#f87171",
+        400: "#ef4444",
+        300: "#dc2626",
+        200: "#b91c1c",
+        100: "#991b1b",
+        50: "#7f1d1d",
+        000: "#441313"
+    },
+    d_warning: {
+        900: "#fffbeb",
+        800: "#fef3c7",
+        700: "#fde68a",
+        600: "#fcd34d",
+        500: "#fbbf24",
+        400: "#f59e0b",
+        300: "#d97706",
+        200: "#b45309",
+        100: "#92400e",
+        50: "#783900",
+        000: "#411e01"
+    },
+    d_positive: {
+        900: "#f0fdf4",
+        800: "#dcfce7",
+        700: "#bbf7d0",
+        600: "#86efac",
+        500: "#4ade80",
+        400: "#22c55e",
+        300: "#16a34a",
+        200: "#15803d",
+        100: "#166534",
+        50: "#14532d",
+        000: "#0f2e1b"
+    },
+    d_urge: {
+        900: "#e0ffff",
+        800: "#c0fbff",
+        700: "#a0f4ff",
+        600: "#80e9ff",
+        500: "#60dbfb",
+        400: "#40cbf3",
+        300: "#20b9e9",
+        200: "#00a4dc",
+        100: "#0054bc",
+        50: "#00169a",
+        000: "#050076"
+    },
+    d_info: {
+        900: "#f5f3ff",
+        800: "#ede9fe",
+        700: "#ddd6fe",
+        600: "#c4b5fd",
+        500: "#a78bfa",
+        400: "#8b5cf6",
+        300: "#7c3aed",
+        200: "#6d28d9",
+        100: "#5b21b6",
+        50: "#4c1d95",
+        000: "#240e44"
+    },
+    slate: {
+        50: '#f8fafc',
+        100: '#f1f5f9',
+        200: '#e2e8f0',
+        300: '#cbd5e1',
+        400: '#94a3b8',
+        500: '#64748b',
+        600: '#475569',
+        700: '#334155',
+        800: '#1e293b',
+        900: '#0f172a'
+    },
+    gray: {
+        50: '#f9fafb',
+        100: '#f3f4f6',
+        200: '#e5e7eb',
+        300: '#d1d5db',
+        400: '#9ca3af',
+        500: '#6b7280',
+        600: '#4b5563',
+        700: '#374151',
+        800: '#1f2937',
+        900: '#111827'
+    },
+    zinc: {
+        50: '#fafafa',
+        100: '#f4f4f5',
+        200: '#e4e4e7',
+        300: '#d4d4d8',
+        400: '#a1a1aa',
+        500: '#71717a',
+        600: '#52525b',
+        700: '#3f3f46',
+        800: '#27272a',
+        900: '#18181b'
+    },
+    neutral: {
+        50: '#fafafa',
+        100: '#f5f5f5',
+        200: '#e5e5e5',
+        300: '#d4d4d4',
+        400: '#a3a3a3',
+        500: '#737373',
+        600: '#525252',
+        700: '#404040',
+        800: '#262626',
+        900: '#171717'
+    },
+    stone: {
+        50: '#fafaf9',
+        100: '#f5f5f4',
+        200: '#e7e5e4',
+        300: '#d6d3d1',
+        400: '#a8a29e',
+        500: '#78716c',
+        600: '#57534e',
+        700: '#44403c',
+        800: '#292524',
+        900: '#1c1917'
+    },
+    red: {
+        50: '#fef2f2',
+        100: '#fee2e2',
+        200: '#fecaca',
+        300: '#fca5a5',
+        400: '#f87171',
+        500: '#ef4444',
+        600: '#dc2626',
+        700: '#b91c1c',
+        800: '#991b1b',
+        900: '#7f1d1d'
+    },
+    orange: {
+        50: '#fff7ed',
+        100: '#ffedd5',
+        200: '#fed7aa',
+        300: '#fdba74',
+        400: '#fb923c',
+        500: '#f97316',
+        600: '#ea580c',
+        700: '#c2410c',
+        800: '#9a3412',
+        900: '#7c2d12'
+    },
+    amber: {
+        50: '#fffbeb',
+        100: '#fef3c7',
+        200: '#fde68a',
+        300: '#fcd34d',
+        400: '#fbbf24',
+        500: '#f59e0b',
+        600: '#d97706',
+        700: '#b45309',
+        800: '#92400e',
+        900: '#78350f'
+    },
+    yellow: {
+        50: '#fefce8',
+        100: '#fef9c3',
+        200: '#fef08a',
+        300: '#fde047',
+        400: '#facc15',
+        500: '#eab308',
+        600: '#ca8a04',
+        700: '#a16207',
+        800: '#854d0e',
+        900: '#713f12'
+    },
+    lime: {
+        50: '#f7fee7',
+        100: '#ecfccb',
+        200: '#d9f99d',
+        300: '#bef264',
+        400: '#a3e635',
+        500: '#84cc16',
+        600: '#65a30d',
+        700: '#4d7c0f',
+        800: '#3f6212',
+        900: '#365314'
+    },
+    green: {
+        50: '#f0fdf4',
+        100: '#dcfce7',
+        200: '#bbf7d0',
+        300: '#86efac',
+        400: '#4ade80',
+        500: '#22c55e',
+        600: '#16a34a',
+        700: '#15803d',
+        800: '#166534',
+        900: '#14532d'
+    },
+    emerald: {
+        50: '#ecfdf5',
+        100: '#d1fae5',
+        200: '#a7f3d0',
+        300: '#6ee7b7',
+        400: '#34d399',
+        500: '#10b981',
+        600: '#059669',
+        700: '#047857',
+        800: '#065f46',
+        900: '#064e3b'
+    },
+    teal: {
+        50: '#f0fdfa',
+        100: '#ccfbf1',
+        200: '#99f6e4',
+        300: '#5eead4',
+        400: '#2dd4bf',
+        500: '#14b8a6',
+        600: '#0d9488',
+        700: '#0f766e',
+        800: '#115e59',
+        900: '#134e4a'
+    },
+    cyan: {
+        50: '#ecfeff',
+        100: '#cffafe',
+        200: '#a5f3fc',
+        300: '#67e8f9',
+        400: '#22d3ee',
+        500: '#06b6d4',
+        600: '#0891b2',
+        700: '#0e7490',
+        800: '#155e75',
+        900: '#164e63'
+    },
+    sky: {
+        50: '#f0f9ff',
+        100: '#e0f2fe',
+        200: '#bae6fd',
+        300: '#7dd3fc',
+        400: '#38bdf8',
+        500: '#0ea5e9',
+        600: '#0284c7',
+        700: '#0369a1',
+        800: '#075985',
+        900: '#0c4a6e'
+    },
+    blue: {
+        50: '#eff6ff',
+        100: '#dbeafe',
+        200: '#bfdbfe',
+        300: '#93c5fd',
+        400: '#60a5fa',
+        500: '#3b82f6',
+        600: '#2563eb',
+        700: '#1d4ed8',
+        800: '#1e40af',
+        900: '#1e3a8a'
+    },
+    indigo: {
+        50: '#eef2ff',
+        100: '#e0e7ff',
+        200: '#c7d2fe',
+        300: '#a5b4fc',
+        400: '#818cf8',
+        500: '#6366f1',
+        600: '#4f46e5',
+        700: '#4338ca',
+        800: '#3730a3',
+        900: '#312e81'
+    },
+    violet: {
+        50: '#f5f3ff',
+        100: '#ede9fe',
+        200: '#ddd6fe',
+        300: '#c4b5fd',
+        400: '#a78bfa',
+        500: '#8b5cf6',
+        600: '#7c3aed',
+        700: '#6d28d9',
+        800: '#5b21b6',
+        900: '#4c1d95'
+    },
+    purple: {
+        50: '#faf5ff',
+        100: '#f3e8ff',
+        200: '#e9d5ff',
+        300: '#d8b4fe',
+        400: '#c084fc',
+        500: '#a855f7',
+        600: '#9333ea',
+        700: '#7e22ce',
+        800: '#6b21a8',
+        900: '#581c87'
+    },
+    fuchsia: {
+        50: '#fdf4ff',
+        100: '#fae8ff',
+        200: '#f5d0fe',
+        300: '#f0abfc',
+        400: '#e879f9',
+        500: '#d946ef',
+        600: '#c026d3',
+        700: '#a21caf',
+        800: '#86198f',
+        900: '#701a75'
+    },
+    pink: {
+        50: '#fdf2f8',
+        100: '#fce7f3',
+        200: '#fbcfe8',
+        300: '#f9a8d4',
+        400: '#f472b6',
+        500: '#ec4899',
+        600: '#db2777',
+        700: '#be185d',
+        800: '#9d174d',
+        900: '#831843'
+    },
+    rose: {
+        50: '#fff1f2',
+        100: '#ffe4e6',
+        200: '#fecdd3',
+        300: '#fda4af',
+        400: '#fb7185',
+        500: '#f43f5e',
+        600: '#e11d48',
+        700: '#be123c',
+        800: '#9f1239',
+        900: '#881337'
+    }
+}
+
+module.exports = c;

css/fonts.css

@@ -0,0 +1,44 @@
+/* hanken-grotesk-regular - cyrillic-ext_latin_vietnamese */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Hanken Grotesk';
+  font-style: normal;
+  font-weight: 400;
+  src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-regular.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* hanken-grotesk-500 - cyrillic-ext_latin_vietnamese */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Hanken Grotesk';
+  font-style: normal;
+  font-weight: 500;
+  src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* hanken-grotesk-500italic - cyrillic-ext_latin_vietnamese */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Hanken Grotesk';
+  font-style: italic;
+  font-weight: 500;
+  src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-500italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ * 
+}
+
+/* hanken-grotesk-700 - cyrillic-ext_latin_vietnamese */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Hanken Grotesk';
+  font-style: normal;
+  font-weight: 700;
+  src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}
+
+/* hanken-grotesk-700italic - cyrillic-ext_latin_vietnamese */
+@font-face {
+  font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+  font-family: 'Hanken Grotesk';
+  font-style: italic;
+  font-weight: 700;
+  src: url('../fonts/hanken-grotesk-v8-cyrillic-ext_latin_vietnamese-700italic.woff2') format('woff2'); /* Chrome 36+, Opera 23+, Firefox 39+, Safari 12+, iOS 10+ */
+}

css/loader.css

@@ -1,6 +1,6 @@
 .loader {
     height: auto;
-    color: rgba(0, 0, 0, 0);
+    color: rgba(0, 0, 0, 0) !important;
 }
 
 .loader .dot {

css/modal.css

@@ -10,56 +10,6 @@
     background-color: rgba(0,0,0,40%);
 }
 
-.modal-shown {
-    display: block;
-}
-
-@keyframes modal-hide {
-    from { opacity: 1; }
-    to { opacity: 0; }
-}
-
-.modal-hiding {
-    animation: modal-hide 0.2s cubic-bezier(0.25, 0.46, 0.45, 0.94);
-}
-
-@keyframes modal-content-show {
-    from {
-        opacity: 0;
-        top: -6rem;
-    }
-    to {
-        opacity: 1;
-        top: 0;
-    }
-}
-
-.modal-content {
-    position: relative;
-    margin: 10% auto;
-    width: 30%;
-}
-
-.modal-content.wide {
-    width: 60%;
-}
-
-.modal-shown .modal-content {
-    animation: modal-content-show 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
-}
-
-@media screen and (max-width: 1000px) {
-    .modal-content.wide {
-        width: 75%;
-    }
-}
-
-@media screen and (max-width: 400px) {
-    .modal-content, .modal-content.wide {
-        width: 90%;
-    }
-}
-
 .modal-close {
     float: right;
     color: #aaa;

daemon.go

@@ -0,0 +1,135 @@
+package main
+
+import "time"
+
+// clearEmails removes stored emails for users which no longer exist.
+// meant to be called with other such housekeeping functions, so assumes
+// the user cache is fresh.
+func (app *appContext) clearEmails() {
+	app.debug.Println("Housekeeping: removing unused email addresses")
+	emails := app.storage.GetEmails()
+	for _, email := range emails {
+		_, status, err := app.jf.UserByID(email.JellyfinID, false)
+		if status == 200 && err != nil {
+			continue
+		}
+		app.storage.DeleteEmailsKey(email.JellyfinID)
+	}
+}
+
+// clearDiscord does the same as clearEmails, but for Discord Users.
+func (app *appContext) clearDiscord() {
+	app.debug.Println("Housekeeping: removing unused Discord IDs")
+	discordUsers := app.storage.GetDiscord()
+	for _, discordUser := range discordUsers {
+		_, status, err := app.jf.UserByID(discordUser.JellyfinID, false)
+		if status == 200 && err != nil {
+			continue
+		}
+		app.storage.DeleteDiscordKey(discordUser.JellyfinID)
+	}
+}
+
+// clearMatrix does the same as clearEmails, but for Matrix Users.
+func (app *appContext) clearMatrix() {
+	app.debug.Println("Housekeeping: removing unused Matrix IDs")
+	matrixUsers := app.storage.GetMatrix()
+	for _, matrixUser := range matrixUsers {
+		_, status, err := app.jf.UserByID(matrixUser.JellyfinID, false)
+		if status == 200 && err != nil {
+			continue
+		}
+		app.storage.DeleteMatrixKey(matrixUser.JellyfinID)
+	}
+}
+
+// clearTelegram does the same as clearEmails, but for Telegram Users.
+func (app *appContext) clearTelegram() {
+	app.debug.Println("Housekeeping: removing unused Telegram IDs")
+	telegramUsers := app.storage.GetTelegram()
+	for _, telegramUser := range telegramUsers {
+		_, status, err := app.jf.UserByID(telegramUser.JellyfinID, false)
+		if status == 200 && err != nil {
+			continue
+		}
+		app.storage.DeleteTelegramKey(telegramUser.JellyfinID)
+	}
+}
+
+// https://bbengfort.github.io/snippets/2016/06/26/background-work-goroutines-timer.html THANKS
+
+type housekeepingDaemon struct {
+	Stopped         bool
+	ShutdownChannel chan string
+	Interval        time.Duration
+	period          time.Duration
+	jobs            []func(app *appContext)
+	app             *appContext
+}
+
+func newInviteDaemon(interval time.Duration, app *appContext) *housekeepingDaemon {
+	daemon := housekeepingDaemon{
+		Stopped:         false,
+		ShutdownChannel: make(chan string),
+		Interval:        interval,
+		period:          interval,
+		app:             app,
+	}
+	daemon.jobs = []func(app *appContext){func(app *appContext) {
+		app.debug.Println("Housekeeping: Checking for expired invites")
+		app.checkInvites()
+	}}
+
+	clearEmail := app.config.Section("email").Key("require_unique").MustBool(false)
+	clearDiscord := app.config.Section("discord").Key("require_unique").MustBool(false)
+	clearTelegram := app.config.Section("telegram").Key("require_unique").MustBool(false)
+	clearMatrix := app.config.Section("matrix").Key("require_unique").MustBool(false)
+
+	if clearEmail || clearDiscord || clearTelegram || clearMatrix {
+		daemon.jobs = append(daemon.jobs, func(app *appContext) { app.jf.CacheExpiry = time.Now() })
+	}
+
+	if clearEmail {
+		daemon.jobs = append(daemon.jobs, func(app *appContext) { app.clearEmails() })
+	}
+	if clearDiscord {
+		daemon.jobs = append(daemon.jobs, func(app *appContext) { app.clearDiscord() })
+	}
+	if clearTelegram {
+		daemon.jobs = append(daemon.jobs, func(app *appContext) { app.clearTelegram() })
+	}
+	if clearMatrix {
+		daemon.jobs = append(daemon.jobs, func(app *appContext) { app.clearMatrix() })
+	}
+
+	return &daemon
+}
+
+func (rt *housekeepingDaemon) run() {
+	rt.app.info.Println("Invite daemon started")
+	for {
+		select {
+		case <-rt.ShutdownChannel:
+			rt.ShutdownChannel <- "Down"
+			return
+		case <-time.After(rt.period):
+			break
+		}
+		started := time.Now()
+
+		for _, job := range rt.jobs {
+			job(rt.app)
+		}
+
+		finished := time.Now()
+		duration := finished.Sub(started)
+		rt.period = rt.Interval - duration
+	}
+}
+
+func (rt *housekeepingDaemon) Shutdown() {
+	rt.Stopped = true
+	rt.ShutdownChannel <- "Down"
+	<-rt.ShutdownChannel
+	close(rt.ShutdownChannel)
+}

discord.go

@@ -3,8 +3,10 @@ package main
 import (
 	"fmt"
 	"strings"
+	"time"
 
 	dg "github.com/bwmarrin/discordgo"
+	"github.com/timshannon/badgerhold/v4"
 )
 
 type DiscordDaemon struct {
@@ -12,13 +14,16 @@ type DiscordDaemon struct {
 	ShutdownChannel                                            chan string
 	bot                                                        *dg.Session
 	username                                                   string
-	tokens                                                     []string
-	verifiedTokens                                             map[string]DiscordUser // Map of tokens to discord users.
+	tokens                                                     map[string]VerifToken  // Map of pins to tokens.
+	verifiedTokens                                             map[string]DiscordUser // Map of token pins 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.
+	roleID                                                     string
 	app                                                        *appContext
+	commandHandlers                                            map[string]func(s *dg.Session, i *dg.InteractionCreate, lang string)
+	commandIDs                                                 []string
 }
 
 func newDiscordDaemon(app *appContext) (*DiscordDaemon, error) {
@@ -34,12 +39,18 @@ func newDiscordDaemon(app *appContext) (*DiscordDaemon, error) {
 		Stopped:         false,
 		ShutdownChannel: make(chan string),
 		bot:             bot,
-		tokens:          []string{},
+		tokens:          map[string]VerifToken{},
 		verifiedTokens:  map[string]DiscordUser{},
 		users:           map[string]DiscordUser{},
 		app:             app,
+		roleID:          app.config.Section("discord").Key("apply_role").String(),
+		commandHandlers: map[string]func(s *dg.Session, i *dg.InteractionCreate, lang string){},
+		commandIDs:      []string{},
 	}
-	for _, user := range app.storage.discord {
+	dd.commandHandlers[app.config.Section("discord").Key("start_command").MustString("start")] = dd.cmdStart
+	dd.commandHandlers["lang"] = dd.cmdLang
+	dd.commandHandlers["pin"] = dd.cmdPIN
+	for _, user := range app.storage.GetDiscord() {
 		dd.users[user.ID] = user
 	}
 
@@ -49,7 +60,15 @@ func newDiscordDaemon(app *appContext) (*DiscordDaemon, error) {
 // 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)
+	d.tokens[pin] = VerifToken{Expiry: time.Now().Add(VERIF_TOKEN_EXPIRY_SEC * time.Second), JellyfinID: ""}
+	return pin
+}
+
+// NewAssignedAuthToken generates an 8-character pin in the form "A1-2B-CD",
+// and assigns it for access only with the given Jellyfin ID.
+func (d *DiscordDaemon) NewAssignedAuthToken(id string) string {
+	pin := genAuthToken()
+	d.tokens[pin] = VerifToken{Expiry: time.Now().Add(VERIF_TOKEN_EXPIRY_SEC * time.Second), JellyfinID: id}
 	return pin
 }
 
@@ -72,6 +91,9 @@ func (d *DiscordDaemon) MustGetUser(channelID, userID, discrim, username string)
 
 func (d *DiscordDaemon) run() {
 	d.bot.AddHandler(d.messageHandler)
+
+	d.bot.AddHandler(d.commandHandler)
+
 	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)
@@ -105,12 +127,44 @@ func (d *DiscordDaemon) run() {
 			d.inviteChannelName = invChannel
 		}
 	}
+	defer d.deregisterCommands()
 	defer d.bot.Close()
+
+	go d.registerCommands()
+
 	<-d.ShutdownChannel
 	d.ShutdownChannel <- "Down"
 	return
 }
 
+// ListRoles returns a list of available (excluding bot and @everyone) roles in a guild as a list of containing an array of the guild ID and its name.
+func (d *DiscordDaemon) ListRoles() (roles [][2]string, err error) {
+	var r []*dg.Role
+	r, err = d.bot.GuildRoles(d.guildID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to get roles: %v", err)
+		return
+	}
+	for _, role := range r {
+		if role.Name != d.username && role.Name != "@everyone" {
+			roles = append(roles, [2]string{role.ID, role.Name})
+		}
+	}
+	// roles = make([][2]string, len(r))
+	// for i, role := range r {
+	// 	roles[i] = [2]string{role.ID, role.Name}
+	// }
+	return
+}
+
+// ApplyRole applies the member role to the given user if set.
+func (d *DiscordDaemon) ApplyRole(userID string) error {
+	if d.roleID == "" {
+		return nil
+	}
+	return d.bot.GuildMemberRoleAdd(d.guildID, userID, d.roleID)
+}
+
 // 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
@@ -166,10 +220,31 @@ func (d *DiscordDaemon) NewTempInvite(ageSeconds, maxUses int) (inviteURL, iconU
 		d.app.err.Printf("Discord: Failed to get guild: %v", err)
 		return
 	}
-	iconURL = guild.IconURL()
+	// FIXME: Fix CSS, and handle no icon
+	iconURL = guild.IconURL("256")
+	fmt.Println("GOT ICON", iconURL)
 	return
 }
 
+// RenderDiscordUsername returns String of discord username, with support for new discriminator-less versions.
+func RenderDiscordUsername[DcUser *dg.User | DiscordUser](user DcUser) string {
+	u, ok := interface{}(user).(*dg.User)
+	var discriminator, username string
+	if ok {
+		discriminator = u.Discriminator
+		username = u.Username
+	} else {
+		u2 := interface{}(user).(DiscordUser)
+		discriminator = u2.Discriminator
+		username = u2.Username
+	}
+
+	if discriminator == "0" {
+		return "@" + username
+	}
+	return username + "#" + discriminator
+}
+
 // 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 {
@@ -183,6 +258,10 @@ func (d *DiscordDaemon) GetUsers(username string) []*dg.Member {
 		return nil
 	}
 	hasDiscriminator := strings.Contains(username, "#")
+	hasAt := strings.HasPrefix(username, "@")
+	if hasAt {
+		username = username[1:]
+	}
 	var users []*dg.Member
 	for _, member := range members {
 		if hasDiscriminator {
@@ -190,6 +269,11 @@ func (d *DiscordDaemon) GetUsers(username string) []*dg.Member {
 				return []*dg.Member{member}
 			}
 		}
+		if hasAt {
+			if member.User.Username == username && member.User.Discriminator == "0" {
+				return []*dg.Member{member}
+			}
+		}
 		if strings.Contains(member.User.Username, username) {
 			users = append(users, member)
 		}
@@ -224,6 +308,202 @@ func (d *DiscordDaemon) Shutdown() {
 	close(d.ShutdownChannel)
 }
 
+func (d *DiscordDaemon) registerCommands() {
+	commands := []*dg.ApplicationCommand{
+		{
+			Name:        d.app.config.Section("discord").Key("start_command").MustString("start"),
+			Description: "Start the Discord linking process. The bot will send further instructions.",
+		},
+		{
+			Name:        "lang",
+			Description: "Set the language for the bot.",
+			Options: []*dg.ApplicationCommandOption{
+				{
+					Type:        dg.ApplicationCommandOptionString,
+					Name:        "language",
+					Description: "Language Name",
+					Required:    true,
+					Choices:     []*dg.ApplicationCommandOptionChoice{},
+				},
+			},
+		},
+		{
+			Name:        "pin",
+			Description: "Send PIN for Discord verification.",
+			Options: []*dg.ApplicationCommandOption{
+				{
+					Type:        dg.ApplicationCommandOptionString,
+					Name:        "pin",
+					Description: "Verification PIN (e.g AB-CD-EF)",
+					Required:    true,
+				},
+			},
+		},
+	}
+	commands[1].Options[0].Choices = make([]*dg.ApplicationCommandOptionChoice, len(d.app.storage.lang.Telegram))
+	i := 0
+	for code := range d.app.storage.lang.Telegram {
+		d.app.debug.Printf("Registering choice \"%s\":\"%s\"\n", d.app.storage.lang.Telegram[code].Meta.Name, code)
+		commands[1].Options[0].Choices[i] = &dg.ApplicationCommandOptionChoice{
+			Name:  d.app.storage.lang.Telegram[code].Meta.Name,
+			Value: code,
+		}
+		i++
+	}
+
+	// d.deregisterCommands()
+
+	d.commandIDs = make([]string, len(commands))
+	// cCommands, err := d.bot.ApplicationCommandBulkOverwrite(d.bot.State.User.ID, d.guildID, commands)
+	// if err != nil {
+	// 	d.app.err.Printf("Discord: Cannot create commands: %v", err)
+	// }
+	for i, cmd := range commands {
+		command, err := d.bot.ApplicationCommandCreate(d.bot.State.User.ID, d.guildID, cmd)
+		if err != nil {
+			d.app.err.Printf("Discord: Cannot create command \"%s\": %v", cmd.Name, err)
+		} else {
+			d.app.debug.Printf("Discord: registered command \"%s\"", cmd.Name)
+			d.commandIDs[i] = command.ID
+		}
+	}
+}
+
+func (d *DiscordDaemon) deregisterCommands() {
+	existingCommands, err := d.bot.ApplicationCommands(d.bot.State.User.ID, d.guildID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to get commands: %v", err)
+		return
+	}
+	for _, cmd := range existingCommands {
+		if err := d.bot.ApplicationCommandDelete(d.bot.State.User.ID, "", cmd.ID); err != nil {
+			d.app.err.Printf("Failed to deregister command: %v", err)
+		}
+	}
+}
+
+func (d *DiscordDaemon) commandHandler(s *dg.Session, i *dg.InteractionCreate) {
+	if h, ok := d.commandHandlers[i.ApplicationCommandData().Name]; ok {
+		if i.GuildID != "" && d.channelName != "" {
+			if d.channelID == "" {
+				channel, err := s.Channel(i.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 != i.ChannelID {
+				d.app.debug.Printf("Discord: Ignoring message as not in specified channel")
+				return
+			}
+		}
+		if i.Interaction.Member.User.ID == s.State.User.ID {
+			return
+		}
+		lang := d.app.storage.lang.chosenTelegramLang
+		if user, ok := d.users[i.Interaction.Member.User.ID]; ok {
+			if _, ok := d.app.storage.lang.Telegram[user.Lang]; ok {
+				lang = user.Lang
+			}
+		}
+		h(s, i, lang)
+	}
+}
+
+// cmd* methods handle slash-commands, msg* methods handle ! commands.
+
+func (d *DiscordDaemon) cmdStart(s *dg.Session, i *dg.InteractionCreate, lang string) {
+	channel, err := s.UserChannelCreate(i.Interaction.Member.User.ID)
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to create private channel with \"%s\": %v", i.Interaction.Member.User.Username, err)
+		return
+	}
+	user := d.MustGetUser(channel.ID, i.Interaction.Member.User.ID, i.Interaction.Member.User.Discriminator, i.Interaction.Member.User.Username)
+	d.users[i.Interaction.Member.User.ID] = user
+
+	content := d.app.storage.lang.Telegram[lang].Strings.get("discordStartMessage") + "\n"
+	content += d.app.storage.lang.Telegram[lang].Strings.template("languageMessageDiscord", tmpl{"command": "/lang"})
+	err = s.InteractionRespond(i.Interaction, &dg.InteractionResponse{
+		//	Type: dg.InteractionResponseChannelMessageWithSource,
+		Type: dg.InteractionResponseChannelMessageWithSource,
+		Data: &dg.InteractionResponseData{
+			Content: content,
+			Flags:   64, // Ephemeral
+		},
+	})
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to send reply: %v", err)
+		return
+	}
+}
+
+func (d *DiscordDaemon) cmdPIN(s *dg.Session, i *dg.InteractionCreate, lang string) {
+	pin := i.ApplicationCommandData().Options[0].StringValue()
+	user, ok := d.tokens[pin]
+	if !ok || time.Now().After(user.Expiry) {
+		err := s.InteractionRespond(i.Interaction, &dg.InteractionResponse{
+			//	Type: dg.InteractionResponseChannelMessageWithSource,
+			Type: dg.InteractionResponseChannelMessageWithSource,
+			Data: &dg.InteractionResponseData{
+				Content: d.app.storage.lang.Telegram[lang].Strings.get("invalidPIN"),
+				Flags:   64, // Ephemeral
+			},
+		})
+		if err != nil {
+			d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", i.Interaction.Member.User.Username, err)
+		}
+		delete(d.tokens, pin)
+		return
+	}
+	err := s.InteractionRespond(i.Interaction, &dg.InteractionResponse{
+		//	Type: dg.InteractionResponseChannelMessageWithSource,
+		Type: dg.InteractionResponseChannelMessageWithSource,
+		Data: &dg.InteractionResponseData{
+			Content: d.app.storage.lang.Telegram[lang].Strings.get("pinSuccess"),
+			Flags:   64, // Ephemeral
+		},
+	})
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", i.Interaction.Member.User.Username, err)
+	}
+	dcUser := d.users[i.Interaction.Member.User.ID]
+	dcUser.JellyfinID = user.JellyfinID
+	d.verifiedTokens[pin] = dcUser
+	delete(d.tokens, pin)
+}
+
+func (d *DiscordDaemon) cmdLang(s *dg.Session, i *dg.InteractionCreate, lang string) {
+	code := i.ApplicationCommandData().Options[0].StringValue()
+	if _, ok := d.app.storage.lang.Telegram[code]; ok {
+		var user DiscordUser
+		for _, u := range d.app.storage.GetDiscord() {
+			if u.ID == i.Interaction.Member.User.ID {
+				u.Lang = code
+				lang = code
+				d.app.storage.SetDiscordKey(u.JellyfinID, u)
+				user = u
+				break
+			}
+		}
+		d.users[i.Interaction.Member.User.ID] = user
+		err := s.InteractionRespond(i.Interaction, &dg.InteractionResponse{
+			//	Type: dg.InteractionResponseChannelMessageWithSource,
+			Type: dg.InteractionResponseChannelMessageWithSource,
+			Data: &dg.InteractionResponseData{
+				Content: d.app.storage.lang.Telegram[lang].Strings.template("languageSet", tmpl{"language": d.app.storage.lang.Telegram[lang].Meta.Name}),
+				Flags:   64, // Ephemeral
+			},
+		})
+		if err != nil {
+			d.app.err.Printf("Discord: Failed to send reply: %v", err)
+			return
+		}
+	}
+}
+
 func (d *DiscordDaemon) messageHandler(s *dg.Session, m *dg.MessageCreate) {
 	if m.GuildID != "" && d.channelName != "" {
 		if d.channelID == "" {
@@ -255,16 +535,16 @@ func (d *DiscordDaemon) messageHandler(s *dg.Session, m *dg.MessageCreate) {
 		}
 	}
 	switch msg := sects[0]; msg {
-	case d.app.config.Section("discord").Key("start_command").MustString("!start"):
-		d.commandStart(s, m, lang)
+	case "!" + d.app.config.Section("discord").Key("start_command").MustString("start"):
+		d.msgStart(s, m, lang)
 	case "!lang":
-		d.commandLang(s, m, sects, lang)
+		d.msgLang(s, m, sects, lang)
 	default:
-		d.commandPIN(s, m, sects, lang)
+		d.msgPIN(s, m, sects, lang)
 	}
 }
 
-func (d *DiscordDaemon) commandStart(s *dg.Session, m *dg.MessageCreate, lang string) {
+func (d *DiscordDaemon) msgStart(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)
@@ -272,6 +552,13 @@ func (d *DiscordDaemon) commandStart(s *dg.Session, m *dg.MessageCreate, lang st
 	}
 	user := d.MustGetUser(channel.ID, m.Author.ID, m.Author.Discriminator, m.Author.Username)
 	d.users[m.Author.ID] = user
+
+	_, err = d.bot.ChannelMessageSendReply(m.ChannelID, d.app.storage.lang.Telegram[lang].Strings.get("discordDMs"), m.Reference())
+	if err != nil {
+		d.app.err.Printf("Discord: Failed to send reply to \"%s\": %v", m.Author.Username, err)
+		return
+	}
+
 	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)
@@ -281,7 +568,7 @@ func (d *DiscordDaemon) commandStart(s *dg.Session, m *dg.MessageCreate, lang st
 	}
 }
 
-func (d *DiscordDaemon) commandLang(s *dg.Session, m *dg.MessageCreate, sects []string, lang string) {
+func (d *DiscordDaemon) msgLang(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 {
@@ -299,13 +586,11 @@ func (d *DiscordDaemon) commandLang(s *dg.Session, m *dg.MessageCreate, sects []
 	}
 	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)
-				}
+		for _, u := range d.app.storage.GetDiscord() {
+			if u.ID == m.Author.ID {
+				u.Lang = sects[1]
+				d.app.storage.SetDiscordKey(u.JellyfinID, u)
+				user = u
 				break
 			}
 		}
@@ -313,7 +598,7 @@ func (d *DiscordDaemon) commandLang(s *dg.Session, m *dg.MessageCreate, sects []
 	}
 }
 
-func (d *DiscordDaemon) commandPIN(s *dg.Session, m *dg.MessageCreate, sects []string, lang string) {
+func (d *DiscordDaemon) msgPIN(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 {
@@ -328,14 +613,8 @@ func (d *DiscordDaemon) commandPIN(s *dg.Session, m *dg.MessageCreate, sects []s
 		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 {
+	user, ok := d.tokens[sects[0]]
+	if !ok || time.Now().After(user.Expiry) {
 		_, err := s.ChannelMessageSend(
 			m.ChannelID,
 			d.app.storage.lang.Telegram[lang].Strings.get("invalidPIN"),
@@ -343,6 +622,7 @@ func (d *DiscordDaemon) commandPIN(s *dg.Session, m *dg.MessageCreate, sects []s
 		if err != nil {
 			d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", m.Author.Username, err)
 		}
+		delete(d.tokens, sects[0])
 		return
 	}
 	_, err := s.ChannelMessageSend(
@@ -352,9 +632,10 @@ func (d *DiscordDaemon) commandPIN(s *dg.Session, m *dg.MessageCreate, sects []s
 	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]
+	dcUser := d.users[m.Author.ID]
+	dcUser.JellyfinID = user.JellyfinID
+	d.verifiedTokens[sects[0]] = dcUser
+	delete(d.tokens, sects[0])
 }
 
 func (d *DiscordDaemon) SendDM(message *Message, userID ...string) error {
@@ -408,3 +689,32 @@ func (d *DiscordDaemon) Send(message *Message, channelID ...string) error {
 	}
 	return nil
 }
+
+// UserVerified returns whether or not a token with the given PIN has been verified, and the user itself.
+func (d *DiscordDaemon) UserVerified(pin string) (user DiscordUser, ok bool) {
+	user, ok = d.verifiedTokens[pin]
+	// delete(d.verifiedTokens, pin)
+	return
+}
+
+// AssignedUserVerified returns whether or not a user with the given PIN has been verified, and the token itself.
+// Returns false if the given Jellyfin ID does not match the one in the user.
+func (d *DiscordDaemon) AssignedUserVerified(pin string, jfID string) (user DiscordUser, ok bool) {
+	user, ok = d.verifiedTokens[pin]
+	if ok && user.JellyfinID != jfID {
+		ok = false
+	}
+	// delete(d.verifiedUsers, pin)
+	return
+}
+
+// UserExists returns whether or not a user with the given ID exists.
+func (d *DiscordDaemon) UserExists(id string) bool {
+	c, err := d.app.storage.db.Count(&DiscordUser{}, badgerhold.Where("ID").Eq(id))
+	return err != nil || c > 0
+}
+
+// DeleteVerifiedUser removes the token with the given PIN.
+func (d *DiscordDaemon) DeleteVerifiedUser(pin string) {
+	delete(d.verifiedTokens, pin)
+}

email.go

@@ -10,92 +10,29 @@ import (
 	"html/template"
 	"io"
 	"io/fs"
-	"net/smtp"
+	"net/url"
 	"os"
 	"strconv"
 	"strings"
-	"sync"
 	textTemplate "text/template"
 	"time"
 
 	"github.com/gomarkdown/markdown"
 	"github.com/gomarkdown/markdown/html"
+	"github.com/hrfee/mediabrowser"
 	"github.com/itchyny/timefmt-go"
-	jEmail "github.com/jordan-wright/email"
 	"github.com/mailgun/mailgun-go/v4"
+	"github.com/timshannon/badgerhold/v4"
+	sMail "github.com/xhit/go-simple-mail/v2"
 )
 
-var renderer = html.NewRenderer(html.RendererOptions{Flags: html.Smartypants})
+var markdownRenderer = html.NewRenderer(html.RendererOptions{Flags: html.Smartypants})
 
-// implements email sending, right now via smtp or mailgun.
+// EmailClient implements email sending, right now via smtp, mailgun or a dummy client.
 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.
-type Mailgun struct {
-	client *mailgun.MailgunImpl
-}
-
-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,
-	)
-	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)
-	return err
-}
-
-// SMTP supports SSL/TLS and STARTTLS; implements emailClient.
-type SMTP struct {
-	sslTLS    bool
-	server    string
-	port      int
-	auth      smtp.Auth
-	tlsConfig *tls.Config
-}
-
-func (sm *SMTP) Send(fromName, fromAddr string, email *Message, address ...string) error {
-	server := fmt.Sprintf("%s:%d", sm.server, sm.port)
-	from := fmt.Sprintf("%s <%s>", fromName, fromAddr)
-	var wg sync.WaitGroup
-	var err error
-	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, translations, and methods to construct messages.
 type Emailer struct {
 	fromAddr, fromName string
@@ -141,17 +78,16 @@ func NewEmailer(app *appContext) *Emailer {
 	}
 	method := app.config.Section("email").Key("method").String()
 	if method == "smtp" {
-		sslTls := false
+		sslTLS := false
 		if app.config.Section("smtp").Key("encryption").String() == "ssl_tls" {
-			sslTls = true
+			sslTLS = true
 		}
-		username := ""
-		if u := app.config.Section("smtp").Key("username").MustString(""); u != "" {
-			username = u
-		} else {
+		username := app.config.Section("smtp").Key("username").MustString("")
+		password := app.config.Section("smtp").Key("password").String()
+		if username == "" && password != "" {
 			username = emailer.fromAddr
 		}
-		err := emailer.NewSMTP(app.config.Section("smtp").Key("server").String(), app.config.Section("smtp").Key("port").MustInt(465), username, app.config.Section("smtp").Key("password").String(), sslTls, app.config.Section("smtp").Key("ssl_cert").MustString(""))
+		err := emailer.NewSMTP(app.config.Section("smtp").Key("server").String(), app.config.Section("smtp").Key("port").MustInt(465), username, password, sslTLS, app.config.Section("smtp").Key("ssl_cert").MustString(""), app.config.Section("smtp").Key("hello_hostname").String(), app.config.Section("smtp").Key("cert_validation").MustBool(true))
 		if err != nil {
 			app.err.Printf("Error while initiating SMTP mailer: %v", err)
 		}
@@ -163,34 +99,45 @@ func NewEmailer(app *appContext) *Emailer {
 	return emailer
 }
 
-// NewMailgun returns a Mailgun emailClient.
-func (emailer *Emailer) NewMailgun(url, key string) {
-	sender := &Mailgun{
-		client: mailgun.NewMailgun(strings.Split(emailer.fromAddr, "@")[1], key),
-	}
-	// Mailgun client takes the base url, so we need to trim off the end (e.g 'v3/messages')
-	if strings.Contains(url, "messages") {
-		url = url[0:strings.LastIndex(url, "/")]
-		url = url[0:strings.LastIndex(url, "/")]
-	}
-	sender.client.SetAPIBase(url)
-	emailer.sender = sender
+// DummyClient just logs the email to the console for debugging purposes. It can be used by settings [email]/method to "dummy".
+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
+}
+
+// SMTP supports SSL/TLS and STARTTLS; implements EmailClient.
+type SMTP struct {
+	Client *sMail.SMTPServer
 }
 
 // NewSMTP returns an SMTP emailClient.
-func (emailer *Emailer) NewSMTP(server string, port int, username, password string, sslTLS bool, certPath string) (err error) {
+func (emailer *Emailer) NewSMTP(server string, port int, username, password string, sslTLS bool, certPath string, helloHostname string, validateCertificate bool) (err error) {
+	sender := &SMTP{}
+	sender.Client = sMail.NewSMTPClient()
+	if sslTLS {
+		sender.Client.Encryption = sMail.EncryptionSSLTLS
+	} else {
+		sender.Client.Encryption = sMail.EncryptionSTARTTLS
+	}
+	if username != "" || password != "" {
+		sender.Client.Authentication = sMail.AuthLogin
+		sender.Client.Username = username
+		sender.Client.Password = password
+	}
+	sender.Client.Helo = helloHostname
+	sender.Client.ConnectTimeout, sender.Client.SendTimeout = 15*time.Second, 15*time.Second
+	sender.Client.Host = server
+	sender.Client.Port = port
+	sender.Client.KeepAlive = false
 	// 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,
-			},
+		sender.Client.TLSConfig = &tls.Config{
+			InsecureSkipVerify: !validateCertificate,
+			ServerName:         server,
 		}
+		emailer.sender = sender
 		return
 	}
 	rootCAs, err := x509.SystemCertPool()
@@ -204,20 +151,74 @@ func (emailer *Emailer) NewSMTP(server string, port int, username, password stri
 			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,
-		},
+	sender.Client.TLSConfig = &tls.Config{
+		InsecureSkipVerify: !validateCertificate,
+		ServerName:         server,
+		RootCAs:            rootCAs,
 	}
+	emailer.sender = sender
 	return
 }
 
+func (sm *SMTP) Send(fromName, fromAddr string, email *Message, address ...string) error {
+	from := fmt.Sprintf("%s <%s>", fromName, fromAddr)
+	var cli *sMail.SMTPClient
+	var err error
+	cli, err = sm.Client.Connect()
+	if err != nil {
+		return err
+	}
+	defer cli.Close()
+	e := sMail.NewMSG()
+	e.SetFrom(from)
+	e.SetSubject(email.Subject)
+	e.AddTo(address...)
+	e.SetBody(sMail.TextPlain, email.Text)
+	if email.HTML != "" {
+		e.AddAlternative(sMail.TextHTML, email.HTML)
+	}
+	err = e.Send(cli)
+	return err
+}
+
+// Mailgun client implements EmailClient.
+type Mailgun struct {
+	client *mailgun.MailgunImpl
+}
+
+// NewMailgun returns a Mailgun emailClient.
+func (emailer *Emailer) NewMailgun(url, key string) {
+	sender := &Mailgun{
+		client: mailgun.NewMailgun(strings.Split(emailer.fromAddr, "@")[1], key),
+	}
+	// Mailgun client takes the base url, so we need to trim off the end (e.g 'v3/messages')
+	if strings.Contains(url, "messages") {
+		url = url[0:strings.LastIndex(url, "/")]
+	}
+	if strings.Contains(url, "v3") {
+		url = url[0:strings.LastIndex(url, "/")]
+	}
+	sender.client.SetAPIBase(url)
+	emailer.sender = sender
+}
+
+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,
+	)
+	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)
+	return err
+}
+
 type templ interface {
 	Execute(wr io.Writer, data interface{}) error
 }
@@ -306,7 +307,17 @@ func (emailer *Emailer) confirmationValues(code, username, key string, app *appC
 	} 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)
+		if code == "" { // Personal email change
+			if strings.HasSuffix(inviteLink, "/invite") {
+				inviteLink = strings.TrimSuffix(inviteLink, "/invite")
+			}
+			inviteLink = fmt.Sprintf("%s/my/confirm/%s", inviteLink, url.PathEscape(key))
+		} else { // Invite email confirmation
+			if !strings.HasSuffix(inviteLink, "/invite") {
+				inviteLink += "/invite"
+			}
+			inviteLink = fmt.Sprintf("%s/%s?key=%s", inviteLink, code, url.PathEscape(key))
+		}
 		template["helloUser"] = emailer.lang.Strings.template("helloUser", tmpl{"username": username})
 		template["confirmationURL"] = inviteLink
 		template["message"] = message
@@ -320,10 +331,11 @@ func (emailer *Emailer) constructConfirmation(code, username, key string, app *a
 	}
 	var err error
 	template := emailer.confirmationValues(code, username, key, app, noSub)
-	if app.storage.customEmails.EmailConfirmation.Enabled {
+	message := app.storage.MustGetCustomContentKey("EmailConfirmation")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.EmailConfirmation.Content,
-			app.storage.customEmails.EmailConfirmation.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -337,18 +349,27 @@ func (emailer *Emailer) constructConfirmation(code, username, key string, app *a
 	return email, nil
 }
 
-func (emailer *Emailer) constructTemplate(subject, md string, app *appContext) (*Message, error) {
+// username is optional, but should only be passed once.
+func (emailer *Emailer) constructTemplate(subject, md string, app *appContext, username ...string) (*Message, error) {
+	if len(username) != 0 {
+		md = templateEmail(md, []string{"{username}"}, nil, map[string]interface{}{"username": username[0]})
+		subject = templateEmail(subject, []string{"{username}"}, nil, map[string]interface{}{"username": username[0]})
+	}
 	email := &Message{Subject: subject}
-	html := markdown.ToHTML([]byte(md), nil, renderer)
+	html := markdown.ToHTML([]byte(md), nil, markdownRenderer)
 	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{}{
+	data := map[string]interface{}{
 		"text":      template.HTML(html),
 		"plaintext": text,
 		"message":   message,
 		"md":        md,
-	})
+	}
+	if len(username) != 0 {
+		data["username"] = username[0]
+	}
+	email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "template_email", "email_", data)
 	if err != nil {
 		return nil, err
 	}
@@ -360,6 +381,9 @@ func (emailer *Emailer) inviteValues(code string, invite Invite, app *appContext
 	d, t, expiresIn := emailer.formatExpiry(expiry, false, app.datePattern, app.timePattern)
 	message := app.config.Section("messages").Key("message").String()
 	inviteLink := app.config.Section("invite_emails").Key("url_base").String()
+	if !strings.HasSuffix(inviteLink, "/invite") {
+		inviteLink += "/invite"
+	}
 	inviteLink = fmt.Sprintf("%s/%s", inviteLink, code)
 	template := map[string]interface{}{
 		"hello":              emailer.lang.InviteEmail.get("hello"),
@@ -391,10 +415,11 @@ func (emailer *Emailer) constructInvite(code string, invite Invite, app *appCont
 	}
 	template := emailer.inviteValues(code, invite, app, noSub)
 	var err error
-	if app.storage.customEmails.InviteEmail.Enabled {
+	message := app.storage.MustGetCustomContentKey("InviteEmail")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.InviteEmail.Content,
-			app.storage.customEmails.InviteEmail.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -430,10 +455,11 @@ func (emailer *Emailer) constructExpiry(code string, invite Invite, app *appCont
 	}
 	var err error
 	template := emailer.expiryValues(code, invite, app, noSub)
-	if app.storage.customEmails.InviteExpiry.Enabled {
+	message := app.storage.MustGetCustomContentKey("InviteExpiry")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.InviteExpiry.Content,
-			app.storage.customEmails.InviteExpiry.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -484,10 +510,11 @@ func (emailer *Emailer) constructCreated(code, username, address string, invite
 	}
 	template := emailer.createdValues(code, username, address, invite, app, noSub)
 	var err error
-	if app.storage.customEmails.UserCreated.Enabled {
+	message := app.storage.MustGetCustomContentKey("UserCreated")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.UserCreated.Content,
-			app.storage.customEmails.UserCreated.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -531,17 +558,16 @@ func (emailer *Emailer) resetValues(pwr PasswordReset, app *appContext, noSub bo
 	} 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 != "" {
+			pinLink, err := app.GenResetLink(pwr.Pin)
+			if err == nil {
 				// Strip /invite form end of this URL, ik its ugly.
 				template["link_reset"] = true
-				pinLink := fmt.Sprintf("%s/reset?pin=%s", strings.TrimPrefix(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.")
+				app.info.Println("Couldn't generate PWR link: %v", err)
 				template["pin"] = pwr.Pin
 			}
 		} else {
@@ -558,10 +584,11 @@ func (emailer *Emailer) constructReset(pwr PasswordReset, app *appContext, noSub
 	}
 	template := emailer.resetValues(pwr, app, noSub)
 	var err error
-	if app.storage.customEmails.PasswordReset.Enabled {
+	message := app.storage.MustGetCustomContentKey("PasswordReset")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.PasswordReset.Content,
-			app.storage.customEmails.PasswordReset.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -599,10 +626,11 @@ func (emailer *Emailer) constructDeleted(reason string, app *appContext, noSub b
 	}
 	var err error
 	template := emailer.deletedValues(reason, app, noSub)
-	if app.storage.customEmails.UserDeleted.Enabled {
+	message := app.storage.MustGetCustomContentKey("UserDeleted")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.UserDeleted.Content,
-			app.storage.customEmails.UserDeleted.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -640,10 +668,11 @@ func (emailer *Emailer) constructDisabled(reason string, app *appContext, noSub
 	}
 	var err error
 	template := emailer.disabledValues(reason, app, noSub)
-	if app.storage.customEmails.UserDisabled.Enabled {
+	message := app.storage.MustGetCustomContentKey("UserDisabled")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.UserDisabled.Content,
-			app.storage.customEmails.UserDisabled.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -681,10 +710,11 @@ func (emailer *Emailer) constructEnabled(reason string, app *appContext, noSub b
 	}
 	var err error
 	template := emailer.enabledValues(reason, app, noSub)
-	if app.storage.customEmails.UserEnabled.Enabled {
+	message := app.storage.MustGetCustomContentKey("UserEnabled")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.UserEnabled.Content,
-			app.storage.customEmails.UserEnabled.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -736,7 +766,8 @@ func (emailer *Emailer) constructWelcome(username string, expiry time.Time, app
 	}
 	var err error
 	var template map[string]interface{}
-	if app.storage.customEmails.WelcomeEmail.Enabled {
+	message := app.storage.MustGetCustomContentKey("WelcomeEmail")
+	if message.Enabled {
 		template = emailer.welcomeValues(username, expiry, app, noSub, true)
 	} else {
 		template = emailer.welcomeValues(username, expiry, app, noSub, false)
@@ -746,11 +777,11 @@ func (emailer *Emailer) constructWelcome(username string, expiry time.Time, app
 			"date": "{yourAccountWillExpire}",
 		})
 	}
-	if app.storage.customEmails.WelcomeEmail.Enabled {
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.WelcomeEmail.Content,
-			app.storage.customEmails.WelcomeEmail.Variables,
-			app.storage.customEmails.WelcomeEmail.Conditionals,
+			message.Content,
+			message.Variables,
+			message.Conditionals,
 			template,
 		)
 		email, err = emailer.constructTemplate(email.Subject, content, app)
@@ -781,10 +812,11 @@ func (emailer *Emailer) constructUserExpired(app *appContext, noSub bool) (*Mess
 	}
 	var err error
 	template := emailer.userExpiredValues(app, noSub)
-	if app.storage.customEmails.UserExpired.Enabled {
+	message := app.storage.MustGetCustomContentKey("UserExpired")
+	if message.Enabled {
 		content := templateEmail(
-			app.storage.customEmails.UserExpired.Content,
-			app.storage.customEmails.UserExpired.Variables,
+			message.Content,
+			message.Variables,
 			nil,
 			template,
 		)
@@ -803,49 +835,114 @@ 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 {
+func (app *appContext) sendByID(email *Message, ID ...string) (err error) {
 	for _, id := range ID {
-		var err error
-		if tgChat, ok := app.storage.telegram[id]; ok && tgChat.Contact && telegramEnabled {
+		if tgChat, ok := app.storage.GetTelegramKey(id); ok && tgChat.Contact && telegramEnabled {
 			err = app.telegram.Send(email, tgChat.ChatID)
-			if err != nil {
-				return err
-			}
+			// if err != nil {
+			// 	return err
+			// }
 		}
-		if dcChat, ok := app.storage.discord[id]; ok && dcChat.Contact && discordEnabled {
+		if dcChat, ok := app.storage.GetDiscordKey(id); ok && dcChat.Contact && discordEnabled {
 			err = app.discord.Send(email, dcChat.ChannelID)
-			if err != nil {
-				return err
-			}
+			// if err != nil {
+			// 	return err
+			// }
 		}
-		if mxChat, ok := app.storage.matrix[id]; ok && mxChat.Contact && matrixEnabled {
-			err = app.matrix.Send(email, mxChat.RoomID)
-			if err != nil {
-				return err
-			}
+		if mxChat, ok := app.storage.GetMatrixKey(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 {
+		if address, ok := app.storage.GetEmailsKey(id); ok && address.Contact && emailEnabled {
 			err = app.email.send(email, address.Addr)
-			if err != nil {
-				return err
-			}
-		}
-		if err != nil {
-			return err
+			// if err != nil {
+			// 	return err
+			// }
 		}
+		// if err != nil {
+		// 	return err
+		// }
 	}
-	return nil
+	return
 }
 
 func (app *appContext) getAddressOrName(jfID string) string {
-	if dcChat, ok := app.storage.discord[jfID]; ok && dcChat.Contact && discordEnabled {
-		return dcChat.Username + "#" + dcChat.Discriminator
+	if dcChat, ok := app.storage.GetDiscordKey(jfID); ok && dcChat.Contact && discordEnabled {
+		return RenderDiscordUsername(dcChat)
 	}
-	if tgChat, ok := app.storage.telegram[jfID]; ok && tgChat.Contact && telegramEnabled {
+	if tgChat, ok := app.storage.GetTelegramKey(jfID); ok && tgChat.Contact && telegramEnabled {
 		return "@" + tgChat.Username
 	}
-	if addr, ok := app.storage.emails[jfID]; ok {
+	if addr, ok := app.storage.GetEmailsKey(jfID); ok {
 		return addr.Addr
 	}
+	if mxChat, ok := app.storage.GetMatrixKey(jfID); ok && mxChat.Contact && matrixEnabled {
+		return mxChat.UserID
+	}
 	return ""
 }
+
+// ReverseUserSearch returns the jellyfin ID of the user with the given username, email, or contact method username.
+// returns "" if none found. returns only the first match, might be an issue if there are users with the same contact method usernames.
+func (app *appContext) ReverseUserSearch(address string) (user mediabrowser.User, ok bool) {
+	ok = false
+	user, status, err := app.jf.UserByName(address, false)
+	if status == 200 && err == nil {
+		ok = true
+		return
+	}
+	emailAddresses := []EmailAddress{}
+	err = app.storage.db.Find(&emailAddresses, badgerhold.Where("Addr").Eq(address))
+	if err == nil && len(emailAddresses) > 0 {
+		for _, emailUser := range emailAddresses {
+			user, status, err = app.jf.UserByID(emailUser.JellyfinID, false)
+			if status == 200 && err == nil {
+				ok = true
+				return
+			}
+		}
+	}
+	// Dont know how we'd use badgerhold when we need to render each username,
+	// Apart from storing the rendered name in the db.
+	for _, dcUser := range app.storage.GetDiscord() {
+		if RenderDiscordUsername(dcUser) == strings.ToLower(address) {
+			user, status, err = app.jf.UserByID(dcUser.JellyfinID, false)
+			if status == 200 && err == nil {
+				ok = true
+				return
+			}
+		}
+	}
+	tgUsername := strings.TrimPrefix(address, "@")
+	telegramUsers := []TelegramUser{}
+	err = app.storage.db.Find(&telegramUsers, badgerhold.Where("Username").Eq(tgUsername))
+	if err == nil && len(telegramUsers) > 0 {
+		for _, telegramUser := range telegramUsers {
+			user, status, err = app.jf.UserByID(telegramUser.JellyfinID, false)
+			if status == 200 && err == nil {
+				ok = true
+				return
+			}
+		}
+	}
+	matrixUsers := []MatrixUser{}
+	err = app.storage.db.Find(&matrixUsers, badgerhold.Where("UserID").Eq(address))
+	if err == nil && len(matrixUsers) > 0 {
+		for _, matrixUser := range matrixUsers {
+			user, status, err = app.jf.UserByID(matrixUser.JellyfinID, false)
+			if status == 200 && err == nil {
+				ok = true
+				return
+			}
+		}
+	}
+	return
+}
+
+// EmailAddressExists returns whether or not a user with the given email address exists.
+func (app *appContext) EmailAddressExists(address string) bool {
+	c, err := app.storage.db.Count(&EmailAddress{}, badgerhold.Where("Addr").Eq(address))
+	return err != nil || c > 0
+}

exit.go

@@ -1,15 +1,64 @@
 package main
 
 import (
+	"fmt"
 	"html/template"
 	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"runtime"
+	"runtime/debug"
+	"strings"
 	"time"
 
-	"github.com/pkg/browser"
+	"github.com/robert-nix/ansihtml"
 )
 
+// https://gist.github.com/swdunlop/9629168
+func identifyPanic() string {
+	var name, file string
+	var line int
+	var pc [16]uintptr
+
+	n := runtime.Callers(4, pc[:])
+	for _, pc := range pc[:n] {
+		fn := runtime.FuncForPC(pc)
+		if fn == nil {
+			continue
+		}
+		file, line = fn.FileLine(pc)
+		name = fn.Name()
+		if !strings.HasPrefix(name, "runtime.") {
+			break
+		}
+	}
+
+	switch {
+	case name != "":
+		return fmt.Sprintf("%v:%v", name, line)
+	case file != "":
+		return fmt.Sprintf("%v:%v", file, line)
+	}
+
+	return fmt.Sprintf("pc:%x", pc)
+}
+
+// OpenFile attempts to open a given file in the appropriate GUI application.
+func OpenFile(fpath string) (err error) {
+	switch PLATFORM {
+	case "linux":
+		err = exec.Command("xdg-open", fpath).Start()
+	case "windows":
+		err = exec.Command("rundll32", "url.dll,FileProtocolHandler", fpath).Start()
+	case "darwin":
+		err = exec.Command("open", fpath).Start()
+	default:
+		err = fmt.Errorf("unknown os")
+	}
+	return
+}
+
 // 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")
@@ -17,20 +66,32 @@ func Exit(err interface{}) {
 		log.Fatalf("Failed to load template: %v", err)
 	}
 	logCache := lineCache.String()
+	if err != nil {
+		fmt.Println(err)
+		logCache += "\n" + fmt.Sprint(err)
+	}
+	logCache += "\n" + string(debug.Stack())
 	sanitized := sanitizeLog(logCache)
 	data := map[string]interface{}{
 		"Log":          logCache,
 		"SanitizedLog": sanitized,
 	}
 	if err != nil {
-		data["Err"] = err
+		data["Err"] = fmt.Sprintf("%s %v", identifyPanic(), err)
 	}
-	fpath := filepath.Join(temp, "jfa-go-crash-"+time.Now().Local().Format("2006-01-02T15:04:05"))
+	// Use dashes for time rather than colons for Windows
+	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")
+
+	// Render ANSI colors to HTML
+	data["Log"] = template.HTML(string(ansihtml.ConvertToHTML([]byte(data["Log"].(string)))))
+	data["SanitizedLog"] = template.HTML(string(ansihtml.ConvertToHTML([]byte(data["SanitizedLog"].(string)))))
+	data["Err"] = template.HTML(string(ansihtml.ConvertToHTML([]byte(data["Err"].(string)))))
+
 	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)
@@ -40,5 +101,13 @@ func Exit(err interface{}) {
 	if err2 != nil {
 		log.Fatalf("Failed to execute template: %v", err2)
 	}
-	browser.OpenFile(fpath + ".html")
+	if err := OpenFile(fpath + ".html"); err != nil {
+		log.Printf("Failed to open browser, trying text file...")
+		OpenFile(fpath + ".txt")
+	}
+	if TRAY {
+		QuitTray()
+	} else {
+		os.Exit(1)
+	}
 }

external.go

@@ -12,8 +12,8 @@ import (
 
 const binaryType = "external"
 
-var localFS fs.FS
-var langFS fs.FS
+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...) }
@@ -29,9 +29,23 @@ func FSJoin(elem ...string) string {
 	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 = os.DirFS(filepath.Join(filepath.Dir(executable), "data"))
-	langFS = os.DirFS(filepath.Join(filepath.Dir(executable), "data", "lang"))
+	localFS = dirFS(filepath.Join(filepath.Dir(executable), "data"))
+	langFS = dirFS(filepath.Join(filepath.Dir(executable), "data", "lang"))
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/hrfee/jfa-go
 
-go 1.16
+go 1.20
 
 replace github.com/hrfee/jfa-go/docs => ./docs
 
@@ -12,51 +12,118 @@ replace github.com/hrfee/jfa-go/logger => ./logger
 
 replace github.com/hrfee/jfa-go/linecache => ./linecache
 
+replace github.com/hrfee/jfa-go/api => ./api
+
 require (
-	github.com/bwmarrin/discordgo v0.23.2
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/bwmarrin/discordgo v0.27.1
 	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-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/fatih/color v1.15.0
+	github.com/fsnotify/fsnotify v1.6.0
+	github.com/getlantern/systray v1.2.2
+	github.com/gin-contrib/pprof v1.4.0
+	github.com/gin-contrib/static v0.0.1
+	github.com/gin-gonic/gin v1.9.1
 	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/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/linecache v0.0.0-00010101000000-000000000000 // indirect
-	github.com/hrfee/jfa-go/logger v0.0.0-00010101000000-000000000000
-	github.com/hrfee/jfa-go/ombi v0.0.0-20201112212552-b6f3cd7c1f71
-	github.com/hrfee/mediabrowser v0.3.4
-	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/mailgun/mailgun-go/v4 v4.5.1
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16
-	github.com/pkg/browser v0.0.0-20210606212950-a7b7a6107d32 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	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
+	github.com/golang-jwt/jwt v3.2.2+incompatible
+	github.com/gomarkdown/markdown v0.0.0-20230322041520-c84983bdbf2a
+	github.com/hrfee/jfa-go/common v0.0.0-20230421170108-d800b97f69b6
+	github.com/hrfee/jfa-go/docs v0.0.0-20230421170108-d800b97f69b6
+	github.com/hrfee/jfa-go/linecache v0.0.0-20230421170108-d800b97f69b6
+	github.com/hrfee/jfa-go/logger v0.0.0-20230421170108-d800b97f69b6
+	github.com/hrfee/jfa-go/ombi v0.0.0-20230421170108-d800b97f69b6
+	github.com/hrfee/mediabrowser v0.3.8
+	github.com/itchyny/timefmt-go v0.1.5
+	github.com/lithammer/shortuuid/v3 v3.0.7
+	github.com/mailgun/mailgun-go/v4 v4.9.0
+	github.com/robert-nix/ansihtml v1.0.1
+	github.com/steambap/captcha v1.4.1
+	github.com/swaggo/files v1.0.1
+	github.com/swaggo/gin-swagger v1.6.0
 	github.com/writeas/go-strip-markdown v2.0.1+incompatible
-	golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9 // indirect
-	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
+	github.com/xhit/go-simple-mail/v2 v2.13.0
+	gopkg.in/ini.v1 v1.67.0
+	maunium.net/go/mautrix v0.15.2
+)
+
+require (
+	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/cespare/xxhash v1.1.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/dgraph-io/badger/v3 v3.2103.1 // indirect
+	github.com/dgraph-io/ristretto v0.1.0 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201 // indirect
+	github.com/getlantern/errors v1.0.3 // indirect
+	github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65 // indirect
+	github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc // indirect
+	github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770 // indirect
+	github.com/getlantern/ops v0.0.0-20230519221840-1283e026181c // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/spec v0.20.9 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.14.1 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/go-test/deep v1.1.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/golang/glog v0.0.0-20210429001901-424d2337a529 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/flatbuffers v2.0.0+incompatible // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.13.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rs/zerolog v1.29.1 // indirect
+	github.com/swaggo/swag v1.16.1 // indirect
+	github.com/technoweenie/multipartstreamer v1.0.1 // indirect
+	github.com/tidwall/gjson v1.14.4 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tidwall/sjson v1.2.5 // indirect
+	github.com/timshannon/badgerhold/v4 v4.0.2 // indirect
+	github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
+	go.opencensus.io v0.23.0 // indirect
+	go.opentelemetry.io/otel v1.16.0 // indirect
+	go.opentelemetry.io/otel/metric v1.16.0 // indirect
+	go.opentelemetry.io/otel/trace v1.16.0 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
+	golang.org/x/image v0.7.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/tools v0.9.3 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	maunium.net/go/maulogger/v2 v2.4.1 // indirect
 )

go.sum

@@ -1,40 +1,53 @@
-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/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 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/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/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 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
+github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY=
+github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
+github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 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/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 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/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/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 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/dgraph-io/badger/v3 v3.2103.1 h1:zaX53IRg7ycxVlkd5pYdCeFp1FynD6qBGQoQql3R3Hk=
+github.com/dgraph-io/badger/v3 v3.2103.1/go.mod h1:dULbq6ehJ5K0cGW/1TQ9iSfUk0gbSiToDWmWmTsJ53E=
+github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI=
+github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 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 h1:4cmBvAEBNJaGARUEs3/suWRyfyBfhf7I60WBZq+bv2w=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 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/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 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=
@@ -42,86 +55,121 @@ github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojt
 github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
 github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y=
 github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
-github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/getlantern/context v0.0.0-20190109183933-c447772a6520 h1:NRUJuo3v3WGC/g5YiyF790gut6oQr5f3FBI88Wv0dx4=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 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/context v0.0.0-20220418194847-3d5e7a086201 h1:oEZYEpZo28Wdx+5FZo4aU7JFXu0WG/4wJWese5reQSA=
+github.com/getlantern/context v0.0.0-20220418194847-3d5e7a086201/go.mod h1:Y9WZUHEb+mpra02CbQ/QczLUe6f0Dezxaw5DCJlJQGo=
 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/errors v1.0.1/go.mod h1:l+xpFBrCtDLpK9qNjxs+cHU6+BAdlBaxHqikB6Lku3A=
+github.com/getlantern/errors v1.0.3 h1:Ne4Ycj7NI1BtSyAfVeAT/DNoxz7/S2BUc3L2Ht1YSHE=
+github.com/getlantern/errors v1.0.3/go.mod h1:m8C7H1qmouvsGpwQqk/6NUpIVMpfzUPn608aBZDYV04=
 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/golog v0.0.0-20230503153817-8e72de7e0a65 h1:NlQedYmPI3pRAXJb+hLVVDGqfvvXGRPV8vp7XOjKAZ0=
+github.com/getlantern/golog v0.0.0-20230503153817-8e72de7e0a65/go.mod h1:+ZU1h+iOVqWReBpky6d5Y2WL0sF2Llxu+QcxJFs2+OU=
 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/hex v0.0.0-20220104173244-ad7e4b9194dc h1:sue+aeVx7JF5v36H1HfvcGFImLpSD5goj8d+MitovDU=
+github.com/getlantern/hex v0.0.0-20220104173244-ad7e4b9194dc/go.mod h1:D9RWpXy/EFPYxiKUURo2TB8UBosbqkiLhttRrZYtvqM=
 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/hidden v0.0.0-20220104173330-f221c5a24770 h1:cSrD9ryDfTV2yaur9Qk3rHYD414j3Q1rl7+L0AylxrE=
+github.com/getlantern/hidden v0.0.0-20220104173330-f221c5a24770/go.mod h1:GOQsoDnEHl6ZmNIL+5uVo+JWRFWozMEp18Izcb++H+A=
 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 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/getlantern/ops v0.0.0-20220713155959-1315d978fff7/go.mod h1:D5ao98qkA6pxftxoqzibIBBrLSUli+kYnJqrgBf9cIA=
+github.com/getlantern/ops v0.0.0-20230519221840-1283e026181c h1:qcPAzA1ZDnwx618jAgQmxo6UvJkw2SkM1L4ofncmEhI=
+github.com/getlantern/ops v0.0.0-20230519221840-1283e026181c/go.mod h1:g2ueCncOwWenlAr56Fh90FwsACkelqqtFUDLAHg1mng=
+github.com/getlantern/systray v1.2.2 h1:dCEHtfmvkJG7HZ8lS/sLklTH4RKUcIsKrAD9sThoEBE=
+github.com/getlantern/systray v1.2.2/go.mod h1:pXFOI1wwqwYXEhLPm9ZGjS2u/vVELeIgNMY5HvhHhcE=
 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=
-github.com/gin-contrib/pprof v1.3.0 h1:G9eK6HnbkSqDZBYbzG4wrjCsA4e+cvYAHUZw6W+W9K0=
-github.com/gin-contrib/pprof v1.3.0/go.mod h1:waMjT1H9b179t3CxuG1cV3DHpga6ybizwfBaM5OXaB0=
+github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
+github.com/gin-contrib/pprof v1.4.0 h1:XxiBSf5jWZ5i16lNOPbMTVdgHBdhfGRD5PZ1LWazzvg=
+github.com/gin-contrib/pprof v1.4.0/go.mod h1:RrehPJasUVBPK6yTUwOl8/NP6i0vbUgmxtis+Z5KE90=
 github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-contrib/static v0.0.0-20200916080430-d45d9a37d28e h1:8bZpGwoPxkaivQPrAbWl+7zjjUcbFUnYp7yQcx2r2N0=
-github.com/gin-contrib/static v0.0.0-20200916080430-d45d9a37d28e/go.mod h1:VhW/Ch/3FhimwZb8Oj+qJmdMmoB8r7lmJ5auRjm50oQ=
+github.com/gin-contrib/static v0.0.1 h1:JVxuvHPuUfkoul12N7dtQw7KRn/pSMq7Ue1Va9Swm1U=
+github.com/gin-contrib/static v0.0.1/go.mod h1:CSxeF+wep05e0kCOsqWdAWbSszmc31zTIbD8TvWl7Hs=
 github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
-github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
-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/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 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=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 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/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
 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=
-github.com/go-openapi/spec v0.20.3 h1:uH9RQ6vdyPSs2pSy9fL8QPspDF2AMIMPtmK5coSSjtQ=
-github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg=
+github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8=
+github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 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/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-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
+github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 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=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
+github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
+github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
+github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible h1:2cauKuaELYAEARXRkq2LrJ0yDDv1rW7+wrTEdVL3uaU=
 github.com/go-telegram-bot-api/telegram-bot-api v4.6.4+incompatible/go.mod h1:qf9acutJ8cwBUhm1bqgz6Bei9/C/c93FPDljKWwsOgM=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
+github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 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/glog v0.0.0-20210429001901-424d2337a529 h1:2voWjNECnrZRbfwXxHB1/j8wa6xdKn85B5NzgVL/pTU=
+github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 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=
@@ -133,165 +181,262 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 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/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/gomarkdown/markdown v0.0.0-20230322041520-c84983bdbf2a h1:AWZzzFrqyjYlRloN6edwTLTUbKxf5flLXNuTBDm3Ews=
+github.com/gomarkdown/markdown v0.0.0-20230322041520-c84983bdbf2a/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA=
+github.com/google/flatbuffers v1.12.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI=
+github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 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/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
-github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/hrfee/mediabrowser v0.3.4 h1:D2FTnuRDXUUAHW80L1kamhVUKNifm8peZVVPNe0yWmA=
-github.com/hrfee/mediabrowser v0.3.4/go.mod h1:PnHZbdxmbv1wCVdAQyM7nwPwpVj9fdKx2EcET7sAk+U=
-github.com/itchyny/timefmt-go v0.1.2 h1:q0Xa4P5it6K6D7ISsbLAMwx1PnWlixDcJL6/sFs93Hs=
-github.com/itchyny/timefmt-go v0.1.2/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A=
-github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=
-github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hrfee/mediabrowser v0.3.8 h1:y0iBCb6jE3QKcsiCJSYva2fFPHRn4UA+sGRzoPuJ/Dk=
+github.com/hrfee/mediabrowser v0.3.8/go.mod h1:PnHZbdxmbv1wCVdAQyM7nwPwpVj9fdKx2EcET7sAk+U=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
+github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 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=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 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/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/compress v1.13.1 h1:wXr2uRxZTJXHLly6qhJabee5JqIhTRoLBhDOA74hDEQ=
+github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 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=
 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/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/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/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/lithammer/shortuuid/v3 v3.0.7 h1:trX0KTHy4Pbwo/6ia8fscyHoGA+mf1jWbPJVuvyJQQ8=
+github.com/lithammer/shortuuid/v3 v3.0.7/go.mod h1:vMk8ke37EmiewwolSO1NLW8vP4ZaKlRuDIi8tWWmAts=
+github.com/lxn/walk v0.0.0-20210112085537-c389da54e794/go.mod h1:E23UucZGqpuUANJooIbHWCufXvOcT6E7Stq81gU+CSQ=
+github.com/lxn/win v0.0.0-20210218163916-a377121e959e/go.mod h1:KxxjdtRkfNoYDCUP5ryK7XJJNTnpC8atvtmTheChOtk=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailgun/mailgun-go/v4 v4.9.0 h1:wRbxvVQ5QObFewLxc1uVvipA16D8gxeiO+cBOca51Iw=
+github.com/mailgun/mailgun-go/v4 v4.9.0/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/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16 h1:ZtO5uywdd5dLDCud4r0r55eP4j9FuUNpl60Gmntcop4=
-github.com/matrix-org/gomatrix v0.0.0-20210324163249-be2af5ef2e16/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s=
-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-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 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-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 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=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 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/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 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/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
+github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
+github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 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/robert-nix/ansihtml v1.0.1 h1:VTiyQ6/+AxSJoSSLsMecnkh8i0ZqOEdiRl/odOc64fc=
+github.com/robert-nix/ansihtml v1.0.1/go.mod h1:CJwclxYaTPc2RfcxtanEACsYuTksh4yDXcNeHHKZINE=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
+github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc=
+github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 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/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
+github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/steambap/captcha v1.4.1 h1:OmMdxLCWCqJvsFaFYwRpvMckIuvI6s8s1LsBrBw97P0=
+github.com/steambap/captcha v1.4.1/go.mod h1:oC9T7IfEgnrhzjDz5Djf1H7GPffCzRMbsQfFkJmhlnk=
 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/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14 h1:PyYN9JH5jY9j6av01SpfRMb+1DWg/i3MbGOKPxJ2wjM=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
+github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
+github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
 github.com/swaggo/gin-swagger v1.2.0/go.mod h1:qlH2+W7zXGZkczuL+r2nEBR2JTT+/lX05Nn6vPhc7OI=
-github.com/swaggo/gin-swagger v1.3.0 h1:eOmp7r57oUgZPw2dJOjcGNMse9cvXcI4tTqBcnZtPsI=
-github.com/swaggo/gin-swagger v1.3.0/go.mod h1:oy1BRA6WvgtCp848lhxce7BnWH4C8Bxa0m5SkWx+cS0=
+github.com/swaggo/gin-swagger v1.6.0 h1:y8sxvQ3E20/RCyrXeFfg60r6H0Z+SwpTjMYsMm+zy8M=
+github.com/swaggo/gin-swagger v1.6.0/go.mod h1:BG00cCEy294xtVpyIAHG6+e2Qzj/xKlRdOqDkvq0uzo=
 github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
 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/swaggo/swag v1.16.1 h1:fTNRhKstPKxcnoKsytm4sahr8FaYzUcT7i1/3nd/fBg=
+github.com/swaggo/swag v1.16.1/go.mod h1:9/LMvHycG3NFHfR6LwvikHv5iFvmPADQ359cKikGxto=
 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.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
+github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
+github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
+github.com/timshannon/badgerhold/v3 v3.0.0-20210909134927-2b6764d68c1e/go.mod h1:/Seq5xGNo8jLhSbDX3jdbeZrp4yFIpQ6/7n4TjziEWs=
+github.com/timshannon/badgerhold/v4 v4.0.2 h1:83OLY/NFnEaMnHEPd84bYtkLipVkjTsMbzQRYbk47g4=
+github.com/timshannon/badgerhold/v4 v4.0.2/go.mod h1:rh6RyXLQFsvrvcKondPQQFZnNovpRzu+gS0FlLxYuHY=
+github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 h1:PM5hJF7HVfNWmCjMdEfbuOBNXSVF2cMFGgQTPdKCbwM=
+github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 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=
-github.com/ugorji/go v1.1.13/go.mod h1:jxau1n+/wyTGLQoCkjok9r5zFa/FxT6eI5HiHKQszjc=
-github.com/ugorji/go v1.2.0 h1:6eXlzYLLwZwXroJx9NyqbYcbv/d93twiOzQLDewE6qM=
-github.com/ugorji/go v1.2.0/go.mod h1:1ny++pKMXhLWrwWV5Nf+CbOuZJhMoaFD+0GMFfd8fEc=
+github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v0.0.0-20181022190402-e5e69e061d4f/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2tfCQDUqRd8fI=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-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/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
+github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 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/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/xhit/go-simple-mail/v2 v2.13.0 h1:OANWU9jHZrVfBkNkvLf8Ww0fexwpQVF/v/5f96fFTLI=
+github.com/xhit/go-simple-mail/v2 v2.13.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5 h1:dPmz1Snjq0kmkz159iL7S6WzdahUTHnHB5M56WFVifs=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-golang.org/dl v0.0.0-20190829154251-82a15e2f2ead h1:jeP6FgaSLNTMP+Yri3qjlACywQLye+huGLmNGhBzm6k=
-golang.org/dl v0.0.0-20190829154251-82a15e2f2ead/go.mod h1:IUMfjQLJQd4UTqG1Z90tenwKoCX93Gn3MAQJMOSBsDQ=
-golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo=
+go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s=
+go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4=
+go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo=
+go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4=
+go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo=
+go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs=
+go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
+go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
+golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/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-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-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw=
+golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg=
 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/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 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-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -304,87 +449,102 @@ golang.org/x/net v0.0.0-20190611141213-3f473d35a33a/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/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/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/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-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-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 h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 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-20190227155943-e225da77a7e6/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-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/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-20181205085412-a5c9d58dba9a/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=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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-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-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210319071255-635bc2c9138d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-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-20210531080801-fdfd190a6549 h1:OL5GcZ2XPkte3dpfuFQ9o884vrE3BZQhajdntNMruv4=
-golang.org/x/sys v0.0.0-20210531080801-fdfd190a6549/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-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 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/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/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 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=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190606050223-4d9ae51c2468/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190611222205-d73e1c7e250b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 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.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3 h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 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-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 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.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 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.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 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=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -393,30 +553,39 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/Knetic/govaluate.v3 v3.0.0/go.mod h1:csKLBORsPbafmSCGTEh3U7Ozmsuq8ZSIlKk1bcqph0E=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 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/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 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=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-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=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/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.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8=
+maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho=
+maunium.net/go/mautrix v0.15.2 h1:fUiVajeoOR92uJoSShHbCvh7uG6lDY4ZO4Mvt90LbjU=
+maunium.net/go/mautrix v0.15.2/go.mod h1:h4NwfKqE4YxGTLSgn/gawKzXAb2sF4qx8agL6QEFtGg=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

html/404.html

@@ -1,16 +1,18 @@
 <!DOCTYPE html>
 <html lang="en" class="{{ .cssClass }}">
     <head>
-        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="css/{{ .cssVersion }}bundle.css">
         {{ template "header.html" . }}
         <title>404 - jfa-go</title>
     </head>
     <body class="section">
         <div class="page-container">
-            <h1 class="heading">Page not found.</h1>
-            <p class="content">
-            {{ .contactMessage }}
-            </p>
+            <div class="card">
+                <h1 class="heading">Page not found.</h1>
+                <p class="content">
+                    {{ .contactMessage }}
+                </p>
+            </div>
         </div>
     </body>
 </html>                            

html/account-linking.html

@@ -0,0 +1,52 @@
+{{ if .discordEnabled }}
+<div id="modal-discord" class="modal">
+    <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+        <span class="heading mb-4">{{ .strings.linkDiscord }}</span>
+        <p class="content mb-4"> {{ .discordSendPINMessage }}</p>
+        <h1 class="text-center text-2xl mb-2 pin"></h1>
+        <div class="row center">
+            <a class="my-5 hover:underline">
+                <span class="mr-2">{{ .strings.joinTheServer }}</span>
+                <span id="discord-invite"></span>
+            </a>
+        </div>
+        <span class="button ~info @low full-width center mt-4" id="discord-waiting">{{ .strings.success }}</span>
+    </div>
+</div>
+{{ end }}
+{{ if .telegramEnabled }}
+<div id="modal-telegram" class="modal">
+    <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+        <span class="heading mb-4">{{ .strings.linkTelegram }}</span>
+        <p class="content mb-4">{{ .strings.sendPIN }}</p>
+        <p class="text-center text-2xl mb-2 pin"></p>
+        <a class="subheading link-center" href="{{ .telegramURL }}" target="_blank">
+            <span class="shield ~info mr-4">
+                <span class="icon">
+                    <i class="ri-telegram-line"></i>
+                </span>
+            </span>
+            &#64;{{ .telegramUsername }}
+        </a>
+        <span class="button ~info @low full-width center mt-4" id="telegram-waiting">{{ .strings.success }}</span>
+    </div>
+</div>
+{{ end }}
+{{ if .matrixEnabled }}
+<div id="modal-matrix" class="modal">
+    <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+        <span class="heading mb-4">{{ .strings.linkMatrix }}</span>
+        <p class="content mb-4"> {{ .strings.matrixEnterUser }}</p>
+        <input type="text" class="input ~neutral @high" placeholder="@user:riot.im" id="matrix-userid">
+        <div class="subheading link-center mt-4">
+            <span class="shield ~info mr-4">
+                <span class="icon">
+                    <i class="ri-chat-3-line"></i>
+                </span>
+            </span>
+            {{ .matrixUser }}
+        </div>
+        <span class="button ~info @low full-width center mt-4" id="matrix-send">{{ .strings.submit }}</span>
+    </div>
+</div>
+{{ end }}

html/admin.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" class="{{ .cssClass }}">
     <head>
-        <link rel="stylesheet" type="text/css" href="{{ .urlBase }}/css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="{{ .urlBase }}/css/{{ .cssVersion }}bundle.css">
         <script>
             window.URLBase = "{{ .urlBase }}";
             window.notificationsEnabled = {{ .notifications }};
@@ -12,113 +12,120 @@
             window.ombiEnabled = {{ .ombiEnabled }};
             window.usernameEnabled = {{ .username }};
             window.langFile = JSON.parse({{ .language }});
+            window.linkResetEnabled = {{ .linkResetEnabled }};
             window.language = "{{ .langName }}";
+            window.jellyfinLogin = {{ .jellyfinLogin }};
+            window.jfAdminOnly = {{ .jfAdminOnly }};
+            window.jfAllowAll = {{ .jfAllowAll }};
         </script>
-        {{ template "header.html" . }}
         <title>Admin - jfa-go</title>
+        {{ template "header.html" . }}
     </head>
     <body class="max-w-full overflow-x-hidden section">
-        <div id="modal-login" class="modal">
-            <form class="modal-content card" id="form-login" href="">
-                <span class="heading">{{ .strings.login }}</span>
-                <input type="text" class="field input ~neutral !high mt-half mb-1" placeholder="{{ .strings.username }}" id="login-user">
-                <input type="password" class="field input ~neutral !high mb-1" placeholder="{{ .strings.password }}" id="login-password">
-                <label>
-                    <input type="submit" class="unfocused">
-                    <span class="button ~urge !normal full-width center supra submit">{{ .strings.login }}</span>
-                </label>
-            </form>
-        </div>
+        {{ template "login-modal.html" . }}
         <div id="modal-add-user" class="modal">
-            <form class="modal-content card" id="form-add-user" href="">
+            <form class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3" id="form-add-user" href="">
                 <span class="heading">{{ .strings.newUser }} <span class="modal-close">&times;</span></span>
-                <input type="text" class="field input ~neutral !high mt-half mb-1" placeholder="{{ .strings.username }}" id="add-user-user">
-                <input type="email" class="field input ~neutral !high mt-half mb-1" placeholder="{{ .strings.emailAddress }}">
-                <input type="password" class="field input ~neutral !high mb-1" placeholder="{{ .strings.password }}" id="add-user-password">
+                <input type="text" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.username }}" id="add-user-user">
+                <input type="email" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.emailAddress }}">
+                <input type="password" class="field input ~neutral @high mb-4" placeholder="{{ .strings.password }}" id="add-user-password">
                 <label>
                     <input type="submit" class="unfocused">
-                    <span class="button ~urge !normal full-width center supra submit">{{ .strings.create }}</span>
+                    <span class="button ~urge @low full-width center supra submit">{{ .strings.create }}</span>
                 </label>
             </form>
         </div>
         <div id="modal-about" class="modal">
-            <div class="modal-content content card">
+            <div class="relative mx-auto my-[10%] w-4/5 lg:w-1/3 content card">
                 <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>
+                <p>{{ .strings.version }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .version }}</span></p>
+                <p>{{ .strings.commitNoun }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .commit }}</span></p>
+                <p>{{ .strings.buildTime }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .buildTime }}</span></p>
+                <p>{{ .strings.builtBy }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .builtBy }}</span></p>
+                <div class="row col flex">
+                    <a class="button ~neutral mr-2 mt-4 mb-4 lang-link" href="https://github.com/hrfee/jfa-go"><i class="ri-github-line mr-2"></i>github</a>
+                    <a class="button ~urge mt-4 mb-4 mr-2 lang-link" href="https://wiki.jfa-go.com">wiki/docs</a>
+                    <a class="button ~positive mt-4 mb-4 mr-2 lang-link" href="https://weblate.jfa-go.com">translation</a>
+                    <div class="dropdown mr-2" tabindex="0">
+                        <a href="https://github.com/sponsors/hrfee" target="_blank" class="button ~info mt-4 mb-4 dropdown-button lang-link">
+                            <i class="ri-hand-heart-line mr-2"></i>
+                            donate
+                            <span class="ml-2 chev"></span>
+                        </a>
+                        <div class="dropdown-display">
+                            <div class="card ~neutral @low">
+                                <a href="https://github.com/sponsors/hrfee" target="_blank" class="button ~neutral mb-2 w-100 lang-link">GitHub</a>
+                                <a href="https://ko-fi.com/hrfee" target="_blank" class="button ~neutral mb-2 w-100 lang-link">Ko-fi</a>
+                            </div>
                         </div>
                     </div>
+                    <a class="button ~urge mt-4 mb-4 @low discord lang-link" href="https://discord.com/invite/MrtvuQmyhP" target="_blank"><i class="ri-discord-line mr-2"></i>discord</a>
                 </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>
+                <p><a href="https://github.com/hrfee/jfa-go/blob/main/LICENSE">Available under the MIT License. Font "Hanken Grotesk" available under SIL OFL 1.1 License.</a></p>
+                <pre class="font-mono bg-inherit">{{ .license }}</pre>
+            </div>
+        </div>
+        <div id="modal-logs" class="modal">
+            <div class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content content card">
+                <span class="heading">{{ .strings.logs }}<span class="modal-close">&times;</span></span>
+                <pre class="monospace" id="log-area"></pre>
             </div>
         </div>
         <div id="modal-modify-user" class="modal">
-            <form class="modal-content card" id="form-modify-user" href="">
+            <form class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3" id="form-modify-user" href="">
                 <span class="heading"><span id="header-modify-user"></span> <span class="modal-close">&times;</span></span>
-                <p class="content">{{ .strings.modifySettingsDescription }}</p>
-                <div class="flex-row mb-1">
-                    <label class="flex-row-group mr-1">
+                <p class="content my-4">{{ .strings.modifySettingsDescription }}</p>
+                <div class="flex-row mb-4">
+                    <label class="flex-row-group mr-2">
                         <input type="radio" name="modify-user-source" class="unfocused" id="radio-use-profile" checked>
-                        <span class="button ~neutral !high supra full-width center">{{ .strings.profile }}</span>
+                        <span class="button ~neutral @high supra full-width center">{{ .strings.profile }}</span>
                     </label>
-                    <label class="flex-row-group ml-1">
+                    <label class="flex-row-group ml-2">
                         <input type="radio" name="modify-user-source" class="unfocused" id="radio-use-user">
-                        <span class="button ~neutral !normal supra full-width center">{{ .strings.user }}</span>
+                        <span class="button ~neutral @low supra full-width center">{{ .strings.user }}</span>
                     </label>
                 </div>
-                <div class="select ~neutral !normal mb-1">
+                <div class="select ~neutral @low mb-4">
                     <select id="modify-user-profiles"></select>
                 </div>
-                <div class="select ~neutral !normal mb-1 unfocused">
+                <div class="select ~neutral @low mb-4 unfocused">
                     <select id="modify-user-users"></select>
                 </div>
-                <label class="switch mb-1">
+                <label class="switch mb-4">
                     <input type="checkbox" id="modify-user-homescreen" checked>
                     <span>{{ .strings.applyHomescreenLayout }}</span>
                 </label>
                 <label>
                     <input type="submit" class="unfocused">
-                    <span class="button ~urge !normal full-width center supra submit">{{ .strings.apply }}</span>
+                    <span class="button ~urge @low full-width center supra submit">{{ .strings.apply }}</span>
                 </label>
             </form>
         </div>
         <div id="modal-delete-user" class="modal">
-            <form class="modal-content card" id="form-delete-user" href="">
+            <form class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3" id="form-delete-user" href="">
                 <span class="heading"><span id="header-delete-user"></span> <span class="modal-close">&times;</span></span>
-                <div class="content mt-half">
-                    <label class="switch mb-1">
+                <div class="content mt-8">
+                    <label class="switch mb-4">
                         <input type="checkbox" id="delete-user-notify" checked>
                         <span>{{ .strings.sendDeleteNotificationEmail }}</span>
                     </label>
-                    <textarea id="textarea-delete-user" class="textarea full-width ~neutral !normal mb-1" placeholder="{{ .strings.sendDeleteNotificationExample }}"></textarea>
+                    <textarea id="textarea-delete-user" class="textarea full-width ~neutral @low mb-4" placeholder="{{ .strings.sendDeleteNotificationExample }}"></textarea>
                     <label>
                         <input type="submit" class="unfocused">
-                        <span class="button ~critical !normal full-width center supra submit">{{ .strings.delete }}</span>
+                        <span class="button ~critical @low full-width center supra submit">{{ .strings.delete }}</span>
                     </label>
                 </div>
             </form>
         </div>
         <div id="modal-extend-expiry" class="modal">
-            <form class="modal-content card" id="form-extend-expiry" href="">
+            <form class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3" 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="content mt-8">
                     <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">
+                            <div class="select ~neutral @low mb-2 mt-4">
                                 <select id="extend-expiry-months">
                                     <option>0</option>
                                 </select>
@@ -126,7 +133,7 @@
                         </div>
                         <div class="col">
                             <label class="label supra" for="extend-expiry-days">{{ .strings.inviteDays }}</label>
-                            <div class="select ~neutral !normal mb-1 mt-half">
+                            <div class="select ~neutral @low mb-2 mt-4">
                                 <select id="extend-expiry-days">
                                     <option>0</option>
                                 </select>
@@ -136,7 +143,7 @@
                     <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">
+                            <div class="select ~neutral @low mb-2 mt-4">
                                 <select id="extend-expiry-hours">
                                     <option>0</option>
                                 </select>
@@ -144,52 +151,70 @@
                         </div>
                         <div class="col">
                             <label class="label supra" for="extend-expiry-minutes">{{ .strings.inviteMinutes }}</label>
-                            <div class="select ~neutral !normal mb-1 mt-half">
+                            <div class="select ~neutral @low mb-2 mt-4">
                                 <select id="extend-expiry-minutes">
                                     <option>0</option>
                                 </select>
                             </div>
                         </div>
                     </div>
+                    <label class="switch mb-4">
+                        <input type="checkbox" id="expiry-extend-enable" checked>
+                        <span>{{ .strings.sendDeleteNotificationEmail }}</span>
+                    </label>
+                    <textarea id="textarea-extend-enable" class="textarea full-width ~neutral @low mb-4" placeholder="{{ .strings.sendDeleteNotificationExample }}"></textarea>
                     <label>
                         <input type="submit" class="unfocused">
-                        <span class="button ~critical !normal full-width center supra submit">{{ .strings.submit }}</span>
+                        <span class="button ~critical @low 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="">
+            <form class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content card" id="form-announce" href="">
                 <span class="heading"><span id="header-announce"></span> <span class="modal-close">&times;</span></span>
                 <div class="row">
-                    <div class="col flex-col content mt-half">
-                        <label class="label supra" for="announce-subject"> {{ .strings.subject }}</label>
-                        <input type="text" id="announce-subject" class="input ~neutral !normal mb-1 mt-half">
-                        <label class="label supra" for="textarea-announce">{{ .strings.message }}</label>
-                        <textarea id="textarea-announce" class="textarea full-width ~neutral !normal mt-half monospace"></textarea>
-                        <p class="support mt-half mb-1">{{ .strings.markdownSupported }}</p>
-                        <label>
-                            <input type="submit" class="unfocused">
-                            <span class="button ~urge !normal full-width center supra submit">{{ .strings.submit }}</span>
+                    <div class="col card ~neutral @low">
+                        <div id="announce-details">
+                            <span class="label supra" for="editor-variables" id="label-editor-variables">{{ .strings.variables }}</span>
+                            <div id="announce-variables">
+                                <span class="button ~urge @low mb-2 mt-4" id="announce-variables-username" style="margin-left: 0.25rem; margin-right: 0.25rem;"><span class="font-mono bg-inherit">{username}</span></span>
+                            </div>
+                            <label class="label supra" for="announce-subject"> {{ .strings.subject }}</label>
+                            <input type="text" id="announce-subject" class="input ~neutral @low mb-2 mt-4">
+                            <label class="label supra" for="textarea-announce">{{ .strings.message }}</label>
+                            <textarea id="textarea-announce" class="textarea full-width ~neutral @low mt-4 font-mono"></textarea>
+                            <p class="support mt-4 mb-2">{{ .strings.markdownSupported }}</p>
+                        </div>
+                        <label class="label unfocused" id="announce-name"><p class="supra">{{ .strings.name }}</p>
+                            <input type="text" class="input ~neutral @low mb-2 mt-4">
+                            <p class="support">{{ .strings.templateEnterName }}</p>
                         </label>
+                        <div class="row flex-expand">
+                            <label>
+                                <input type="submit" class="unfocused">
+                                <span class="button ~urge @low center supra submit">{{ .strings.send }}</span>
+                            </label>
+                            <span class="button ~info @low center supra" id="save-announce">{{ .strings.saveAsTemplate }}</span>
+                        </div>
                     </div>
-                    <div class="col card ~neutral !low">
+                    <div class="col card ~neutral @low">
                         <span class="subheading supra">{{ .strings.preview }}</span>
-                        <div class="mt-half" id="announce-preview"></div>
+                        <div class="mt-8" id="announce-preview"></div>
                     </div>
                 </div>
             </form>
         </div>
         <div id="modal-customize" class="modal">
-            <div class="modal-content card">
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
                 <span class="heading">{{ .strings.customizeMessages }} <span class="modal-close">&times;</span></span>
-                <p class="content">{{ .strings.customizeMessagesDescription }}</p>
+                <p class="content my-4">{{ .strings.customizeMessagesDescription }}</p>
                 <div class="table-responsive">
                     <table class="table">
                         <thead>
                             <tr>
                                 <th>{{ .strings.name }}</th>
-                                <th>{{ .strings.reset }}</th>
+                                <th class="table-inline justify-center">{{ .strings.reset }}</th>
                                 <th>{{ .strings.edit }}</th>
                             </tr>
                         </thead>
@@ -199,73 +224,83 @@
             </div>
         </div>
         <div id="modal-editor" class="modal">
-            <form class="modal-content wide card" id="form-editor" href="">
+            <form class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content 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">
+                    <div class="col card ~neutral @low">
                         <span class="label supra" for="editor-variables" id="label-editor-variables">{{ .strings.variables }}</span>
-                        <div id="editor-variables"></div>
+                        <div id="editor-variables" class="mt-4"></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>
+                        <textarea id="textarea-editor" class="textarea full-width flex-auto ~neutral @low mt-4 font-mono"></textarea>
+                        <p class="support mt-4 mb-2">{{ .strings.markdownSupported }}</p>
                         <div class="flex-row">
-                            <label class="full-width ml-half">
+                            <label class="full-width ml-2">
                                 <input type="submit" class="unfocused">
-                                <span class="button ~urge !normal full-width center supra submit">{{ .strings.submit }}</span>
+                                <span class="button ~urge @low full-width center supra submit">{{ .strings.submit }}</span>
                             </label>
                         </div>
                     </div>
-                    <div class="col card ~neutral !low">
+                    <div class="col card ~neutral @low">
                         <span class="subheading supra">{{ .strings.preview }}</span>
-                        <div class="mt-half" id="editor-preview"></div>
+                        <div class="mt-8" id="editor-preview"></div>
                     </div>
                 </div>
             </form>
         </div>
         <div id="modal-restart" class="modal">
-            <div class="modal-content card ~critical !low">
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3 ~critical @low">
                 <span class="heading">{{ .strings.settingsRestartRequired }} <span class="modal-close">&times;</span></span>
-                <p class="content pb-1">{{ .strings.settingsRestartRequiredDescription }}</p>
-                <div class="fr">
-                    <span class="button ~info !normal mb-half" id="settings-apply-no-restart">{{ .strings.settingsApplyRestartLater }}</span>
-                    <span class="button ~critical !normal" id="settings-apply-restart">{{ .strings.settingsApplyRestartNow }}</span>
+                <p class="content my-4">{{ .strings.settingsRestartRequiredDescription }}</p>
+                <div class="float-right">
+                    <span class="button ~info @low mb-2" id="settings-apply-no-restart">{{ .strings.settingsApplyRestartLater }}</span>
+                    <span class="button ~critical @low" id="settings-apply-restart">{{ .strings.settingsApplyRestartNow }}</span>
                 </div>
             </div>
         </div>
         <div id="modal-refresh" class="modal">
-            <div class="modal-content card ~neutral !normal">
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3 ~neutral @low">
                 <span class="heading">{{ .strings.settingsApplied }}</span>
                 <p class="content">{{ .strings.settingsRefreshPage }}</p>
             </div>
         </div>
-        <div id="modal-ombi-defaults" class="modal">
-            <form class="modal-content card" id="form-ombi-defaults" href="">
-                <span class="heading">{{ .strings.ombiUserDefaults }} <span class="modal-close">&times;</span></span>
-                <p class="content">{{ .strings.ombiUserDefaultsDescription }}</p>
-                <div class="select ~neutral !normal mb-1">
+        <div id="modal-send-pwr" class="modal">
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3 ~neutral @low">
+                <span class="heading">{{ .strings.sendPWR }}</span>
+                <p class="content my-2" id="send-pwr-note"></p>
+                <span class="button ~urge @low mt-2" id="send-pwr-link">{{ .strings.copy }}</span>
+            </div>
+        </div>
+        <div id="modal-ombi-profile" class="modal">
+            <form class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3" id="form-ombi-defaults" href="">
+                <span class="heading">{{ .strings.ombiProfile }} <span class="modal-close">&times;</span></span>
+                <p class="content my-4">{{ .strings.ombiUserDefaultsDescription }}</p>
+                <div class="select ~neutral @low mb-4">
                     <select></select>
                 </div>
                 <label>
                     <input type="submit" class="unfocused">
-                    <span class="button ~urge !normal full-width center supra submit">{{ .strings.submit }}</span>
+                    <span class="button ~urge @low full-width center supra submit">{{ .strings.submit }}</span>
                 </label>
             </form>
         </div>
         <div id="modal-user-profiles" class="modal">
-            <div class="modal-content wide card">
+            <div class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content card">
                 <span class="heading">{{ .strings.userProfiles }} <span class="modal-close">&times;</span></span>
-                <p class="support lg">{{ .strings.userProfilesDescription }}</p>
+                <p class="content my-4">{{ .strings.userProfilesDescription }}</p>
                 <div class="table-responsive">
                     <table class="table">
                         <thead>
                             <tr>
                                 <th>{{ .strings.name }}</th>
                                 <th>{{ .strings.userProfilesIsDefault }}</th>
+                                {{ if .ombiEnabled }}
+                                <th>Ombi</th>
+                                {{ end }}
                                 <th>{{ .strings.from }}</th>
                                 <th>{{ .strings.userProfilesLibraries }}</th>
-                                <th><span class="button ~neutral !high" id="button-profile-create">{{ .strings.create }}</span></th>
+                                <th><span class="button ~neutral @high" id="button-profile-create">{{ .strings.create }}</span></th>
                             </tr>
                         </thead>
                         <tbody id="table-profiles"></tbody>
@@ -274,146 +309,151 @@
             </div>
         </div>
         <div id="modal-add-profile" class="modal">
-            <form class="modal-content card" id="form-add-profile" href="">
+            <form class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3" id="form-add-profile" href="">
                 <span class="heading">{{ .strings.addProfile }} <span class="modal-close">&times;</span></span>
-                <p class="content">{{ .strings.addProfileDescription }}</p>
+                <p class="content my-4">{{ .strings.addProfileDescription }}</p>
                 <label>
                     <span class="supra">{{ .strings.addProfileNameOf }} </span>
-                    <input type="text" class="field input ~neutral !high mt-half mb-1" placeholder="{{ .strings.name }}" id="add-profile-name">
+                    <input type="text" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.name }}" id="add-profile-name">
                 <label>
                     <span class="supra">{{ .strings.user }}</span>
-                    <div class="select ~neutral !normal mt-half mb-1">
+                    <div class="select ~neutral @low mt-4 mb-2">
                         <select id="add-profile-user"></select>
                     </div>
                 </label>
-                <label class="switch mb-1">
+                <label class="switch mb-4">
                     <input type="checkbox" id="add-profile-homescreen" checked>
                     <span>{{ .strings.addProfileStoreHomescreenLayout }}</span>
                 </label>
                 <label>
                     <input type="submit" class="unfocused">
-                    <span class="button ~urge !normal full-width center supra submit">{{ .strings.create }}</span>
+                    <span class="button ~urge @low full-width center supra submit">{{ .strings.create }}</span>
                 </label>
             </form>
         </div>
         <div id="modal-update" class="modal">
-            <div class="modal-content wide card">
+            <div class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content 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 class="mt-2">
+                        <a id="update-version"></a> (<span class="font-mono bg-inherit" 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 class="content mt-2" id="update-description"></p>
+                    <p class="support mt-2" id="update-date"></p>
+                    <div class="content markdown-box mt-2" 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>
+                <span class="button ~info @low full-width center mt-2" id="update-download">{{ .strings.download }}</span>
+                <span class="button ~urge @low full-width center mt-2" 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>
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+                <span class="heading mb-4">{{ .strings.linkTelegram }}</span>
+                <p class="content mb-4">{{ .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="shield ~info mr-2">
                         <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>
+                <span class="button ~info @low full-width center mt-4" 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="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+                <span class="heading mb-4"><span id="discord-header"></span><span class="modal-close">&times;</span></span>
+                <p class="content mb-4" id="discord-description"></p>
                 <div class="row">
-                    <input type="search" class="col sm field ~neutral !normal input" id="discord-search" placeholder="user#1234">
+                    <input type="search" class="col sm field ~neutral @low 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="">
+            <form class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3" 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">
+                <p class="content my-4">{{ .strings.linkMatrixDescription }}</p>
+                <input type="text" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.matrixHomeServer }}" id="matrix-homeserver">
+                <input type="text" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.username }}" id="matrix-user">
+                <input type="password" class="field input ~neutral @high mt-4 mb-2" 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>
+                    <span class="button ~urge @low 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">
-                <i class="ri-global-line"></i>
-                <span class="ml-1 chev"></span>
-            </span>
-            <div class="dropdown-display">
-                <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 class="top-4 left-4 absolute">
+            <span class="dropdown" tabindex="0" id="lang-dropdown">
+                <span class="button ~urge dropdown-button">
+                    <i class="ri-global-line"></i>
+                    <span class="ml-2 chev"></span>
+                </span>
+                <div class="dropdown-display">
+                    <div class="card ~neutral @low">
+                        <label class="switch pb-4">
+                            <input type="radio" name="lang-time" id="lang-12h">
+                            <span>{{ .strings.time12h }}</span>
+                        </label>
+                        <label class="switch pb-4">
+                            <input type="radio" name="lang-time" id="lang-24h">
+                            <span>{{ .strings.time24h }}</span>
+                        </label>
+                        <div id="lang-list"></div>
+                    </div>
                 </div>
-            </div>
-        </span>
+            </span>
+            <span class="button ~warning" alt="{{ .strings.theme }}" id="button-theme"><i class="ri-sun-line"></i></span>
+        </div>
+        <div class="top-4 right-4 absolute">
+            <a class="button ~info" href="/my/account"><i class="ri-account-circle-fill mr-2"></i>{{ .strings.myAccount }}</a>
+        </div>
         <div class="page-container">
-            <div class="mb-1">
+            <div class="mb-4">
                 <header class="flex flex-wrap items-center justify-between">
-                    <div class="text-neutral-700">
-                        <span id="button-tab-invites" class="tab-button portal">{{ .strings.invites }}</span>
-                        <span id="button-tab-accounts" class="tab-button portal">{{ .strings.accounts }}</span>
-                        <span id="button-tab-settings" class="tab-button portal">{{ .strings.settings }}</span>
+                    <div>
+                        <span id="button-tab-invites" class="text-3xl button portal ~neutral dark:~d_neutral @low mr-2 mb-2 px-5">{{ .strings.invites }}</span>
+                        <span id="button-tab-accounts" class="text-3xl button portal ~neutral dark:~d_neutral @low mr-2 mb-2 px-5">{{ .strings.accounts }}</span>
+                        <span id="button-tab-settings" class="text-3xl button portal ~neutral dark:~d_neutral @low mr-2 mb-2 px-5">{{ .strings.settings }}</span>
                     </div>
                 </header>
             </div>
-            <div class="mb-1">
-                <div class="text-neutral-700">
-                    <span class="button ~critical !normal mb-1 unfocused" id="logout-button">{{ .strings.logout }}</span>
-                    <span id="button-theme" class="button ~neutral !normal mb-1">{{ .strings.theme }}</span>
+            <div class="mb-4">
+                <div>
+                    <span class="button ~critical @low mb-4 unfocused" id="logout-button">{{ .strings.logout }}</span>
                 </div>
             </div>
             <div id="tab-invites">
-                <div class="card ~neutral !low invites mb-1">
+                <div class="card @low invites dark:~d_neutral mb-4">
                     <span class="heading">{{ .strings.invites }}</span>
                     <div id="invites"></div>
                 </div>
-                <div class="card ~neutral !low">
+                <div class="card @low dark:~d_neutral">
                     <span class="heading">{{ .strings.create }}</span>
-                    <div class="row" id="create-inv">
-                        <div class="card ~neutral !normal col">
-                            <div class="row mb-1">
-                                <label class="col mr-1">
+                    <div class="flex flex-col md:flex-row gap-3" id="create-inv">
+                        <div class="card ~neutral @low col">
+                            <div class="row mb-2">
+                                <label class="col mr-2">
                                     <input type="radio" name="duration" class="unfocused" id="radio-inv-duration" checked>
-                                    <span class="button ~neutral !high supra full-width center">{{ .strings.inviteDuration }}</span>
+                                    <span class="button ~neutral @high supra full-width center">{{ .strings.inviteDuration }}</span>
                                 </label>
-                                <label class="col ml-1">
+                                <label class="col ml-2">
                                     <input type="radio" name="duration" class="unfocused" id="radio-user-expiry">
-                                    <span class="button ~neutral !normal supra full-width center">{{ .strings.userExpiry }}</span>
+                                    <span class="button ~neutral @low supra full-width center">{{ .strings.userExpiry }}</span>
                                 </label>
                             </div>
                             <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">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="create-months">
                                                 <option>0</option>
                                             </select>
@@ -421,7 +461,7 @@
                                     </div>
                                     <div class="col">
                                         <label class="label supra" for="create-days">{{ .strings.inviteDays }}</label>
-                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="create-days">
                                                 <option>0</option>
                                             </select>
@@ -431,7 +471,7 @@
                                 <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">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="create-hours">
                                                 <option>0</option>
                                             </select>
@@ -439,7 +479,7 @@
                                     </div>
                                     <div class="col">
                                         <label class="label supra" for="create-minutes">{{ .strings.inviteMinutes }}</label>
-                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="create-minutes">
                                                 <option>0</option>
                                             </select>
@@ -448,17 +488,17 @@
                                 </div>
                             </div>
                             <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">
+                                <p class="support mb-2">{{ .strings.userExpiryDescription }}</p>
+                                <div class="mb-2">
+                                    <label for="create-user-expiry-enabled" class="button ~neutral @low">
                                         <input type="checkbox" id="create-user-expiry-enabled" aria-label="User duration enabled">
-                                        <span class="ml-half">{{ .strings.enabled }} </span>
+                                        <span class="ml-2">{{ .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">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="user-months">
                                                 <option>0</option>
                                             </select>
@@ -466,7 +506,7 @@
                                     </div>
                                     <div class="col">
                                         <label class="label supra" for="user-days">{{ .strings.inviteDays }}</label>
-                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="user-days">
                                                 <option>0</option>
                                             </select>
@@ -476,7 +516,7 @@
                                 <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">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="user-hours">
                                                 <option>0</option>
                                             </select>
@@ -484,7 +524,7 @@
                                     </div>
                                     <div class="col">
                                         <label class="label supra" for="user-minutes">{{ .strings.inviteMinutes }}</label>
-                                        <div class="select ~neutral !normal mb-1 mt-half">
+                                        <div class="select ~neutral @low mb-2 mt-4">
                                             <select id="user-minutes">
                                                 <option>0</option>
                                             </select>
@@ -494,79 +534,111 @@
                             </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">
+                                <input type="text" id="create-label" class="input ~neutral @low mb-2 mt-4">
                             </div>
                         </div>
-                        <div class="card ~neutral !normal col">
+                        <div class="card ~neutral @low col">
                             <label class="label supra" for="create-uses">{{ .strings.inviteNumberOfUses }}</label>
-                            <div class="flex-expand mb-1 mt-half">
-                                <input type="number" min="0" id="create-uses" class="input ~neutral !normal mr-1" value=1>
-                                <label for="create-inf-uses" class="button ~neutral !normal" title="Set uses to infinite">
-                                    <span>∞</span>
+                            <div class="flex-expand mb-2 mt-4">
+                                <input type="number" min="0" id="create-uses" class="input ~neutral @low mr-2" value=1>
+                                <label for="create-inf-uses" class="button ~neutral @low" title="Set uses to infinite">
+                                    <span>&infin;</span>
                                     <input type="checkbox" class="unfocused" id="create-inf-uses" aria-label="Set uses to infinite">
                                 </label>
                             </div>
-                            <p class="support unfocused" id="create-inf-uses-warning"><span class="badge ~critical">{{ .strings.warning }}</span> {{ .strings.inviteInfiniteUsesWarning }}</p>
+                            <p class="support unfocused my-2" id="create-inf-uses-warning"><span class="badge ~critical">{{ .strings.warning }}</span> {{ .strings.inviteInfiniteUsesWarning }}</p>
                             <label class="label supra">{{ .strings.profile }}</label>
-                            <div class="select ~neutral !normal mb-1 mt-half">
+                            <div class="select ~neutral @low mb-2 mt-4">
                                 <select id="create-profile">
                                 </select>
                             </div>
                             <div id="create-send-to-container">
                                 <label class="label supra">{{ .strings.inviteSendToEmail }}</label>
-                                <div class="flex-expand mb-1 mt-half">
+                                <div class="flex-expand mb-2 mt-4">
                                     {{ 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">
+                                    <input type="text" id="create-send-to" class="input ~neutral @low mr-2" placeholder="example@example.com | user#1234">
+                                    <span id="create-send-to-search" class="button ~neutral @low mr-2">
                                         <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">
+                                    <input type="email" id="create-send-to" class="input ~neutral @low mr-2" placeholder="example@example.com">
                                     {{ end }}
-                                    <label for="create-send-to-enabled" class="button ~neutral !normal">
+                                    <label for="create-send-to-enabled" class="button ~neutral @low">
                                         <input type="checkbox" id="create-send-to-enabled" aria-label="Send to address enabled">
                                     </label>
                                 </div>
                             </div>
-                            <span class="button ~urge !normal supra full-width center lg" id="create-submit">{{ .strings.create }}</span>
+                            <span class="button ~urge @low supra full-width center lg" id="create-submit">{{ .strings.create }}</span>
                         </div>
                     </div>
                 </div>
             </div>
             <div id="tab-accounts" class="unfocused">
-                <div class="card ~neutral !low accounts mb-1">
-                    <div class="flex-expand row">
-                        <div class="row">
-                            <span class="heading mr-1 col sm">{{ .strings.accounts }}</span>
-                            <input type="search" class="col sm field ~neutral !normal input search ml-1 mr-1" id="accounts-search" placeholder="{{ .strings.search }}">
-                        </div>
-                        <div class="row">
-                            <span class="col sm button ~neutral !normal center mb-half" id="accounts-add-user">{{ .quantityStrings.addUser.Singular }}</span>
-                            <span class="col sm button ~info !normal center mb-half" id="accounts-announce">{{ .strings.announce }}</span>
-                            <span class="col sm button ~urge !normal center mb-half" id="accounts-modify-user">{{ .strings.modifySettings }}</span>
-                            <span class="col sm button ~warning !normal center mb-half" id="accounts-extend-expiry">{{ .strings.extendExpiry }}</span>
-                            <span class="col sm button ~positive !normal center mb-half" id="accounts-disable-enable">{{ .strings.disable }}</span>
-                            <span class="col sm button ~critical !normal center mb-half" id="accounts-delete-user">{{ .quantityStrings.deleteUser.Singular }}</span>
+                <div class="card @low dark:~d_neutral accounts mb-4 overflow-visible">
+                    <div class="flex-expand align-middle">
+                        <span class="text-3xl font-bold mr-4">{{ .strings.accounts }}</span>
+                        <div id="accounts-filter-dropdown" class="dropdown z-10" tabindex="0">
+                            <span class="h-100 button ~neutral @low center" id="accounts-filter-button">{{ .strings.filters }}</span>
+                            <div class="dropdown-display">
+                                <div class="card ~neutral @low mt-2" id="accounts-filter-list">
+                                    <p class="supra pb-2">{{ .strings.filters }}</p>
+                                </div>
+                            </div>
                         </div>
+                        <input type="search" class="field ~neutral @low input search ml-2 mr-2" id="accounts-search" placeholder="{{ .strings.search }}">
+                        <span class="button ~neutral @low center -ml-8" id="accounts-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></span>
                     </div>
-                    <div class="card ~neutral !normal accounts-header table-responsive mt-half">
-                        <table class="table">
+                    <div class="supra py-1 sm hidden" id="accounts-search-options-header">{{ .strings.searchOptions }}</div>
+                    <div class="row -mx-2">
+                        <button type="button" class="button ~neutral @low center m-2 hidden"><span id="accounts-sort-by-field"></span> <i class="ri-close-line ml-2 text-2xl"></i></button>
+                        <span id="accounts-filter-area"></span>
+                    </div>
+                    <div class="supra py-1 sm">{{ .strings.actions }}</div>
+                    <div class="row -mx-2">
+                        <span class="col button ~neutral @low center max-w-[20%]" id="accounts-add-user">{{ .quantityStrings.addUser.Singular }}</span>
+                        <div id="accounts-announce-dropdown" class="col dropdown pb-0i max-w-[20%]" tabindex="0">
+                            <span class="w-100 button ~info @low center" 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 button ~urge @low center max-w-[20%]" id="accounts-modify-user">{{ .strings.modifySettings }}</span>
+                        <span class="col button ~warning @low center max-w-[20%]" id="accounts-extend-expiry">{{ .strings.extendExpiry }}</span>
+                        <div id="accounts-disable-enable-dropdown" class="col dropdown manual pb-0i max-w-[20%]" tabindex="0">
+                            <span class="w-100 button ~positive @low center" id="accounts-disable-enable">{{ .strings.disable }}</span>
+                            <div class="dropdown-display">
+                                <div class="card ~neutral @low">
+                                    <span class="button ~urge full-width accounts-announce-template-button" id="accounts-enable-expiry">{{ .strings.setExpiry }}</span>
+                                </div>
+                            </div>
+                        </div>
+                        <span class="col button ~info @low center unfocused max-w-[20%]" id="accounts-send-pwr">{{ .strings.sendPWR }}</span>
+                        <span class="col button ~critical @low center max-w-[20%]" id="accounts-delete-user">{{ .quantityStrings.deleteUser.Singular }}</span>
+                    </div>
+                    <div class="card @low accounts-header table-responsive mt-2">
+                        <table class="table text-base leading-4">
                             <thead>
                                 <tr>
                                     <th><input type="checkbox" value="" id="accounts-select-all"></th>
-                                    <th>{{ .strings.username }}</th>
-                                    <th>{{ .strings.emailAddress }}</th>
+                                    <th class="table-inline my-2 grid gap-4 place-items-stretch accounts-header-username">{{ .strings.username }}</th>
+                                    {{ if .jellyfinLogin }}
+                                    <th class="text-center-i grid gap-4 place-items-stretch accounts-header-access-jfa">{{ .strings.accessJFA }}</th>
+                                    {{ end }}
+                                    <th class="grid gap-4 place-items-stretch accounts-header-email">{{ .strings.emailAddress }}</th>
                                     {{ if .telegramEnabled }}
-                                    <th>Telegram</th>
+                                    <th class="text-center-i grid gap-4 place-items-stretch accounts-header-telegram">Telegram</th>
                                     {{ end }}
                                     {{ if .matrixEnabled }}
-                                    <th>Matrix</th>
+                                    <th class="text-center-i grid gap-4 place-items-stretch accounts-header-matrix">Matrix</th>
                                     {{ end }}
                                     {{ if .discordEnabled }}
-                                    <th>Discord</th>
+                                    <th class="text-center-i grid gap-4 place-items-stretch accounts-header-discord">Discord</th>
                                     {{ end }}
-                                    <th>{{ .strings.expiry }}</th>
-                                    <th>{{ .strings.lastActiveTime }}</th>
+                                    <th class="grid gap-4 place-items-stretch accounts-header-expiry">{{ .strings.expiry }}</th>
+                                    <th class="grid gap-4 place-items-stretch accounts-header-last-active">{{ .strings.lastActiveTime }}</th>
                                 </tr>
                             </thead>
                             <tbody id="accounts-list"></tbody>
@@ -575,27 +647,28 @@
                 </div>
             </div>
             <div id="tab-settings" class="unfocused">
-                <div class="card ~neutral !low settings overflow">
+                <div class="card @low dark:~d_neutral settings overflow">
                     <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">
+                            <label for="settings-advanced-enabled" class="button ~neutral @low ml-2 my-2">
                                 <input type="checkbox" id="settings-advanced-enabled" aria-label="Advanced settings enabled">
-                                <span class="ml-half">{{ .strings.advancedSettings }} </span>
+                                <span class="ml-2">{{ .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>
+                            <span class="button ~info @low my-1" id="settings-logs">{{ .strings.logs }}</span>
+                            <span class="button ~neutral @low my-1" id="settings-restart">{{ .strings.settingsRestart }}</span>
+                            <span class="button ~urge @low unfocused my-1" id="settings-save">{{ .strings.settingsSave }}</span>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="card ~neutral !normal col" id="settings-sidebar">
-                            <aside class="aside sm ~info mb-half" id="settings-message">Note: <span class="badge ~critical">*</span> indicates a required field, <span class="badge ~info">R</span> indicates changes require a restart.</aside> 
-                            <span class="button ~neutral !low settings-section-button mb-half" id="setting-about"><span class="flex">{{ .strings.aboutProgram }} <i class="ri-information-line ml-half"></i></span></span>
-                            <span class="button ~neutral !low settings-section-button mb-half" id="setting-profiles"><span class="flex">{{ .strings.userProfiles }} <i class="ri-user-line ml-half"></i></span></span>
+                    <div class="flex flex-col md:flex-row gap-3">
+                        <div class="card @low dark:~d_neutral col" id="settings-sidebar">
+                            <aside class="aside sm ~urge dark:~d_info mb-2 @low" id="settings-message">Note: <span class="badge ~critical">*</span> indicates a required field, <span class="badge ~info dark:~d_warning">R</span> indicates changes require a restart.</aside> 
+                            <span class="button ~neutral @low settings-section-button justify-between mb-2" id="setting-about"><span class="flex">{{ .strings.aboutProgram }} <i class="ri-information-line ml-2"></i></span></span>
+                            <span class="button ~neutral @low settings-section-button justify-between mb-2" id="setting-profiles"><span class="flex">{{ .strings.userProfiles }} <i class="ri-user-line ml-2"></i></span></span>
                         </div>
-                        <div class="card ~neutral !normal col overflow" id="settings-panel"></div>
+                        <div class="card ~neutral @low col overflow" id="settings-panel"></div>
                     </div>
                 </div>
             </div>

html/crash.html

@@ -7,41 +7,37 @@
     </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 class="card ~critical sectioned">
+                <section class="section ~critical">
+                    <span class="heading">Crash report for jfa-go</span>
+                    {{ if .Err }}
+                    <div class="font-mono bg-inherit pre-line mt-4 mb-4">
+                    Error: {{ .Err }}
                     </div>
-                </div>
+                    {{ end }}
+                    <a class="button ~critical mb-4" 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-4" id="copy-log">Copy</span>
+                    </div>
+                    <div class="row mb-4">
+                        <label class="col mr-4">
+                            <span class="button ~neutral @high supra full-width center" id="button-log-normal">Normal</span>
+                        </label>
+                        <label class="col mr-4">
+                            <span class="button ~neutral @low supra full-width center" id="button-log-sanitized">Sanitized</span>
+                        </label>
+                    </div>
+                    <div id="log-normal">
+                        <pre class="font-mono bg-inherit 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="font-mono bg-inherit pre-line">{{ .SanitizedLog }}</pre>
+                    </div>
+                </section>
             </div>
         </div>
         <script inline src="crash.js"></script>

html/create-success.html

@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <html lang="en" class="{{ .cssClass }}">
     <head>
-        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="{{ .urlBase }}/css/{{ .cssVersion }}bundle.css">
         {{ template "header.html" . }}
-        <title>{{ .strings.successHeader }} -  jfa-go</title>
+        <title>{{ .strings.successHeader }} - jfa-go</title>
     </head>
     <body class="section">
         <div class="page-container">
-            <div class="card ~neutral !normal mb-1">
-                <span class="heading mb-1">{{ .strings.successHeader }}</span>
-                <p class="content mb-1">{{ .successMessage }}</p>
-                <a class="button ~urge !normal full-width center supra submit" href="{{ .jfLink }}" id="create-success-button">{{ .strings.successContinueButton }}</a>
+            <div class="card ~neutral @low mb-4">
+                <span class="heading mb-4">{{ .strings.successHeader }}</span>
+                <p class="content my-4">{{ .successMessage }}</p>
+                <a class="button ~urge @high full-width center supra submit" href="{{ .jfLink }}" id="create-success-button">{{ .strings.continue }}</a>
             </div>
             <i class="content">{{ .contactMessage }}</i>
         </div>

html/form-base.html

@@ -17,6 +17,7 @@
     window.telegramEnabled = {{ .telegramEnabled }};
     window.telegramRequired = {{ .telegramRequired }};
     window.telegramPIN = "{{ .telegramPIN }}";
+    window.emailRequired = {{ .emailRequired }};
     window.discordEnabled = {{ .discordEnabled }};
     window.discordRequired = {{ .discordRequired }};
     window.discordPIN = "{{ .discordPIN }}";
@@ -25,10 +26,27 @@
     window.matrixEnabled = {{ .matrixEnabled }};
     window.matrixRequired = {{ .matrixRequired }};
     window.matrixUserID = "{{ .matrixUser }}";
+    window.captcha = {{ .captcha }};
+    window.reCAPTCHA = {{ .reCAPTCHA }};
+    window.reCAPTCHASiteKey = "{{ .reCAPTCHASiteKey }}";
+    window.userPageEnabled = {{ .userPageEnabled }};
+    window.userPageAddress = "{{ .userPageAddress }}";
 </script>
 {{ if .passwordReset }}
 <script src="js/pwr.js" type="module"></script>
 {{ else }}
 <script src="js/form.js" type="module"></script>
+{{ if .reCAPTCHA }}
+<script>
+    var reCAPTCHACallback = () => {
+        const el = document.getElementsByClassName("g-recaptcha")[0];
+        grecaptcha.render(el, {
+            "sitekey": window.reCAPTCHASiteKey,
+            "theme": document.documentElement.classList.contains("dark") ? "dark" : "light"
+        });
+    }
+</script>
+<script src="https://www.google.com/recaptcha/api.js?onload=reCAPTCHACallback&render=explicit" async defer></script>
+{{ end }}
 {{ end }}
 {{ end }}

html/form.html

@@ -1,99 +1,57 @@
 <!DOCTYPE html>
 <html lang="en" class="{{ .cssClass }}">
     <head>
-        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="css/{{ .cssVersion }}bundle.css">
         {{ template "header.html" . }}
-        <title>
-            {{ if .passwordReset }}
-            {{ .strings.passwordReset }}
-            {{ else }}
-            {{ .strings.pageTitle }}
-            {{ end }}
-        </title>
+        {{ if .passwordReset }}
+        <title>{{ .strings.passwordReset }}</title>
+        {{ else }}
+        <title>{{ .strings.pageTitle }}</title>
+        {{ end }}
+        <script>
+            window.redirectToJellyfin = {{ .redirectToJellyfin }};
+        </script>
     </head>
     <body class="max-w-full overflow-x-hidden section">
         <div id="modal-success" class="modal">
-            <div class="modal-content card">
-                <span class="heading mb-1">{{ .strings.successHeader }}</span>
-                <p class="content mb-1">{{ .successMessage }}</p>
-                <a class="button ~urge !normal full-width center supra submit" href="{{ .jfLink }}" id="create-success-button">{{ .strings.successContinueButton }}</a>
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+                <span class="heading mb-4">{{ if .passwordReset }}{{ .strings.passwordReset }}{{ else }}{{ .strings.successHeader }}{{ end }}</span>
+                <p class="content mb-4">{{ if .passwordReset }}{{ .strings.youCanLoginPassword }}{{ else }}{{ .successMessage }}{{ end }}</p>
+                {{ if .userPageEnabled }}<p class="content mb-4" id="modal-success-user-page-area" my-account-term="{{ .strings.myAccount }}">{{ .strings.userPageSuccessMessage }}</p>{{ end }}
+                <a class="button ~urge @low full-width center supra submit" href="{{ .jfLink }}" id="create-success-button">{{ .strings.continue }}</a>
             </div>
         </div>
         <div id="modal-confirmation" class="modal">
-            <div class="modal-content card">
-                <span class="heading mb-1">{{ .strings.confirmationRequired }}</span>
-                <p class="content mb-1">{{ .strings.confirmationRequiredMessage }}</p>
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+                <span class="heading mb-4">{{ .strings.confirmationRequired }}</span>
+                <p class="content mb-4">{{ .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 }}
+        {{ template "account-linking.html" . }}
+        <div class="top-4 left-4 absolute">
+            <span class="dropdown" tabindex="0" id="lang-dropdown">
+                <span class="button ~urge dropdown-button">
+                    <i class="ri-global-line"></i>
+                    <span class="ml-2 chev"></span>
+                </span>
+                <div class="dropdown-display">
+                    <div class="card ~neutral @low" id="lang-list">
+                    </div>
                 </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>
-                <span class="ml-1 chev"></span>
             </span>
-            <div class="dropdown-display">
-                <div class="card ~neutral !low" id="lang-list">
-                </div>
-            </div>
-        </span>
+        </div>
         <div id="notification-box"></div>
         <div class="page-container">
-            <div class="card ~neutral !low">
-                <div class="row baseline">
-                    <span class="col heading">
+            <div class="card dark:~d_neutral @low">
+                <div class="flex flex-col md:flex-row gap-3 inline align-baseline">
+                    <span class="heading mr-5">
                         {{ if .passwordReset }}
                         {{ .strings.passwordReset }}
                         {{ else }}
                         {{ .strings.createAccountHeader }}
                         {{ end }}
                     </span>
-                    <span class="col subheading"> 
+                    <span class="subheading">
                         {{ if .passwordReset }}
                         {{ .strings.enterYourPassword }}
                         {{ else }}
@@ -101,60 +59,60 @@
                         {{ end }}
                     </span>
                 </div>
-                <div class="row">
-                    <div class="col">
+                <div class="flex flex-col md:flex-row gap-3">
+                    <div class="flex-1">
                         {{ if .userExpiry }}
                         <aside class="col aside sm ~warning" id="user-expiry-message"></aside>
                         {{ end }}
-                        <form class="card ~neutral !normal" id="form-create" href="">
+                        <form class="card dark:~d_neutral @low" 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 }}">
+                                <input type="text" class="input ~neutral @high mt-2 mb-4" 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 !high mt-half mb-1" placeholder="{{ .strings.emailAddress }}" id="create-email" aria-label="{{ .strings.emailAddress }}" value="{{ .email }}">
+                            <input type="email" class="input ~neutral @high mt-2 mb-4" 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>
+                            <span class="button ~info @low full-width center mb-4" id="link-telegram">{{ .strings.linkTelegram }} {{ if .telegramRequired }}({{ .strings.required }}){{ end }}</span>
                             {{ end }}
                             {{ if .discordEnabled }}
-                            <span class="button ~info !normal full-width center mb-1" id="link-discord">{{ .strings.linkDiscord }}</span>
+                            <span class="button ~info @low full-width center mb-4" id="link-discord">{{ .strings.linkDiscord }} {{ if .discordRequired }}({{ .strings.required }}){{ end }}</span>
                             {{ end }}
                             {{ if .matrixEnabled }}
-                            <span class="button ~info !normal full-width center mb-1" id="link-matrix">{{ .strings.linkMatrix }}</span>
+                            <span class="button ~info @low full-width center mb-4" id="link-matrix">{{ .strings.linkMatrix }} {{ if .matrixRequired }}({{ .strings.required }}){{ end }}</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 class="row switch pb-4 unfocused">
+                                    <input type="checkbox" name="contact-via" value="email" id="contact-via-email" class="mr-2"><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 class="row switch pb-4 unfocused">
+                                    <input type="checkbox" name="contact-via" value="telegram" id="contact-via-telegram" class="mr-2"><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 class="row switch pb-4 unfocused">
+                                    <input type="checkbox" name="contact-via" value="discord" id="contact-via-discord" class="mr-2"><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 class="row switch pb-4 unfocused">
+                                    <input type="checkbox" name="contact-via" value="matrix" id="contact-via-matrix" class="mr-2"><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 !high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-password" aria-label="{{ .strings.password }}">
-                            
+                            <input type="password" class="input ~neutral @high mt-2 mb-4" 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 !high mt-half mb-1" placeholder="{{ .strings.password }}" id="create-reenter-password" aria-label="{{ .strings.reEnterPassword }}">
+                            <input type="password" class="input ~neutral @high mt-2 mb-4" 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">
+                                <span class="button ~urge @low full-width center supra submit">
                                     {{ if .passwordReset }}
                                     {{ .strings.reset }}
                                     {{ else }}
@@ -164,9 +122,9 @@
                             </label>
                         </form>
                     </div>
-                    <div class="col">
-                        <div class="card ~neutral !normal">
-                            <span class="label supra" for="inv-uses">{{ .strings.passwordRequirementsHeader }}</span>
+                    <div class="flex-initial">
+                        <div class="card ~neutral @low mb-4">
+                            <span class="label supra">{{ .strings.passwordRequirementsHeader }}</span>
                             <ul>
                                 {{ range $key, $value := .requirements }}
                                 <li class="" id="requirement-{{ $key }}" min="{{ $value }}">
@@ -175,8 +133,17 @@
                                 {{ end }}
                             </ul>
                         </div>
+                        {{ if .captcha }}
+                        <div class="card ~neutral @low mb-4">
+                            <span class="label supra mb-2">CAPTCHA {{ if not .reCAPTCHA }}<span id="captcha-regen" title="{{ .strings.refresh }}" class="badge lg @low ~info ml-2 float-right"><i class="ri-refresh-line"></i></span><span id="captcha-success" class="badge lg @low ~critical ml-2 float-right"><i class="ri-close-line"></i></span>{{ end }}</span>
+                            <div id="captcha-img" class="mt-2 mb-2 {{ if .reCAPTCHA }}g-recaptcha{{ end }}"></div>
+                            {{ if not .reCAPTCHA }}
+                            <input class="field ~neutral @low" id="captcha-input" class="mt-2" placeholder="CAPTCHA">
+                            {{ end }}
+                        </div>
+                        {{ end }}
                         {{ if .contactMessage }}
-                        <aside class="col aside sm ~info">{{ .contactMessage }}</aside>
+                        <aside class="col aside sm ~info mt-4">{{ .contactMessage }}</aside>
                         {{ end }}
                     </div>
                 </div>

html/header.html

@@ -1,4 +1,4 @@
-<meta charset="utf-8">
+<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">

html/invalidCode.html

@@ -1,17 +1,19 @@
 <!DOCTYPE html>
 <html lang="en" class="{{ .cssClass }}">
     <head>
-        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="{{ .urlBase }}/css/{{ .cssVersion }}bundle.css">
         {{ template "header.html" . }}
         <title>Invalid Code - jfa-go</title>
     </head>
     <body class="section">
         <div class="page-container">
-            <h1 class="heading">Invalid invite code.</h1>
-            <p class="content">The code above was either incorrect, or has expired.</p>
-            <p class="content">
-            {{ .contactMessage }}
-            </p>
+            <div class="card">
+                <h1 class="text-3xl font-semibold">Invalid invite code.</h1>
+                <p class="content">The code above was either incorrect, or has expired.</p>
+                <p class="content">
+                    {{ .contactMessage }}
+                </p>
+            </div>
         </div>
     </body>
 </html>                            

html/login-modal.html

@@ -0,0 +1,25 @@
+<div id="modal-login" class="modal">
+    <div class="my-[10%] row items-stretch relative mx-auto w-[40%] lg:w-[60%]">
+        {{ if index . "LoginMessageEnabled" }}
+            {{ if .LoginMessageEnabled }}
+                <div class="card mx-2 flex-initial w-[100%] xl:w-[35%] mb-4 xl:mb-0 dark:~d_neutral @low content">
+                    {{ .LoginMessageContent }}
+                </div>
+            {{ end }}
+        {{ end }}
+        <form class="card mx-2 flex-auto form-login w-[100%] xl:w-[55%] mb-0" href="">
+            <span class="heading">{{ .strings.login }}</span>
+            <input type="text" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.username }}" id="login-user">
+            <input type="password" class="field input ~neutral @high mb-4" placeholder="{{ .strings.password }}" id="login-password">
+            <label>
+                <input type="submit" class="unfocused">
+                <span class="button ~urge @low full-width center supra submit">{{ .strings.login }}</span>
+                {{ if index . "pwrEnabled" }}
+                    {{ if .pwrEnabled }}
+                        <span class="button ~info @low full-width center supra submit my-2" id="modal-login-pwr">{{ .strings.resetPassword }}</span>
+                    {{ end }}
+                {{ end }}
+            </label>
+        </form>
+    </div>
+</div>

html/password-reset.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" class="{{ .cssClass }}">
     <head>
-        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="css/{{ .cssVersion }}bundle.css">
         {{ template "header.html" . }}
         <title>{{ .strings.passwordReset }} -  jfa-go</title>
     </head>
@@ -12,15 +12,15 @@
         </div>
         {{ end }}
         <div class="page-container">
-            <div class="card ~neutral !normal mb-1">
-                <span class="heading mb-1">
+            <div class="card ~neutral @low mb-4">
+                <span class="heading mb-4">
                 {{ if .success }}
                 {{ .strings.passwordReset }}
                 {{ else }}
                 {{ .strings.resetFailed }}
                 {{ end }}
                 </span>
-                <p class="content mb-1">
+                <p class="content mb-4">
                 {{ if .success }}
                 {{ if .ombiEnabled }}
                 {{ .strings.youCanLoginOmbi }}
@@ -35,7 +35,7 @@
                 <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>
+                <span class="button ~urge @low w-100 text-center text-xl p-1 mt-4" id="pin" title="{{ .strings.copy }}">{{ .pin }}</span>
                 {{ end }}
             </div>
             <i class="content">{{ .contactMessage }}</i>

html/setup.html

@@ -1,24 +1,26 @@
 <!DOCTYPE html>
-<html lang="en" class="light-theme">
+<html lang="en" class="light">
     <head>
-        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="css/{{ .cssVersion }}bundle.css">
         {{ template "header.html" . }}
         <title>{{ .lang.Strings.pageTitle }}</title>
     </head>
     <body class="max-w-full overflow-x-hidden section">
         <div id="notification-box"></div>
-        <span class="dropdown" tabindex="0" id="lang-dropdown">
-            <span class="button ~urge dropdown-button">
-                <i class="ri-global-line"></i>
-                <span class="ml-1 chev"></span>
-            </span>
-            <div class="dropdown-display">
-                <div class="card ~neutral !low" id="lang-list">
+        <div class="top-4 left-4 absolute">
+            <span class="dropdown" tabindex="0" id="lang-dropdown">
+                <span class="button ~urge dropdown-button">
+                    <i class="ri-global-line"></i>
+                    <span class="ml-2 chev"></span>
+                </span>
+                <div class="dropdown-display">
+                    <div class="card ~neutral @low" id="lang-list">
+                    </div>
                 </div>
-            </div>
-        </span>
+            </span>
+        </div>    
         <div class="page-container" id="page-container">
-            <div class="card ~neutral !low mb-1">
+            <div class="card ~neutral @low mb-2">
                 <div class="row">
                     <img class="banner header" src="banner.svg" alt="jfa-go" />
                 </div>
@@ -26,70 +28,70 @@
                     <span class="heading welcome">{{ .lang.StartPage.welcome }}</span>
                 </div>
                 <div class="row col flex center">
-                    <p class="content">{{ .lang.StartPage.pressStart }}</p>
+                    <p class="content my-2">{{ .lang.StartPage.pressStart }}</p>
                 </div>
                 <section class="section ~neutral banner footer flex-expand middle">
                     <span class="support">{{ .lang.StartPage.httpsNotice }}</span>
-                    <span class="button ~urge !normal next">{{ .lang.StartPage.start }}</span>
+                    <span class="button ~urge @low next">{{ .lang.StartPage.start }}</span>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <span class="heading">{{ .lang.Language.title }}</span>
-                <p class="content" id="language-description"></p>
+                <p class="content my-2" id="language-description"></p>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Language.defaultAdminLang }}</span>
-                    <div class="select ~neutral !normal mt-half mb-1">
+                    <span class="mt-4">{{ .lang.Language.defaultAdminLang }}</span>
+                    <div class="select ~neutral @low mt-4 mb-2">
                         <select id="ui-language-admin">
                         </select>
                     </div>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Language.defaultFormLang }}</span>
-                    <div class="select ~neutral !normal mt-half mb-1">
+                    <span class="mt-4">{{ .lang.Language.defaultFormLang }}</span>
+                    <div class="select ~neutral @low mt-4 mb-2">
                         <select id="ui-language-form">
                         </select>
                     </div>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Language.defaultEmailLang }}</span>
-                    <div class="select ~neutral !normal mt-half mb-1">
+                    <span class="mt-4">{{ .lang.Language.defaultEmailLang }}</span>
+                    <div class="select ~neutral @low mt-4 mb-2">
                         <select id="email-language">
                         </select>
                     </div>
                 </label>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
-                    <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <span class="heading">{{ .lang.General.title }}</span>
                 <div class="row">
                     <div class="col">
                         <label class="label">
-                            <span class="mt-half">{{ .lang.General.listenAddress }}</span>
-                            <input type="url" class="input ~neutral !normal mt-half mb-1" id="ui-host" value="0.0.0.0">
+                            <span class="mt-4">{{ .lang.General.listenAddress }}</span>
+                            <input type="url" class="input ~neutral @low mt-4 mb-2" id="ui-host" value="0.0.0.0">
                         </label>
                         <label class="row switch">
-                            <input type="checkbox" id="advanced-tls"><span>{{ .lang.General.useHTTPS }}</span>
+                            <input type="checkbox" class="mr-2" id="advanced-tls"><span>{{ .lang.General.useHTTPS }}</span>
                         </label>
-                        <p class="support mb-1">{{ .lang.General.useHTTPSNotice }}</p>
+                        <p class="support mb-2 mt-1">{{ .lang.General.useHTTPSNotice }}</p>
                         <label class="label">
-                            <span class="mt-half">{{ .lang.General.pathToCertificate }}</span>
-                            <input type="text" class="input ~neutral !normal mt-half mb-1" id="advanced-tls_cert">
+                            <span class="mt-4">{{ .lang.General.pathToCertificate }}</span>
+                            <input type="text" class="input ~neutral @low mt-4 mb-2" id="advanced-tls_cert">
                         </label>
                         <label class="label">
-                            <span class="mt-half">{{ .lang.General.pathToKeyFile }}</span>
-                            <input type="text" class="input ~neutral !normal mt-half mb-1" id="advanced-tls_key">
+                            <span class="mt-4">{{ .lang.General.pathToKeyFile }}</span>
+                            <input type="text" class="input ~neutral @low mt-4 mb-2" 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>
+                        <p class="content my-2" id="updates-description"></p>
+                        <label class="row switch pb-4">
+                            <input type="checkbox" class="mr-2" 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">
+                            <div class="select ~neutral @low mt-4 mb-2">
                                 <select id="updates-channel">
                                     <option value="stable">{{ .lang.Updates.stable }}</option>
                                     <option value="unstable">{{ .lang.Updates.unstable }}</option>
@@ -99,21 +101,21 @@
                     </div>
                     <div class="col">
                         <label class="label">
-                            <span class="mt-half">{{ .lang.Strings.port }}</span>
-                            <input type="number" class="input ~neutral !normal mt-half mb-1" id="ui-port" value="8056">
+                            <span class="mt-4">{{ .lang.Strings.port }}</span>
+                            <input type="number" class="input ~neutral @low mt-4 mb-2" id="ui-port" value="8056">
                         </label>
                         <label class="label">
-                            <span class="mt-half">{{ .lang.General.httpsPort }}</span>
-                            <input type="number" class="input ~neutral !normal mt-half mb-1" id="advanced-tls_port" value="8057">
+                            <span class="mt-4">{{ .lang.General.httpsPort }}</span>
+                            <input type="number" class="input ~neutral @low mt-4 mb-2" id="advanced-tls_port" value="8057">
                         </label>
                         <label class="label">
-                            <span class="mt-half">{{ .lang.General.urlBase }} ({{ .lang.Strings.optional }})</span>
-                            <input type="url" class="input ~neutral !normal mt-half" id="ui-url_base">
-                            <p class="support mb-1">{{ .lang.General.urlBaseNotice }}</p>
+                            <span class="mt-4">{{ .lang.General.urlBase }} ({{ .lang.Strings.optional }})</span>
+                            <input type="url" class="input ~neutral @low mt-4" id="ui-url_base">
+                            <p class="support mb-2 mt-1">{{ .lang.General.urlBaseNotice }}</p>
                         </label>
                         <label class="label">
                             <span>{{ .lang.Strings.theme }}</span>
-                            <div class="select ~neutral !normal mt-half mb-1">
+                            <div class="select ~neutral @low mt-4 mb-2">
                                 <select id="ui-theme">
                                     <option value="Jellyfin (Dark)">{{ .lang.General.darkTheme }}</option>
                                     <option value="Default (Light)">{{ .lang.General.lightTheme }}</option>
@@ -123,355 +125,370 @@
                     </div>
                 </div>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
-                    <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <span class="heading">{{ .lang.Login.title }}</span>
-                <p class="content">{{ .lang.Login.description }}</p>
-                <div class="pl-1">
-                    <label class="row switch pb-1">
-                        <input type="radio" name="ui-jellyfin_login" value="true" checked><span>{{ .lang.Login.authorizeWithJellyfin }}</span>
+                <p class="content my-2">{{ .lang.Login.description }}</p>
+                <div class="pl-4">
+                    <label class="row switch pb-4">
+                        <input type="radio" class="mr-2" name="ui-jellyfin_login" value="true" checked><span>{{ .lang.Login.authorizeWithJellyfin }}</span>
                     </label>
-                    <label class="row switch pl-1 pb-1">
-                        <input type="checkbox" id="ui-admin_only"><span>{{ .lang.Login.adminOnly }}</span>
+                    <label class="row switch pl-4 pb-4">
+                        <input type="checkbox" class="mr-2" id="ui-admin_only" checked><span>{{ .lang.Login.adminOnly }}</span>
                     </label>
-                    <label class="row switch pb-1">
-                        <input type="radio" name="ui-jellyfin_login" value="false"><span>{{ .lang.Login.authorizeManual }}</span>
+                    <label class="row switch pl-4 pb-2">
+                        <input type="checkbox" class="mr-2" id="ui-allow_all"><span>{{ .lang.Login.allowAll }}</span>
+                    </label>
+                    <p class="support pb-4 pl-4 mt-1" id="description-ui-allow_all">{{ .lang.Login.allowAllDescription }}</p>
+                    <label class="row switch pb-4">
+                        <input type="radio" class="mr-2" name="ui-jellyfin_login" value="false"><span>{{ .lang.Login.authorizeManual }}</span>
                     </label>
                 </div>
                 <div id="login-manual">
                     <label class="label">
-                        <span class="mt-half">{{ .lang.Strings.username }}</span>
-                        <input type="text" id="ui-username" class="input ~neutral !normal mt-half mb-1" placeholder="{{ .lang.Strings.username }}">
+                        <span class="mt-4">{{ .lang.Strings.username }}</span>
+                        <input type="text" id="ui-username" class="input ~neutral @low mt-4 mb-2" placeholder="{{ .lang.Strings.username }}">
                     </label>
                     <label class="label">
                         <span>{{ .lang.Strings.password }}</span>
-                        <input type="password" id="ui-password" class="input ~neutral !normal mt-half mb-1" placeholder="{{ .lang.Strings.password }}">
+                        <input type="password" id="ui-password" class="input ~neutral @low mt-4 mb-2" placeholder="{{ .lang.Strings.password }}">
                     </label>
                     <label class="label">
                         <span>{{ .lang.Strings.emailAddress }} ({{ .lang.Strings.optional }})</span>
-                        <input type="email" id="ui-email" class="input ~neutral !normal mt-half" placeholder="email@address">
-                        <span class="support mb-1">{{ .lang.Login.emailNotice }}</span>
+                        <input type="email" id="ui-email" class="input ~neutral @low mt-4" placeholder="email@address">
+                        <span class="support mb-2 mt-1">{{ .lang.Login.emailNotice }}</span>
                     </label>
                 </div>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
-                    <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <span class="heading">{{ .lang.JellyfinEmby.title }}</span>
-                <p class="content">{{ .lang.JellyfinEmby.description }}</p>
+                <p class="content my-2">{{ .lang.JellyfinEmby.description }}</p>
                 <div class="row">
                     <div class="col">
                         <label class="label">
                             <span>{{ .lang.Strings.serverType }}</span>
-                            <div class="select ~neutral !normal mt-half">
+                            <div class="select ~neutral @low mt-4">
                                 <select id="jellyfin-type">
                                     <option value="jellyfin">Jellyfin</option>
                                     <option value="emby">Emby</option>
                                 </select>
                             </div>
-                            <p class="support mb-1">{{ .lang.JellyfinEmby.embyNotice }}</p>
+                            <p class="support mb-2 mt-1">{{ .lang.JellyfinEmby.embyNotice }}</p>
                         </label>
                         <label class="label">
-                            <span class="mt-half">{{ .lang.JellyfinEmby.replaceJellyfin }} ({{ .lang.Strings.optional }})</span>
-                            <input type="text" class="input ~neutral !normal mt-half" id="jellyfin-substitute_jellyfin_strings">
-                            <p class="support mb-1">{{ .lang.JellyfinEmby.replaceJellyfinNotice }}</p>
+                            <span class="mt-4">{{ .lang.JellyfinEmby.replaceJellyfin }} ({{ .lang.Strings.optional }})</span>
+                            <input type="text" class="input ~neutral @low mt-4" id="jellyfin-substitute_jellyfin_strings">
+                            <p class="support mb-2 mt-1">{{ .lang.JellyfinEmby.replaceJellyfinNotice }}</p>
                         </label>
                         <label class="label">
-                            <span class="mt-half">{{ .lang.Strings.username }}</span>
-                            <input type="text" id="jellyfin-username" class="input ~neutral !normal mt-half mb-1" placeholder="{{ .lang.Strings.username }}">
+                            <span class="mt-4">{{ .lang.Strings.username }}</span>
+                            <input type="text" id="jellyfin-username" class="input ~neutral @low mt-4 mb-2" placeholder="{{ .lang.Strings.username }}">
                         </label>
                         <label class="label">
                             <span>{{ .lang.Strings.password }}</span>
-                            <input type="password" id="jellyfin-password" class="input ~neutral !normal mt-half mb-1" placeholder="{{ .lang.Strings.password }}">
+                            <input type="password" id="jellyfin-password" class="input ~neutral @low mt-4 mb-2" placeholder="{{ .lang.Strings.password }}">
                         </label>
                     </div>
                     <div class="col">
                         <label class="label">
-                            <span class="mt-half">{{ .lang.Strings.serverAddress }} ({{ .lang.JellyfinEmby.internal }})</span>
-                            <input type="url" class="input ~neutral !normal mt-half mb-1" id="jellyfin-server" placeholder="http://jellyf.in:80">
+                            <span class="mt-4">{{ .lang.Strings.serverAddress }} ({{ .lang.JellyfinEmby.internal }})</span>
+                            <input type="url" class="input ~neutral @low mt-4 mb-2" id="jellyfin-server" placeholder="http://jellyf.in:80">
                         </label>
                         <label class="label">
-                            <span class="mt-half">{{ .lang.Strings.serverAddress }} ({{ .lang.JellyfinEmby.external }})</span>
-                            <input type="url" class="input ~neutral !normal mt-half" id="jellyfin-public_server" placeholder="https://jellyf.in">
-                            <p class="support mb-1">{{ .lang.JellyfinEmby.addressExternalNotice }}</p>
+                            <span class="mt-4">{{ .lang.Strings.serverAddress }} ({{ .lang.JellyfinEmby.external }})</span>
+                            <input type="url" class="input ~neutral @low mt-4" id="jellyfin-public_server" placeholder="https://jellyf.in">
+                            <p class="support mb-2 mt-1">{{ .lang.JellyfinEmby.addressExternalNotice }}</p>
                         </label>
                     </div>
                 </div>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal" id="jellyfin-test-connection">{{ .lang.JellyfinEmby.testConnection }}</span>
-                        <span class="button ~urge !normal next" disabled>{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low" id="jellyfin-test-connection">{{ .lang.JellyfinEmby.testConnection }}</span>
+                        <span class="button ~urge @low next" disabled>{{ .lang.Strings.next }}</span>
                     </div>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <span class="heading">{{ .lang.Ombi.title }}</span>
-                <p class="content">{{ .lang.Ombi.description }}</p>
-                <label class="row switch pb-1">
-                    <input type="checkbox" id="ombi-enabled"><span>{{ .lang.Strings.enabled }}</span>
+                <p class="content my-2">{{ .lang.Ombi.description }}</p>
+                <label class="row switch pb-4">
+                    <input type="checkbox" class="mr-2" id="ombi-enabled"><span>{{ .lang.Strings.enabled }}</span>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Strings.serverAddress }}</span>
-                    <input type="url" class="input ~neutral !normal mt-half mb-1" id="ombi-server" placeholder="ombi.jellyf.in">
+                    <span class="mt-4">{{ .lang.Strings.serverAddress }}</span>
+                    <input type="url" class="input ~neutral @low mt-4 mb-2" id="ombi-server" placeholder="ombi.jellyf.in">
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Strings.apiKey }}</span>
-                    <input type="text" class="input ~neutral !normal mt-half" id="ombi-api_key">
-                    <p class="support mb-1">{{ .lang.Ombi.apiKeyNotice }}</p>
+                    <span class="mt-4">{{ .lang.Strings.apiKey }}</span>
+                    <input type="text" class="input ~neutral @low mt-4" id="ombi-api_key">
+                    <p class="support mb-2 mt-1">{{ .lang.Ombi.apiKeyNotice }}</p>
                 </label>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                     </div>
                 </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>
-                            <p class="support mb-1">{{ .lang.Email.useEmailAsUsernameNotice }}</p>
-                        </label>
-                        <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.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>
-                    <div class="col">
-                        <div id="email-smtp">
-                            <p class="subheading">SMTP</p>
+            <div class="card ~neutral @low mb-2 unfocused">
+                <span class="heading">{{ .lang.Messages.title }}</span>
+                <p class="content my-2" id="messages-description"></p>
+                <label class="row switch pb-4">
+                    <input type="checkbox" class="mr-2" id="messages-enabled" checked><span>{{ .lang.Strings.enabled }}</span>
+                </label>
+                <label class="label">
+                    <span class="mt-4">{{ .lang.Email.dateFormat }}</span>
+                    <input type="text" class="input ~neutral @low mt-4" id="email-date_format" value="%d/%m/%y">
+                    <p class="support mb-2 mt-1" id="email-dateformat-notice"></p>
+                </label>
+                <div>
+                    <label class="row switch pb-4">
+                        <input type="radio" class="mr-2" name="email-24h" value="true" checked><span>{{ .lang.Strings.time24h }}</span>
+                    </label>
+                    <label class="row switch pb-4">
+                        <input type="radio" class="mr-2" 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 my-2" id="email-description"></p>
+                    <div class="row">
+                        <div class="col">
                             <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>
+                                <span>{{ .lang.Email.method }}</span>
+                                <div class="select ~neutral @low mt-4 mb-2">
+                                    <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" class="mr-2" id="email-no_username"><span>{{ .lang.Email.useEmailAsUsername }}</span>
+                                <p class="support mb-2 mt-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-4">{{ .lang.Email.fromAddress }}</span>
+                                <input type="email" class="input ~neutral @low mt-4 mb-2" 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-4">{{ .lang.Email.senderName }}</span>
+                                <input type="text" class="input ~neutral @low mt-4 mb-2" 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="text-2xl font-semibold mb-2">SMTP</p>
+                                <label class="label">
+                                    <span>{{ .lang.Email.encryption }}</span>
+                                    <div class="select ~neutral @low mt-4 mb-2">
+                                        <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-4">{{ .lang.Strings.serverAddress }}</span>
+                                    <input type="url" class="input ~neutral @low mt-4 mb-2" id="smtp-server" placeholder="smtp.jellyf.in">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-4">{{ .lang.Strings.port }}</span>
+                                    <input type="number" class="input ~neutral @low mt-4 mb-2" id="smtp-port" placeholder="587">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-4">{{ .lang.Strings.username }}</span>
+                                    <input type="text" class="input ~neutral @low mt-4 mb-2" id="smtp-username">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-4">{{ .lang.Strings.password }}</span>
+                                    <input type="password" class="input ~neutral @low mt-4 mb-2" id="smtp-password">
+                                </label>
+                            </div>
+                            <div id="email-mailgun">
+                                <p class="text-2xl font-semibold mb-2">Mailgun</p>
+                                <label class="label">
+                                    <span class="mt-4">{{ .lang.Email.mailgunApiURL }}</span>
+                                    <input type="url" class="input ~neutral @low mt-4 mb-2" id="mailgun-api_url" placeholder="https://api.eu.mailgun.net/v3/mail.jellyf.in/messages">
+                                </label>
+                                <label class="label">
+                                    <span class="mt-4">{{ .lang.Strings.apiKey }}</span>
+                                    <input type="text" class="input ~neutral @low mt-4 mb-2" id="mailgun-api_key">
+                                </label>
+                            </div>
                         </div>
                     </div>
                 </div>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                     </div>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused related-to-email">
+            <div class="card ~neutral @low mb-2 unfocused related-to-email">
                 <span class="heading">{{ .lang.Notifications.title }}</span>
-                <p class="content">{{ .lang.Notifications.description }}</p>
-                <label class="row switch pb-1">
-                    <input type="checkbox" id="notifications-enabled"><span>{{ .lang.Strings.enabled }}</span>
+                <p class="content my-2">{{ .lang.Notifications.description }}</p>
+                <label class="row switch pb-4">
+                    <input type="checkbox" class="mr-2" id="notifications-enabled"><span>{{ .lang.Strings.enabled }}</span>
                 </label>
                 <span class="heading">{{ .lang.WelcomeEmails.title }}</span>
-                <p class="content">{{ .lang.WelcomeEmails.description }}</p>
-                <label class="row switch pb-1">
-                    <input type="checkbox" id="welcome_email-enabled"><span>{{ .lang.Strings.enabled }}</span>
+                <p class="content my-2">{{ .lang.WelcomeEmails.description }}</p>
+                <label class="row switch pb-4">
+                    <input type="checkbox" class="mr-2" id="welcome_email-enabled"><span>{{ .lang.Strings.enabled }}</span>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Strings.emailSubject }}</span>
-                    <input type="text" class="input ~neutral !normal mt-half mb-1" id="welcome_email-subject" placeholder="{{ .emailLang.WelcomeEmail.title }}">
+                    <span class="mt-4">{{ .lang.Strings.emailSubject }}</span>
+                    <input type="text" class="input ~neutral @low mt-4 mb-2" id="welcome_email-subject" placeholder="{{ .emailLang.WelcomeEmail.title }}">
                 </label>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                     </div>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused related-to-email">
+            <div class="card ~neutral @low mb-2 unfocused related-to-email">
                 <span class="heading">{{ .lang.InviteEmails.title }}</span>
-                <p class="content">{{ .lang.InviteEmails.description }}</p>
-                <label class="row switch pb-1">
-                    <input type="checkbox" id="invite_emails-enabled"><span>{{ .lang.Strings.enabled }}</span>
+                <p class="content my-2">{{ .lang.InviteEmails.description }}</p>
+                <label class="row switch pb-4">
+                    <input type="checkbox" class="mr-2" id="invite_emails-enabled"><span>{{ .lang.Strings.enabled }}</span>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Strings.URL }}</span>
-                    <input type="url" class="input ~neutral !normal mt-half mb-1" id="invite_emails-url_base" placeholder="https://accounts.jellyf.in/invite">
+                    <span class="mt-4">{{ .lang.Strings.URL }}</span>
+                    <input type="url" class="input ~neutral @low mt-4 mb-2" id="invite_emails-url_base" placeholder="https://accounts.jellyf.in/invite">
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.Strings.emailSubject }}</span>
-                    <input type="text" class="input ~neutral !normal mt-half mb-1" id="invite_emails-subject" placeholder="{{ .emailLang.InviteEmail.title }}">
+                    <span class="mt-4">{{ .lang.Strings.emailSubject }}</span>
+                    <input type="text" class="input ~neutral @low mt-4 mb-2" id="invite_emails-subject" placeholder="{{ .emailLang.InviteEmail.title }}">
                 </label>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                     </div>
                 </section>
             </div>
-            <div id="password-resets" class="card ~neutral !low mb-1 unfocused related-to-email">
+            <div id="password-resets" class="card ~neutral @low mb-2 unfocused related-to-email">
                 <span class="heading">{{ .lang.PasswordResets.title }}</span>
-                <p class="content">{{ .lang.PasswordResets.description }}</p>
-                <label class="row switch pb-1">
-                    <input type="checkbox" id="password_resets-enabled"><span>{{ .lang.Strings.enabled }}</span>
+                <p class="content my-2">{{ .lang.PasswordResets.description }}</p>
+                <label class="row switch pb-4">
+                    <input type="checkbox" class="mr-2" id="password_resets-enabled"><span>{{ .lang.Strings.enabled }}</span>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.PasswordResets.pathToJellyfin }}</span>
-                    <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>
+                    <span class="mt-4">{{ .lang.PasswordResets.pathToJellyfin }}</span>
+                    <input type="text" class="input ~neutral @low mt-4" id="password_resets-watch_directory" placeholder="/config/jellyfin">
+                    <p class="support mb-2 mt-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>
+                    <input type="checkbox" class="mr-2" id="password_resets-link_reset"><span>{{ .lang.PasswordResets.resetLinks }}</span>
+                    <p class="support mb-2 mt-1">{{ .lang.PasswordResets.resetLinksNotice }}</p>
                 </label>
-                <label class="row label">
-                    <p class="mt-half">{{ .lang.PasswordResets.resetLinksLanguage }}</p>
-                    <div class="select ~neutral !normal mt-half mb-1">
+                <label class="switch">
+                    <input type="checkbox" class="mr-2" id="password_resets-set_password"><span>{{ .lang.PasswordResets.setPassword }}</span>
+                    <p class="support mb-2 mt-1">{{ .lang.PasswordResets.setPasswordNotice }}</p>
+                </label>
+                <label class="label">
+                    <p class="mt-4">{{ .lang.PasswordResets.resetLinksLanguage }}</p>
+                    <div class="select ~neutral @low mt-4 mb-2">
                         <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 }}">
+                    <span class="mt-4">{{ .lang.Strings.emailSubject }}</span>
+                    <input type="text" class="input ~neutral @low mt-4 mb-2" id="password_resets-subject" placeholder="{{ .emailLang.PasswordReset.title }}">
                 </label>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                     </div>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <span class="heading">{{ .lang.PasswordValidation.title }}</span>
-                <p class="content">{{ .lang.PasswordValidation.description }}</p>
-                <label class="row switch pb-1">
-                    <input type="checkbox" id="password_validation-enabled" checked><span>{{ .lang.Strings.enabled }}</span>
+                <p class="content my-2">{{ .lang.PasswordValidation.description }}</p>
+                <label class="row switch pb-4">
+                    <input type="checkbox" class="mr-2" id="password_validation-enabled" checked><span>{{ .lang.Strings.enabled }}</span>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.PasswordValidation.length }}</span>
-                    <input type="number" class="input ~neutral !normal mt-half mb-1" id="password_validation-min_length" value="8">
+                    <span class="mt-4">{{ .lang.PasswordValidation.length }}</span>
+                    <input type="number" class="input ~neutral @low mt-4 mb-2" id="password_validation-min_length" value="8">
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.PasswordValidation.uppercase }}</span>
-                    <input type="number" class="input ~neutral !normal mt-half mb-1" id="password_validation-upper" value="1">
+                    <span class="mt-4">{{ .lang.PasswordValidation.uppercase }}</span>
+                    <input type="number" class="input ~neutral @low mt-4 mb-2" id="password_validation-upper" value="1">
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.PasswordValidation.lowercase }}</span>
-                    <input type="number" class="input ~neutral !normal mt-half mb-1" id="password_validation-lower" value="0">
+                    <span class="mt-4">{{ .lang.PasswordValidation.lowercase }}</span>
+                    <input type="number" class="input ~neutral @low mt-4 mb-2" id="password_validation-lower" value="0">
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.PasswordValidation.numbers }}</span>
-                    <input type="number" class="input ~neutral !normal mt-half mb-1" id="password_validation-number" value="0">
+                    <span class="mt-4">{{ .lang.PasswordValidation.numbers }}</span>
+                    <input type="number" class="input ~neutral @low mt-4 mb-2" id="password_validation-number" value="0">
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.PasswordValidation.special }}</span>
-                    <input type="number" class="input ~neutral !normal mt-half mb-1" id="password_validation-special" value="0">
+                    <span class="mt-4">{{ .lang.PasswordValidation.special }}</span>
+                    <input type="number" class="input ~neutral @low mt-4 mb-2" id="password_validation-special" value="0">
                 </label>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                     </div>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <span class="heading">{{ .lang.HelpMessages.title }}</span>
-                <p class="content">{{ .lang.HelpMessages.description }}</p>
+                <p class="content my-2">{{ .lang.HelpMessages.description }}</p>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.HelpMessages.contactMessage }}</span>
-                    <input type="text" class="input ~neutral !normal mt-half" id="ui-contact_message">
-                    <p class="support mb-1">{{ .lang.HelpMessages.contactMessageNotice }}</p>
+                    <span class="mt-4">{{ .lang.HelpMessages.contactMessage }}</span>
+                    <input type="text" class="input ~neutral @low mt-4" id="ui-contact_message">
+                    <p class="support mb-2 mt-1">{{ .lang.HelpMessages.contactMessageNotice }}</p>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.HelpMessages.helpMessage }}</span>
-                    <input type="text" class="input ~neutral !normal mt-half" id="ui-help_message">
-                    <p class="support mb-1">{{ .lang.HelpMessages.helpMessageNotice }}</p>
+                    <span class="mt-4">{{ .lang.HelpMessages.helpMessage }}</span>
+                    <input type="text" class="input ~neutral @low mt-4" id="ui-help_message">
+                    <p class="support mb-2 mt-1">{{ .lang.HelpMessages.helpMessageNotice }}</p>
                 </label>
                 <label class="label">
-                    <span class="mt-half">{{ .lang.HelpMessages.successMessage }}</span>
-                    <input type="text" class="input ~neutral !normal mt-half" id="ui-success_message">
-                    <p class="support mb-1">{{ .lang.HelpMessages.successMessageNotice }}</p>
+                    <span class="mt-4">{{ .lang.HelpMessages.successMessage }}</span>
+                    <input type="text" class="input ~neutral @low mt-4" id="ui-success_message">
+                    <p class="support mb-2 mt-1">{{ .lang.HelpMessages.successMessageNotice }}</p>
                 </label>
                 <label class="label related-to-email">
-                    <span class="mt-half">{{ .lang.HelpMessages.emailMessage }}</span>
-                    <input type="text" class="input ~neutral !normal mt-half" id="email-message">
-                    <p class="support mb-1">{{ .lang.HelpMessages.emailMessageNotice }}</p>
+                    <span class="mt-4">{{ .lang.HelpMessages.emailMessage }}</span>
+                    <input type="text" class="input ~neutral @low mt-4" id="email-message">
+                    <p class="support mb-2 mt-1">{{ .lang.HelpMessages.emailMessageNotice }}</p>
                 </label>
                 <section class="section ~neutral banner footer flex-expand middle">
-                    <span class="button ~neutral !normal back">{{ .lang.Strings.back }}</span>
+                    <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
-                        <span class="button ~urge !normal next">{{ .lang.Strings.next }}</span>
+                        <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                     </div>
                 </section>
             </div>
-            <div class="card ~neutral !low mb-1 unfocused">
+            <div class="card ~neutral @low mb-2 unfocused">
                 <div class="row col flex center">
                     <span class="heading">{{ .lang.EndPage.finished }}</span>
                 </div>
                 <div class="row col flex center">
-                    <p class="content">{{ .lang.EndPage.restartMessage }}</p>
+                    <p class="content my-2">{{ .lang.EndPage.restartMessage }}</p>
                 </div>
                 <div class="row col flex center">
-                    <span class="button ~neutral !normal back mr-1">{{ .lang.Strings.back }}</span>
-                    <span class="button ~urge !normal" id="restart">{{ .lang.Strings.submit }}</span>
-                    <span class="button ~urge !normal unfocused" id="refresh">{{ .lang.EndPage.refreshPage }}</span>
+                    <span class="button ~neutral @low back mr-4">{{ .lang.Strings.back }}</span>
+                    <span class="button ~urge @low" id="restart">{{ .lang.Strings.submit }}</span>
+                    <span class="button ~urge @low unfocused" id="refresh">{{ .lang.EndPage.refreshPage }}</span>
                 </div>
             </div>
         </div>

html/user.html

@@ -0,0 +1,158 @@
+<html lang="en" class="light">
+    <head>
+        <link rel="stylesheet" type="text/css" href="{{ .urlBase }}/css/{{ .cssVersion }}bundle.css">
+        <script>
+            window.URLBase = "{{ .urlBase }}";
+            window.notificationsEnabled = {{ .notifications }};
+            window.ombiEnabled = {{ .ombiEnabled }};
+            window.langFile = JSON.parse({{ .language }});
+            window.pwrEnabled = {{ .pwrEnabled }};
+            window.linkResetEnabled = {{ .linkResetEnabled }};
+            window.language = "{{ .langName }}";
+            window.telegramEnabled = {{ .telegramEnabled }};
+            window.telegramRequired = {{ .telegramRequired }};
+            window.telegramUsername = {{ .telegramUsername }};
+            window.telegramURL = {{ .telegramURL }};
+            window.emailEnabled = {{ .emailEnabled }};
+            window.emailRequired = {{ .emailRequired }};
+            window.discordEnabled = {{ .discordEnabled }};
+            window.discordRequired = {{ .discordRequired }};
+            window.discordServerName = "{{ .discordServerName }}";
+            window.discordInviteLink = {{ .discordInviteLink }};
+            window.discordSendPINMessage = "{{ .discordSendPINMessage }}";
+            window.matrixEnabled = {{ .matrixEnabled }};
+            window.matrixRequired = {{ .matrixRequired }};
+            window.matrixUserID = "{{ .matrixUser }}";
+            window.validationStrings = JSON.parse({{ .validationStrings }});
+        </script>
+        {{ template "header.html" . }}
+        <title>{{ .strings.myAccount }}</title>
+    </head>
+    <body class="max-w-full overflow-x-hidden section">
+        <div id="modal-email" class="modal">
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3">
+                <div class="content">
+                    <span class="heading mb-4 my-2"></span>
+                    <label class="label supra row m-1" for="modal-email-input">{{ .strings.emailAddress }}</label>
+                    <div class="row">
+                        <input type="email" class="col sm field ~neutral @low input" id="modal-email-input" placeholder="{{ .strings.emailAddress }}">
+                    </div>
+                    <button class="button ~urge @low supra full-width center lg my-2 modal-submit">{{ .strings.submit }}</button>
+                </div>
+                <div class="confirmation-required unfocused">
+                    <span class="heading mb-4">{{ .strings.confirmationRequired }} <span class="modal-close">&times;</span></span>
+                    <p class="content mb-4">{{ .strings.confirmationRequiredMessage }}</p>
+                </div>
+            </div>
+        </div>
+        {{ if .pwrEnabled }}
+        <div id="modal-pwr" class="modal">
+            <div class="card relative mx-auto my-[10%] w-4/5 lg:w-1/3 ~neutral @low">
+                <span class="heading">{{ .strings.resetPassword }}</span>
+                <p class="content my-2">
+                {{ if .linkResetEnabled }}
+                    {{ .strings.resetPasswordThroughLink }}
+                {{ else }}
+                    {{ .strings.resetPasswordThroughJellyfin }}
+                {{ end }}
+                </p>
+                <div class="row">
+                    <input type="text" class="col sm field ~neutral @low input" id="pwr-address" placeholder="username | example@example.com | user#1234 | @user:host | @username">
+                </div>
+                {{ if .linkResetEnabled }}
+                    <span class="button ~info @low full-width center mt-4" id="pwr-submit">
+                        {{ .strings.submit }}
+                    </span>
+                {{ else }}
+                    <a class="button ~info @low full-width center mt-4" href="{{ .jfLink }}" target="_blank">{{ .strings.continue }}</a>
+                {{ end }}
+            </div>
+        </div>
+        {{ end }}
+        {{ template "login-modal.html" . }}
+        {{ template "account-linking.html" . }}
+        <div id="notification-box"></div>
+        <div class="top-4 left-4 absolute">
+            <span class="dropdown" tabindex="0" id="lang-dropdown">
+                <span class="button ~urge dropdown-button">
+                    <i class="ri-global-line"></i>
+                    <span class="ml-2 chev"></span>
+                </span>
+                <div class="dropdown-display">
+                    <div class="card ~neutral @low">
+                        <label class="switch pb-4">
+                            <input type="radio" name="lang-time" id="lang-12h">
+                            <span>{{ .strings.time12h }}</span>
+                        </label>
+                        <label class="switch pb-4">
+                            <input type="radio" name="lang-time" id="lang-24h">
+                            <span>{{ .strings.time24h }}</span>
+                        </label>
+                        <div id="lang-list"></div>
+                    </div>
+                </div>
+            </span>
+            <span class="button ~warning" alt="{{ .strings.theme }}" id="button-theme"><i class="ri-sun-line"></i></span>
+            <span class="button ~critical @low mb-4 unfocused" id="logout-button">{{ .strings.logout }}</span>
+        </div>
+        <div class="top-4 right-4 absolute">
+            <a class="button ~info unfocused" href="/" id="admin-back-button"><i class="ri-arrow-left-fill mr-2"></i>{{ .strings.admin }}</a>
+        </div>
+        <div class="page-container unfocused">
+            <div class="card @low dark:~d_neutral mb-4" id="card-user">
+                <span class="heading mb-2"></span>
+            </div>
+            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+                {{ if index . "PageMessageEnabled" }}
+                    {{ if .PageMessageEnabled }}
+                        <div class="card @low dark:~d_neutral content" id="card-message">
+                            {{ .PageMessageContent }}
+                        </div>
+                    {{ end }}
+                {{ end }}
+                <div class="card @low dark:~d_neutral flex-col" id="card-contact">
+                    <span class="heading mb-2">{{ .strings.contactMethods }}</span>
+                    <div class="content flex justify-between flex-col h-100"></div>
+                </div>
+                <div>
+                    <div class="card @low dark:~d_neutral content" id="card-password">
+                        <span class="heading row mb-2">{{ .strings.changePassword }}</span>
+                        <div class="">
+                            <div class="my-2">
+                                <span class="label supra row">{{ .strings.passwordRequirementsHeader }}</span>
+                                <ul>
+                                    {{ range $key, $value := .requirements }}
+                                        <li class="" id="requirement-{{ $key }}" min="{{ $value }}">
+                                            <span class="badge lg ~positive requirement-valid"></span> <span class="content requirement-content"></span>
+                                        </li>
+                                    {{ end }}
+                                </ul>
+                            </div>
+                            <div class="my-2">
+                                <label class="label supra" for="user-old-password">{{ .strings.oldPassword }}</label>
+                                <input type="password" class="input ~neutral @low mt-2 mb-4" placeholder="{{ .strings.password }}" id="user-old-password" aria-label="{{ .strings.oldPassword }}">
+                                <label class="label supra" for="user-new-password">{{ .strings.newPassword }}</label>
+                                <input type="password" class="input ~neutral @low mt-2 mb-4" placeholder="{{ .strings.password }}" id="user-new-password" aria-label="{{ .strings.newPassword }}">
+
+                                <label class="label supra" for="user-reenter-password">{{ .strings.reEnterPassword }}</label>
+                                <input type="password" class="input ~neutral @low mt-2 mb-4" placeholder="{{ .strings.password }}" id="user-reenter-new-password" aria-label="{{ .strings.reEnterPassword }}">
+                                <span class="button ~info @low full-width center mt-4" id="user-password-submit">
+                                    {{ .strings.changePassword }}
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div>
+                    <div class="card @low dark:~d_neutral unfocused" id="card-status">
+                        <span class="heading mb-2">{{ .strings.expiry }}</span>
+                        <aside class="aside ~warning user-expiry my-4"></aside>
+                        <div class="user-expiry-countdown"></div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script src="{{ .urlBase }}/js/user.js" type="module"></script>
+    </body>
+</html>
+

invdaemon.go

@@ -1,50 +0,0 @@
-package main
-
-import "time"
-
-// https://bbengfort.github.io/snippets/2016/06/26/background-work-goroutines-timer.html THANKS
-
-type inviteDaemon struct {
-	Stopped         bool
-	ShutdownChannel chan string
-	Interval        time.Duration
-	period          time.Duration
-	app             *appContext
-}
-
-func newInviteDaemon(interval time.Duration, app *appContext) *inviteDaemon {
-	return &inviteDaemon{
-		Stopped:         false,
-		ShutdownChannel: make(chan string),
-		Interval:        interval,
-		period:          interval,
-		app:             app,
-	}
-}
-
-func (rt *inviteDaemon) run() {
-	rt.app.info.Println("Invite daemon started")
-	for {
-		select {
-		case <-rt.ShutdownChannel:
-			rt.ShutdownChannel <- "Down"
-			return
-		case <-time.After(rt.period):
-			break
-		}
-		started := time.Now()
-		rt.app.storage.loadInvites()
-		rt.app.debug.Println("Daemon: Checking invites")
-		rt.app.checkInvites()
-		finished := time.Now()
-		duration := finished.Sub(started)
-		rt.period = rt.Interval - duration
-	}
-}
-
-func (rt *inviteDaemon) Shutdown() {
-	rt.Stopped = true
-	rt.ShutdownChannel <- "Down"
-	<-rt.ShutdownChannel
-	close(rt.ShutdownChannel)
-}

lang.go

@@ -26,8 +26,10 @@ func (ls *adminLangs) getOptions() [][2]string {
 type commonLangs map[string]commonLang
 
 type commonLang struct {
-	Meta    langMeta    `json:"meta"`
-	Strings langSection `json:"strings"`
+	Meta            langMeta                  `json:"meta"`
+	Strings         langSection               `json:"strings"`
+	Notifications   langSection               `json:"notifications"`
+	QuantityStrings map[string]quantityString `json:"quantityStrings"`
 }
 
 type adminLang struct {
@@ -38,9 +40,9 @@ type adminLang struct {
 	JSON            string
 }
 
-type formLangs map[string]formLang
+type userLangs map[string]userLang
 
-func (ls *formLangs) getOptions() [][2]string {
+func (ls *userLangs) getOptions() [][2]string {
 	opts := make([][2]string, len(*ls))
 	i := 0
 	for key, lang := range *ls {
@@ -50,13 +52,15 @@ func (ls *formLangs) getOptions() [][2]string {
 	return opts
 }
 
-type formLang struct {
+type userLang struct {
 	Meta                  langMeta    `json:"meta"`
 	Strings               langSection `json:"strings"`
 	Notifications         langSection `json:"notifications"`
 	notificationsJSON     string
 	ValidationStrings     map[string]quantityString `json:"validationStrings"`
 	validationStringsJSON string
+	QuantityStrings       map[string]quantityString `json:"quantityStrings"`
+	JSON                  string
 }
 
 type pwrLangs map[string]pwrLang
@@ -117,6 +121,7 @@ type setupLang struct {
 	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"`

lang/admin/da-dk.json

@@ -0,0 +1,204 @@
+{
+    "meta": {
+        "name": "Dansk (DK)"
+    },
+    "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",
+        "create": "Opret",
+        "apply": "Anvend",
+        "select": "Vælg",
+        "name": "Navn",
+        "date": "Dato",
+        "updates": "Opdateringer",
+        "update": "Opdatering",
+        "download": "Hent",
+        "search": "Søg",
+        "advancedSettings": "Avanceret Indstillinger",
+        "lastActiveTime": "Sidst Aktiv",
+        "from": "Fra",
+        "user": "Bruger",
+        "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",
+        "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 når denne profil er valgt.",
+        "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 botten.",
+        "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",
+        "saveAsTemplate": "Gem som skabelon",
+        "templates": "Skabeloner",
+        "deleteTemplate": "Slet skabelon",
+        "templateEnterName": "Indtast et navn for at gemme denne skabelon.",
+        "ombiProfile": "Ombi bruger profil",
+        "setExpiry": "Sæt udløb",
+        "logs": "Log",
+        "sendPWR": "Send Nulstilling af Adgangskode",
+        "sendPWRManual": "Brugeren {n} har ingen kontaktinformation, tryk kopier for at få et link du kan sende til dem.",
+        "sendPWRSuccess": "Link til nulstilling af adgangskode sendt.",
+        "sendPWRSuccessManual": "Hvis brugeren ikke er modtaget den, så tryk på kopier for manuelt at sende et link til dem.",
+        "sendPWRValidFor": "Dette link er gyldigt i 30m.",
+        "accessJFA": "Få adgang til jfa-go",
+        "accessJFASettings": "Kan ikke ændres, da enten \"Kun administrator\" eller \"Tillad alle\" er blevet indstillet i Indstillinger > Generelt."
+    },
+    "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.",
+        "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.",
+        "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.",
+        "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.",
+        "savedAnnouncement": "Meddelelse gemt.",
+        "setOmbiProfile": "Gemt i ombi profilen.",
+        "errorSetOmbiProfile": "Ombi profilen kunne ikke gemmes."
+    },
+    "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."
+        },
+        "setExpiry": {
+            "singular": "Indstil udløb for {n} bruger",
+            "plural": "Indstil udløb for {n} brugere"
+        }
+    }
+}

lang/admin/de-de.json

@@ -13,11 +13,8 @@
         "warning": "Warnung",
         "inviteInfiniteUsesWarning": "Invites mit unendlich vielen Verwendungen können missbräuchlich verwendet werden",
         "inviteSendToEmail": "Senden an",
-        "login": "Anmelden",
-        "logout": "Abmelden",
         "create": "Erstellen",
         "apply": "Anwenden",
-        "delete": "Löschen",
         "name": "Name",
         "date": "Datum",
         "lastActiveTime": "Zuletzt aktiv",
@@ -43,7 +40,7 @@
         "settingsRequiredOrRestartMessage": "Hinweis: {n} zeigt ein erforderliches Feld an, {n} zeigt an, dass Änderungen einen Neustart erfordern.",
         "settingsSave": "Speichern",
         "ombiUserDefaults": "Ombi-Benutzerstandardeinstellungen",
-        "ombiUserDefaultsDescription": "Erstelle einen Ombi-Benutzer und konfiguriere ihn, dann wähle ihn unten aus. Seine Einstellungen/Berechtigungen werden gespeichert und auf neue Ombi-Benutzer, erstellt von jfa-go, angewendet",
+        "ombiUserDefaultsDescription": "Erstelle einen Ombi-Benutzer, konfiguriere ihn und wähle ihn dann unten aus. Seine Einstellungen/Berechtigungen werden gespeichert und auf neue Ombi-Benutzer, welche von jfa-go erstellt werden, angewendet, sofern dieses Profil ausgewählt ist.",
         "userProfiles": "Benutzerprofile",
         "userProfilesDescription": "Profile werden auf Benutzer angewendet, wenn sie ein Konto erstellen. Ein Profil beinhaltet Bibliothekszugriffsrechte und das Startbildschirmlayout.",
         "userProfilesIsDefault": "Standard",
@@ -68,8 +65,7 @@
         "variables": "Variablen",
         "preview": "Vorschau",
         "reset": "Zurücksetzen",
-        "edit": "Bearbeiten",
-        "customizeMessages": "E-Mails anpassen",
+        "customizeMessages": "Benachrichtigungen 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",
@@ -79,28 +75,35 @@
         "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"
+        "matrixHomeServer": "Adresse des Homeservers",
+        "templates": "Vorlagen",
+        "ombiProfile": "Ombi-Benutzerprofil",
+        "accessJFA": "jfa-go Zugriff",
+        "sendPWRValidFor": "Der Link ist 30m gültig.",
+        "logs": "Logdaten",
+        "setExpiry": "Ablauf setzen",
+        "sendPWRSuccess": "Link zur Passwortrücksetzung versandt.",
+        "sendPWRSuccessManual": "Falls der Benutzer ihn nicht erhalten hat, klicke \"Kopieren\" und sende ihm den Link manuell.",
+        "sendPWR": "Sende Passwortrücksetzung",
+        "sendPWRManual": "Benutzer {n} hat keine Kontaktmöglichkeit hinterlegt. Klicke \"Kopieren\" um einen Link zu erhalten, den du dem Benutzer manuell senden kannst.",
+        "accessJFASettings": "Kann nicht geändert werden, da entweder \"Nur Admin-Benutzer\" oder \"Erlaube allen Jellyfin-Nutzern sich anzumelden\" in Einstellungen > Allgemein aktiviert ist.",
+        "saveAsTemplate": "Als Vorlage speichern",
+        "deleteTemplate": "Vorlage löschen",
+        "templateEnterName": "Gebe einen Namen ein, um diese Vorlage zu speichern."
     },
     "notifications": {
         "changedEmailAddress": "E-Mail-Adresse von {n} geändert.",
@@ -108,20 +111,15 @@
         "createProfile": "Profil {n} erstellt.",
         "saveSettings": "Einstellungen wurden gespeichert",
         "setOmbiDefaults": "Ombi-Standardeinstellungen gespeichert.",
-        "errorConnection": "Konnte keine Verbindung zu jfa-go herstellen.",
-        "error401Unauthorized": "Unberechtigt. Versuch, die Seite zu aktualisieren.",
         "errorSettingsAppliedNoHomescreenLayout": "Einstellungen wurden angewendet, aber die Anwendung des Startbildschirmlayouts ist möglicherweise fehlgeschlagen.",
         "errorHomescreenAppliedNoSettings": "Startbildschirmlayout wurde angewendet, aber die Anwendung der Einstellungen ist möglicherweise fehlgeschlagen.",
         "errorSettingsFailed": "Anwendung ist fehlgeschlagen.",
-        "errorLoginBlank": "Der Benutzername und/oder das Passwort wurden nicht ausgefüllt.",
-        "errorUnknown": "Unbekannter Fehler.",
         "errorBlankFields": "Felder wurden nicht ausgefüllt",
         "errorDeleteProfile": "Fehler beim Löschen des Profils {n}",
         "errorLoadProfiles": "Fehler beim Laden der Profile.",
         "errorCreateProfile": "Fehler beim Erstellen des Profils {n}",
         "errorSetDefaultProfile": "Fehler beim Setzen des Standardprofils.",
         "errorLoadUsers": "Fehler beim Laden der Benutzer.",
-        "errorSaveSettings": "Einstellungen konnten nicht gespeichert werden.",
         "errorLoadSettings": "Fehler beim Laden der Einstellungen.",
         "errorSetOmbiDefaults": "Fehler beim Speichern der Ombi-Standardeinstellungen.",
         "errorLoadOmbiUsers": "Fehler beim Laden der Ombi-Benutzer.",
@@ -140,7 +138,10 @@
         "noUpdatesAvailable": "Keinen neuen Aktualisierungen verfügbar.",
         "updateAppliedRefresh": "Update angewendet, bitte aktualisieren.",
         "telegramVerified": "Telegram-Konto verifiziert.",
-        "accountConnected": "Konto verbunden."
+        "accountConnected": "Konto verbunden.",
+        "savedAnnouncement": "Ankündigung gespeichert.",
+        "errorSetOmbiProfile": "Ombi-Profil konnte nicht gespeichert werden.",
+        "setOmbiProfile": "Ombi-Profil gespeichert."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -194,6 +195,10 @@
         "reEnableUsers": {
             "singular": "Benutzer {n} wieder aktivieren",
             "plural": "Benutzer {n} wieder aktivieren"
+        },
+        "setExpiry": {
+            "singular": "Ablauf für {n} Benutzer setzen",
+            "plural": "Ablauf für {n} Benutzer setzen"
         }
     }
-}
+}

lang/admin/el-gr.json

@@ -13,11 +13,8 @@
         "warning": "Προσοχή",
         "inviteInfiniteUsesWarning": "μπορεί να γίνει κατάχρηση των προσκλήσεων με άπειρες χρήσεις",
         "inviteSendToEmail": "Αποστολή σε",
-        "login": "Σύνδεση",
-        "logout": "Αποσύνδεση",
         "create": "Δημιουργία",
         "apply": "Εφαρμογή",
-        "delete": "Διαγραφή",
         "name": "Όνομα",
         "date": "Ημερομηνία",
         "lastActiveTime": "Τελευταία Ενεργός",
@@ -68,7 +65,6 @@
         "variables": "Μεταβλητές",
         "preview": "Προεπισκόπηση",
         "reset": "Επαναφορά",
-        "edit": "Επεξεργασία",
         "customizeMessages": "Παραμετροποίηση Emails",
         "advancedSettings": "Προχωρημένες Ρυθμίσεις",
         "customizeMessagesDescription": "Αν δεν θέλετε να ζρησιμοποιήσετε τα πρότυπα email του jfa-go, μπορείτε να δημιουργήσετε τα δικά σας με χρήση Markdown.",
@@ -77,10 +73,6 @@
         "download": "Λήψη",
         "search": "Αναζήτηση",
         "inviteDuration": "Διάρκεια Πρόσκλησης",
-        "enabled": "Ενεργοποιημένο",
-        "disabled": "Απενεργοποιημένο",
-        "admin": "Διαχειριστής",
-        "expiry": "Λήξη",
         "userExpiry": "Λήξη Χρήστη",
         "userExpiryDescription": "Μετά απο ένα καθορισμένο χρόνο μετά απο κάθε εγγραφή, το jfa-go θα διαγράφει/απενεργοποιεί τον λογαριασμό. Μπορείτε να αλλάξετε αυτή την συμπεριφορά στις ρυθμίσεις.",
         "announce": "Ανακοίνωση",
@@ -88,8 +80,6 @@
         "message": "Μήνυμα",
         "extendExpiry": "Παράταση λήξης",
         "markdownSupported": "Το Markdown υποστυρίζεται.",
-        "reEnable": "Επανα-ενεργοποίηση",
-        "disable": "Απενεργοποίηση",
         "inviteMonths": "Μήνες"
     },
     "notifications": {
@@ -98,20 +88,15 @@
         "createProfile": "Δημιουργήθηκε το {n} προφίλ.",
         "saveSettings": "Οι ρυθμίσεις αποθηκεύτηκαν",
         "setOmbiDefaults": "Αποθηκεύτηκαν οι προκαθορισμένες ρυθμίσεις του ombi.",
-        "errorConnection": "Δεν μπόρεσε να συνδεθεί με το jfa-go.",
-        "error401Unauthorized": "Ανεξουσιοδότητος. Προσπαθήστε να κάνετε επαναφόρτωση την σελίδα.",
         "errorSettingsAppliedNoHomescreenLayout": "Οι ρυθμίσεις αποθηκεύτηκαν, αλλά η καταχώρηση δομής αρχικής οθόνης ίσως απέτυχε.",
         "errorHomescreenAppliedNoSettings": "Η δομή αρχικής οθόνης εφαρμόστηκε, αλλά οι ρυθμίσεις ίσως απέτυχαν.",
         "errorSettingsFailed": "Η εφαρμογή απέτυχε.",
-        "errorLoginBlank": "Το όνομα χρήστη και/ή ο κωδικός ήταν κενά.",
-        "errorUnknown": "Άγνωστο σφάλμα.",
         "errorBlankFields": "Τα πεφία ήταν κενά",
         "errorDeleteProfile": "Αποτυχία διαγραφής του προφίλ {n}",
         "errorLoadProfiles": "Αποτυχία φόρτωσης των προφίλ.",
         "errorCreateProfile": "Αποτυχία δημιουργίας του προφίλ {n}",
         "errorSetDefaultProfile": "Αποτυχία ορισμού του προκαθορισμένου προφίλ.",
         "errorLoadUsers": "Αποτυχία φόρτωσης χρηστών.",
-        "errorSaveSettings": "Αποτυχία αποθήκευσης ρυθμίσεων.",
         "errorLoadSettings": "Αποτυχία φόρτωσης ρυθμίσεων.",
         "errorSetOmbiDefaults": "Αποτυχία αποθήκευσης προκαθορισμένων ρυθμίσεων για το Ombi.",
         "errorLoadOmbiUsers": "Αποτυχία φόρτωσης χρηστών Ombi.",
@@ -183,4 +168,4 @@
             "plural": "Εργοποιήθηκαν {n} χρήστες."
         }
     }
-}
+}

lang/admin/en-gb.json

@@ -1,5 +1,201 @@
 {
     "meta": {
         "name": "English (GB)"
+    },
+    "quantityStrings": {
+        "deleteUser": {
+            "singular": "Delete User",
+            "plural": "Delete Users"
+        },
+        "deletedUser": {
+            "singular": "Deleted {n} user.",
+            "plural": "Deleted {n} users."
+        },
+        "disabledUser": {
+            "plural": "Disabled {n} users.",
+            "singular": "Disabled {n} user."
+        },
+        "extendExpiry": {
+            "singular": "Extend expiry for {n} user",
+            "plural": "Extend expiry for {n} users"
+        },
+        "extendedExpiry": {
+            "plural": "Extended expiry for {n} users.",
+            "singular": "Extended expiry for {n} user."
+        },
+        "addUser": {
+            "singular": "Add user",
+            "plural": "Add users"
+        },
+        "modifySettingsFor": {
+            "singular": "Modify Settings for {n} user",
+            "plural": "Modify Settings for {n} users"
+        },
+        "deleteNUsers": {
+            "plural": "Delete {n} users",
+            "singular": "Delete {n} user"
+        },
+        "disableUsers": {
+            "singular": "Disable {n} user",
+            "plural": "Disable {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."
+        },
+        "setExpiry": {
+            "singular": "Set expiry for {n} user",
+            "plural": "Set expiry for {n} users"
+        },
+        "reEnableUsers": {
+            "singular": "Re-enable {n} user",
+            "plural": "Re-enable {n} users"
+        }
+    },
+    "strings": {
+        "invites": "Invites",
+        "accounts": "Accounts",
+        "settings": "Settings",
+        "inviteDays": "Days",
+        "inviteHours": "Hours",
+        "inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively",
+        "inviteSendToEmail": "Send to",
+        "apply": "Apply",
+        "updates": "Updates",
+        "variables": "Variables",
+        "preview": "Preview",
+        "markdownSupported": "Markdown is supported.",
+        "applyHomescreenLayout": "Apply homescreen layout",
+        "ombiProfile": "Ombi user profile",
+        "settingsApplyRestartNow": "Apply & restart",
+        "settingsApplied": "Settings applied.",
+        "userProfiles": "User Profiles",
+        "addProfile": "Add Profile",
+        "userProfilesLibraries": "Libraries",
+        "addProfileNameOf": "Profile Name",
+        "inviteDateCreated": "Created",
+        "settingsRestart": "Restart",
+        "inviteMinutes": "Minutes",
+        "inviteNumberOfUses": "Number of uses",
+        "warning": "Warning",
+        "create": "Create",
+        "name": "Name",
+        "conditionals": "Conditionals",
+        "contactThrough": "Contact through:",
+        "select": "Select",
+        "date": "Date",
+        "extendExpiry": "Extend expiry",
+        "sendPWR": "Send Password Reset",
+        "inviteMonths": "Months",
+        "inviteDuration": "Invite Duration",
+        "update": "Update",
+        "user": "User",
+        "userExpiryDescription": "A specified amount of time after each signup, jfa-go will delete/disable the account. You can change this behaviour in settings.",
+        "templates": "Templates",
+        "accessJFA": "Access jfa-go",
+        "message": "Message",
+        "reset": "Reset",
+        "donate": "Donate",
+        "sendPWRSuccessManual": "If the user hasn't received it, press copy to get a link to manually send to them.",
+        "modifySettingsDescription": "Apply settings from an existing profile, or source them directly from a user.",
+        "logs": "Logs",
+        "sendPWRManual": "User {n} has no method of contact, press copy to get a link to send to them.",
+        "sendPWRSuccess": "Password reset link sent.",
+        "customizeMessages": "Customise Messages",
+        "customizeMessagesDescription": "If you don't want to use jfa-go's message templates, you can create your own using Markdown.",
+        "modifySettings": "Modify Settings",
+        "sendDeleteNotificationEmail": "Send notification message",
+        "sendDeleteNotifiationExample": "Your account has been deleted.",
+        "settingsRestarting": "Restarting…",
+        "settingsRestartRequired": "Restart needed",
+        "settingsRefreshPage": "Refresh the page in a few seconds.",
+        "settingsRequiredOrRestartMessage": "Note: {n} indicates a required field, {n} indicates changes require a restart.",
+        "settingsSave": "Save",
+        "userProfilesDescription": "Profiles are applied to users when they create an account. A profile include library access rights and homescreen layout.",
+        "addProfileDescription": "Create a Jellyfin user and configure it, then select it below. When this profile is applied to an invite, new users will be created with the settings.",
+        "addProfileStoreHomescreenLayout": "Store homescreen layout",
+        "inviteNoUsersCreated": "None yet!",
+        "inviteUsersCreated": "Created users",
+        "inviteRemainingUses": "Remaining uses",
+        "inviteNoInvites": "None",
+        "inviteExpiresInTime": "Expires in {n}",
+        "notifyEvent": "Notify on:",
+        "notifyInviteExpiry": "On expiry",
+        "notifyUserCreation": "On user creation",
+        "sendPIN": "Ask the user to send the PIN below to the bot.",
+        "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",
+        "settingsRestartRequiredDescription": "A restart is necessary to apply some settings you changed. Restart now or later?",
+        "settingsApplyRestartLater": "Apply, restart later",
+        "subject": "Subject",
+        "setExpiry": "Set expiry",
+        "download": "Download",
+        "search": "Search",
+        "advancedSettings": "Advanced Settings",
+        "lastActiveTime": "Last Active",
+        "from": "From",
+        "userExpiry": "User Expiry",
+        "aboutProgram": "About",
+        "version": "Version",
+        "commitNoun": "Commit",
+        "newUser": "New User",
+        "profile": "Profile",
+        "unknown": "Unknown",
+        "label": "Label",
+        "announce": "Announce",
+        "sendPWRValidFor": "The link is valid for 30m.",
+        "ombiUserDefaultsDescription": "Create an Ombi user and configure it, then select it below. It's settings/permissions will be stored and applied to new Ombi users created by jfa-go when this profile is selected.",
+        "userProfilesIsDefault": "Default",
+        "inviteNoProfile": "No Profile",
+        "searchDiscordUser": "Start typing the Discord username to find the user.",
+        "templateEnterName": "Enter a name to save this template.",
+        "accessJFASettings": "Cannot be changed as either \"Admin Only\" or \"Allow All\" has been set in Settings > General."
+    },
+    "notifications": {
+        "errorSettingsFailed": "Application failed.",
+        "errorLoadSettings": "Failed to load settings.",
+        "errorDeleteProfile": "Failed to delete profile {n}",
+        "sentAnnouncement": "Announcement sent.",
+        "savedAnnouncement": "Announcement saved.",
+        "setOmbiProfile": "Stored ombi profile.",
+        "updateApplied": "Update applied, please restart.",
+        "updateAppliedRefresh": "Update applied, please refresh.",
+        "telegramVerified": "Telegram account verified.",
+        "accountConnected": "Account connected.",
+        "errorSettingsAppliedNoHomescreenLayout": "Settings were applied, but applying homescreen layout may have failed.",
+        "errorSaveEmail": "Failed to save email.",
+        "errorLoadProfiles": "Failed to load profiles.",
+        "errorCreateProfile": "Failed to create profile {n}",
+        "errorLoadUsers": "Failed to load users.",
+        "errorSetOmbiProfile": "Failed to store ombi profile.",
+        "errorLoadOmbiUsers": "Failed to load ombi users.",
+        "errorFailureCheckLogs": "Failed (check console/logs)",
+        "errorPartialFailureCheckLogs": "Partial failure (check console/logs)",
+        "errorUserCreated": "Failed to create user {n}.",
+        "errorSendWelcomeEmail": "Failed to send welcome message (check console/logs)",
+        "errorApplyUpdate": "Failed to apply update, try manually.",
+        "errorCheckUpdate": "Failed to check for update.",
+        "noUpdatesAvailable": "No new updates available.",
+        "changedEmailAddress": "Changed email address of {n}.",
+        "userCreated": "User {n} created.",
+        "saveEmail": "Email saved.",
+        "createProfile": "Created profile {n}.",
+        "saveSettings": "Settings were saved",
+        "errorHomescreenAppliedNoSettings": "Homescreen layout was applied, but applying settings may have failed.",
+        "errorBlankFields": "Fields were left blank",
+        "errorSetDefaultProfile": "Failed to set default profile.",
+        "errorChangedEmailAddress": "Couldn't change email address of {n}.",
+        "updateAvailable": "A new update is available, check settings."
     }
-}
+}

lang/admin/en-us.json

@@ -15,20 +15,12 @@
         "warning": "Warning",
         "inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively",
         "inviteSendToEmail": "Send to",
-        "login": "Login",
-        "logout": "Logout",
         "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",
+        "setExpiry": "Set expiry",
         "updates": "Updates",
         "update": "Update",
         "download": "Download",
@@ -36,8 +28,9 @@
         "advancedSettings": "Advanced Settings",
         "lastActiveTime": "Last Active",
         "from": "From",
+        "after": "After",
+        "before": "Before",
         "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",
@@ -47,17 +40,24 @@
         "profile": "Profile",
         "unknown": "Unknown",
         "label": "Label",
+        "logs": "Logs",
         "announce": "Announce",
+        "templates": "Templates",
         "subject": "Subject",
         "message": "Message",
         "variables": "Variables",
         "conditionals": "Conditionals",
         "preview": "Preview",
         "reset": "Reset",
-        "edit": "Edit",
         "donate": "Donate",
+        "unlink": "Unlink Account",
+        "sendPWR": "Send Password Reset",
         "contactThrough": "Contact through:",
         "extendExpiry": "Extend expiry",
+        "sendPWRManual": "User {n} has no method of contact, press copy to get a link to send to them.",
+        "sendPWRSuccess": "Password reset link sent.",
+        "sendPWRSuccessManual": "If the user hasn't received it, press copy to get a link to manually send to them.",
+        "sendPWRValidFor": "The link is valid for 30m.",
         "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.",
@@ -76,10 +76,10 @@
         "settingsRefreshPage": "Refresh the page in a few seconds.",
         "settingsRequiredOrRestartMessage": "Note: {n} indicates a required field, {n} indicates changes require a restart.",
         "settingsSave": "Save",
-        "ombiUserDefaults": "Ombi user defaults",
-        "ombiUserDefaultsDescription": "Create an Ombi user and configure it, then select it below. It's settings/permissions will be stored and applied to new Ombi users created by jfa-go",
+        "ombiProfile": "Ombi user profile",
+        "ombiUserDefaultsDescription": "Create an Ombi user and configure it, then select it below. It's settings/permissions will be stored and applied to new Ombi users created by jfa-go when this profile is selected.",
         "userProfiles": "User Profiles",
-        "userProfilesDescription": "Profiles are applied to users when they create an account. A profile include library access rights and homescreen layout.",
+        "userProfilesDescription": "Profiles are applied to users when they create an account. A profile includes library access rights and homescreen layout.",
         "userProfilesIsDefault": "Default",
         "userProfilesLibraries": "Libraries",
         "addProfile": "Add Profile",
@@ -100,7 +100,24 @@
         "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"
+        "matrixHomeServer": "Home server address",
+        "saveAsTemplate": "Save as template",
+        "deleteTemplate": "Delete template",
+        "templateEnterName": "Enter a name to save this template.",
+        "accessJFA": "Access jfa-go",
+        "accessJFASettings": "Cannot be changed as either \"Admin Only\" or \"Allow All\" has been set in Settings > General.",
+        "sortingBy": "Sorting By",
+        "filters": "Filters",
+        "clickToRemoveFilter": "Click to remove this filter.",
+        "clearSearch": "Clear search",
+        "actions": "Actions",
+        "searchOptions": "Search Options",
+        "matchText": "Match Text",
+        "jellyfinID": "Jellyfin ID",
+        "userPageLogin": "User Page: Login",
+        "userPagePage": "User Page: Page",
+        "buildTime": "Build Time",
+        "builtBy": "Built By"
     },
     "notifications": {
         "changedEmailAddress": "Changed email address of {n}.",
@@ -109,18 +126,15 @@
         "saveSettings": "Settings were saved",
         "saveEmail": "Email saved.",
         "sentAnnouncement": "Announcement sent.",
-        "setOmbiDefaults": "Stored ombi defaults.",
+        "savedAnnouncement": "Announcement saved.",
+        "setOmbiProfile": "Stored ombi profile.",
         "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.",
         "errorHomescreenAppliedNoSettings": "Homescreen layout was applied, but applying settings may have failed.",
         "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}",
@@ -128,9 +142,8 @@
         "errorCreateProfile": "Failed to create profile {n}",
         "errorSetDefaultProfile": "Failed to set default profile.",
         "errorLoadUsers": "Failed to load users.",
-        "errorSaveSettings": "Couldn't save settings.",
         "errorLoadSettings": "Failed to load settings.",
-        "errorSetOmbiDefaults": "Failed to store ombi defaults.",
+        "errorSetOmbiProfile": "Failed to store ombi profile.",
         "errorLoadOmbiUsers": "Failed to load ombi users.",
         "errorChangedEmailAddress": "Couldn't change email address of {n}.",
         "errorFailureCheckLogs": "Failed (check console/logs)",
@@ -191,6 +204,10 @@
             "singular": "Extend expiry for {n} user",
             "plural": "Extend expiry for {n} users"
         },
+        "setExpiry": {
+            "singular": "Set expiry for {n} user",
+            "plural": "Set expiry for {n} users"
+        },
         "extendedExpiry": {
             "singular": "Extended expiry for {n} user.",
             "plural": "Extended expiry for {n} users."

lang/admin/es-es.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Español(ES)"
+        "name": "Español (ES)"
     },
     "strings": {
         "invites": "Invitaciones",
@@ -13,20 +13,12 @@
         "inviteNumberOfUses": "Números de usos",
         "inviteDuration": "Duración de invitación",
         "warning": "Advertencia",
-        "inviteInfiniteUsesWarning": "Las invitaciones con usos infinitos pueden usarse abusivamente",
+        "inviteInfiniteUsesWarning": "Las invitaciones con usos infinitos se pueden usar de forma abusiva",
         "inviteSendToEmail": "Enviar a",
-        "login": "Acceso",
-        "logout": "Cerrar sesión",
-        "create": "Cerrar sesión",
+        "create": "Crear",
         "apply": "Aplicar",
-        "delete": "Eliminar",
         "name": "Nombre",
         "date": "Fecha",
-        "enabled": "Activado",
-        "disabled": "Desactivado",
-        "reEnable": "Reactivar",
-        "disable": "Desactivar",
-        "admin": "Administrador",
         "updates": "Actualizaciones",
         "update": "Actualizar",
         "download": "Descargar",
@@ -35,12 +27,11 @@
         "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.",
+        "userExpiryDescription": "Una cantidad de tiempo específica 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",
+        "commitNoun": "Revisión",
         "newUser": "Nuevo usuario",
         "profile": "Perfil",
         "unknown": "Desconocido",
@@ -49,38 +40,37 @@
         "subject": "Asunto del email",
         "message": "Mensaje",
         "variables": "Variables",
-        "preview": "Previsualizar",
+        "preview": "Vista previa",
         "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.",
+        "customizeMessages": "Personalizar mensajes",
+        "customizeMessagesDescription": "Si no desea utilizar las plantillas de mensajes de jfa-go, puede crear las suyas 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",
+        "sendDeleteNotificationEmail": "Enviar mensaje de notificación",
         "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",
+        "settingsApplyRestartNow": "Aplicar y reiniciar",
         "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",
+        "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 cuando se seleccione este perfil.",
         "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",
+        "userProfilesIsDefault": "Por defecto",
         "userProfilesLibraries": "Bibliotecas",
-        "addProfile": "Agregar perfil",
+        "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",
+        "addProfileStoreHomescreenLayout": "Guardar el diseño de la pantalla de inicio",
         "inviteNoUsersCreated": "¡Ninguno todavía!",
         "inviteUsersCreated": "Usuarios creados",
         "inviteNoProfile": "Sin perfil",
@@ -92,7 +82,28 @@
         "notifyInviteExpiry": "Al vencimiento",
         "notifyUserCreation": "Sobre la creación de usuarios",
         "conditionals": "Condicionales",
-        "donate": "Donar"
+        "donate": "Donar",
+        "templates": "Plantillas",
+        "contactThrough": "Contactar a través de:",
+        "select": "Seleccionar",
+        "sendPIN": "Pídale al usuario que envíe el PIN a continuación al bot.",
+        "searchDiscordUser": "Comienza a escribir el nombre de usuario de Discord para encontrar al usuario.",
+        "findDiscordUser": "Encontrar usuario de Discord",
+        "linkMatrixDescription": "Ingrese el nombre de usuario y la contraseña del usuario para usar como bot. Una vez enviada, la aplicación se reiniciará.",
+        "matrixHomeServer": "Dirección del servidor de inicio",
+        "saveAsTemplate": "Guardar como plantilla",
+        "deleteTemplate": "Eliminar plantilla",
+        "templateEnterName": "Ingrese un nombre para guardar esta plantilla.",
+        "setExpiry": "Establecer vencimiento",
+        "sendPWR": "Enviar restablecimiento de contraseña",
+        "sendPWRSuccess": "Se envió el enlace para restablecer la contraseña.",
+        "sendPWRSuccessManual": "Si el usuario no lo ha recibido, presione copiar para generar el enlace y enviárselo manualmente.",
+        "sendPWRValidFor": "El enlace es válido por 30m.",
+        "sendPWRManual": "El usuario {n} no tiene ningún método de contacto, presione copiar para generar el enlace para enviarle.",
+        "ombiProfile": "Perfil de usuario de Ombi",
+        "logs": "Registros",
+        "accessJFA": "Acceso",
+        "accessJFASettings": "No se puede cambia, ya que se ha establecido \"Solo administradores\" o \"Permitir a todos\" en Configuración > General."
     },
     "notifications": {
         "changedEmailAddress": "Se cambió la dirección de correo electrónico de {n}.",
@@ -103,13 +114,9 @@
         "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.",
+        "errorHomescreenAppliedNoSettings": "Se aplicó el diseño de la pantalla de inicio, pero es posible que la aplicación de la configuración haya fallado.",
         "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}",
@@ -117,19 +124,24 @@
         "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.",
+        "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)",
+        "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)",
+        "errorSendWelcomeEmail": "No se pudo enviar el mensaje 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."
+        "noUpdatesAvailable": "No hay nuevas actualizaciones disponibles.",
+        "updateAppliedRefresh": "Actualización aplicada, por favor actualice.",
+        "accountConnected": "Cuenta vinculada.",
+        "savedAnnouncement": "Anuncio guardado.",
+        "telegramVerified": "Cuenta de Telegram verificada.",
+        "setOmbiProfile": "Perfil de Ombi guardado.",
+        "errorSetOmbiProfile": "No se pudo guardar el perfil de Ombi."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -141,8 +153,8 @@
             "plural": "Eliminar {n} usuarios"
         },
         "disableUsers": {
-            "singular": "Deshabilitar {n} usuario",
-            "plural": "Inhabilitar {n} usuarios"
+            "singular": "Desactivar {n} usuario",
+            "plural": "Desactivar {n} usuarios"
         },
         "reEnableUsers": {
             "singular": "Reactivar {n} usuario",
@@ -157,32 +169,36 @@
             "plural": "Borrar usuarios"
         },
         "deletedUser": {
-            "singular": "Usuario eliminado {n}.",
-            "plural": "Usuarios eliminados {n}."
+            "singular": "{n} usuario eliminado.",
+            "plural": "{n} usuarios eliminados."
         },
         "disabledUser": {
-            "singular": "Usuario deshabilitado {n}.",
-            "plural": "Usuarios deshabilitados {n}."
+            "singular": "{n} usuario desactivado.",
+            "plural": "{n} usuarios desactivados."
         },
         "enabledUser": {
-            "singular": "Usuario {n} habilitado.",
-            "plural": "Usuarios {n} habilitados."
+            "singular": "{n} usuario activado.",
+            "plural": "{n} usuarios activados."
         },
         "announceTo": {
-            "singular": "Anunciar al usuario {n}",
-            "plural": "Anunciar a los usuarios {n}"
+            "singular": "Anunciar a {n} usuario",
+            "plural": "Anunciar a {n} usuarios"
         },
         "appliedSettings": {
-            "singular": "Se aplicó la configuración al usuario {n}.",
-            "plural": "Se aplicó la configuración a los usuarios {n}."
+            "singular": "Se aplicó la configuración a {n} usuario.",
+            "plural": "Se aplicó la configuración a {n} usuarios."
         },
         "extendExpiry": {
-            "singular": "Extender la expiración para el usuario {n}",
-            "plural": "Extender la expiración para los usuarios {n}"
+            "singular": "Extender la expiración para {n} usuario",
+            "plural": "Extender la expiración para {n} usuarios"
         },
         "extendedExpiry": {
-            "singular": "Caducidad extendida para el usuario {n}.",
-            "plural": "Caducidad extendida para los usuarios {n}."
+            "singular": "Caducidad extendida para {n} usuario.",
+            "plural": "Caducidad extendida para {n} usuarios."
+        },
+        "setExpiry": {
+            "singular": "Fijar la caducidad del usuario {n}",
+            "plural": "Establecer la caducidad para {n} usuarios"
         }
     }
-}
+}

lang/admin/fr-fr.json

@@ -15,11 +15,8 @@
         "warning": "Attention",
         "inviteInfiniteUsesWarning": "les invitations infinies peuvent être utilisées abusivement",
         "inviteSendToEmail": "Envoyer à",
-        "login": "S'identifier",
-        "logout": "Se déconnecter",
         "create": "Créer",
         "apply": "Appliquer",
-        "delete": "Effacer",
         "name": "Nom",
         "date": "Date",
         "lastActiveTime": "Dernière activité",
@@ -45,7 +42,7 @@
         "settingsRequiredOrRestartMessage": "Remarque : {n} indique un champ obligatoire, {n} indique que les modifications nécessitent un redémarrage.",
         "settingsSave": "Sauver",
         "ombiUserDefaults": "Paramètres par défaut de l'utilisateur Ombi",
-        "ombiUserDefaultsDescription": "Créez un utilisateur Ombi et configurez-le, puis sélectionnez-le ci-dessous. Ses paramètres/autorisations seront stockés et appliqués aux nouveaux utilisateurs Ombi créés par jfa-go",
+        "ombiUserDefaultsDescription": "Créez un utilisateur Ombi et configurez-le, puis sélectionnez-le ci-dessous. Ses paramètres/autorisations seront stockés et appliqués aux nouveaux utilisateurs Ombi créés par jfa-go lorsque ce profil est sélectionné.",
         "userProfiles": "Profils d'utilisateurs",
         "userProfilesDescription": "Les profils sont appliqués aux utilisateurs lorsqu'ils créent un compte. Un profil inclut les droits d'accès à la bibliothèque et la disposition de l'écran d'accueil.",
         "userProfilesIsDefault": "Défaut",
@@ -55,7 +52,7 @@
         "addProfileNameOf": "Nom de profil",
         "addProfileStoreHomescreenLayout": "Enregistrer la disposition de l'écran d'accueil",
         "inviteNoUsersCreated": "Aucun pour l'instant !",
-        "inviteUsersCreated": "Utilisateurs créer",
+        "inviteUsersCreated": "Utilisateurs créés",
         "inviteNoProfile": "Aucun profil",
         "inviteDateCreated": "Créer",
         "inviteRemainingUses": "Utilisations restantes",
@@ -64,7 +61,7 @@
         "notifyEvent": "Notifier sur :",
         "notifyInviteExpiry": "À l'expiration",
         "notifyUserCreation": "à la création de l'utilisateur",
-        "label": "Etiquette",
+        "label": "Nom",
         "settingsRestarting": "Redémarrage…",
         "settingsRestart": "Redémarrer",
         "announce": "Annoncer",
@@ -74,16 +71,9 @@
         "customizeMessagesDescription": "Si vous ne souhaitez pas utiliser les modèles d'e-mails de jfa-go, vous pouvez créer les vôtres à l'aide de Markdown.",
         "variables": "Variables",
         "preview": "Aperçu",
-        "reset": "Réinitialiser",
-        "edit": "Éditer",
+        "reset": "Réinitialisation",
         "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",
@@ -94,8 +84,27 @@
         "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": "Contactez par :",
-        "sendPIN": "Demandez à l'utilisateur d'envoyer le code PIN ci-dessous au bot."
+        "contactThrough": "Contacté par :",
+        "sendPIN": "Demandez à l'utilisateur d'envoyer le code PIN ci-dessous au bot.",
+        "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 domestique",
+        "saveAsTemplate": "Sauvegarder comme modèle",
+        "templateEnterName": "Entrez un nom pour sauvegarder ce modèle.",
+        "deleteTemplate": "Supprimer le modèle",
+        "templates": "Modèles",
+        "setExpiry": "Paramétrer l'expiration",
+        "sendPWRSuccess": "Réinitialisation du mot de passe envoyée.",
+        "sendPWR": "Envoyer une réinitialisation du mot de passe",
+        "sendPWRValidFor": "Ce lien est valable 30min.",
+        "sendPWRManual": "L'utilisateur {n} n'a pas indiqué de méthode de contact, appuyez sur copier pour recevoir un lien à lui envoyer.",
+        "sendPWRSuccessManual": "Si l'utilisateur ne l'a pas reçu, appuyez sur copier pour recevoir un lien à lui envoyer manuellement.",
+        "ombiProfile": "Profil d'utilisateur Ombi",
+        "logs": "Logs",
+        "accessJFA": "Accès à jfa-go",
+        "accessJFASettings": "Ne peut pas être changé car \"Admin Only\" ou \"Allow All\" a été défini dans Paramètres > Général."
     },
     "notifications": {
         "changedEmailAddress": "Adresse e-mail modifiée de {n}.",
@@ -103,20 +112,15 @@
         "createProfile": "Profil créé {n}.",
         "saveSettings": "Les paramètres ont été enregistrés",
         "setOmbiDefaults": "Valeurs par défaut de Ombi.",
-        "errorConnection": "Impossible de se connecter à jfa-go.",
-        "error401Unauthorized": "Non autorisé. Essayez d'actualiser la page.",
         "errorSettingsAppliedNoHomescreenLayout": "Les paramètres ont été appliqués, mais l'application de la disposition de l'écran d'accueil a peut-être échoué.",
         "errorHomescreenAppliedNoSettings": "La disposition de l'écran d'accueil a été appliquée, mais l'application des paramètres a peut-être échoué.",
         "errorSettingsFailed": "L'application a échoué.",
-        "errorLoginBlank": "Le nom d'utilisateur et/ou le mot de passe sont vides.",
-        "errorUnknown": "Erreur inconnue.",
         "errorBlankFields": "Les champs sont vides",
         "errorDeleteProfile": "Échec de la suppression du profil {n}",
         "errorLoadProfiles": "Échec du chargement des profils.",
         "errorCreateProfile": "Échec de la création du profil {n}",
         "errorSetDefaultProfile": "Échec de la définition du profil par défaut.",
         "errorLoadUsers": "Échec du chargement des utilisateurs.",
-        "errorSaveSettings": "Impossible d'enregistrer les paramètres.",
         "errorLoadSettings": "Échec du chargement des paramètres.",
         "errorSetOmbiDefaults": "Impossible de stocker les valeurs par défaut d'Ombi.",
         "errorLoadOmbiUsers": "Échec du chargement des utilisateurs Ombi.",
@@ -134,7 +138,11 @@
         "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."
+        "updateAppliedRefresh": "Mise à jour appliquée, veuillez actualiser.",
+        "accountConnected": "Compte connecté.",
+        "savedAnnouncement": "Annonce enregistrée.",
+        "setOmbiProfile": "Profil ombi enregistré.",
+        "errorSetOmbiProfile": "Echec de la sauvegarde du profil ombi."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -188,6 +196,10 @@
         "disabledUser": {
             "singular": "{n} utilisateur désactivé.",
             "plural": "{n} utilisateurs désactivés."
+        },
+        "setExpiry": {
+            "singular": "Définir l'expiration pour {n} utilisateur",
+            "plural": "Définir l'expiration pour {n} utilisateurs"
         }
     }
-}
+}

lang/admin/hu-hu.json

@@ -0,0 +1,195 @@
+{
+    "meta": {
+        "name": "Magyar (HU)"
+    },
+    "strings": {
+        "invites": "Meghívások",
+        "accounts": "Fiókok",
+        "settings": "Beállítások",
+        "inviteMonths": "Hónapok",
+        "inviteDays": "Napok",
+        "inviteHours": "Órák",
+        "inviteMinutes": "Percek",
+        "inviteNumberOfUses": "Felhasználások száma",
+        "inviteDuration": "Meghívás időtartama",
+        "warning": "Figyelmeztetés",
+        "inviteInfiniteUsesWarning": "a végtelen felhasználású meghívókkal visszaélhetnek",
+        "inviteSendToEmail": "Címzett",
+        "create": "Létrehozás",
+        "apply": "Alkalmaz",
+        "select": "Kiválasztás",
+        "name": "Név",
+        "date": "Dátum",
+        "setExpiry": "Lejárat beállítása",
+        "updates": "Frissítések",
+        "update": "Frissítés",
+        "download": "Letöltés",
+        "search": "Keresés",
+        "advancedSettings": "További beállítások",
+        "lastActiveTime": "Utoljára aktív",
+        "from": "Feladó",
+        "user": "Felhasználó",
+        "userExpiry": "Felhasználói lejárat",
+        "userExpiryDescription": "Egy meghatározott idő után minden regisztrációt töröl, vagy felfüggeszt a jfa-go. Ezt a működést megváltoztathatod a beállításokban.",
+        "aboutProgram": "Névjegy",
+        "version": "Verzió",
+        "commitNoun": "Elkövet",
+        "newUser": "Új felhasználó",
+        "profile": "Profil",
+        "unknown": "Ismeretlen",
+        "label": "Címke",
+        "logs": "Naplók",
+        "announce": "Bejelentés",
+        "templates": "Sablonok",
+        "subject": "Téma",
+        "message": "Üzenet",
+        "variables": "Változók",
+        "conditionals": "Feltételek",
+        "preview": "Előnézet",
+        "reset": "Visszaállítás",
+        "donate": "Támogatás",
+        "sendPWR": "Jelszó visszaállítás küldése",
+        "contactThrough": "",
+        "extendExpiry": "",
+        "sendPWRManual": "",
+        "sendPWRSuccess": "",
+        "sendPWRSuccessManual": "",
+        "sendPWRValidFor": "",
+        "customizeMessages": "",
+        "customizeMessagesDescription": "",
+        "markdownSupported": "",
+        "modifySettings": "",
+        "modifySettingsDescription": "",
+        "applyHomescreenLayout": "",
+        "sendDeleteNotificationEmail": "",
+        "sendDeleteNotifiationExample": "",
+        "settingsRestart": "",
+        "settingsRestarting": "",
+        "settingsRestartRequired": "",
+        "settingsRestartRequiredDescription": "",
+        "settingsApplyRestartLater": "",
+        "settingsApplyRestartNow": "",
+        "settingsApplied": "",
+        "settingsRefreshPage": "",
+        "settingsRequiredOrRestartMessage": "",
+        "settingsSave": "",
+        "ombiProfile": "",
+        "ombiUserDefaultsDescription": "",
+        "userProfiles": "",
+        "userProfilesDescription": "",
+        "userProfilesIsDefault": "",
+        "userProfilesLibraries": "",
+        "addProfile": "",
+        "addProfileDescription": "",
+        "addProfileNameOf": "",
+        "addProfileStoreHomescreenLayout": "",
+        "inviteNoUsersCreated": "",
+        "inviteUsersCreated": "",
+        "inviteNoProfile": "",
+        "inviteDateCreated": "",
+        "inviteRemainingUses": "",
+        "inviteNoInvites": "",
+        "inviteExpiresInTime": "",
+        "notifyEvent": "",
+        "notifyInviteExpiry": "",
+        "notifyUserCreation": "",
+        "sendPIN": "",
+        "searchDiscordUser": "",
+        "findDiscordUser": "",
+        "linkMatrixDescription": "",
+        "matrixHomeServer": "",
+        "saveAsTemplate": "",
+        "deleteTemplate": "",
+        "templateEnterName": ""
+    },
+    "notifications": {
+        "changedEmailAddress": "",
+        "userCreated": "",
+        "createProfile": "",
+        "saveSettings": "",
+        "saveEmail": "",
+        "sentAnnouncement": "",
+        "savedAnnouncement": "",
+        "setOmbiProfile": "",
+        "updateApplied": "",
+        "updateAppliedRefresh": "",
+        "telegramVerified": "",
+        "accountConnected": "",
+        "errorSettingsAppliedNoHomescreenLayout": "",
+        "errorHomescreenAppliedNoSettings": "",
+        "errorSettingsFailed": "",
+        "errorSaveEmail": "",
+        "errorBlankFields": "",
+        "errorDeleteProfile": "",
+        "errorLoadProfiles": "",
+        "errorCreateProfile": "",
+        "errorSetDefaultProfile": "",
+        "errorLoadUsers": "",
+        "errorLoadSettings": "",
+        "errorSetOmbiProfile": "",
+        "errorLoadOmbiUsers": "",
+        "errorChangedEmailAddress": "",
+        "errorFailureCheckLogs": "",
+        "errorPartialFailureCheckLogs": "",
+        "errorUserCreated": "",
+        "errorSendWelcomeEmail": "",
+        "errorApplyUpdate": "",
+        "errorCheckUpdate": "",
+        "updateAvailable": "",
+        "noUpdatesAvailable": ""
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "",
+            "plural": ""
+        },
+        "deleteNUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "disableUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "reEnableUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "addUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "deleteUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "deletedUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "disabledUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "enabledUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "announceTo": {
+            "singular": "",
+            "plural": ""
+        },
+        "appliedSettings": {
+            "singular": "",
+            "plural": ""
+        },
+        "extendExpiry": {
+            "singular": "",
+            "plural": ""
+        },
+        "extendedExpiry": {
+            "singular": "",
+            "plural": ""
+        }
+    }
+}

lang/admin/id-id.json

@@ -13,11 +13,8 @@
         "warning": "Peringatan",
         "inviteInfiniteUsesWarning": "Undangan dalam jumlah tak terbatas dapat disalahgunakan",
         "inviteSendToEmail": "Dikirim kepada",
-        "login": "Masuk",
-        "logout": "Keluar",
         "create": "Buat",
         "apply": "Terapkan",
-        "delete": "Hapus",
         "name": "Nama",
         "date": "Tanggal",
         "lastActiveTime": "Terakhir Aktif",
@@ -68,7 +65,6 @@
         "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",
@@ -82,20 +78,15 @@
         "createProfile": "Membuat profil {n}.",
         "saveSettings": "Pengaturan telah disimpan",
         "setOmbiDefaults": "Default ombi tersimpan.",
-        "errorConnection": "Tidak dapat terhubung ke jfa-go.",
-        "error401Unauthorized": "Tidak ter-otorisasi. Coba segarkan halaman.",
         "errorSettingsAppliedNoHomescreenLayout": "Pengaturan telah diterapkan, tetapi menerapkan tata letak layar utama mungkin gagal.",
         "errorHomescreenAppliedNoSettings": "Tata letak layar beranda diterapkan, tetapi menerapkan pengaturan mungkin gagal.",
         "errorSettingsFailed": "Aplikasi gagal.",
-        "errorLoginBlank": "Nama pengguna dan / atau sandi kosong.",
-        "errorUnknown": "Kesalahan yang tidak diketahui.",
         "errorBlankFields": "Isian dibiarkan kosong",
         "errorDeleteProfile": "Gagal menghapus profil {n}",
         "errorLoadProfiles": "Gagal memuat profil.",
         "errorCreateProfile": "Gagal membuat profil {n}",
         "errorSetDefaultProfile": "Gagal menyetel profil default.",
         "errorLoadUsers": "Gagal memuat pengguna.",
-        "errorSaveSettings": "Tidak dapat menyimpan pengaturan.",
         "errorLoadSettings": "Gagal memuat pengaturan.",
         "errorSetOmbiDefaults": "Gagal menyimpan default ombi.",
         "errorLoadOmbiUsers": "Gagal memuat pengguna ombi.",
@@ -138,4 +129,4 @@
             "plural": "Umumkan kepada {n} pengguna"
         }
     }
-}
+}

lang/admin/nl-nl.json

@@ -13,11 +13,8 @@
         "warning": "Waarschuwing",
         "inviteInfiniteUsesWarning": "ongelimiteerde uitnodigingen kunnen misbruikt worden",
         "inviteSendToEmail": "Stuur naar",
-        "login": "Inloggen",
-        "logout": "Uitloggen",
         "create": "Aanmaken",
         "apply": "Toepassen",
-        "delete": "Verwijderen",
         "name": "Naam",
         "date": "Datum",
         "lastActiveTime": "Laatst actief",
@@ -43,7 +40,7 @@
         "settingsRequiredOrRestartMessage": "Opmerking: {n} is een verplicht veld, {n} geeft aan dat na wijzigen een herstart nodig is.",
         "settingsSave": "Opslaan",
         "ombiUserDefaults": "Ombi gebruiker standaardinstellingen",
-        "ombiUserDefaultsDescription": "Maak een Ombi gebruiker aan met de gewenste instellingen, en selecteer deze hieronder. Deze instellingen/rechten worden opgeslagen en toegepast voor nieuwe Ombi gebruikers die jfa-go aanmaakt",
+        "ombiUserDefaultsDescription": "Maak een Ombi gebruiker aan met de gewenste instellingen, en selecteer deze hieronder. Deze instellingen/rechten worden opgeslagen en toegepast voor nieuwe Ombi gebruikers die jfa-go aanmaakt als dit profiel is geselecteerd.",
         "userProfiles": "Gebruikersprofielen",
         "userProfilesDescription": "Profielen worden toegepast op gebruikers wanneer ze een account aanmaken. Een profiel bevat rechten voor bibliotheken en indeling van de startpagina.",
         "userProfilesIsDefault": "Standaard",
@@ -72,15 +69,10 @@
         "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",
+        "reset": "Reset",
         "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",
@@ -89,18 +81,29 @@
         "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"
+        "matrixHomeServer": "Adres home server",
+        "templates": "Sjablonen",
+        "templateEnterName": "Voer een naam in om dit sjabloon op te slaan.",
+        "saveAsTemplate": "Sla op als sjabloon",
+        "deleteTemplate": "Verwijder sjabloon",
+        "setExpiry": "Stel verloop in",
+        "sendPWRManual": "Gebruiker {n} heeft geen contactmogelijkheden, druk op kopiëren om een link te krijgen die je kunt sturen.",
+        "sendPWRSuccessManual": "Als de gebruiker hem niet heeft ontvangen, druk dan op kopiëren om een link te krijgen die je handmatig kunt sturen.",
+        "sendPWR": "Verstuur wachtwoordreset",
+        "sendPWRSuccess": "Wachtwoordreset-link verstuurd.",
+        "sendPWRValidFor": "De link is 30m geldig.",
+        "ombiProfile": "Ombi gebruikersprofiel",
+        "logs": "Logs",
+        "accessJFA": "Toegang tot jfa-go",
+        "accessJFASettings": "Kan niet worden aangepast, omdat \"Alleen beheerders\" of \"Laat alle Jellyfin-gebruikers inloggen\" is aangevinkt in Instellingen > Algemeen."
     },
     "notifications": {
         "changedEmailAddress": "E-mailadres van {n} gewijzigd.",
@@ -108,20 +111,15 @@
         "createProfile": "Profiel {n} aangemaakt.",
         "saveSettings": "De instellingen zijn opgeslagen",
         "setOmbiDefaults": "De ombi standaardinstellingen zijn opgeslagen.",
-        "errorConnection": "Kon geen verbinding maken met jfa-go.",
-        "error401Unauthorized": "Geen toegang. Probeer de pagina te vernieuwen.",
         "errorSettingsAppliedNoHomescreenLayout": "De instellingen zijn toegepast, maar wijzigen van de startpaginaindeling is misschien mislukt.",
         "errorHomescreenAppliedNoSettings": "Startpaginaindeling toegepast, maar opslaan van instellingen is misschien mislukt.",
         "errorSettingsFailed": "Opslaan mislukt.",
-        "errorLoginBlank": "De gebruikersnaam en/of wachtwoord is leeg.",
-        "errorUnknown": "Onbekende fout.",
         "errorBlankFields": "Velden leeggelaten",
         "errorDeleteProfile": "Verwijderen van profiel {n} mislukt",
         "errorLoadProfiles": "Fout bij het laden van profielen.",
         "errorCreateProfile": "Aanmaken van profile {n} mislukt",
         "errorSetDefaultProfile": "Fout bij instellen van standaardprofiel.",
         "errorLoadUsers": "Laden van gebruikers mislukt.",
-        "errorSaveSettings": "Opslaan van instellingen mislukt.",
         "errorLoadSettings": "Laden van instellingen mislukt.",
         "errorSetOmbiDefaults": "Opslaan van ombi standaardinstellingen mislukt.",
         "errorLoadOmbiUsers": "Laden van ombi gebruikers mislukt.",
@@ -140,7 +138,10 @@
         "noUpdatesAvailable": "Geen nieuwe updates beschikbaar.",
         "telegramVerified": "Telegram-account goedgekeurd.",
         "updateAppliedRefresh": "Update toegepast, ververs alsjeblieft.",
-        "accountConnected": "Account gekoppeld."
+        "accountConnected": "Account gekoppeld.",
+        "savedAnnouncement": "Aankondiging opgeslagen.",
+        "setOmbiProfile": "Opgeslagen ombi-profiel.",
+        "errorSetOmbiProfile": "Opslaan van ombi-profiel mislukt."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -194,6 +195,10 @@
         "enabledUser": {
             "singular": "{n} gebruiker ingeschakeld.",
             "plural": "{n} gebruikers ingeschakeld."
+        },
+        "setExpiry": {
+            "singular": "Stel verloop in voor {n} gebruiker",
+            "plural": "Stel verloop in voor {n} gebruikers"
         }
     }
-}
+}

lang/admin/pl-pl.json

@@ -0,0 +1,201 @@
+{
+    "meta": {
+        "name": "Polski (PL)"
+    },
+    "strings": {
+        "invites": "Zaproszenia",
+        "accounts": "Konta",
+        "settings": "Ustawienia",
+        "inviteMonths": "Miesiące",
+        "inviteDays": "Dni",
+        "inviteHours": "Godziny",
+        "inviteMinutes": "Minuty",
+        "inviteNumberOfUses": "Liczba użyć",
+        "inviteDuration": "Czas trwania zaproszenia",
+        "warning": "Ostrzeżenie",
+        "inviteInfiniteUsesWarning": "",
+        "inviteSendToEmail": "",
+        "create": "",
+        "apply": "",
+        "select": "",
+        "name": "Imię",
+        "date": "Data",
+        "setExpiry": "",
+        "updates": "Aktualizacje",
+        "update": "Aktualizacja",
+        "download": "Pobierz",
+        "search": "Szukaj",
+        "advancedSettings": "Zaawansowane",
+        "lastActiveTime": "Ostatnia aktywność",
+        "from": "Od",
+        "user": "Użytkownik",
+        "userExpiry": "Użytkownik wygasa",
+        "userExpiryDescription": "",
+        "aboutProgram": "O",
+        "version": "Wersja",
+        "commitNoun": "",
+        "newUser": "",
+        "profile": "",
+        "unknown": "",
+        "label": "",
+        "logs": "",
+        "announce": "",
+        "templates": "",
+        "subject": "",
+        "message": "Wiadomość",
+        "variables": "",
+        "conditionals": "",
+        "preview": "",
+        "reset": "Zresetuj",
+        "donate": "",
+        "sendPWR": "",
+        "contactThrough": "",
+        "extendExpiry": "",
+        "sendPWRManual": "",
+        "sendPWRSuccess": "",
+        "sendPWRSuccessManual": "",
+        "sendPWRValidFor": "",
+        "customizeMessages": "",
+        "customizeMessagesDescription": "",
+        "markdownSupported": "",
+        "modifySettings": "Zmień ustawienia",
+        "modifySettingsDescription": "",
+        "applyHomescreenLayout": "",
+        "sendDeleteNotificationEmail": "",
+        "sendDeleteNotifiationExample": "",
+        "settingsRestart": "",
+        "settingsRestarting": "",
+        "settingsRestartRequired": "",
+        "settingsRestartRequiredDescription": "",
+        "settingsApplyRestartLater": "",
+        "settingsApplyRestartNow": "",
+        "settingsApplied": "",
+        "settingsRefreshPage": "",
+        "settingsRequiredOrRestartMessage": "",
+        "settingsSave": "",
+        "ombiProfile": "",
+        "ombiUserDefaultsDescription": "",
+        "userProfiles": "",
+        "userProfilesDescription": "",
+        "userProfilesIsDefault": "",
+        "userProfilesLibraries": "",
+        "addProfile": "Dodaj Profil",
+        "addProfileDescription": "",
+        "addProfileNameOf": "Nazwa profilu",
+        "addProfileStoreHomescreenLayout": "",
+        "inviteNoUsersCreated": "",
+        "inviteUsersCreated": "",
+        "inviteNoProfile": "",
+        "inviteDateCreated": "Utworzone",
+        "inviteRemainingUses": "",
+        "inviteNoInvites": "",
+        "inviteExpiresInTime": "",
+        "notifyEvent": "",
+        "notifyInviteExpiry": "",
+        "notifyUserCreation": "",
+        "sendPIN": "Poproś użytkownika aby wysłał kod PIN przy użyciu bota.",
+        "searchDiscordUser": "",
+        "findDiscordUser": "",
+        "linkMatrixDescription": "",
+        "matrixHomeServer": "",
+        "saveAsTemplate": "",
+        "deleteTemplate": "Usuń szablon",
+        "templateEnterName": "Wprowadź nazwę aby zapisać szablon.",
+        "accessJFA": "",
+        "accessJFASettings": ""
+    },
+    "notifications": {
+        "changedEmailAddress": "Zmieniono adres email {n}.",
+        "userCreated": "Użytkownik {n} utworzony.",
+        "createProfile": "Stworzono profil {n}.",
+        "saveSettings": "Ustawienia zostały zapisane",
+        "saveEmail": "Email zapisany.",
+        "sentAnnouncement": "Ogłoszenie wysłane.",
+        "savedAnnouncement": "Ogłoszenie zostało zapisane.",
+        "setOmbiProfile": "Zapisany profil ombi.",
+        "updateApplied": "Aktualizacja zastosowana, uruchom ponownie.",
+        "updateAppliedRefresh": "Aktualizacja zastosowana, odśwież.",
+        "telegramVerified": "Konto telegramu zweryfikowane.",
+        "accountConnected": "Konto połączone.",
+        "errorSettingsAppliedNoHomescreenLayout": "Zastosowano ustawienia, ale zastosowanie układu ekranu głównego mogło się nie powieść.",
+        "errorHomescreenAppliedNoSettings": "",
+        "errorSettingsFailed": "",
+        "errorSaveEmail": "",
+        "errorBlankFields": "",
+        "errorDeleteProfile": "",
+        "errorLoadProfiles": "",
+        "errorCreateProfile": "",
+        "errorSetDefaultProfile": "",
+        "errorLoadUsers": "",
+        "errorLoadSettings": "",
+        "errorSetOmbiProfile": "",
+        "errorLoadOmbiUsers": "",
+        "errorChangedEmailAddress": "",
+        "errorFailureCheckLogs": "",
+        "errorPartialFailureCheckLogs": "",
+        "errorUserCreated": "",
+        "errorSendWelcomeEmail": "",
+        "errorApplyUpdate": "",
+        "errorCheckUpdate": "",
+        "updateAvailable": "",
+        "noUpdatesAvailable": ""
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "",
+            "plural": ""
+        },
+        "deleteNUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "disableUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "reEnableUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "addUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "deleteUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "deletedUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "disabledUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "enabledUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "announceTo": {
+            "singular": "",
+            "plural": ""
+        },
+        "appliedSettings": {
+            "singular": "",
+            "plural": ""
+        },
+        "extendExpiry": {
+            "singular": "",
+            "plural": ""
+        },
+        "setExpiry": {
+            "singular": "",
+            "plural": ""
+        },
+        "extendedExpiry": {
+            "singular": "",
+            "plural": ""
+        }
+    }
+}

lang/admin/pt-br.json

@@ -13,11 +13,8 @@
         "warning": "Aviso",
         "inviteInfiniteUsesWarning": "convites infinitos podem ser usados de forma abusiva",
         "inviteSendToEmail": "Enviar para",
-        "login": "Login",
-        "logout": "Sair",
         "create": "Criar",
         "apply": "Aplicar",
-        "delete": "Deletar",
         "name": "Nome",
         "date": "Data",
         "lastActiveTime": "Ativo pela última vez",
@@ -44,7 +41,7 @@
         "settingsRequiredOrRestartMessage": "Nota: {n} indica campo obrigatório, {n} indica que as alterações requer um reinício.",
         "settingsSave": "Salve",
         "ombiUserDefaults": "Padrões do usuário Ombi",
-        "ombiUserDefaultsDescription": "Crie um usuário Ombi, configure-o e selecione-o abaixo. Suas configurações/permissões serão armazenadas e aplicadas aos novos usuários Ombi criados pelo jfa-go",
+        "ombiUserDefaultsDescription": "Crie um usuário Ombi e configure-o, depois selecione-o abaixo. Suas configurações/permissões serão armazenadas e aplicadas a novos usuários Ombi criados pelo jfa-go quando este perfil for selecionado.",
         "userProfiles": "Perfil de usuário",
         "userProfilesDescription": "Os perfis são aplicados aos usuários quando eles criam uma conta. Um perfil inclui direitos de acesso à biblioteca e layout da tela inicial.",
         "userProfilesIsDefault": "Padrão",
@@ -72,15 +69,10 @@
         "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",
+        "reset": "Redefinir",
         "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",
@@ -89,17 +81,29 @@
         "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.",
+        "sendPIN": "Peça que o usuário envie 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"
+        "select": "Selecionar",
+        "templates": "Modelos",
+        "matrixHomeServer": "Endereço do servidor local",
+        "saveAsTemplate": "Salvar o modelo",
+        "deleteTemplate": "Deletar modelo",
+        "templateEnterName": "Digite um nome para salvar este modelo.",
+        "ombiProfile": "Ombi perfil de usuário",
+        "setExpiry": "Definir vencimento",
+        "logs": "Histórico",
+        "sendPWRManual": "O usuário {a} não tem método de contato, pressione copiar para obter um link para enviar a ele.",
+        "accessJFA": "Acessar o jfa-go",
+        "sendPWR": "Enviar redefinição de senha",
+        "sendPWRSuccess": "Link de redefinição de senha enviado.",
+        "sendPWRSuccessManual": "Se o usuário não o recebeu, pressione copiar para obter um link para enviar manualmente a ele.",
+        "sendPWRValidFor": "O link é válido por 30m.",
+        "accessJFASettings": "Não pode ser alterado porque \"Só Administrador\" ou \"Permitir todos\" foi definido em Configurações> Geral."
     },
     "notifications": {
         "changedEmailAddress": "Endereço de e-mail alterado de {n}.",
@@ -107,20 +111,15 @@
         "createProfile": "Perfil {n} criado.",
         "saveSettings": "As configurações foram salvas",
         "setOmbiDefaults": "Padrões do ombi armazenados.",
-        "errorConnection": "Não foi possível conectar ao jfa-go.",
-        "error401Unauthorized": "Não autorizado. Tente atualizar a página.",
         "errorSettingsAppliedNoHomescreenLayout": "As configurações foram aplicadas, mas a aplicação do layout da tela inicial pode ter falhado.",
         "errorHomescreenAppliedNoSettings": "O layout da tela inicial foi aplicado, mas a aplicação das configurações pode ter falhado.",
         "errorSettingsFailed": "Falha na aplicação.",
-        "errorLoginBlank": "O nome de usuário e/ou senha foram deixados em branco.",
-        "errorUnknown": "Erro desconhecido.",
         "errorBlankFields": "Os campos foram deixados em branco",
         "errorDeleteProfile": "Falha ao excluir perfil {n}",
         "errorLoadProfiles": "Falha ao carregar perfis.",
         "errorCreateProfile": "Falha ao criar perfil {n}",
         "errorSetDefaultProfile": "Falha ao definir o perfil padrão.",
         "errorLoadUsers": "Falha ao carregar usuários.",
-        "errorSaveSettings": "Não foi possível salvar as configurações.",
         "errorLoadSettings": "Falha ao carregar as configurações.",
         "errorSetOmbiDefaults": "Falha em armazenar os padrões ombi.",
         "errorLoadOmbiUsers": "Falha ao carregar usuários ombi.",
@@ -139,7 +138,10 @@
         "noUpdatesAvailable": "Nenhuma atualização disponível.",
         "telegramVerified": "Conta do Telegram verificada.",
         "updateAppliedRefresh": "Atualização instalada, atualize.",
-        "accountConnected": "Conta conectada."
+        "accountConnected": "Conta conectada.",
+        "savedAnnouncement": "Anúncio salvo.",
+        "setOmbiProfile": "Perfil ombi armazenado.",
+        "errorSetOmbiProfile": "Falha ao armazenar o perfil ombi."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -193,6 +195,10 @@
         "enabledUser": {
             "singular": "{n} Usuário habilitado.",
             "plural": "{n} Usuários habilitado."
+        },
+        "setExpiry": {
+            "singular": "Definir expiração para {a} usuário",
+            "plural": "Definir expiração para {a} usuários"
         }
     }
-}
+}

lang/admin/sv-se.json

@@ -13,11 +13,8 @@
         "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",
@@ -36,7 +33,6 @@
         "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.",
@@ -75,11 +71,7 @@
         "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"
@@ -92,13 +84,9 @@
         "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}",
@@ -106,7 +94,6 @@
         "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.",
@@ -154,4 +141,4 @@
             "plural": "Utökad giltighetstid för {n} användare."
         }
     }
-}
+}

lang/admin/vi-vn.json

@@ -0,0 +1,196 @@
+{
+    "meta": {
+        "name": "Tiếng Anh (Mỹ)"
+    },
+    "strings": {
+        "invites": "Lời mời",
+        "accounts": "Tài khoản",
+        "settings": "Cài đặt",
+        "inviteMonths": "Tháng",
+        "inviteDays": "Ngày",
+        "inviteHours": "Giờ",
+        "inviteMinutes": "Phút",
+        "inviteNumberOfUses": "Số lần sử dụng",
+        "inviteDuration": "Thời hạn hiệu lực",
+        "warning": "Cảnh báo",
+        "inviteInfiniteUsesWarning": "các lời mời không giới hạn số lần sử dụng có thể bị lạm dụng",
+        "inviteSendToEmail": "Gửi tới",
+        "create": "Tạo mới",
+        "apply": "Áp dụng",
+        "select": "Chọn",
+        "name": "Tên",
+        "date": "Ngày",
+        "setExpiry": "Đặt hết hạn",
+        "updates": "Cập nhật",
+        "update": "Cập nhật",
+        "download": "Tải về",
+        "search": "Tìm kiếm",
+        "advancedSettings": "Cài đặt Cấp cao",
+        "lastActiveTime": "Lần cuối Hoạt động",
+        "from": "Từ",
+        "user": "Người dùng",
+        "userExpiry": "Hết hạn Người dùng",
+        "userExpiryDescription": "Sau một khoảng thời gian nhất định sau khi mỗi đăng ký, jfa-go sẽ xóa/vô hiệu hóa tài khoản. Bạn có thể chỉnh sửa chế độ này trong cài đặt.",
+        "aboutProgram": "Thông tin",
+        "version": "Phiên bản",
+        "commitNoun": "Gửi",
+        "newUser": "Người dùng mới",
+        "profile": "Hồ sơ",
+        "unknown": "Không xác định",
+        "label": "Nhãn",
+        "announce": "Thông báo",
+        "templates": "Mẫu",
+        "subject": "Chủ đề",
+        "message": "Tin nhắn",
+        "variables": "Biến",
+        "conditionals": "Điều kiện",
+        "preview": "Xem trước",
+        "reset": "Đặt lại",
+        "donate": "Đóng góp",
+        "sendPWR": "Gửi Đặt lại Mật khẩu",
+        "contactThrough": "Liên lạc qua:",
+        "extendExpiry": "Gia hạn",
+        "sendPWRManual": "Người dùng {n} không có phương thức liên lạc, nhấn chép để lấy đường link để gửi cho họ.",
+        "sendPWRSuccess": "Link đặt lại mật khẩu đã được gửi đi.",
+        "sendPWRSuccessManual": "Nếu người dùng chưa nhận được, nhấn chép để lấy đường link có thể gửi đến họ.",
+        "sendPWRValidFor": "Link có hiệu lực trong vòng 30 phút.",
+        "customizeMessages": "Tùy chỉnh Tin nhắn",
+        "customizeMessagesDescription": "Nếu bạn không muốn sử dụng mẫu tin nhắn của jfa-go, bạn có thể tự tạo mẫu của mình bằng Markdown.",
+        "markdownSupported": "Có hỗ trợ Markdown.",
+        "modifySettings": "Chỉnh sửa Cài đặt",
+        "modifySettingsDescription": "Áp dụng các cài đặt từ một mẫu có sẵn, hoặc lấy trực tiếp từ một người dùng.",
+        "applyHomescreenLayout": "Áp dụng bố cục trang chủ",
+        "sendDeleteNotificationEmail": "Gửi tin nhắn thông báo",
+        "sendDeleteNotifiationExample": "Tài khoản của bạn đã bị xóa.",
+        "settingsRestart": "Khởi động lại",
+        "settingsRestarting": "Đang khởi động lại…",
+        "settingsRestartRequired": "Cần khởi động lại",
+        "settingsRestartRequiredDescription": "Một số cài đặt bạn đã thay đổi cần phải khởi động lại để có hiệu lực. Khởi động lại ngay hay để sau?",
+        "settingsApplyRestartLater": "Áp dụng, khởi động lại sau",
+        "settingsApplyRestartNow": "Áp dụng & khởi động lại",
+        "settingsApplied": "Cài đặt đã được áp dụng.",
+        "settingsRefreshPage": "Làm mới trang trong một vài giây nữa.",
+        "settingsRequiredOrRestartMessage": "Lưu ý: {n} là những cài đặt cần thiết, {n} là những cài đặt cần khởi động lại nếu chúng được thay đổi.",
+        "settingsSave": "Lưu",
+        "ombiProfile": "Tài khoản người dùng Ombi",
+        "ombiUserDefaultsDescription": "Tạo và cài đặt một tài khoản người dùng Ombi, sau đó chọn nó bên dưới. Các cài đặt/quyền sẽ được lưu lại và được áp dụng cho các tài khoản Ombi được tạo bởi jfa-go khi tài khoản mẫy này được chọn.",
+        "userProfiles": "Thông tin Người dùng",
+        "userProfilesDescription": "Mẫu tài khoản được áp dụng cho người dùng khi họ tạo tài khoản. Mẫu tài khoản bao gồm các quyền truy cập thư viện và bốc cục trang chủ.",
+        "userProfilesIsDefault": "Mặc định",
+        "userProfilesLibraries": "Thư viện",
+        "addProfile": "Thêm Tài khoản Mẫu",
+        "addProfileDescription": "Tạo một tài khoản Jellyfin và cấu hình nó, rồi chọn nó bên dưới. Khi tài khoản mẫu này được áp dụng trong lời mời, các người dùng mới sẽ được tạo với các cài đặt tương tự.",
+        "addProfileNameOf": "Tên Tài khoản mẫu",
+        "addProfileStoreHomescreenLayout": "Lưu bố cục trang chủ",
+        "inviteNoUsersCreated": "Chưa có!",
+        "inviteUsersCreated": "Người dùng đã tạo",
+        "inviteNoProfile": "Không có Tài khoản mẫu",
+        "inviteDateCreated": "Tạo",
+        "inviteRemainingUses": "Số lần sử dụng còn lại",
+        "inviteNoInvites": "Không có",
+        "inviteExpiresInTime": "Hết hạn trong {n}",
+        "notifyEvent": "Thông báo khi:",
+        "notifyInviteExpiry": "Khi hết hạn",
+        "notifyUserCreation": "Khi có người dùng được tạo",
+        "sendPIN": "Yêu cầu người dùng gửi mã PIN bên dưới cho bot.",
+        "searchDiscordUser": "Gõ tên người dùng Discord để tìm người dùng.",
+        "findDiscordUser": "Tìm người dùng Discord",
+        "linkMatrixDescription": "Nhập tên đăng nhập và mật khẩu của người dùng được sử dụng làm bot. Khi hoàn thành, ứng dụng sẽ khởi động lại.",
+        "matrixHomeServer": "Địa chỉ máy chủ",
+        "saveAsTemplate": "Lưu thành mẫu",
+        "deleteTemplate": "Xóa mẫu",
+        "templateEnterName": "Nhập tên mẫu để lưu mẫu này.",
+        "logs": "Nhật ký",
+        "accessJFA": "Truy cập jfa-go"
+    },
+    "notifications": {
+        "changedEmailAddress": "Đã đổi địa chỉ email của {n}.",
+        "userCreated": "Người dùng {n} đã được tạo.",
+        "createProfile": "Đã tạo tài khoản mẫu {n}.",
+        "saveSettings": "Cài đặt đã được lưu",
+        "saveEmail": "Email đã được lưu.",
+        "sentAnnouncement": "Thông báo đã được gửi.",
+        "savedAnnouncement": "Thông báo đã được lưu.",
+        "setOmbiProfile": "Mẫu tài khoản Ombi đã được lưu trữ.",
+        "updateApplied": "Cập nhật mới đã được áp dụng, vui lòng khởi động lại.",
+        "updateAppliedRefresh": "Cập nhật mới đã được áp dụng, vui lòng làm mới lại trang.",
+        "telegramVerified": "Tài khoản Telegram đã được xác thực.",
+        "accountConnected": "Tài khoản đã được kết nối.",
+        "errorSettingsAppliedNoHomescreenLayout": "Cài đặt đã được áp dụng, nhưng việc áp dụng bố cục màn hình chính có thể không thành công.",
+        "errorHomescreenAppliedNoSettings": "",
+        "errorSettingsFailed": "",
+        "errorSaveEmail": "",
+        "errorBlankFields": "",
+        "errorDeleteProfile": "",
+        "errorLoadProfiles": "",
+        "errorCreateProfile": "",
+        "errorSetDefaultProfile": "",
+        "errorLoadUsers": "",
+        "errorLoadSettings": "",
+        "errorSetOmbiProfile": "",
+        "errorLoadOmbiUsers": "",
+        "errorChangedEmailAddress": "",
+        "errorFailureCheckLogs": "",
+        "errorPartialFailureCheckLogs": "",
+        "errorUserCreated": "",
+        "errorSendWelcomeEmail": "",
+        "errorApplyUpdate": "",
+        "errorCheckUpdate": "",
+        "updateAvailable": "",
+        "noUpdatesAvailable": ""
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "",
+            "plural": ""
+        },
+        "deleteNUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "disableUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "reEnableUsers": {
+            "singular": "",
+            "plural": ""
+        },
+        "addUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "deleteUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "deletedUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "disabledUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "enabledUser": {
+            "singular": "",
+            "plural": ""
+        },
+        "announceTo": {
+            "singular": "",
+            "plural": ""
+        },
+        "appliedSettings": {
+            "singular": "",
+            "plural": ""
+        },
+        "extendExpiry": {
+            "singular": "",
+            "plural": ""
+        },
+        "extendedExpiry": {
+            "singular": "",
+            "plural": ""
+        }
+    }
+}

lang/admin/zh-hans.json

@@ -0,0 +1,204 @@
+{
+    "meta": {
+        "name": "简体中文(CN)"
+    },
+    "strings": {
+        "invites": "邀请",
+        "accounts": "用户",
+        "settings": "设置",
+        "inviteMonths": "月",
+        "inviteDays": "日",
+        "inviteHours": "小时",
+        "inviteMinutes": "分钟",
+        "inviteNumberOfUses": "使用次数",
+        "inviteDuration": "邀请时长",
+        "warning": "警告",
+        "inviteInfiniteUsesWarning": "无限使用次数的邀请码可能被滥用",
+        "inviteSendToEmail": "发送到",
+        "create": "创建",
+        "apply": "申请",
+        "select": "选择",
+        "name": "名称",
+        "date": "日期",
+        "updates": "更新",
+        "update": "更新",
+        "download": "下载",
+        "search": "搜索",
+        "advancedSettings": "高级设置",
+        "lastActiveTime": "上次活动",
+        "from": "从",
+        "user": "用户",
+        "userExpiry": "用户到期",
+        "userExpiryDescription": "每次注册后的指定时间，jfa-go 将删除/禁用该帐户。您可以在设置中更改此行为。",
+        "aboutProgram": "关于",
+        "version": "版本",
+        "commitNoun": "提交",
+        "newUser": "新用户",
+        "profile": "个人资料",
+        "unknown": "未知",
+        "label": "标签",
+        "announce": "宣布",
+        "templates": "模板",
+        "subject": "主题",
+        "message": "信息",
+        "variables": "变量",
+        "conditionals": "条件性条款",
+        "preview": "预览",
+        "reset": "重设",
+        "donate": "捐助",
+        "contactThrough": "联系方式：",
+        "extendExpiry": "延长有效期",
+        "customizeMessages": "自定义消息",
+        "customizeMessagesDescription": "如果不想使用 jfa-go 的消息模板，可以使用 Markdown 创建自己的消息模板。",
+        "markdownSupported": "已支持Markdown。",
+        "modifySettings": "修改设置",
+        "modifySettingsDescription": "应用现有配置文件中的设置，或直接从用户处获取设置。",
+        "applyHomescreenLayout": "应用主屏幕布局",
+        "sendDeleteNotificationEmail": "发送通知消息",
+        "sendDeleteNotifiationExample": "您的帐户已被删除。",
+        "settingsRestart": "重启",
+        "settingsRestarting": "正在重启……",
+        "settingsRestartRequired": "需要重启",
+        "settingsRestartRequiredDescription": "需要重新启动才能应用您更改的某些设置。现在重启还是稍后重启？",
+        "settingsApplyRestartLater": "应用，稍后重启",
+        "settingsApplyRestartNow": "应用并重启",
+        "settingsApplied": "已应用设置。",
+        "settingsRefreshPage": "几秒钟后刷新页面。",
+        "settingsRequiredOrRestartMessage": "注意：{n} 表示必填字段，{n} 表示更改需要重新启动。",
+        "settingsSave": "保存",
+        "ombiUserDefaults": "Ombi 用户默认值",
+        "ombiUserDefaultsDescription": "创建并配置 Ombi 用户，然后在下面选择它。它的设置/权限将被存储并应用于由 jfa-go 创建的新 Ombi 用户。",
+        "userProfiles": "用户档案",
+        "userProfilesDescription": "配置文件在用户创建帐户时应用于用户。配置文件包括库访问权限和主屏幕布局。",
+        "userProfilesIsDefault": "默认",
+        "userProfilesLibraries": "库",
+        "addProfile": "添加档案",
+        "addProfileDescription": "创建一个 Jellyfin 用户并配置它，然后在下面选择它。将此配置文件应用于邀请时，将使用这些设置创建新用户。",
+        "addProfileNameOf": "配置文件名称",
+        "addProfileStoreHomescreenLayout": "保存主屏幕布局",
+        "inviteNoUsersCreated": "暂时不！",
+        "inviteUsersCreated": "已创建的用户",
+        "inviteNoProfile": "没有个人资料",
+        "inviteDateCreated": "已创建",
+        "inviteRemainingUses": "剩余使用次数",
+        "inviteNoInvites": "无",
+        "inviteExpiresInTime": "在 {n} 到期",
+        "notifyEvent": "通知：",
+        "notifyInviteExpiry": "在到期时",
+        "notifyUserCreation": "在创建用户时",
+        "sendPIN": "需要用户将下面的 PIN 发送给机器人。",
+        "searchDiscordUser": "开始输入 Discord 用户名以查找用户。",
+        "findDiscordUser": "查找 Discord 用户",
+        "linkMatrixDescription": "输入要用作机器人的用户的用户名和密码。一旦提交，应用程序将重新启动。",
+        "matrixHomeServer": "主服务器地址",
+        "saveAsTemplate": "保存为模板",
+        "deleteTemplate": "删除模板",
+        "templateEnterName": "输入名称以保存此模板。",
+        "sendPWRManual": "用户 {n} 没有联系方式，请按下钮复制能发给用户的链接。",
+        "sendPWRSuccess": "密码重置链接已发了。",
+        "sendPWR": "发送密码重置",
+        "sendPWRSuccessManual": "如果用户没收到，请按下钮复制链接，手动发给用户。",
+        "setExpiry": "设置到期",
+        "logs": "记录",
+        "sendPWRValidFor": "此链接有效30分钟。",
+        "ombiProfile": "Ombi 用户配置文件",
+        "accessJFASettings": "无法更改，因为“仅限管理员”或“允许所有”已在“设置”>“常规”中设置。",
+        "accessJFA": "访问jfa-go"
+    },
+    "notifications": {
+        "changedEmailAddress": "更改了 {n} 的电子邮件地址。",
+        "userCreated": "用户 {n} 已创建。",
+        "createProfile": "创建了配置文件{n}。",
+        "saveSettings": "设置已保存",
+        "saveEmail": "电子邮件已保存。",
+        "sentAnnouncement": "公告已发出。",
+        "savedAnnouncement": "公告已保存。",
+        "setOmbiDefaults": "存储的ombi默认值。",
+        "updateApplied": "已应用更新，请重新启动。",
+        "updateAppliedRefresh": "已应用更新，请刷新。",
+        "telegramVerified": "Telegram账户已验证。",
+        "accountConnected": "帐户已连接。",
+        "errorSettingsAppliedNoHomescreenLayout": "已应用设置，但应用主屏幕布局可能失败。",
+        "errorHomescreenAppliedNoSettings": "已应用主屏幕布局，但应用设置可能失败。",
+        "errorSettingsFailed": "应用失败。",
+        "errorSaveEmail": "电子邮箱保存失败。",
+        "errorBlankFields": "字段留空",
+        "errorDeleteProfile": "删除配置文件{n}失败",
+        "errorLoadProfiles": "加载配置文件失败。",
+        "errorCreateProfile": "创建配置文件{n}失败",
+        "errorSetDefaultProfile": "设置默认配置文件失败。",
+        "errorLoadUsers": "加载用户列表失败。",
+        "errorLoadSettings": "加载配置列表失败。",
+        "errorSetOmbiDefaults": "存储Ombi默认值失败。",
+        "errorLoadOmbiUsers": "加载ombi用户列表失败。",
+        "errorChangedEmailAddress": "无法更改 {n} 的电子邮件地址。",
+        "errorFailureCheckLogs": "失败（检查控制台/日志）",
+        "errorPartialFailureCheckLogs": "部分失败（检查控制台/日志）",
+        "errorUserCreated": "创建用户{n}失败。",
+        "errorSendWelcomeEmail": "发送欢迎消息失败（检查控制台/日志）",
+        "errorApplyUpdate": "无法应用更新，请手动尝试。",
+        "errorCheckUpdate": "检查更新失败。",
+        "updateAvailable": "有新更新可用，请检查设置。",
+        "noUpdatesAvailable": "没有可用的更新。",
+        "setOmbiProfile": "保存ombi配置文件。",
+        "errorSetOmbiProfile": "无法保存ombi配置文件。"
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "修改{n}用户的设置",
+            "plural": "修改{n}用户列表的设置"
+        },
+        "deleteNUsers": {
+            "singular": "删除 {n} 个用户",
+            "plural": "删除 {n} 个用户"
+        },
+        "disableUsers": {
+            "singular": "禁用 {n} 个用户",
+            "plural": "禁用 {n} 个用户"
+        },
+        "reEnableUsers": {
+            "singular": "重新启用 {n} 个用户",
+            "plural": "重新启用 {n} 个用户"
+        },
+        "addUser": {
+            "singular": "添加用户",
+            "plural": "添加用户"
+        },
+        "deleteUser": {
+            "singular": "删除用户",
+            "plural": "删除用户"
+        },
+        "deletedUser": {
+            "singular": "删除了 {n} 个用户。",
+            "plural": "删除了 {n} 个用户。"
+        },
+        "disabledUser": {
+            "singular": "禁用 了{n} 个用户。",
+            "plural": "禁用 了{n} 个用户。"
+        },
+        "enabledUser": {
+            "singular": "启用了{n} 个用户。",
+            "plural": "启用了{n} 个用户。"
+        },
+        "announceTo": {
+            "singular": "通知 {n} 位用户",
+            "plural": "通知 {n} 位用户"
+        },
+        "appliedSettings": {
+            "singular": "将设置应用到 {n} 个用户。",
+            "plural": "将设置应用到 {n} 个用户。"
+        },
+        "extendExpiry": {
+            "singular": "延长 {n} 个用户的有效期",
+            "plural": "延长 {n} 个用户的有效期"
+        },
+        "extendedExpiry": {
+            "singular": "延长了 {n} 个用户的有效期。",
+            "plural": "延长了 {n} 个用户的有效期。"
+        },
+        "setExpiry": {
+            "plural": "为{n}用户设置到期时间",
+            "singular": "为{n}用户设置到期时间"
+        }
+    }
+}

lang/admin/zh-hant.json

@@ -0,0 +1,201 @@
+{
+    "meta": {
+        "name": "繁體中文 (TW)"
+    },
+    "strings": {
+        "invites": "邀請",
+        "accounts": "帳戶",
+        "settings": "設置",
+        "inviteMonths": "月",
+        "inviteDays": "日",
+        "inviteHours": "小時",
+        "inviteMinutes": "分鐘",
+        "inviteNumberOfUses": "使用次數",
+        "inviteDuration": "邀請時長",
+        "warning": "警告",
+        "inviteInfiniteUsesWarning": "無限使用次數的邀請碼可能被濫用",
+        "inviteSendToEmail": "發送到",
+        "create": "創建",
+        "apply": "應用",
+        "select": "選擇",
+        "name": "帳戶名稱",
+        "date": "日期",
+        "setExpiry": "設置到期時間",
+        "updates": "更新",
+        "update": "更新",
+        "download": "下載",
+        "search": "搜尋",
+        "advancedSettings": "高級設置",
+        "lastActiveTime": "上次啟用時間",
+        "from": "從",
+        "user": "帳戶",
+        "userExpiry": "帳戶到期",
+        "userExpiryDescription": "每次註冊后指定的時間，jfa-go 將刪除/禁用該帳戶。您可以在設定中更改此行為。",
+        "aboutProgram": "關於",
+        "version": "版本",
+        "commitNoun": "提交",
+        "newUser": "新帳戶",
+        "profile": "帳戶資料",
+        "unknown": "未知",
+        "label": "標籤",
+        "logs": "日誌",
+        "announce": "公告",
+        "templates": "範本",
+        "subject": "主題",
+        "message": "訊息",
+        "variables": "變數",
+        "conditionals": "條件",
+        "preview": "預覽",
+        "reset": "重設",
+        "donate": "捐贈",
+        "sendPWR": "發送密碼重置",
+        "contactThrough": "聯繫方式：",
+        "extendExpiry": "延長到期時間",
+        "sendPWRManual": "使用者 {n} 沒有聯繫方式，請按 “複製” 以獲取連結並手動發送給使用者。",
+        "sendPWRSuccess": "已發送密碼重置連結。",
+        "sendPWRSuccessManual": "如果使用者沒收到，請按 “複製” 以獲取連結並手動發送給使用者。",
+        "sendPWRValidFor": "該連結的有效期為 30 分鐘。",
+        "customizeMessages": "自定義訊息",
+        "customizeMessagesDescription": "如果您不想使用 jfa-go 的訊息範本，可以使用 Markdown 創建自己的訊息範本。",
+        "markdownSupported": "支持 Markdown。",
+        "modifySettings": "修改設置",
+        "modifySettingsDescription": "應用現有配置文件中的設置，或直接從帳戶處獲取設置。",
+        "applyHomescreenLayout": "應用主螢幕佈局",
+        "sendDeleteNotificationEmail": "發送通知訊息",
+        "sendDeleteNotifiationExample": "您的帳戶已被刪除。",
+        "settingsRestart": "重新啟動",
+        "settingsRestarting": "正在重新啟動…",
+        "settingsRestartRequired": "需要重新啟動",
+        "settingsRestartRequiredDescription": "需要重新啟動才能應用您更改的某些設定。 現在重新啟動還是稍後重新啟動？",
+        "settingsApplyRestartLater": "應用，稍後重新啟動",
+        "settingsApplyRestartNow": "應用並重新啟動",
+        "settingsApplied": "已應用設置。",
+        "settingsRefreshPage": "幾秒鐘後刷新頁面。",
+        "settingsRequiredOrRestartMessage": "注意： {n} 表示必填欄位， {n} 表示更改需要重新啟動。",
+        "settingsSave": "儲存",
+        "ombiProfile": "Ombi 帳戶資料",
+        "ombiUserDefaultsDescription": "創建一個 Ombi 帳戶並對其進行配置，然後在下面選擇它。選擇此設定時，它的設置/權限將被存儲並應用於由 jfa-go 創建的新 Ombi 帳戶。",
+        "userProfiles": "帳戶資料",
+        "userProfilesDescription": "配置文件在使用者創建帳戶時應用於使用者。配置文件包括庫訪問權限和主螢幕佈局。",
+        "userProfilesIsDefault": "預設",
+        "userProfilesLibraries": "庫",
+        "addProfile": "添加配置文件",
+        "addProfileDescription": "創建一個 Jellyfin 帳戶並對其進行配置，然後在下面選擇它。將此設定文件應用於邀請時，將使用這些設置創建新帳戶。",
+        "addProfileNameOf": "配置文件名稱",
+        "addProfileStoreHomescreenLayout": "保存主螢幕佈局",
+        "inviteNoUsersCreated": "暫無！",
+        "inviteUsersCreated": "創建的帳戶",
+        "inviteNoProfile": "無資料",
+        "inviteDateCreated": "已創建",
+        "inviteRemainingUses": "剩餘使用次數",
+        "inviteNoInvites": "無",
+        "inviteExpiresInTime": "在 {n} 到期",
+        "notifyEvent": "通知：",
+        "notifyInviteExpiry": "在到期時",
+        "notifyUserCreation": "在創建用戶時",
+        "sendPIN": "要求使用者將下面的 PIN 發送給機器人。",
+        "searchDiscordUser": "開始鍵入 Discord 帳戶名稱以查找帳戶。",
+        "findDiscordUser": "查尋 Discord 帳戶",
+        "linkMatrixDescription": "輸入要用作機器人的帳戶的帳戶名稱和密碼。提交后，應用程序將重新啟動。",
+        "matrixHomeServer": "主伺服器位址",
+        "saveAsTemplate": "儲存為範本",
+        "deleteTemplate": "刪除範本",
+        "templateEnterName": "輸入名稱以儲存此範本。",
+        "accessJFA": "訪問 jfa-go",
+        "accessJFASettings": "無法更改，因為已在「一般設置」中設置了「僅限管理員帳戶」或「允許全部帳戶」。"
+    },
+    "notifications": {
+        "changedEmailAddress": "更改了 {n} 的電子郵件地址。",
+        "userCreated": "帳戶 {n} 已創建。",
+        "createProfile": "創建了配置文件 {n}。",
+        "saveSettings": "設置已儲存",
+        "saveEmail": "電子郵件已儲存。",
+        "sentAnnouncement": "已發送公告。",
+        "savedAnnouncement": "公告已儲存。",
+        "setOmbiProfile": "ombi 設定已存儲。",
+        "updateApplied": "已應用更新，請重新啟動。",
+        "updateAppliedRefresh": "更新已應用，請重新整理。",
+        "telegramVerified": "Telegram 帳戶已驗證。",
+        "accountConnected": "帳戶已連接。",
+        "errorSettingsAppliedNoHomescreenLayout": "已應用設置，但應用主螢幕佈局可能失敗。",
+        "errorHomescreenAppliedNoSettings": "已應用主螢幕佈局，但應用設置可能失敗。",
+        "errorSettingsFailed": "應用失敗。",
+        "errorSaveEmail": "無法儲存電子郵件。",
+        "errorBlankFields": "欄位留空",
+        "errorDeleteProfile": "無法刪除設置文件 {n}",
+        "errorLoadProfiles": "無法讀取設置文件。",
+        "errorCreateProfile": "無法創建設置文件 {n}",
+        "errorSetDefaultProfile": "無法設置預設設置文件。",
+        "errorLoadUsers": "無法讀取帳戶。",
+        "errorLoadSettings": "無法讀取設置。",
+        "errorSetOmbiProfile": "無法儲存 ombi 設置文件。",
+        "errorLoadOmbiUsers": "無法讀取 ombi 帳戶。",
+        "errorChangedEmailAddress": "無法更改 {n} 的電子郵件地址。",
+        "errorFailureCheckLogs": "失敗（請檢查主控台/紀錄）",
+        "errorPartialFailureCheckLogs": "部分故障（請檢查主控台/日誌）",
+        "errorUserCreated": "無法創建帳戶 {n}。",
+        "errorSendWelcomeEmail": "無法送出歡迎訊息（請檢查主控台/紀錄）",
+        "errorApplyUpdate": "無法應用更新，請手動嘗試。",
+        "errorCheckUpdate": "無法檢查更新。",
+        "updateAvailable": "有新的更新可用，請檢查設置。",
+        "noUpdatesAvailable": "沒有新的更新可用。"
+    },
+    "quantityStrings": {
+        "modifySettingsFor": {
+            "singular": "修改 {n} 個帳戶的設置",
+            "plural": "修改 {n} 個帳戶的設置"
+        },
+        "deleteNUsers": {
+            "singular": "刪除 {n} 個帳戶",
+            "plural": "刪除 {n} 個帳戶"
+        },
+        "disableUsers": {
+            "singular": "禁用 {n} 個帳戶",
+            "plural": "禁用 {n} 個帳戶"
+        },
+        "reEnableUsers": {
+            "singular": "重新啟用 {n} 個帳戶",
+            "plural": "重新啟用 {n} 個帳戶"
+        },
+        "addUser": {
+            "singular": "添加帳戶",
+            "plural": "添加帳戶"
+        },
+        "deleteUser": {
+            "singular": "刪除帳戶",
+            "plural": "刪除帳戶"
+        },
+        "deletedUser": {
+            "singular": "刪除 {n} 個帳戶。",
+            "plural": "刪除 {n} 個帳戶。"
+        },
+        "disabledUser": {
+            "singular": "禁用 {n} 個帳戶。",
+            "plural": "禁用 {n} 個帳戶。"
+        },
+        "enabledUser": {
+            "singular": "已啟用 {n} 個帳戶。",
+            "plural": "已啟用 {n} 個帳戶。"
+        },
+        "announceTo": {
+            "singular": "公告給 {n} 個帳戶",
+            "plural": "公告給 {n} 個帳戶"
+        },
+        "appliedSettings": {
+            "singular": "將設置應用到 {n} 個帳戶。",
+            "plural": "將設置應用到 {n} 個帳戶。"
+        },
+        "extendExpiry": {
+            "singular": "延長 {n} 個帳戶的到期時間",
+            "plural": "延長 {n} 個帳戶的到期時間"
+        },
+        "setExpiry": {
+            "singular": "設置 {n} 個帳戶的到期時間",
+            "plural": "設置 {n} 個帳戶的到期時間"
+        },
+        "extendedExpiry": {
+            "singular": "已延長 {n} 個帳戶的到期時間。",
+            "plural": "已延長 {n} 個帳戶的到期時間。"
+        }
+    }
+}

lang/common/ar-aa.json

@@ -0,0 +1,8 @@
+{
+    "meta": {
+        "name": "العربية (AR)"
+    },
+    "strings": {},
+    "notifications": {},
+    "quantityStrings": {}
+}

lang/common/da-dk.json

@@ -0,0 +1,48 @@
+{
+    "meta": {
+        "name": "Dansk (DK)"
+    },
+    "strings": {
+        "username": "Brugernavn",
+        "password": "Adgangskode",
+        "emailAddress": "E-mail Adresse",
+        "name": "Navn",
+        "submit": "Indsend",
+        "send": "Send",
+        "success": "Succes",
+        "continue": "Fortsæt",
+        "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",
+        "refresh": "Opdater",
+        "required": "Påkrævet",
+        "login": "Log på",
+        "logout": "Log ud",
+        "admin": "Administrator",
+        "enabled": "Aktiveret",
+        "disabled": "Deaktiveret",
+        "reEnable": "Genaktiver",
+        "disable": "Deaktiver",
+        "expiry": "Udløb",
+        "add": "Tilføj",
+        "edit": "Rediger",
+        "delete": "Slet"
+    },
+    "notifications": {
+        "errorLoginBlank": "Brugernavnet og/eller adgangskoden blev efterladt tomme.",
+        "errorConnection": "Kunne ikke oprette forbindelse til jfa-go.",
+        "errorUnknown": "Ukendt fejl.",
+        "error401Unauthorized": "Adgang nægtet. Prøv at genindlæse siden.",
+        "errorSaveSettings": "Kunne ikke gemme indstillingerne."
+    },
+    "quantityStrings": {}
+}

lang/common/de-de.json

@@ -4,23 +4,45 @@
     },
     "strings": {
         "username": "Benutzername",
-        "name": "Name",
         "password": "Passwort",
-        "emailAddress": "E-Mail-Adresse",
+        "emailAddress": "E-Mail Adresse",
+        "name": "Name",
         "submit": "Absenden",
+        "send": "Senden",
         "success": "Erfolgreich",
+        "continue": "Weiter",
         "error": "Fehler",
         "copy": "Kopieren",
-        "theme": "Thema",
+        "copied": "Kopiert",
         "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"
-    }
-}
+        "contactDiscord": "Kontakt über Discord",
+        "theme": "Thema",
+        "refresh": "Aktualisieren",
+        "required": "Erforderlich",
+        "login": "Anmelden",
+        "logout": "Abmelden",
+        "admin": "Admin",
+        "enabled": "Aktiviert",
+        "disabled": "Deaktiviert",
+        "reEnable": "Wieder aktivieren",
+        "disable": "Deaktivieren",
+        "expiry": "Ablaufdatum",
+        "add": "Hinzufügen",
+        "edit": "Bearbeiten",
+        "delete": "Löschen"
+    },
+    "notifications": {
+        "errorLoginBlank": "Der Benutzername und/oder das Passwort wurden nicht ausgefüllt.",
+        "errorConnection": "Konnte keine Verbindung zu jfa-go herstellen.",
+        "errorUnknown": "Unbekannter Fehler.",
+        "error401Unauthorized": "Unberechtigt. Versuch, die Seite zu aktualisieren.",
+        "errorSaveSettings": "Einstellungen konnten nicht gespeichert werden."
+    },
+    "quantityStrings": {}
+}

lang/common/el-gr.json

@@ -9,11 +9,30 @@
         "name": "Όνομα",
         "submit": "Καταχώρηση",
         "success": "Επιτυχία",
+        "continue": "Συνέχεια",
         "error": "Σφάλμα",
         "copy": "Αντιγραφή",
-        "theme": "Θέμα",
+        "copied": "Αντιγράφηκε",
         "time24h": "24 Ώρες",
         "time12h": "12 Ώρες",
-        "copied": "Αντιγράφηκε"
-    }
-}
+        "theme": "Θέμα",
+        "login": "Σύνδεση",
+        "logout": "Αποσύνδεση",
+        "admin": "Διαχειριστής",
+        "enabled": "Ενεργοποιημένο",
+        "disabled": "Απενεργοποιημένο",
+        "reEnable": "Επανα-ενεργοποίηση",
+        "disable": "Απενεργοποίηση",
+        "expiry": "Λήξη",
+        "edit": "Επεξεργασία",
+        "delete": "Διαγραφή"
+    },
+    "notifications": {
+        "errorLoginBlank": "Το όνομα χρήστη και/ή ο κωδικός ήταν κενά.",
+        "errorConnection": "Δεν μπόρεσε να συνδεθεί με το jfa-go.",
+        "errorUnknown": "Άγνωστο σφάλμα.",
+        "error401Unauthorized": "Ανεξουσιοδότητος. Προσπαθήστε να κάνετε επαναφόρτωση την σελίδα.",
+        "errorSaveSettings": "Αποτυχία αποθήκευσης ρυθμίσεων."
+    },
+    "quantityStrings": {}
+}

lang/common/en-gb.json

@@ -1,5 +1,48 @@
 {
     "meta": {
         "name": "English (GB)"
-    }
-}
+    },
+    "strings": {
+        "username": "Username",
+        "password": "Password",
+        "emailAddress": "Email Address",
+        "name": "Name",
+        "submit": "Submit",
+        "send": "Send",
+        "success": "Success",
+        "continue": "Continue",
+        "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",
+        "refresh": "Refresh",
+        "required": "Required",
+        "login": "Login",
+        "logout": "Logout",
+        "admin": "Admin",
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "reEnable": "Re-enable",
+        "disable": "Disable",
+        "expiry": "Expiry",
+        "add": "Add",
+        "edit": "Edit",
+        "delete": "Delete"
+    },
+    "notifications": {
+        "errorLoginBlank": "The username and/or password was left blank.",
+        "errorConnection": "Couldn't connect to jfa-go.",
+        "errorUnknown": "Unknown error.",
+        "error401Unauthorized": "Unauthorised. Try refreshing the page.",
+        "errorSaveSettings": "Couldn't save settings."
+    },
+    "quantityStrings": {}
+}

lang/common/en-us.json

@@ -10,6 +10,7 @@
         "submit": "Submit",
         "send": "Send",
         "success": "Success",
+        "continue": "Continue",
         "error": "Error",
         "copy": "Copy",
         "copied": "Copied",
@@ -21,6 +22,44 @@
         "linkDiscord": "Link Discord",
         "linkMatrix": "Link Matrix",
         "contactDiscord": "Contact through Discord",
-        "theme": "Theme"
+        "theme": "Theme",
+        "refresh": "Refresh",
+        "required": "Required",
+        "login": "Login",
+        "logout": "Logout",
+        "admin": "Admin",
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "reEnable": "Re-enable",
+        "disable": "Disable",
+        "contactMethods": "Contact Methods",
+        "accountStatus": "Account Status",
+        "notSet": "Not set",
+        "expiry": "Expiry",
+        "add": "Add",
+        "edit": "Edit",
+        "delete": "Delete",
+        "myAccount": "My Account"
+    },
+    "notifications": {
+        "errorLoginBlank": "The username and/or password were left blank.",
+        "errorConnection": "Couldn't connect to jfa-go.",
+        "errorUnknown": "Unknown error.",
+        "error401Unauthorized": "Unauthorized. Try refreshing the page.",
+        "errorSaveSettings": "Couldn't save settings."
+    },
+    "quantityStrings": {
+        "year": {
+            "singular": "{n} Year",
+            "plural": "{n} Years"
+        },
+        "month": {
+            "singular": "{n} Month",
+            "plural": "{n} Months"
+        },
+        "day": {
+            "singular": "{n} Day",
+            "plural": "{n} Days"
+        }
     }
 }

lang/common/es-es.json

@@ -1,19 +1,48 @@
 {
     "meta": {
-        "name": "Español(ES)"
+        "name": "Español (ES)"
     },
     "strings": {
         "username": "Nombre de usuario",
         "password": "Contraseña",
-        "emailAddress": "Dirección de correo electrónico",
+        "emailAddress": "Correo electrónico",
         "name": "Nombre",
         "submit": "Enviar",
+        "send": "Enviar",
         "success": "Éxito",
+        "continue": "Continuar",
         "error": "Error",
         "copy": "Copiar",
         "copied": "Copiado",
-        "time24h": "24 horas",
-        "time12h": "24 horas",
-        "theme": "Tema"
-    }
-}
+        "time24h": "Formato de 24 horas",
+        "time12h": "Formato de 12 horas",
+        "linkTelegram": "Enlace Telegram",
+        "contactEmail": "Contactar por correo electrónico",
+        "contactTelegram": "Contactar por Telegram",
+        "linkDiscord": "Enlace Discord",
+        "linkMatrix": "Enlace Matrix",
+        "contactDiscord": "Contactar por Discord",
+        "theme": "Tema",
+        "refresh": "Refrescar",
+        "required": "Requerido",
+        "login": "Acceso",
+        "logout": "Cerrar sesión",
+        "admin": "Administrador",
+        "enabled": "Activado",
+        "disabled": "Desactivado",
+        "reEnable": "Reactivar",
+        "disable": "Desactivar",
+        "expiry": "Expiración",
+        "add": "Agregar",
+        "edit": "Editar",
+        "delete": "Eliminar"
+    },
+    "notifications": {
+        "errorLoginBlank": "El nombre de usuario y/o la contraseña se dejaron en blanco.",
+        "errorConnection": "No se pudo conectar a jfa-go.",
+        "errorUnknown": "Error desconocido.",
+        "error401Unauthorized": "No autorizado. Intente actualizar la página.",
+        "errorSaveSettings": "No se pudo guardar la configuración."
+    },
+    "quantityStrings": {}
+}

lang/common/fa-ir.json

@@ -0,0 +1,29 @@
+{
+    "meta": {
+        "name": "انگلیسی"
+    },
+    "strings": {
+        "username": "نام کاربری",
+        "password": "کلمه عبور",
+        "emailAddress": "پست الکترونیک",
+        "name": "نام",
+        "submit": "تایید",
+        "send": "ارسال",
+        "success": "موفقیت",
+        "continue": "ادامه دادن",
+        "error": "خطا",
+        "copy": "کپی",
+        "copied": "کپی شد",
+        "time24h": "ساعت 24 ساعت",
+        "time12h": "ساعت 12 ساعت",
+        "linkTelegram": "لینک تلگرام",
+        "contactEmail": "تماس از طریق ایمیل",
+        "contactTelegram": "تماس از طریق تلگرام",
+        "linkDiscord": "پیوند دیسکورد",
+        "linkMatrix": "پیوند ماتریکس",
+        "contactDiscord": "از طریق دیسکورد تماس بگیرید",
+        "theme": "موضوع"
+    },
+    "notifications": {},
+    "quantityStrings": {}
+}

lang/common/fr-fr.json

@@ -1,23 +1,48 @@
 {
     "meta": {
-        "name": "Français (FR)",
-        "author": "https://github.com/Killianbe"
+        "name": "Français (FR)"
     },
     "strings": {
         "username": "Nom d'utilisateur",
-        "name": "Nom",
         "password": "Mot de passe",
-        "emailAddress": "Addresse Email",
+        "emailAddress": "Adresse e-mail",
+        "name": "Nom",
         "submit": "Soumettre",
+        "send": "Envoyer",
         "success": "Succès",
+        "continue": "Continuer",
         "error": "Erreur",
         "copy": "Copier",
+        "copied": "Copié",
         "time24h": "Temps 24h",
         "time12h": "Temps 12h",
-        "theme": "Thème",
-        "copied": "Copié",
         "linkTelegram": "Lien Telegram",
         "contactEmail": "Contact par e-mail",
-        "contactTelegram": "Contact par Telegram"
-    }
-}
+        "contactTelegram": "Contact par Telegram",
+        "linkDiscord": "Lier Discord",
+        "linkMatrix": "Lier Matrix",
+        "contactDiscord": "Contacter par Discord",
+        "theme": "Thème",
+        "refresh": "Actualiser",
+        "required": "Requis",
+        "login": "S'identifier",
+        "logout": "Se déconnecter",
+        "admin": "Administrateur",
+        "enabled": "Activé",
+        "disabled": "Désactivé",
+        "reEnable": "Ré-activé",
+        "disable": "Désactivé",
+        "expiry": "Expiration",
+        "add": "Ajouter",
+        "edit": "Éditer",
+        "delete": "Effacer"
+    },
+    "notifications": {
+        "errorLoginBlank": "Le nom d'utilisateur et/ou le mot de passe sont vides.",
+        "errorConnection": "Impossible de se connecter à jfa-go.",
+        "errorUnknown": "Erreur inconnue.",
+        "error401Unauthorized": "Non autorisé. Essayez d'actualiser la page.",
+        "errorSaveSettings": "Impossible d'enregistrer les paramètres."
+    },
+    "quantityStrings": {}
+}

lang/common/hu-hu.json

@@ -0,0 +1,20 @@
+{
+    "meta": {
+        "name": "English (US)"
+    },
+    "strings": {
+        "login": "Belépés",
+        "logout": "Kijelentkezés",
+        "admin": "Adminisztrátor",
+        "enabled": "Engedélyezve",
+        "disabled": "Tiltva",
+        "reEnable": "Újra engedélyezés",
+        "disable": "Letiltás",
+        "expiry": "Lejárat",
+        "add": "Hozzáadás",
+        "edit": "Szerkesztés",
+        "delete": "Törlés"
+    },
+    "notifications": {},
+    "quantityStrings": {}
+}

lang/common/id-id.json

@@ -8,11 +8,25 @@
         "emailAddress": "Alamat Email",
         "name": "Nama",
         "submit": "Submit",
+        "send": "Kirim",
         "success": "Sukses",
+        "continue": "Lanjut",
         "error": "Error",
         "copy": "Salin",
         "time24h": "Waktu 24 jam",
         "time12h": "Waktu 12 jam",
-        "theme": "Tema"
-    }
-}
+        "theme": "Tema",
+        "login": "Masuk",
+        "logout": "Keluar",
+        "edit": "Edit",
+        "delete": "Hapus"
+    },
+    "notifications": {
+        "errorLoginBlank": "Nama pengguna dan / atau sandi kosong.",
+        "errorConnection": "Tidak dapat terhubung ke jfa-go.",
+        "errorUnknown": "Kesalahan yang tidak diketahui.",
+        "error401Unauthorized": "Tidak ter-otorisasi. Coba segarkan halaman.",
+        "errorSaveSettings": "Tidak dapat menyimpan pengaturan."
+    },
+    "quantityStrings": {}
+}

lang/common/it-it.json

@@ -0,0 +1,31 @@
+{
+    "meta": {
+        "name": "Italiano (IT)"
+    },
+    "strings": {
+        "username": "Username",
+        "password": "Password",
+        "emailAddress": "Indirizzo Email",
+        "name": "Nome",
+        "submit": "Invia",
+        "send": "Invia",
+        "success": "Successo",
+        "continue": "Continua",
+        "error": "Errore",
+        "copy": "Copia",
+        "copied": "Copiato",
+        "time24h": "Formato 24h",
+        "time12h": "Formato 12h",
+        "linkTelegram": "Link Telegram",
+        "contactEmail": "Contatta tramite Email",
+        "contactTelegram": "Contatta tramite Telegram",
+        "linkDiscord": "Link Discord",
+        "linkMatrix": "Link Matrix",
+        "contactDiscord": "Contatta tramite Discord",
+        "theme": "Tema",
+        "refresh": "Aggiorna",
+        "required": "Richiesto"
+    },
+    "notifications": {},
+    "quantityStrings": {}
+}

lang/common/nl-nl.json

@@ -4,23 +4,45 @@
     },
     "strings": {
         "username": "Gebruikersnaam",
-        "name": "Naam",
         "password": "Wachtwoord",
         "emailAddress": "E-mailadres",
+        "name": "Naam",
         "submit": "Verstuur",
+        "send": "Verstuur",
         "success": "Succes",
+        "continue": "Doorgaan",
         "error": "Fout",
         "copy": "Kopiëer",
-        "theme": "Thema",
+        "copied": "Gekopieerd",
         "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"
-    }
-}
+        "contactDiscord": "Stuur Discord bericht",
+        "theme": "Thema",
+        "refresh": "Ververs",
+        "required": "Verplicht",
+        "login": "Inloggen",
+        "logout": "Uitloggen",
+        "admin": "Beheerder",
+        "enabled": "Ingeschakeld",
+        "disabled": "Uitgeschakeld",
+        "reEnable": "Opnieuw inschakelen",
+        "disable": "Uitschakelen",
+        "expiry": "Verloop",
+        "add": "Voeg toe",
+        "edit": "Bewerken",
+        "delete": "Verwijderen"
+    },
+    "notifications": {
+        "errorLoginBlank": "De gebruikersnaam en/of wachtwoord is leeg.",
+        "errorConnection": "Kon geen verbinding maken met jfa-go.",
+        "errorUnknown": "Onbekende fout.",
+        "error401Unauthorized": "Geen toegang. Probeer de pagina te vernieuwen.",
+        "errorSaveSettings": "Opslaan van instellingen mislukt."
+    },
+    "quantityStrings": {}
+}

lang/common/pl-pl.json

@@ -0,0 +1,41 @@
+{
+    "meta": {
+        "name": "Polski (PL)"
+    },
+    "strings": {
+        "username": "Nazwa Użytkownika",
+        "password": "Hasło",
+        "emailAddress": "E-mail",
+        "name": "Imię",
+        "submit": "Akceptuj",
+        "send": "Wyślij",
+        "success": "Sukces",
+        "continue": "Kontynuuj",
+        "error": "Błąd",
+        "copy": "Kopiuj",
+        "copied": "Skopiowano",
+        "time24h": "24 godziny",
+        "time12h": "12 godzin",
+        "linkTelegram": "Link Telegram",
+        "contactEmail": "Kontakt drogą mailową",
+        "contactTelegram": "Kontakt przez Telegram",
+        "linkDiscord": "Link do Discord",
+        "linkMatrix": "Link Matrix",
+        "contactDiscord": "Kontakt przez Discord",
+        "theme": "Motyw",
+        "refresh": "Odśwież",
+        "required": "Wymagane",
+        "admin": "Admin",
+        "enabled": "Włączone",
+        "disabled": "Wyłączone",
+        "disable": "Wyłączone",
+        "expiry": "Wygasa",
+        "edit": "Edytuj"
+    },
+    "notifications": {
+        "errorConnection": "Nie udało się połączyć z jfa-go.",
+        "errorUnknown": "Nieznany błąd.",
+        "error401Unauthorized": "Nieautoryzowany. Spróbuj odświeżyć stronę."
+    },
+    "quantityStrings": {}
+}

lang/common/pt-br.json

@@ -4,23 +4,45 @@
     },
     "strings": {
         "username": "Nome do Usuário",
-        "name": "Nome",
         "password": "Senha",
-        "emailAddress": "Endereço de Email",
+        "emailAddress": "Endereço de e-mail",
+        "name": "Nome",
         "submit": "Enviar",
+        "send": "Enviar",
         "success": "Sucesso",
+        "continue": "Continuar",
         "error": "Erro",
         "copy": "Copiar",
-        "theme": "Tema",
+        "copied": "Copiado",
         "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"
-    }
-}
+        "contactDiscord": "Contato através do Discord",
+        "theme": "Tema",
+        "refresh": "Atualizar",
+        "required": "Requeridos",
+        "login": "Login",
+        "logout": "Sair",
+        "admin": "Admin",
+        "enabled": "Habilitado",
+        "disabled": "Desativado",
+        "reEnable": "Reativar",
+        "disable": "Desativar",
+        "expiry": "Expira",
+        "add": "Adicionar",
+        "edit": "Editar",
+        "delete": "Deletar"
+    },
+    "notifications": {
+        "errorLoginBlank": "O nome de usuário e/ou senha foram deixados em branco.",
+        "errorConnection": "Não foi possível conectar ao jfa-go.",
+        "errorUnknown": "Erro desconhecido.",
+        "error401Unauthorized": "Não autorizado. Tente atualizar a página.",
+        "errorSaveSettings": "Não foi possível salvar as configurações."
+    },
+    "quantityStrings": {}
+}

lang/common/ro-ro.json

@@ -0,0 +1,8 @@
+{
+    "meta": {
+        "name": "Română (ROU)"
+    },
+    "strings": {},
+    "notifications": {},
+    "quantityStrings": {}
+}

lang/common/sl-si.json

@@ -0,0 +1,31 @@
+{
+    "meta": {
+        "name": "Slovenščina (SI)"
+    },
+    "strings": {
+        "username": "Uporabniško ime",
+        "password": "Geslo",
+        "emailAddress": "E-poštni naslov",
+        "name": "Ime",
+        "submit": "Potrdi",
+        "send": "Pošlji",
+        "success": "Uspeh",
+        "continue": "Nadaljuj",
+        "error": "Napaka",
+        "copy": "Kopiraj",
+        "copied": "Kopirano",
+        "time24h": "24ur format čas",
+        "time12h": "12ur format časa",
+        "linkTelegram": "Poveži Telegram",
+        "contactEmail": "Kontakt preko e-pošte",
+        "contactTelegram": "Kontakt preko Telegrama",
+        "linkDiscord": "Poveži Discord",
+        "linkMatrix": "Poveži Matrix",
+        "contactDiscord": "Kontakt preko Discorda",
+        "theme": "Tema",
+        "refresh": "Osveži",
+        "required": "Obvezno"
+    },
+    "notifications": {},
+    "quantityStrings": {}
+}

lang/common/sv-se.json

@@ -9,10 +9,27 @@
         "name": "Namn",
         "submit": "Skicka",
         "success": "Lyckades",
+        "continue": "Fortsätt",
         "error": "Fel",
         "copy": "Kopiera",
         "time24h": "24 timmarsklocka",
         "time12h": "12 timmarsklocka",
-        "theme": "Tema"
-    }
-}
+        "theme": "Tema",
+        "login": "Logga in",
+        "logout": "Logga ut",
+        "admin": "Admin",
+        "enabled": "Aktiverad",
+        "disabled": "Inaktiverad",
+        "expiry": "Löper ut",
+        "edit": "Redigera",
+        "delete": "Radera"
+    },
+    "notifications": {
+        "errorLoginBlank": "Användarnamnet och/eller lösenordet lämnades tomt.",
+        "errorConnection": "Det gick inte att ansluta till jfa-go.",
+        "errorUnknown": "Okänt fel.",
+        "error401Unauthorized": "Obehörig. Prova att uppdatera sidan.",
+        "errorSaveSettings": "Det gick inte att spara inställningarna."
+    },
+    "quantityStrings": {}
+}

lang/common/vi-vn.json

@@ -0,0 +1,23 @@
+{
+    "meta": {
+        "name": "Tiếng Anh (Mỹ)"
+    },
+    "strings": {
+        "login": "Đăng nhập",
+        "logout": "Đăng xuất",
+        "admin": "Admin",
+        "enabled": "Mở",
+        "disabled": "Tắt",
+        "reEnable": "Mở lại",
+        "disable": "Tắt",
+        "expiry": "Hết hạn",
+        "add": "Thêm",
+        "edit": "Chỉnh sửa",
+        "delete": "Xóa"
+    },
+    "notifications": {
+        "errorConnection": "Không thể kết nối với jfa-go.",
+        "error401Unauthorized": "Không được phép. Hãy thử làm mới trang."
+    },
+    "quantityStrings": {}
+}

lang/common/zh-hans.json

@@ -0,0 +1,48 @@
+{
+    "meta": {
+        "name": "简体中文(CN)"
+    },
+    "strings": {
+        "username": "用户名",
+        "password": "密码",
+        "emailAddress": "电子邮箱",
+        "name": "名称",
+        "submit": "提交",
+        "send": "发送",
+        "success": "成功",
+        "continue": "继续",
+        "error": "错误",
+        "copy": "复制",
+        "copied": "已复制",
+        "time24h": "24小时制",
+        "time12h": "12小时制",
+        "linkTelegram": "关联Telegram",
+        "contactEmail": "通过邮件联系",
+        "contactTelegram": "通过Telegram联系",
+        "linkDiscord": "关联Discord",
+        "linkMatrix": "关联Matrix",
+        "contactDiscord": "通过Discord联系",
+        "theme": "主题",
+        "refresh": "刷新",
+        "required": "必需的",
+        "login": "登录",
+        "logout": "登出",
+        "admin": "管理员",
+        "enabled": "已启用",
+        "disabled": "已禁用",
+        "reEnable": "重新启用",
+        "disable": "禁用",
+        "expiry": "到期",
+        "add": "添加",
+        "edit": "编辑",
+        "delete": "删除"
+    },
+    "notifications": {
+        "errorLoginBlank": "用户名/密码留空。",
+        "errorConnection": "无法连接到 jfa-go。",
+        "errorUnknown": "未知错误。",
+        "error401Unauthorized": "无授权。尝试刷新页面。",
+        "errorSaveSettings": "无法保存设置。"
+    },
+    "quantityStrings": {}
+}

lang/common/zh-hant.json

@@ -0,0 +1,48 @@
+{
+    "meta": {
+        "name": "繁體中文 (TW)"
+    },
+    "strings": {
+        "username": "帳戶名稱",
+        "password": "密碼",
+        "emailAddress": "電子郵件",
+        "name": "帳戶名稱",
+        "submit": "提交",
+        "send": "發送",
+        "success": "成功",
+        "continue": "繼續",
+        "error": "錯誤",
+        "copy": "複製",
+        "copied": "已複製",
+        "time24h": "24小時制",
+        "time12h": "12小時制",
+        "linkTelegram": "連結 Telegram",
+        "contactEmail": "通過電子郵件聯繫",
+        "contactTelegram": "通過 Telegram 聯繫",
+        "linkDiscord": "連結 Discord",
+        "linkMatrix": "連結 Matrix",
+        "contactDiscord": "通過 Discord 聯繫",
+        "theme": "主題",
+        "refresh": "重新整理",
+        "required": "必填",
+        "login": "登錄",
+        "logout": "登出",
+        "admin": "管理員",
+        "enabled": "已啟用",
+        "disabled": "已禁用",
+        "reEnable": "重新啟用",
+        "disable": "禁用",
+        "expiry": "到期",
+        "add": "添加",
+        "edit": "編輯",
+        "delete": "刪除"
+    },
+    "notifications": {
+        "errorLoginBlank": "帳戶名稱和/或密碼留空。",
+        "errorConnection": "無法連接到 jfa-go。",
+        "errorUnknown": "未知的錯誤。",
+        "error401Unauthorized": "未經授權。嘗試重新整理頁面。",
+        "errorSaveSettings": "無法儲存設置。"
+    },
+    "quantityStrings": {}
+}

lang/email/da-dk.json

@@ -0,0 +1,77 @@
+{
+    "meta": {
+        "name": "Dansk (DK)"
+    },
+    "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": "Bemærk: Notifikations beskeder 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": "Bemærk: Notifikations beskeder 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

@@ -11,14 +11,14 @@
         "title": "Mitteilung: Benutzer 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: Benachrichtigungen können auf dem Administrator-Dashboard umgeschalten werden.",
         "name": "Benutzererstellung"
     },
     "inviteExpiry": {
         "title": "Mitteilung: Invite abgelaufen",
         "inviteExpired": "Invite abgelaufen.",
         "expiredAt": "Code {code} lief um {time} ab.",
-        "notificationNotice": "Hinweis: Benachrichtigungs-E-Mails können auf dem Administrator-Dashboard umgeschalten werden.",
+        "notificationNotice": "Hinweis: Benachrichtigungen können auf dem Administrator-Dashboard umgeschalten werden.",
         "name": "Invite Ablaufdatum"
     },
     "passwordReset": {
@@ -74,4 +74,4 @@
         "title": "Dein Konto wurde wieder freigeschaltet - Jellyfin",
         "yourAccountWasEnabled": "Dein Konto wurde wieder aktiviert."
     }
-}
+}

lang/email/el-gr.json

@@ -74,4 +74,4 @@
         "name": "Ο χρήστης ενεργοποιήθηκε",
         "yourAccountWasEnabled": "Ο λογαριασμός σας ενεργοποιήθηκε εκ νέου."
     }
-}
+}

lang/email/en-gb.json

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

lang/email/en-us.json

@@ -12,14 +12,14 @@
         "title": "Notice: User created",
         "aUserWasCreated": "A user was created using code {code}.",
         "time": "Time",
-        "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard."
+        "notificationNotice": "Note: Notification messages can be toggled on the admin dashboard."
     },
     "inviteExpiry": {
         "name": "Invite expiry",
         "title": "Notice: Invite expired",
         "inviteExpired": "Invite expired.",
         "expiredAt": "Code {code} expired at {time}.",
-        "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard."
+        "notificationNotice": "Note: Notification messages can be toggled on the admin dashboard."
     },
     "passwordReset": {
         "name": "Password reset",
@@ -74,4 +74,4 @@
         "yourAccountHasExpired": "Your account has expired.",
         "contactTheAdmin": "Contact the administrator for more info."
     }
-}
+}

lang/email/es-es.json

@@ -1,33 +1,33 @@
 {
     "meta": {
-        "name": "Español(ES)"
+        "name": "Español (ES)"
     },
     "strings": {
-        "ifItWasNotYou": "Si no fue usted, ignore este correo electrónico.",
+        "ifItWasNotYou": "Si no fue usted, ignórelo.",
         "helloUser": "Hola {username},",
         "reason": "Razón"
     },
     "userCreated": {
         "name": "Creación de usuarios",
-        "title": "Noticia: Usuario creado",
+        "title": "Aviso: 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."
+        "notificationNotice": "Nota: Los mensajes 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."
+        "notificationNotice": "Nota: Los mensajes 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.",
+        "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}.",
+        "codeExpiry": "El código vencerá el {date}, a las {time} UTC, que es en {expiresInMinutes}.",
         "pin": "PIN"
     },
     "userDeleted": {
@@ -36,26 +36,26 @@
         "yourAccountWasDeleted": "Su cuenta de Jellyfin fue eliminada."
     },
     "userDisabled": {
-        "name": "Usuario deshabilitado",
-        "title": "Su cuenta ha sido deshabilitada - Jellyfin",
-        "yourAccountWasDisabled": "Su cuenta fue inhabilitada."
+        "name": "Usuario desactivado",
+        "title": "Su cuenta ha sido desactivada - Jellyfin",
+        "yourAccountWasDisabled": "Su cuenta fue desactivada."
     },
     "userEnabled": {
-        "name": "Usuario habilitado",
+        "name": "Usuario activado",
         "title": "Su cuenta ha sido reactivada - Jellyfin",
-        "yourAccountWasEnabled": "Su cuenta se volvió a habilitar."
+        "yourAccountWasEnabled": "Su cuenta fue reactivada."
     },
     "inviteEmail": {
-        "name": "Correo electrónico",
-        "title": "Invitar - Jellyfin",
+        "name": "Invitar por correo electrónico",
+        "title": "Invitación - 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"
+        "inviteExpiry": "Esta invitación vencerá el {date} a las {time}, que es en {expiresInMinutes}, así que regístrese cuanto antes.",
+        "linkButton": "Configura tu cuenta"
     },
     "welcomeEmail": {
-        "name": "Correo de bienvenida",
+        "name": "Bienvenido",
         "title": "Bienvenido a Jellyfin",
         "welcome": "¡Bienvenido a Jellyfin!",
         "youCanLoginWith": "Puede iniciar sesión con los detalles a continuación",
@@ -66,12 +66,12 @@
         "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"
+        "confirmEmail": "Confirma el 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."
+        "contactTheAdmin": "Póngase en contacto con el administrador para obtener más información."
     }
-}
+}

lang/email/fr-fr.json

@@ -12,14 +12,14 @@
         "title": "Notification : Utilisateur créé",
         "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 messages 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 {code} a expiré à {time}.",
-        "notificationNotice": "Note : Les emails de notification peuvent être activés sur le tableau de bord administrateur.",
+        "notificationNotice": "Note : Les messages de notification peuvent être activés sur le tableau de bord administrateur.",
         "name": "Expiration de l'invitation"
     },
     "passwordReset": {
@@ -75,4 +75,4 @@
         "title": "Ton compte a été ré-activé - Jellyfin",
         "yourAccountWasEnabled": "Ton compte a été ré-activé."
     }
-}
+}

lang/email/id-id.json

@@ -3,7 +3,7 @@
         "name": "Bahasa Indonesia (ID)"
     },
     "strings": {
-        "ifItWasNotYou": "Jika ini bukan kamu, silahkan mengabaikan email ini.",
+        "ifItWasNotYou": "Jika ini bukan kamu, silahkan abaikan email ini.",
         "reason": "Alasan",
         "helloUser": "Halo {username},"
     },
@@ -56,4 +56,4 @@
         "confirmEmail": "Konfirmasi Email",
         "name": "Email konfirmasi"
     }
-}
+}

lang/email/nl-nl.json

@@ -11,14 +11,14 @@
         "title": "Melding: Gebruiker aangemaakt",
         "aUserWasCreated": "Er is een gebruiker aangemaakt door gebruik te maken van code {code}.",
         "time": "Tijdstip",
-        "notificationNotice": "Opmerking: Meldingse-mails kunnen worden aan- of uitgezet via het beheerdersdashboard.",
+        "notificationNotice": "Opmerking: Meldingen kunnen worden aan- of uitgezet via het beheerders-dashboard.",
         "name": "Gebruiker aangemaakt"
     },
     "inviteExpiry": {
         "title": "Melding: Uitnodiging verlopen",
         "inviteExpired": "Uitnodiging verlopen.",
         "expiredAt": "Code {code} is verlopen op {time}.",
-        "notificationNotice": "Opmerking: Meldingse-mails kunnen worden aan- of uitgezet via het beheerdersdashboard.",
+        "notificationNotice": "Opmerking: Meldingen kunnen worden aan- of uitgezet via het beheerders-dashboard.",
         "name": "Uitnodiging verlopen"
     },
     "passwordReset": {
@@ -74,4 +74,4 @@
         "name": "Gebruiker ingeschakeld",
         "title": "Je account is opnieuw ingeschakeld - Jellyfin"
     }
-}
+}

lang/email/pl-pl.json

@@ -0,0 +1,77 @@
+{
+    "meta": {
+        "name": "Polski (PL)"
+    },
+    "strings": {
+        "ifItWasNotYou": "Jeśli to nie ty, zignoruj tą wiadomość.",
+        "helloUser": "Hi {username},",
+        "reason": "Przyczyna"
+    },
+    "userCreated": {
+        "name": "Tworzenie użytkownika",
+        "title": "Uwaga: Użytkownik utworzony",
+        "aUserWasCreated": "Użytkownik został utworzony przy użyciu kodu {code}.",
+        "time": "Czas",
+        "notificationNotice": "Uwaga: Powiadomienia mogą być włączone z panelu administratora."
+    },
+    "inviteExpiry": {
+        "name": "Zaproszenie wygaśnie",
+        "title": "Uwaga: Zaproszenie wygasło",
+        "inviteExpired": "Zaproszenie wygasło.",
+        "expiredAt": "Kod {code} wygaśnie za {time}.",
+        "notificationNotice": "Uwaga: Powiadomienia mogą zostać włączone w panelu administratora."
+    },
+    "passwordReset": {
+        "name": "Resetowanie hasła",
+        "title": "Prośba o reset hasła -Jellyfin",
+        "someoneHasRequestedReset": "Ktoś niedawno poprosił o zresetowanie hasła w Jellyfin.",
+        "ifItWasYou": "Jeśli to byłeś ty, wprowadź PIN poniżej.",
+        "ifItWasYouLink": "Jeśli to byłeś ty, kliknij link poniżej.",
+        "codeExpiry": "Ten kod wygaśnie {date}, o {time} UTC, dokładnie za {expiresInMinutes}.",
+        "pin": "PIN"
+    },
+    "userDeleted": {
+        "name": "Usuwanie użytownika",
+        "title": "Twoje konto zostało usunięte - Jellyfin",
+        "yourAccountWasDeleted": "Twoje konto Jellyfin zostało usunięte."
+    },
+    "userDisabled": {
+        "name": "Użytkownik wyłączony",
+        "title": "Twoje konto zostało wyłączone - Jellyfin",
+        "yourAccountWasDisabled": "Twoje konto zostało wyłączone."
+    },
+    "userEnabled": {
+        "name": "Użytkownik włączony",
+        "title": "Twoje konto zostało ponownie włączony - Jellyfin",
+        "yourAccountWasEnabled": "Twoje konto zostało włączone ponownie."
+    },
+    "inviteEmail": {
+        "name": "Email z zaproszeniem",
+        "title": "Zaproszenie - Jellyfin",
+        "hello": "Cześć",
+        "youHaveBeenInvited": "Zostałeś zaproszony na Jellyfin.",
+        "toJoin": "Aby dołączyć, przejdź używając linku poniżej.",
+        "inviteExpiry": "To zaproszenie wygaśnie {date} o {time}, czyli za {expiresInMinutes}, więc się pośpiesz.",
+        "linkButton": "Skonfiguruj swoje konto"
+    },
+    "welcomeEmail": {
+        "name": "Witaj",
+        "title": "Witaj w Jellyfin",
+        "welcome": "Witaj w Jellyfin!",
+        "youCanLoginWith": "Możesz się teraz zalogować używając poniższych danych",
+        "yourAccountWillExpire": "Twoje konto wygaśnie {date}.",
+        "jellyfinURL": "URL"
+    },
+    "emailConfirmation": {
+        "name": "Potwierdź adres email",
+        "title": "Potwierdź adres email - Jellyfin",
+        "clickBelow": "Naciśnij link poniżej aby potwierdzić adres email.",
+        "confirmEmail": "Potwierdź adres email"
+    },
+    "userExpired": {
+        "name": "Użytkownik wygasł",
+        "title": "Twoje konto wygasło - Jellyfin",
+        "yourAccountHasExpired": "Twoje konto wygasło.",
+        "contactTheAdmin": "Skontaktuj się z administratorem aby uzyskać więcej szczegółów."
+    }
+}

lang/email/pt-br.json

@@ -11,14 +11,14 @@
         "title": "Aviso: Usuário criado",
         "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: As mensagens de notificação podem ser alternadas no painel do administrador.",
         "name": "Criação de usuário"
     },
     "inviteExpiry": {
         "title": "Aviso: Convite expirado",
         "inviteExpired": "Convite expirado.",
         "expiredAt": "O código {code} expirou em {time}.",
-        "notificationNotice": "Nota: Os emails de notificação podem ser alternados no painel do administrador.",
+        "notificationNotice": "Nota: As mensagens de notificação podem ser alternadas no painel do administrador.",
         "name": "Convite Expirado"
     },
     "passwordReset": {
@@ -74,4 +74,4 @@
         "name": "Usuário ativado",
         "yourAccountWasEnabled": "Sua conta foi reativada."
     }
-}
+}

lang/email/ro-ro.json

@@ -0,0 +1,77 @@
+{
+    "meta": {
+        "name": "Română (ROU)"
+    },
+    "strings": {
+        "ifItWasNotYou": "Dacă nu ați fost dvs., vă rugăm să ignorați asta.",
+        "helloUser": "Salut {username},",
+        "reason": "Motiv"
+    },
+    "userCreated": {
+        "name": "Crearea utilizatorului",
+        "title": "Notă: Utilizator creat",
+        "aUserWasCreated": "Un utilizator a fost creat folosind codul {code}.",
+        "time": "Oră",
+        "notificationNotice": "Notă: Mesajele de notificare pot fi comutate în Tabloul de Bord."
+    },
+    "inviteExpiry": {
+        "name": "Expirare invitație",
+        "title": "Notă: Invitația a expirat",
+        "inviteExpired": "Invitația a expirat.",
+        "expiredAt": "Codul {code} a expirat la {time}.",
+        "notificationNotice": "Notă: Mesajele de notificare pot fi comutate în Tabloul de Bord."
+    },
+    "passwordReset": {
+        "name": "Resetare parolă",
+        "title": "Solicitată resetarea parolei - Jellyfin",
+        "someoneHasRequestedReset": "Cineva a cerut recent o resetare a parolei pe Jellyfin.",
+        "ifItWasYou": "Dacă acesta ați fost dvs., introduceți codul de mai jos în solicitare.",
+        "ifItWasYouLink": "Dacă acesta ați fost dvs., faceți clic pe linkul de mai jos.",
+        "codeExpiry": "Codul va expira pe {date}, la {time} UTC, adică în {expiresInMinutes}.",
+        "pin": "PIN"
+    },
+    "userDeleted": {
+        "name": "Ștergere utilizator",
+        "title": "Contul dvs. a fost șters - Jellyfin",
+        "yourAccountWasDeleted": "Contul dvs. Jellyfin a fost șters."
+    },
+    "userDisabled": {
+        "name": "Utilizator dezactivat",
+        "title": "Contul dvs. a fost dezactivat - Jellyfin",
+        "yourAccountWasDisabled": "Contul dvs. a fost dezactivat."
+    },
+    "userEnabled": {
+        "name": "Utilizator activat",
+        "title": "Contul dvs. a fost reactivat - Jellyfin",
+        "yourAccountWasEnabled": "Contul dvs. a fost reactivat."
+    },
+    "inviteEmail": {
+        "name": "E-mail de invitație",
+        "title": "Invitație - Jellyfin",
+        "hello": "Salut",
+        "youHaveBeenInvited": "Ai fost invitat la Jellyfin.",
+        "toJoin": "Pentru a vă alătura, urmați linkul de mai jos.",
+        "inviteExpiry": "Această invitație va expira pe {date} la {time}, care este în {expiresInMinutes}, așa că acționați rapid.",
+        "linkButton": "Configurați-vă contul"
+    },
+    "welcomeEmail": {
+        "name": "Bun venit",
+        "title": "Bun venit la Jellyfin",
+        "welcome": "Bun venit la Jellyfin!",
+        "youCanLoginWith": "Vă puteți autentifica cu detaliile de mai jos",
+        "yourAccountWillExpire": "Contul dvs. va expira pe {date}.",
+        "jellyfinURL": "URL"
+    },
+    "emailConfirmation": {
+        "name": "E-mail de confirmare",
+        "title": "Confirmați e-mailul dvs. - Jellyfin",
+        "clickBelow": "Faceți clic pe linkul de mai jos pentru a vă confirma adresa de e-mail și pentru a începe să utilizați Jellyfin.",
+        "confirmEmail": "Confirmați adresa de e-mail"
+    },
+    "userExpired": {
+        "name": "Expirarea utilizatorului",
+        "title": "Contul dvs. a expirat - Jellyfin",
+        "yourAccountHasExpired": "Contul dvs. a expirat.",
+        "contactTheAdmin": "Contactați administratorul pentru mai multe informații."
+    }
+}

lang/email/sv-se.json

@@ -62,4 +62,4 @@
         "yourAccountHasExpired": "Ditt konto har gått ut.",
         "contactTheAdmin": "Kontakta administratören för mer information."
     }
-}
+}