From 89e0cfd8741b6763ca04e90558bccf4c3c380cfa Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 13 Apr 2024 13:25:10 +0200 Subject: [feature] Admin accounts endpoints; approve/reject sign-ups (#2826) * update settings panels, add pending overview + approve/deny functions * add admin accounts get, approve, reject * send approved/rejected emails * use signup URL * docs! * email * swagger * web linting * fix email tests * wee lil fixerinos * use new paging logic for GetAccounts() series of admin endpoints, small changes to query building * shuffle useAccountIDIn check *before* adding to query * fix parse from toot react error * use `netip.Addr` * put valid slices in globals * optimistic updates for account state --------- Co-authored-by: kim --- web/template/email_confirm.tmpl | 2 ++ web/template/email_report_closed.tmpl | 4 ++++ web/template/email_reset.tmpl | 2 ++ web/template/email_signup_approved.tmpl | 34 +++++++++++++++++++++++++++++++++ web/template/email_signup_rejected.tmpl | 28 +++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 web/template/email_signup_approved.tmpl create mode 100644 web/template/email_signup_rejected.tmpl (limited to 'web/template') diff --git a/web/template/email_confirm.tmpl b/web/template/email_confirm.tmpl index 7963cf631..b223e9e40 100644 --- a/web/template/email_confirm.tmpl +++ b/web/template/email_confirm.tmpl @@ -27,4 +27,6 @@ To confirm your email, paste the following in your browser's address bar: {{ .ConfirmLink }} +--- + If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{ .InstanceURL -}}. diff --git a/web/template/email_report_closed.tmpl b/web/template/email_report_closed.tmpl index 878e5b63f..4cbac5aa6 100644 --- a/web/template/email_report_closed.tmpl +++ b/web/template/email_report_closed.tmpl @@ -25,3 +25,7 @@ The report you submitted has now been closed. {{ if .ActionTakenComment }}The moderator who closed the report left the following comment: {{ .ActionTakenComment }} {{- else }}The moderator who closed the report did not leave a comment.{{ end }} + +--- + +If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{ .InstanceURL -}}. diff --git a/web/template/email_reset.tmpl b/web/template/email_reset.tmpl index 789470efc..afc74f203 100644 --- a/web/template/email_reset.tmpl +++ b/web/template/email_reset.tmpl @@ -25,4 +25,6 @@ To reset your password, paste the following in your browser's address bar: {{.ResetLink}} +--- + If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{.InstanceURL}}. diff --git a/web/template/email_signup_approved.tmpl b/web/template/email_signup_approved.tmpl new file mode 100644 index 000000000..83402a2ae --- /dev/null +++ b/web/template/email_signup_approved.tmpl @@ -0,0 +1,34 @@ +{{- /* +// GoToSocial +// Copyright (C) GoToSocial Authors admin@gotosocial.org +// SPDX-License-Identifier: AGPL-3.0-or-later +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . +*/ -}} + +Hello {{ .Username -}}! + +You are receiving this mail because your request for an account on {{ .InstanceName }} has been approved by a moderator. Welcome! + +If you have already confirmed your email address, you can now log in to your new account using a client application of your choice. + +Some client applications known to work with GoToSocial are listed here: {{ .InstanceURL -}}#apps. + +If you have not yet confirmed your email address, you will not be able to log in until you have done so. + +Please check your inbox for the relevant email containing the confirmation link. + +--- + +If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{ .InstanceURL -}}. diff --git a/web/template/email_signup_rejected.tmpl b/web/template/email_signup_rejected.tmpl new file mode 100644 index 000000000..6101165ad --- /dev/null +++ b/web/template/email_signup_rejected.tmpl @@ -0,0 +1,28 @@ +{{- /* +// GoToSocial +// Copyright (C) GoToSocial Authors admin@gotosocial.org +// SPDX-License-Identifier: AGPL-3.0-or-later +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . +*/ -}} + +Hello! + +You are receiving this mail because your request for an account on {{ .InstanceName }} has been rejected by a moderator. + +{{ if .Message }}The moderator who handled the sign-up included the following message regarding this rejection: "{{- .Message -}}"{{ end }} + +--- + +If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of {{ .InstanceURL -}}. -- cgit v1.2.3