Fix missing app variable in mail subject for password resets (#15352)

Cyberes · web-flow · commit 9d641d88b785 · 2023-03-30T11:44:53.000+01:00
* Update mailer.py

Fix `KeyError: 'app'`

* Create 15352.bugfix

Signed-off-by: Cyberes &lt;cyberes@evulid.cc&gt;

---------

Signed-off-by: Cyberes &lt;cyberes@evulid.cc&gt;
diff --git a/changelog.d/15352.bugfix 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
@@ -149,7 +149,7 @@ async def send_password_reset_mail(
         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,
         )
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix missing app variable in mail subject for password resets. Contributed by Cyberes.`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ async def send_password_reset_mail(`
`149`	`149`	`await self.send_email(`
`150`	`150`	`email_address,`
`151`	`151`	`self.email_subjects.password_reset`
`152`		`- % {"server_name": self.hs.config.server.server_name},`
	`152`	`+ % {"server_name": self.hs.config.server.server_name, "app": self.app_name},`
`153`	`153`	`template_vars,`
`154`	`154`	`)`
`155`	`155`