summary refs log tree commit diff
diff options
context:
space:
mode:
authorCyberes <64224601+Cyberes@users.noreply.github.com>2023-03-30 04:44:53 -0600
committerGitHub <noreply@github.com>2023-03-30 11:44:53 +0100
commit9d641d88b785dd4b4e6e7dca3356678a42a3ac23 (patch)
tree97a8dadfb27133981b2d092f17bf4755d14501a2
parentFix registering a device on an account with lots of devices (#15348) (diff)
downloadsynapse-9d641d88b785dd4b4e6e7dca3356678a42a3ac23.tar.xz
Fix missing app variable in mail subject for password resets (#15352)
* Update mailer.py

Fix `KeyError: 'app'`

* Create 15352.bugfix

Signed-off-by: Cyberes <cyberes@evulid.cc>

---------

Signed-off-by: Cyberes <cyberes@evulid.cc>
-rw-r--r--changelog.d/15352.bugfix1
-rw-r--r--synapse/push/mailer.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/15352.bugfix b/changelog.d/15352.bugfix
new file mode 100644
index 0000000000..36d6615cac
--- /dev/null
+++ b/changelog.d/15352.bugfix
@@ -0,0 +1 @@
+Fix missing app variable in mail subject for password resets. Contributed by Cyberes.
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 93b255ced5..491a09b71d 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -149,7 +149,7 @@ class Mailer:
         await self.send_email(
             email_address,
             self.email_subjects.password_reset
-            % {"server_name": self.hs.config.server.server_name},
+            % {"server_name": self.hs.config.server.server_name, "app": self.app_name},
             template_vars,
         )