From d3280193ee2da9ce23800b1d8a6c6daae6224219 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 29 Oct 2020 17:49:00 +0000 Subject: [PATCH 1/2] Fix optional parameter in stripped state storage method --- synapse/storage/databases/main/events_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/storage/databases/main/events_worker.py b/synapse/storage/databases/main/events_worker.py index 5ae263827dde..4732685f6e60 100644 --- a/synapse/storage/databases/main/events_worker.py +++ b/synapse/storage/databases/main/events_worker.py @@ -530,7 +530,7 @@ async def get_stripped_room_state_from_event_context( self, context: EventContext, state_types_to_include: List[EventTypes], - membership_user_id: Optional[str], + membership_user_id: Optional[str] = None, ) -> List[JsonDict]: """ Retrieve the stripped state from a room, given an event context to retrieve state From cfbebc3899b05cffe6929a00f216f8cb06adf6ef Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 29 Oct 2020 17:53:43 +0000 Subject: [PATCH 2/2] Changelog --- changelog.d/8688.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/8688.misc diff --git a/changelog.d/8688.misc b/changelog.d/8688.misc new file mode 100644 index 000000000000..bef8dc425a01 --- /dev/null +++ b/changelog.d/8688.misc @@ -0,0 +1 @@ +Abstract some invite-related code in preparation for landing knocking. \ No newline at end of file