userpage: show and allow modification of contact methods

api-messages.go

@@ -336,6 +336,10 @@ func (app *appContext) SetContactMethods(gc *gin.Context) {
 		respondBool(400, false, gc)
 		return
 	}
+	app.setContactMethods(req, gc)
+}
+
+func (app *appContext) setContactMethods(req SetContactMethodsDTO, gc *gin.Context) {
 	if tgUser, ok := app.storage.telegram[req.ID]; ok {
 		change := tgUser.Contact != req.Telegram
 		tgUser.Contact = req.Telegram

api-userpage.go

@@ -19,6 +19,88 @@ func (app *appContext) MyDetails(gc *gin.Context) {
 		return
 	}
 	resp.Username = user.Name
+	resp.Admin = user.Policy.IsAdministrator
+	resp.Disabled = user.Policy.IsDisabled
+
+	if exp, ok := app.storage.users[user.ID]; ok {
+		resp.Expiry = exp.Unix()
+	}
+
+	app.storage.loadEmails()
+	app.storage.loadDiscordUsers()
+	app.storage.loadMatrixUsers()
+	app.storage.loadTelegramUsers()
+
+	if emailEnabled {
+		resp.Email = &MyDetailsContactMethodsDTO{}
+		if email, ok := app.storage.emails[user.ID]; ok {
+			resp.Email.Value = email.Addr
+			resp.Email.Enabled = email.Contact
+		}
+	}
+
+	if discordEnabled {
+		resp.Discord = &MyDetailsContactMethodsDTO{}
+		if discord, ok := app.storage.discord[user.ID]; ok {
+			resp.Discord.Value = RenderDiscordUsername(discord)
+			resp.Discord.Enabled = discord.Contact
+		}
+	}
+
+	if telegramEnabled {
+		resp.Telegram = &MyDetailsContactMethodsDTO{}
+		if telegram, ok := app.storage.telegram[user.ID]; ok {
+			resp.Telegram.Value = telegram.Username
+			resp.Telegram.Enabled = telegram.Contact
+		}
+	}
+
+	if matrixEnabled {
+		resp.Matrix = &MyDetailsContactMethodsDTO{}
+		if matrix, ok := app.storage.matrix[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("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)
+}

html/user.html

@@ -46,6 +46,14 @@
             <div class="card @low dark:~d_neutral mb-4" id="card-user">
                 <span class="heading"></span>
             </div>
+            <div class="grid grid-cols-2 gap-4">
+                <div class="card @low dark:~d_neutral" id="card-times">
+                </div>
+                <div class="card @low dark:~d_neutral" id="card-contact">
+                    <span class="heading">{{ .strings.contactMethods }}</span>
+                    <div class="content"></div>
+                </div>
+            </div>
         </div>
         <script src="{{ .urlBase }}/js/user.js" type="module"></script>
     </body>

lang/admin/da-dk.json

@@ -22,11 +22,6 @@
         "select": "Vælg",
         "name": "Navn",
         "date": "Dato",
-        "enabled": "Aktiveret",
-        "disabled": "Deaktiveret",
-        "reEnable": "Genaktiver",
-        "disable": "Deaktiver",
-        "admin": "Administrator",
         "updates": "Opdateringer",
         "update": "Opdatering",
         "download": "Hent",
@@ -136,7 +131,6 @@
         "errorCreateProfile": "Kunne ikke oprette profilen {n}",
         "errorSetDefaultProfile": "Standard profilen kunne ikke indstilles.",
         "errorLoadUsers": "Kunne ikke indlæse brugere.",
-        "errorSaveSettings": "Kunne ikke gemme indstillingerne.",
         "errorLoadSettings": "Indstillingerne kunne ikke indlæses.",
         "errorSetOmbiDefaults": "Ombi standarderne kunne ikke gemmes.",
         "errorLoadOmbiUsers": "Kunne ikke indlæse ombi brugere.",

lang/admin/de-de.json

@@ -77,17 +77,12 @@
         "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:",
@@ -129,7 +124,6 @@
         "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.",

lang/admin/el-gr.json

@@ -75,9 +75,6 @@
         "download": "Λήψη",
         "search": "Αναζήτηση",
         "inviteDuration": "Διάρκεια Πρόσκλησης",
-        "enabled": "Ενεργοποιημένο",
-        "disabled": "Απενεργοποιημένο",
-        "admin": "Διαχειριστής",
         "expiry": "Λήξη",
         "userExpiry": "Λήξη Χρήστη",
         "userExpiryDescription": "Μετά απο ένα καθορισμένο χρόνο μετά απο κάθε εγγραφή, το jfa-go θα διαγράφει/απενεργοποιεί τον λογαριασμό. Μπορείτε να αλλάξετε αυτή την συμπεριφορά στις ρυθμίσεις.",
@@ -86,8 +83,6 @@
         "message": "Μήνυμα",
         "extendExpiry": "Παράταση λήξης",
         "markdownSupported": "Το Markdown υποστυρίζεται.",
-        "reEnable": "Επανα-ενεργοποίηση",
-        "disable": "Απενεργοποίηση",
         "inviteMonths": "Μήνες"
     },
     "notifications": {
@@ -105,7 +100,6 @@
         "errorCreateProfile": "Αποτυχία δημιουργίας του προφίλ {n}",
         "errorSetDefaultProfile": "Αποτυχία ορισμού του προκαθορισμένου προφίλ.",
         "errorLoadUsers": "Αποτυχία φόρτωσης χρηστών.",
-        "errorSaveSettings": "Αποτυχία αποθήκευσης ρυθμίσεων.",
         "errorLoadSettings": "Αποτυχία φόρτωσης ρυθμίσεων.",
         "errorSetOmbiDefaults": "Αποτυχία αποθήκευσης προκαθορισμένων ρυθμίσεων για το Ombi.",
         "errorLoadOmbiUsers": "Αποτυχία φόρτωσης χρηστών Ombi.",

lang/admin/en-gb.json

@@ -94,16 +94,12 @@
         "contactThrough": "Contact through:",
         "select": "Select",
         "date": "Date",
-        "enabled": "Enabled",
-        "disabled": "Disabled",
-        "disable": "Disable",
         "edit": "Edit",
         "extendExpiry": "Extend expiry",
         "sendPWR": "Send Password Reset",
         "inviteMonths": "Months",
         "inviteDuration": "Invite Duration",
         "add": "Add",
-        "reEnable": "Re-enable",
         "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.",
@@ -148,7 +144,6 @@
         "settingsApplyRestartLater": "Apply, restart later",
         "subject": "Subject",
         "setExpiry": "Set expiry",
-        "admin": "Admin",
         "download": "Download",
         "search": "Search",
         "advancedSettings": "Advanced Settings",
@@ -187,7 +182,6 @@
         "errorLoadProfiles": "Failed to load profiles.",
         "errorCreateProfile": "Failed to create profile {n}",
         "errorLoadUsers": "Failed to load users.",
-        "errorSaveSettings": "Couldn't save settings.",
         "errorSetOmbiProfile": "Failed to store ombi profile.",
         "errorLoadOmbiUsers": "Failed to load ombi users.",
         "errorFailureCheckLogs": "Failed (check console/logs)",

lang/admin/en-us.json

@@ -22,12 +22,7 @@
         "select": "Select",
         "name": "Name",
         "date": "Date",
-        "enabled": "Enabled",
-        "disabled": "Disabled",
-        "reEnable": "Re-enable",
         "setExpiry": "Set expiry",
-        "disable": "Disable",
-        "admin": "Admin",
         "updates": "Updates",
         "update": "Update",
         "download": "Download",
@@ -147,7 +142,6 @@
         "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.",
         "errorSetOmbiProfile": "Failed to store ombi profile.",
         "errorLoadOmbiUsers": "Failed to load ombi users.",

lang/admin/es-es.json

@@ -20,11 +20,6 @@
         "delete": "Eliminar",
         "name": "Nombre",
         "date": "Fecha",
-        "enabled": "Activado",
-        "disabled": "Desactivado",
-        "reEnable": "Reactivar",
-        "disable": "Desactivar",
-        "admin": "Administrador",
         "updates": "Actualizaciones",
         "update": "Actualizar",
         "download": "Descargar",
@@ -133,7 +128,6 @@
         "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.",

lang/admin/fr-fr.json

@@ -76,11 +76,6 @@
         "edit": "Éditer",
         "customizeMessages": "Personnaliser les e-mails",
         "inviteDuration": "Durée de l'invitation",
-        "enabled": "Activé",
-        "disabled": "Désactivé",
-        "reEnable": "Ré-activé",
-        "disable": "Désactivé",
-        "admin": "Administrateur",
         "expiry": "Expiration",
         "advancedSettings": "Paramètres avancés",
         "userExpiry": "Expiration de l'utilisateur",
@@ -130,7 +125,6 @@
         "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.",

lang/admin/hu-hu.json

@@ -22,12 +22,7 @@
         "select": "Kiválasztás",
         "name": "Név",
         "date": "Dátum",
-        "enabled": "Engedélyezve",
-        "disabled": "Tiltva",
-        "reEnable": "Újra engedélyezés",
         "setExpiry": "Lejárat beállítása",
-        "disable": "Letiltás",
-        "admin": "Adminisztrátor",
         "updates": "Frissítések",
         "update": "Frissítés",
         "download": "Letöltés",
@@ -134,7 +129,6 @@
         "errorCreateProfile": "",
         "errorSetDefaultProfile": "",
         "errorLoadUsers": "",
-        "errorSaveSettings": "",
         "errorLoadSettings": "",
         "errorSetOmbiProfile": "",
         "errorLoadOmbiUsers": "",

lang/admin/id-id.json

@@ -89,7 +89,6 @@
         "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.",

lang/admin/nl-nl.json

@@ -75,9 +75,6 @@
         "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",
@@ -87,8 +84,6 @@
         "search": "Zoeken",
         "advancedSettings": "Geavanceerde instellingen",
         "inviteMonths": "Maanden",
-        "reEnable": "Opnieuw inschakelen",
-        "disable": "Uitschakelen",
         "conditionals": "Voorwaarden",
         "donate": "Doneer",
         "contactThrough": "Stuur bericht via:",
@@ -129,7 +124,6 @@
         "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.",

lang/admin/pl-pl.json

@@ -22,12 +22,7 @@
         "select": "",
         "name": "Imię",
         "date": "Data",
-        "enabled": "Włączone",
-        "disabled": "Wyłączone",
-        "reEnable": "",
         "setExpiry": "",
-        "disable": "Wyłączone",
-        "admin": "Admin",
         "updates": "Aktualizacje",
         "update": "Aktualizacja",
         "download": "Pobierz",
@@ -136,7 +131,6 @@
         "errorCreateProfile": "",
         "errorSetDefaultProfile": "",
         "errorLoadUsers": "",
-        "errorSaveSettings": "",
         "errorLoadSettings": "",
         "errorSetOmbiProfile": "",
         "errorLoadOmbiUsers": "",

lang/admin/pt-br.json

@@ -73,11 +73,8 @@
         "reset": "Redefinir",
         "edit": "Editar",
         "customizeMessages": "Customizar Emails",
-        "disabled": "Desativado",
         "userExpiryDescription": "Após um determinado período de tempo de cada inscrição, o jfa-go apagará/desabilitará a conta. Você pode alterar essa opção nas configurações.",
         "inviteDuration": "Duração do Convite",
-        "enabled": "Habilitado",
-        "admin": "Admin",
         "expiry": "Expira",
         "userExpiry": "Vencimento do Usuário",
         "extendExpiry": "Extender o vencimento",
@@ -87,8 +84,6 @@
         "search": "Procurar",
         "advancedSettings": "Configurações Avançada",
         "inviteMonths": "Meses",
-        "reEnable": "Reativar",
-        "disable": "Desativar",
         "conditionals": "Condicionais",
         "donate": "Doar",
         "contactThrough": "Contato através:",
@@ -129,7 +124,6 @@
         "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.",

lang/admin/sv-se.json

@@ -73,10 +73,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.",
@@ -100,7 +97,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.",

lang/admin/vi-vn.json

@@ -22,12 +22,7 @@
         "select": "Chọn",
         "name": "Tên",
         "date": "Ngày",
-        "enabled": "Mở",
-        "disabled": "Tắt",
-        "reEnable": "Mở lại",
         "setExpiry": "Đặt hết hạn",
-        "disable": "Tắt",
-        "admin": "Admin",
         "updates": "Cập nhật",
         "update": "Cập nhật",
         "download": "Tải về",
@@ -135,7 +130,6 @@
         "errorCreateProfile": "",
         "errorSetDefaultProfile": "",
         "errorLoadUsers": "",
-        "errorSaveSettings": "",
         "errorLoadSettings": "",
         "errorSetOmbiProfile": "",
         "errorLoadOmbiUsers": "",

lang/admin/zh-hans.json

@@ -22,11 +22,6 @@
         "select": "选择",
         "name": "名称",
         "date": "日期",
-        "enabled": "已启用",
-        "disabled": "已禁用",
-        "reEnable": "重新启用",
-        "disable": "禁用",
-        "admin": "管理员",
         "updates": "更新",
         "update": "更新",
         "download": "下载",
@@ -137,7 +132,6 @@
         "errorCreateProfile": "创建配置文件{n}失败",
         "errorSetDefaultProfile": "设置默认配置文件失败。",
         "errorLoadUsers": "加载用户列表失败。",
-        "errorSaveSettings": "无法保存设置。",
         "errorLoadSettings": "加载配置列表失败。",
         "errorSetOmbiDefaults": "存储Ombi默认值失败。",
         "errorLoadOmbiUsers": "加载ombi用户列表失败。",

lang/admin/zh-hant.json

@@ -22,12 +22,7 @@
         "select": "選擇",
         "name": "帳戶名稱",
         "date": "日期",
-        "enabled": "已啟用",
-        "disabled": "已禁用",
-        "reEnable": "重新啟用",
         "setExpiry": "設置到期時間",
-        "disable": "禁用",
-        "admin": "管理員",
         "updates": "更新",
         "update": "更新",
         "download": "下載",
@@ -136,7 +131,6 @@
         "errorCreateProfile": "無法創建設置文件 {n}",
         "errorSetDefaultProfile": "無法設置預設設置文件。",
         "errorLoadUsers": "無法讀取帳戶。",
-        "errorSaveSettings": "無法儲存設置。",
         "errorLoadSettings": "無法讀取設置。",
         "errorSetOmbiProfile": "無法儲存 ombi 設置文件。",
         "errorLoadOmbiUsers": "無法讀取 ombi 帳戶。",

lang/common/da-dk.json

@@ -26,12 +26,18 @@
         "refresh": "Opdater",
         "required": "Påkrævet",
         "login": "Log på",
-        "logout": "Log ud"
+        "logout": "Log ud",
+        "admin": "Administrator",
+        "enabled": "Aktiveret",
+        "disabled": "Deaktiveret",
+        "reEnable": "Genaktiver",
+        "disable": "Deaktiver"
     },
     "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."
+        "error401Unauthorized": "Adgang nægtet. Prøv at genindlæse siden.",
+        "errorSaveSettings": "Kunne ikke gemme indstillingerne."
     }
 }

lang/common/de-de.json

@@ -26,12 +26,18 @@
         "refresh": "Aktualisieren",
         "required": "Erforderlich",
         "login": "Anmelden",
-        "logout": "Abmelden"
+        "logout": "Abmelden",
+        "admin": "Admin",
+        "enabled": "Aktiviert",
+        "disabled": "Deaktiviert",
+        "reEnable": "Wieder aktivieren",
+        "disable": "Deaktivieren"
     },
     "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."
