mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
Fix returned count of delete extremities admin API (#12496)
This commit is contained in:
parent
b80bb7e452
commit
c1482a352a
1
changelog.d/12496.bugfix
Normal file
1
changelog.d/12496.bugfix
Normal file
@ -0,0 +1 @@
|
||||
Fix bug where the admin API for [deleting forward extremities](https://github.com/matrix-org/synapse/blob/erikj/fix_delete_event_response_count/docs/admin_api/rooms.md#deleting-forward-extremities) would always return a count of 1 no matter how many extremities were deleted. Broke in v1.27.0.
|
@ -66,13 +66,15 @@ class EventForwardExtremitiesStore(
|
||||
"""
|
||||
|
||||
txn.execute(sql, (event_id, room_id))
|
||||
|
||||
deleted_count = txn.rowcount
|
||||
logger.info(
|
||||
"Deleted %s extra forward extremities for room %s",
|
||||
txn.rowcount,
|
||||
deleted_count,
|
||||
room_id,
|
||||
)
|
||||
|
||||
if txn.rowcount > 0:
|
||||
if deleted_count > 0:
|
||||
# Invalidate the cache
|
||||
self._invalidate_cache_and_stream(
|
||||
txn,
|
||||
@ -80,7 +82,7 @@ class EventForwardExtremitiesStore(
|
||||
(room_id,),
|
||||
)
|
||||
|
||||
return txn.rowcount
|
||||
return deleted_count
|
||||
|
||||
return await self.db_pool.runInteraction(
|
||||
"delete_forward_extremities_for_room",
|
||||
|
Loading…
Reference in New Issue
Block a user