Merge branch 'release-v1.47' into matrix-org-hotfixes

1 files changed, 7 insertions, 0 deletions

diff --git a/synapse/api/errors.py b/synapse/api/errors.py

index 685d1c25cf..85302163da 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -596,3 +596,10 @@ class ShadowBanError(Exception):
 
     This should be caught and a proper "fake" success response sent to the user.
     """
+
+
+class ModuleFailedException(Exception):
+    """
+    Raised when a module API callback fails, for example because it raised an
+    exception.
+    """