+        "error401Unauthorized": "Unberechtigt. Versuch, die Seite zu aktualisieren.",
+        "errorSaveSettings": "Einstellungen konnten nicht gespeichert werden."
     }
 }

lang/common/el-gr.json

@@ -17,12 +17,18 @@
         "time12h": "12 Ώρες",
         "theme": "Θέμα",
         "login": "Σύνδεση",
-        "logout": "Αποσύνδεση"
+        "logout": "Αποσύνδεση",
+        "admin": "Διαχειριστής",
+        "enabled": "Ενεργοποιημένο",
+        "disabled": "Απενεργοποιημένο",
+        "reEnable": "Επανα-ενεργοποίηση",
+        "disable": "Απενεργοποίηση"
     },
     "notifications": {
         "errorLoginBlank": "Το όνομα χρήστη και/ή ο κωδικός ήταν κενά.",
         "errorConnection": "Δεν μπόρεσε να συνδεθεί με το jfa-go.",
         "errorUnknown": "Άγνωστο σφάλμα.",
-        "error401Unauthorized": "Ανεξουσιοδότητος. Προσπαθήστε να κάνετε επαναφόρτωση την σελίδα."
+        "error401Unauthorized": "Ανεξουσιοδότητος. Προσπαθήστε να κάνετε επαναφόρτωση την σελίδα.",
+        "errorSaveSettings": "Αποτυχία αποθήκευσης ρυθμίσεων."
     }
 }

