diff options
author | 2023-03-19 13:11:46 +0100 | |
---|---|---|
committer | 2023-03-19 13:11:46 +0100 | |
commit | 7db81cde444f6bc95e79527af0997de1788d48c7 (patch) | |
tree | f6c077ec298a4f018d0870798bc46bd64ba70069 /web | |
parent | [docs] Update docs on how to login (#1626) (diff) | |
download | gotosocial-7db81cde444f6bc95e79527af0997de1788d48c7.tar.xz |
[feature] Email notifications for new / closed moderation reports (#1628)
* start fiddling about with email sending to allow multiple recipients
* do some fiddling
* notifs working
* notify on closed report
* finishing up
* envparsing
* use strings.ContainsAny
Diffstat (limited to 'web')
-rw-r--r-- | web/template/email_confirm.tmpl | 28 | ||||
-rw-r--r-- | web/template/email_confirm_html.tmpl | 47 | ||||
-rw-r--r-- | web/template/email_confirm_text.tmpl | 27 | ||||
-rw-r--r-- | web/template/email_new_report.tmpl | 26 | ||||
-rw-r--r-- | web/template/email_report_closed.tmpl | 27 | ||||
-rw-r--r-- | web/template/email_reset.tmpl | 28 | ||||
-rw-r--r-- | web/template/email_reset_html.tmpl | 47 | ||||
-rw-r--r-- | web/template/email_reset_text.tmpl | 27 | ||||
-rw-r--r-- | web/template/email_test.tmpl (renamed from web/template/email_test_text.tmpl) | 0 |
9 files changed, 109 insertions, 148 deletions
diff --git a/web/template/email_confirm.tmpl b/web/template/email_confirm.tmpl new file mode 100644 index 000000000..17926fdde --- /dev/null +++ b/web/template/email_confirm.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 <http://www.gnu.org/licenses/>. +*/ -}} + +Hello {{.Username}}! + +You are receiving this mail because you've requested an account on {{.InstanceURL}}. + +We just need to confirm that this is your email address. 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_confirm_html.tmpl b/web/template/email_confirm_html.tmpl deleted file mode 100644 index 3fb9b234b..000000000 --- a/web/template/email_confirm_html.tmpl +++ /dev/null @@ -1,47 +0,0 @@ -{{- /* - GoToSocial - Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org - - 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 <http://www.gnu.org/licenses/>. -*/ -}} - -<!DOCTYPE html> -<html> - </head> - <body> - <div> - <h1> - Hello {{.Username}}! - </h1> - </div> - <div> - <p> - You are receiving this mail because you've requested an account on <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. - </p> - <p> - We just need to confirm that this is your email address. To confirm your email, <a href="{{.ConfirmLink}}">click here</a> or paste the following in your browser's address bar: - </p> - <p> - <code> - {{.ConfirmLink}} - </code> - </p> - </div> - <div> - <p> - If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. - </p> - </div> - </body> -</html>
\ No newline at end of file diff --git a/web/template/email_confirm_text.tmpl b/web/template/email_confirm_text.tmpl deleted file mode 100644 index 738f6fd37..000000000 --- a/web/template/email_confirm_text.tmpl +++ /dev/null @@ -1,27 +0,0 @@ -{{- /* - GoToSocial - Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org - - 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 <http://www.gnu.org/licenses/>. -*/ -}} - -Hello {{.Username}}! - -You are receiving this mail because you've requested an account on {{.InstanceURL}}. - -We just need to confirm that this is your email address. 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_new_report.tmpl b/web/template/email_new_report.tmpl new file mode 100644 index 000000000..af98579c4 --- /dev/null +++ b/web/template/email_new_report.tmpl @@ -0,0 +1,26 @@ +{{- /* +// 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 <http://www.gnu.org/licenses/>. +*/ -}} + +Hello moderator of {{ .InstanceName }} ({{ .InstanceURL }})! + +{{ if .ReportDomain }}Someone from {{ .ReportDomain }} has reported a user from your instance. +{{- else if .ReportTargetDomain }}Someone from your instance has reported a user from {{ .ReportTargetDomain }}. +{{- else }}Someone from your instance has reported another user from your instance.{{ end }} + +To view the report, paste the following link into your browser: {{ .ReportURL }} diff --git a/web/template/email_report_closed.tmpl b/web/template/email_report_closed.tmpl new file mode 100644 index 000000000..878e5b63f --- /dev/null +++ b/web/template/email_report_closed.tmpl @@ -0,0 +1,27 @@ +{{- /* +// 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 <http://www.gnu.org/licenses/>. +*/ -}} + +Hello {{.Username}}! + +You recently reported the account @{{ .ReportTargetUsername }}{{ if .ReportTargetDomain }}@{{ .ReportTargetDomain }}{{ end }} to the moderator(s) of {{ .InstanceName }} ({{ .InstanceURL }}). + +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 }} diff --git a/web/template/email_reset.tmpl b/web/template/email_reset.tmpl new file mode 100644 index 000000000..789470efc --- /dev/null +++ b/web/template/email_reset.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 <http://www.gnu.org/licenses/>. +*/ -}} + +Hello {{.Username}}! + +You are receiving this mail because a password reset has been requested for your account on {{.InstanceURL}}. + +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_reset_html.tmpl b/web/template/email_reset_html.tmpl deleted file mode 100644 index 4da26de15..000000000 --- a/web/template/email_reset_html.tmpl +++ /dev/null @@ -1,47 +0,0 @@ -{{- /* - GoToSocial - Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org - - 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 <http://www.gnu.org/licenses/>. -*/ -}} - -<!DOCTYPE html> -<html> - </head> - <body> - <div> - <h1> - Hello {{.Username}}! - </h1> - </div> - <div> - <p> - You are receiving this mail because a password reset has been requested for your account on <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. - </p> - <p> - To reset your password, <a href="{{.ResetLink}}">click here</a> or paste the following in your browser's address bar: - </p> - <p> - <code> - {{.ResetLink}} - </code> - </p> - </div> - <div> - <p> - If you believe you've been sent this email in error, feel free to ignore it, or contact the administrator of <a href="{{.InstanceURL}}">{{.InstanceName}}</a>. - </p> - </div> - </body> -</html>
\ No newline at end of file diff --git a/web/template/email_reset_text.tmpl b/web/template/email_reset_text.tmpl deleted file mode 100644 index 378bf3f7e..000000000 --- a/web/template/email_reset_text.tmpl +++ /dev/null @@ -1,27 +0,0 @@ -{{- /* - GoToSocial - Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org - - 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 <http://www.gnu.org/licenses/>. -*/ -}} - -Hello {{.Username}}! - -You are receiving this mail because a password reset has been requested for your account on {{.InstanceURL}}. - -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_test_text.tmpl b/web/template/email_test.tmpl index d7af4d161..d7af4d161 100644 --- a/web/template/email_test_text.tmpl +++ b/web/template/email_test.tmpl |