mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-15 17:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' into fix-purge-room-state-groups

Browse source
This commit is contained in:
Mathieu Velten 2024-12-11 16:57:43 +00:00 committed by GitHub
commit d320b210f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/17846.misc Normal file
View file

@ -0,0 +1 @@
Update Alpine Linux Synapse Package Maintainer within installation.md.

1
changelog.d/17930.bugfix Normal file
View file

@ -0,0 +1 @@
Fix bug when rejecting withdrew invite with a third_party_rules module, where the invite would be stuck for the client.

2
docs/setup/installation.md
View file

@ -157,7 +157,7 @@ sudo pip install py-bcrypt
#### Alpine Linux #### Alpine Linux
6543 maintains [Synapse packages for Alpine Linux](https://pkgs.alpinelinux.org/packages?name=synapse&branch=edge) in the community repository. Install with: Jahway603 maintains [Synapse packages for Alpine Linux](https://pkgs.alpinelinux.org/packages?name=synapse&branch=edge) in the community repository. Install with:
```sh ```sh
sudo apk add synapse sudo apk add synapse

10
synapse/events/snapshot.py
View file

@ -248,7 +248,7 @@ class EventContext(UnpersistedEventContextBase):
@tag_args @tag_args
async def get_current_state_ids( async def get_current_state_ids(
self, state_filter: Optional["StateFilter"] = None self, state_filter: Optional["StateFilter"] = None
) -> Optional[StateMap[str]]: ) -> StateMap[str]:
""" """
Gets the room state map, including this event - ie, the state in ``state_group`` Gets the room state map, including this event - ie, the state in ``state_group``
@ -256,13 +256,12 @@ class EventContext(UnpersistedEventContextBase):
not make it into the room state. This method will raise an exception if not make it into the room state. This method will raise an exception if
``rejected`` is set. ``rejected`` is set.
It is also an error to access this for an outlier event.
Arg: Arg:
state_filter: specifies the type of state event to fetch from DB, example: EventTypes.JoinRules state_filter: specifies the type of state event to fetch from DB, example: EventTypes.JoinRules
Returns: Returns:
Returns None if state_group is None, which happens when the associated
event is an outlier.
Maps a (type, state_key) to the event ID of the state event matching Maps a (type, state_key) to the event ID of the state event matching
this tuple. this tuple.
""" """
@ -300,7 +299,8 @@ class EventContext(UnpersistedEventContextBase):
this tuple. this tuple.
""" """
assert self.state_group_before_event is not None if self.state_group_before_event is None:
return {}
return await self._storage.state.get_state_ids_for_group( return await self._storage.state.get_state_ids_for_group(
self.state_group_before_event, state_filter self.state_group_before_event, state_filter
) )