lang/common/en-gb.json

@@ -26,12 +26,18 @@
         "refresh": "Refresh",
         "required": "Required",
         "login": "Login",
-        "logout": "Logout"
+        "logout": "Logout",
+        "admin": "Admin",
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "reEnable": "Re-enable",
+        "disable": "Disable"
     },
     "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."
+        "error401Unauthorized": "Unauthorised. Try refreshing the page.",
+        "errorSaveSettings": "Couldn't save settings."
     }
 }

lang/common/en-us.json

@@ -26,12 +26,19 @@
         "refresh": "Refresh",
         "required": "Required",
         "login": "Login",
-        "logout": "Logout"
+        "logout": "Logout",
+        "admin": "Admin",
+        "enabled": "Enabled",
+        "disabled": "Disabled",
+        "reEnable": "Re-enable",
+        "disable": "Disable",
+        "contactMethods": "Contact Methods"
     },
     "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."
+        "error401Unauthorized": "Unauthorized. Try refreshing the page.",
+        "errorSaveSettings": "Couldn't save settings."
     }
 }

lang/common/es-es.json

@@ -26,12 +26,18 @@
         "refresh": "Refrescar",
         "required": "Requerido",
         "login": "Acceso",
-        "logout": "Cerrar sesión"
+        "logout": "Cerrar sesión",
+        "admin": "Administrador",
+        "enabled": "Activado",
+        "disabled": "Desactivado",
+        "reEnable": "Reactivar",
+        "disable": "Desactivar"
     },
     "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."
