summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2023-03-21 13:23:47 +0000
committerGitHub <noreply@github.com>2023-03-21 13:23:47 +0000
commitb6aef593347924d39b4ff8b07e375eb656001545 (patch)
tree3f7642647b8e184b21067834bcb4a89abc5a34a6 /synapse
parentDocument that our Docker images are mirrored to GHCR. (#15282) (diff)
downloadsynapse-b6aef593347924d39b4ff8b07e375eb656001545.tar.xz
Make `EventHandler.get_event` return `None` when the requested event is not found (#15298)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/events.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 68c07f0265..33359f6ed7 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -159,15 +159,16 @@ class EventHandler:
         Returns:
             An event, or None if there is no event matching this ID.
         Raises:
-            SynapseError if there was a problem retrieving this event, or
-            AuthError if the user does not have the rights to inspect this
-            event.
+            AuthError: if the user does not have the rights to inspect this event.
         """
         redact_behaviour = (
             EventRedactBehaviour.as_is if show_redacted else EventRedactBehaviour.redact
         )
         event = await self.store.get_event(
-            event_id, check_room_id=room_id, redact_behaviour=redact_behaviour
+            event_id,
+            check_room_id=room_id,
+            redact_behaviour=redact_behaviour,
+            allow_none=True,
         )
 
         if not event: