Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 2b94477

Browse files
committed
Don't fail on events we don't have
Signed-off-by: Nicolas Werner <nicolas.werner@hotmail.de>
1 parent c64565a commit 2b94477

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

synapse/push/bulk_push_rule_evaluator.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,21 @@ async def action_for_event_by_user(
206206
related_event_id = event.content.get("m.relates_to", {}).get("event_id")
207207
relation_type = event.content.get("m.relates_to", {}).get("rel_type")
208208
if related_event_id is not None and relation_type is not None:
209-
related_events[relation_type] = await self.store.get_event(related_event_id)
209+
related_event = await self.store.get_event(
210+
related_event_id, allow_none=True
211+
)
212+
if related_event is not None:
213+
related_events[relation_type] = related_event
210214

211215
reply_event_id = (
212216
event.content.get("m.relates_to", {})
213217
.get("m.in_reply_to", {})
214218
.get("event_id")
215219
)
216220
if reply_event_id is not None:
217-
related_events["m.in_reply_to"] = await self.store.get_event(reply_event_id)
221+
related_event = await self.store.get_event(reply_event_id, allow_none=True)
222+
if related_event is not None:
223+
related_events["m.in_reply_to"] = related_event
218224

219225
evaluator = PushRuleEvaluatorForEvent(
220226
event, len(room_members), sender_power_level, power_levels, related_events

0 commit comments

Comments
 (0)