+        "error401Unauthorized": "No autorizado. Intente actualizar la página.",
+        "errorSaveSettings": "No se pudo guardar la configuración."
     }
 }

lang/common/fr-fr.json

@@ -26,12 +26,18 @@
         "refresh": "Actualiser",
         "required": "Requis",
         "login": "S'identifier",
-        "logout": "Se déconnecter"
+        "logout": "Se déconnecter",
+        "admin": "Administrateur",
+        "enabled": "Activé",
+        "disabled": "Désactivé",
+        "reEnable": "Ré-activé",
+        "disable": "Désactivé"
     },
     "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."
+        "error401Unauthorized": "Non autorisé. Essayez d'actualiser la page.",
+        "errorSaveSettings": "Impossible d'enregistrer les paramètres."
     }
 }

lang/common/hu-hu.json

@@ -4,7 +4,12 @@
     },
     "strings": {
         "login": "Belépés",
-        "logout": "Kijelentkezés"
+        "logout": "Kijelentkezés",
+        "admin": "Adminisztrátor",
+        "enabled": "Engedélyezve",
+        "disabled": "Tiltva",
+        "reEnable": "Újra engedélyezés",
+        "disable": "Letiltás"
     },
     "notifications": {}
 }

lang/common/id-id.json

@@ -23,6 +23,7 @@
         "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."
+        "error401Unauthorized": "Tidak ter-otorisasi. Coba segarkan halaman.",
+        "errorSaveSettings": "Tidak dapat menyimpan pengaturan."
     }
 }

lang/common/nl-nl.json

@@ -26,12 +26,18 @@
         "refresh": "Ververs",
         "required": "Verplicht",
         "login": "Inloggen",
-        "logout": "Uitloggen"
+        "logout": "Uitloggen",
+        "admin": "Beheerder",
+        "enabled": "Ingeschakeld",
+        "disabled": "Uitgeschakeld",
+        "reEnable": "Opnieuw inschakelen",
+        "disable": "Uitschakelen"
     },
     "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."
+        "error401Unauthorized": "Geen toegang. Probeer de pagina te vernieuwen.",
+        "errorSaveSettings": "Opslaan van instellingen mislukt."
     }
 }

lang/common/pl-pl.json

@@ -24,7 +24,11 @@
         "contactDiscord": "Kontakt przez Discord",
         "theme": "Motyw",
         "refresh": "Odśwież",
-        "required": "Wymagane"
+        "required": "Wymagane",
+        "admin": "Admin",
+        "enabled": "Włączone",
+        "disabled": "Wyłączone",
+        "disable": "Wyłączone"
     },
     "notifications": {
         "errorConnection": "Nie udało się połączyć z jfa-go.",

lang/common/pt-br.json

@@ -26,12 +26,18 @@
         "refresh": "Atualizar",
         "required": "Requeridos",
         "login": "Login",
-        "logout": "Sair"
+        "logout": "Sair",
+        "admin": "Admin",
+        "enabled": "Habilitado",
+        "disabled": "Desativado",
+        "reEnable": "Reativar",
+        "disable": "Desativar"
     },
     "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."
+        "error401Unauthorized": "Não autorizado. Tente atualizar a página.",
+        "errorSaveSettings": "Não foi possível salvar as configurações."
     }
 }

lang/common/sv-se.json

@@ -16,12 +16,16 @@
         "time12h": "12 timmarsklocka",
         "theme": "Tema",
         "login": "Logga in",
-        "logout": "Logga ut"
+        "logout": "Logga ut",
+        "admin": "Admin",
+        "enabled": "Aktiverad",
+        "disabled": "Inaktiverad"
     },
     "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."
+        "error401Unauthorized": "Obehörig. Prova att uppdatera sidan.",
+        "errorSaveSettings": "Det gick inte att spara inställningarna."
     }
 }

lang/common/vi-vn.json

@@ -4,7 +4,12 @@
     },
     "strings": {
         "login": "Đăng nhập",
-        "logout": "Đăng xuất"
+        "logout": "Đăng xuất",
+        "admin": "Admin",
+        "enabled": "Mở",
+        "disabled": "Tắt",
+        "reEnable": "Mở lại",
+        "disable": "Tắt"
     },
     "notifications": {
         "errorConnection": "Không thể kết nối với jfa-go.",

lang/common/zh-hans.json

@@ -26,12 +26,18 @@
         "refresh": "刷新",
         "required": "必需的",
         "login": "登录",
-        "logout": "登出"
+        "logout": "登出",
+        "admin": "管理员",
+        "enabled": "已启用",
+        "disabled": "已禁用",
+        "reEnable": "重新启用",
+        "disable": "禁用"
     },
     "notifications": {
         "errorLoginBlank": "用户名/密码留空。",
         "errorConnection": "无法连接到 jfa-go。",
         "errorUnknown": "未知错误。",
-        "error401Unauthorized": "无授权。尝试刷新页面。"
+        "error401Unauthorized": "无授权。尝试刷新页面。",
+        "errorSaveSettings": "无法保存设置。"
     }
 }

