Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad naming of storage function (#9637)

Browse Source 
We had two functions named `get_forward_extremities_for_room` and
`get_forward_extremeties_for_room` that took different paramters. We
rename one of them to avoid confusion.
This commit is contained in:
Erik Johnston 2021-03-17 13:20:08 +00:00 committed by GitHub
parent 567f88f835
commit ad721fc559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9637.misc Normal file
View File

@ -0,0 +1 @@
Rename storage function to fix spelling and not conflict with another functions name.

2
synapse/handlers/device.py
View File

@ -166,7 +166,7 @@ class DeviceWorkerHandler(BaseHandler):
# Fetch the current state at the time. # Fetch the current state at the time.
try: try:
event_ids = await self.store.get_forward_extremeties_for_room( event_ids = await self.store.get_forward_extremities_for_room_at_stream_ordering(
room_id, stream_ordering=stream_ordering room_id, stream_ordering=stream_ordering
) )
except errors.StoreError: except errors.StoreError:

6
synapse/handlers/sync.py
View File

@ -1979,8 +1979,10 @@ class SyncHandler:
logger.info("User joined room after current token: %s", room_id) logger.info("User joined room after current token: %s", room_id)
extrems = await self.store.get_forward_extremeties_for_room( extrems = (
room_id, event_pos.stream await self.store.get_forward_extremities_for_room_at_stream_ordering(
room_id, event_pos.stream
)
) )
users_in_room = await self.state.get_current_users_in_room(room_id, extrems) users_in_room = await self.state.get_current_users_in_room(room_id, extrems)
if user_id in users_in_room: if user_id in users_in_room:

2
synapse/storage/databases/main/event_federation.py
View File

@ -793,7 +793,7 @@ class EventFederationWorkerStore(EventsWorkerStore, SignatureWorkerStore, SQLBas
return int(min_depth) if min_depth is not None else None return int(min_depth) if min_depth is not None else None
async def get_forward_extremeties_for_room( async def get_forward_extremities_for_room_at_stream_ordering(
self, room_id: str, stream_ordering: int self, room_id: str, stream_ordering: int
) -> List[str]: ) -> List[str]:
"""For a given room_id and stream_ordering, return the forward """For a given room_id and stream_ordering, return the forward