lang/common/zh-hant.json

@@ -26,12 +26,18 @@
         "refresh": "重新整理",
         "required": "必填",
         "login": "登錄",
-        "logout": "登出"
+        "logout": "登出",
+        "admin": "管理員",
+        "enabled": "已啟用",
+        "disabled": "已禁用",
+        "reEnable": "重新啟用",
+        "disable": "禁用"
     },
     "notifications": {
         "errorLoginBlank": "帳戶名稱和/或密碼留空。",
         "errorConnection": "無法連接到 jfa-go。",
         "errorUnknown": "未知的錯誤。",
-        "error401Unauthorized": "未經授權。嘗試重新整理頁面。"
+        "error401Unauthorized": "未經授權。嘗試重新整理頁面。",
+        "errorSaveSettings": "無法儲存設置。"
     }
 }

lang/form/en-us.json

@@ -20,7 +20,7 @@
         "sendPIN": "Send the PIN below to the bot, then come back here to link your account.",
         "sendPINDiscord": "Type {command} in {server_channel} on Discord, then send the PIN below.",
         "matrixEnterUser": "Enter your User ID, press submit, and a PIN will be sent to you. Enter it here to continue.",
-        "welcomeUser": "Welcome, {user}"
+        "welcomeUser": "Welcome, {user}!"
     },
     "notifications": {
         "errorUserExists": "User already exists.",

models.go

@@ -378,4 +378,16 @@ type ReCaptchaResponseDTO struct {
 type MyDetailsDTO struct {
 	Id       string                      `json:"id"`
 	Username string                      `json:"username"`
+	Expiry   int64                       `json:"expiry"`
+	Admin    bool                        `json:"admin"`
+	Disabled bool                        `json:"disabled"`
+	Email    *MyDetailsContactMethodsDTO `json:"email,omitempty"`
+	Discord  *MyDetailsContactMethodsDTO `json:"discord,omitempty"`
+	Telegram *MyDetailsContactMethodsDTO `json:"telegram,omitempty"`
+	Matrix   *MyDetailsContactMethodsDTO `json:"matrix,omitempty"`
+}
+
+type MyDetailsContactMethodsDTO struct {
+	Value   string `json:"value"`
+	Enabled bool   `json:"enabled"`
 }

router.go

@@ -227,6 +227,8 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
 
 		if userPageEnabled {
 			user.GET(p+"/details", app.MyDetails)
+			user.POST(p+"/contact", app.SetMyContactMethods)
+			user.POST(p+"/logout", app.LogoutUser)
 		}
 	}
 }

scripts/langmover/login.json

@@ -23,13 +23,19 @@
         "theme": "common",
         "refresh": "common",
         "required": "common",
-        "login": "admin",
+        "login": "common",
-        "logout": "admin"
+        "logout": "common",
+        "admin": "common",
+        "enabled": "common",
+        "disabled": "common",
+        "reEnable": "common",
+        "disable": "common"
     },
     "notifications": {
-        "errorLoginBlank": "admin",
+        "errorLoginBlank": "common",
-        "errorConnection": "admin",
+        "errorConnection": "common",
-        "errorUnknown": "admin",
+        "errorUnknown": "common",
-        "error401Unauthorized": "admin"
+        "error401Unauthorized": "common",
+        "errorSaveSettings": "admin"
     }
 }

storage.go

@@ -144,6 +144,10 @@ func (st *Storage) loadLang(filesystems ...fs.FS) (err error) {
 	if err != nil {
 		return
 	}
+	err = st.loadLangEmail(filesystems...)
+	if err != nil {
+		return
+	}
 	err = st.loadLangUser(filesystems...)
 	if err != nil {
 		return
@@ -152,10 +156,6 @@ func (st *Storage) loadLang(filesystems ...fs.FS) (err error) {
 	if err != nil {
 		return
 	}
-	err = st.loadLangEmail(filesystems...)
-	if err != nil {
-		return
-	}
 	err = st.loadLangTelegram(filesystems...)
 	return
 }
@@ -437,6 +437,11 @@ func (st *Storage) loadLangUser(filesystems ...fs.FS) error {
 		}
 		st.lang.Common.patchCommonStrings(&lang.Strings, index)
 		st.lang.Common.patchCommonNotifications(&lang.Notifications, index)
+		// turns out, a lot of email strings are useful on the user page.
+		emailLang := []langSection{st.lang.Email[index].WelcomeEmail, st.lang.Email[index].UserDisabled, st.lang.Email[index].UserExpired}
+		for _, v := range emailLang {
+			patchLang(&lang.Strings, &v)
+		}
 		if fname != "en-us.json" {
 			if lang.Meta.Fallback != "" {
 				fallback, ok := st.lang.User[lang.Meta.Fallback]

ts/admin.ts

@@ -177,12 +177,6 @@ login.onLogin = () => {
     }
 }
 
-login.login("", "");
+login.bindLogout(document.getElementById("logout-button"));
 
-(document.getElementById('logout-button') as HTMLButtonElement).onclick = () => _post("/logout", null, (req: XMLHttpRequest): boolean => {
+login.login("", "");
-    if (req.readyState == 4 && req.status == 200) {
-        window.token = "";
-        location.reload();
-        return false;
-    }
-});

ts/modules/login.ts

@@ -1,17 +1,17 @@
 import { Modal } from "../modules/modal.js";
-import { toggleLoader } from "../modules/common.js";
+import { toggleLoader, _post } from "../modules/common.js";
 
 export class Login {
     private _modal: Modal;
     private _form: HTMLFormElement;
     private _url: string;
     private _onLogin: (username: string, password: string) => void;
+    private _logoutButton: HTMLElement = null;
 
     constructor(modal: Modal, endpoint: string) {
 
         this._url = window.URLBase + endpoint;
         if (this._url[this._url.length-1] != '/') this._url += "/";
-        this._url += "token/";
 
         this._modal = modal;
         this._form = this._modal.asElement().querySelector(".form-login") as HTMLFormElement;
@@ -29,6 +29,18 @@ export class Login {
         };
     }
 
+    bindLogout = (button: HTMLElement) => {
+        this._logoutButton = button;
+        this._logoutButton.classList.add("unfocused");
+        this._logoutButton.onclick = () => _post(this._url + "logout", null, (req: XMLHttpRequest): boolean => {
+            if (req.readyState == 4 && req.status == 200) {
+                window.token = "";
+                location.reload();
+                return false;
+            }
+        });
+    };
+
     get onLogin() { return this._onLogin; }
     set onLogin(f: (username: string, password: string) => void) { this._onLogin = f; }
 
@@ -36,7 +48,7 @@ export class Login {
         const req = new XMLHttpRequest();
         req.responseType = 'json';
         const refresh = (username == "" && password == "");
-        req.open("GET", this._url + (refresh ? "refresh" : "login"), true);
+        req.open("GET", this._url + (refresh ? "token/refresh" : "token/login"), true);
         if (!refresh) {
             req.setRequestHeader("Authorization", "Basic " + btoa(username + ":" + password));
         }
@@ -46,6 +58,10 @@ export class Login {
                     let errorMsg = window.lang.notif("errorConnection");
                     if (req.response) {
                         errorMsg = req.response["error"];
+                        const langErrorMsg = window.lang.strings(errorMsg);
+                        if (langErrorMsg) {
+                            errorMsg = langErrorMsg;
+                        }
                     }
                     if (!errorMsg) {
                         errorMsg = window.lang.notif("errorUnknown");
@@ -62,7 +78,8 @@ export class Login {
                         this._onLogin(username, password);
                     }
                     this._modal.close();
-                    document.getElementById("logout-button").classList.remove("unfocused");
+                    if (this._logoutButton != null)
+                        this._logoutButton.classList.remove("unfocused");
                 }
                 if (run) { run(+req.status); }
             }

ts/user.ts

@@ -30,21 +30,167 @@ window.modals = {} as Modals;
 window.notifications = new notificationBox(document.getElementById('notification-box') as HTMLDivElement, 5);
 
 var rootCard = document.getElementById("card-user");
+var contactCard = document.getElementById("card-contact");
 
-const login = new Login(window.modals.login as Modal, "/my/");
+interface MyDetailsContactMethod {
-login.onLogin = () => {
+    value: string;
-    console.log("Logged in.");
+    enabled: boolean;
+}
+
+interface MyDetails {
+    id: string;
+    username: string;
+    expiry: number;
+    admin: boolean;
+    disabled: boolean;
+    email?: MyDetailsContactMethod;
+    discord?: MyDetailsContactMethod;
+    telegram?: MyDetailsContactMethod;
+    matrix?: MyDetailsContactMethod;
+}
+
+interface ContactDTO {
+    email?: boolean;
+    discord?: boolean;
+    telegram?: boolean;
+    matrix?: boolean;
+}
+
+class ContactMethods {
+    private _card: HTMLElement;
+    private _buttons: { [name: string]: { element: HTMLElement, details: MyDetailsContactMethod } };
+
+    constructor (card: HTMLElement) {
+        this._card = card;
+        this._buttons = {};
+    }
+
+    clear = () => {
+        this._card.textContent = "";
+        this._buttons = {};
+    }
+
+    append = (name: string, details: MyDetailsContactMethod, icon: string) => {
+        const row = document.createElement("div");
+        row.classList.add("row", "flex-expand", "my-2");
+        row.innerHTML = `
+            <div class="inline align-middle">
+                <span class="shield ~info" alt="${name}">
+                    <span class="icon">
+                        ${icon}
+                    </span>
+                </span>
+                <span class="ml-2 font-bold">${details.value}</span>
+            </div>
+            <div class="flex items-center">
+                <button class="user-contact-enabled-disabled button ~neutral">
+                    <input type="checkbox" class="mr-2">
+                    <span>${window.lang.strings("enabled")}</span>
+                </button>
+            </div>
+        `;
+        
+        this._buttons[name] = {
+            element: row,
+            details: details
+        };
+        
+        const button = row.querySelector(".user-contact-enabled-disabled") as HTMLButtonElement;
+        const checkbox = button.querySelector("input[type=checkbox]") as HTMLInputElement;
+        const setButtonAppearance = () => {
+            if (checkbox.checked) {
+                button.classList.add("~info");
+                button.classList.remove("~neutral");
+            } else {
+                button.classList.add("~neutral");
+                button.classList.remove("~info");
+            }
+        };
+        const onPress = () => {
+            this._buttons[name].details.enabled = checkbox.checked;
+            setButtonAppearance();
+            this._save();
+        };
+
+        checkbox.onchange = onPress;
+        button.onclick = () => {
+            checkbox.checked = !checkbox.checked;
+            onPress();
+        };
+
+        checkbox.checked = details.enabled;
+        setButtonAppearance();
+
+        this._card.appendChild(row);
+    };
+
+    private _save = () => {
+        let data: ContactDTO = {};
+        for (let method of Object.keys(this._buttons)) {
+            data[method] = this._buttons[method].details.enabled;
+        }
+
+        _post("/my/contact", data, (req: XMLHttpRequest) => {
+            if (req.readyState == 4) {
+                if (req.status != 200) {
+                    window.notifications.customError("errorSetNotify", window.lang.notif("errorSaveSettings"));
+                    document.dispatchEvent(new CustomEvent("details-reload"));
+                }
+            }
+        });
+    };
+}
+
+var contactMethodList = new ContactMethods(contactCard);
+
+document.addEventListener("details-reload", () => {
     _get("/my/details", null, (req: XMLHttpRequest) => {
         if (req.readyState == 4) {
             if (req.status != 200) {
                 window.notifications.customError("myDetailsError", req.response["error"]);
                 return;
             }
-            window.jellyfinID = req.response["id"];
+            const details: MyDetails = req.response as MyDetails;
-            window.username = req.response["username"];
+            window.jellyfinID = details.id;
-            rootCard.querySelector(".heading").textContent = window.lang.strings("welcomeUser").replace("{user}", window.username);
+            window.username = details.username;
+            let innerHTML = `
+            <span>${window.lang.strings("welcomeUser").replace("{user}", window.username)}</span>
+            `;
+            if (details.admin) {
+                innerHTML += `<span class="chip ~info ml-4">${window.lang.strings("admin")}</span>`;
+            }
+            if (details.disabled) {
+                innerHTML += `<span class="chip ~warning ml-4">${window.lang.strings("disabled")}</span>`;
+            }
+
+            rootCard.querySelector(".heading").innerHTML = innerHTML;
+
+            contactMethodList.clear(); 
+
+            const contactMethods = [
+                ["email", `<i class="ri-mail-fill"></i>`],
+                ["discord", `<i class="ri-discord-fill"></i>`],
+                ["telegram", `<i class="ri-telegram-fill"></i>`],
+                ["matrix", `[m]`]
+            ];
+            
+            for (let method of contactMethods) {
+                if (method[0] in details) {
+                    contactMethodList.append(method[0], details[method[0]], method[1]);
+                }
+            }
         }
     });
+});
+
+const login = new Login(window.modals.login as Modal, "/my/");
+login.onLogin = () => {
+    console.log("Logged in.");
+    document.dispatchEvent(new CustomEvent("details-reload"));
 };
 
+
+
+login.bindLogout(document.getElementById("logout-button"));
+
 login.login("", "");