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

Properly update the threads table when thread events are redacted #14248

Merged
merged 11 commits into from
Oct 21, 2022
Merged

Properly update the threads table when thread events are redacted #14248

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8943503
Refactor to return early if no relation.
clokep Oct 20, 2022
bd0b132
Return the relation type of redacted events.
clokep Oct 20, 2022
fc17215
Invalidate caches based on relation type.
clokep Oct 20, 2022
d92d8ff
Re-order some code.
clokep Oct 20, 2022
524dab2
Properly invalidate the threads table.
clokep Oct 20, 2022
76e049c
Update tests.
clokep Oct 20, 2022
b768732
Create a helper method.
clokep Oct 20, 2022
85fbad7
Augment tests for redacting an event in the middle of a thread.
clokep Oct 20, 2022
bbe251b
Clarify comment.
clokep Oct 20, 2022
55b4809
Newsfragment
clokep Oct 20, 2022
59ac7c7
Lint
clokep Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions synapse/storage/databases/main/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2040,9 +2040,13 @@ def _handle_redact_relations(
if row is None:
return

# Any relation information for the related event must be cleared.
redacted_relates_to = row["relates_to_id"]
rel_type = row["relation_type"]
self.db_pool.simple_delete_txn(
txn, table="event_relations", keyvalues={"event_id": redacted_event_id}
)

# Any relation information for the related event must be cleared.
self.store._invalidate_cache_and_stream(
txn, self.store.get_relations_for_event, (redacted_relates_to,)
)
Expand All @@ -2065,10 +2069,6 @@ def _handle_redact_relations(
txn, self.store.get_threads, (room_id,)
)

self.db_pool.simple_delete_txn(
txn, table="event_relations", keyvalues={"event_id": redacted_event_id}
)

DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
def _store_room_topic_txn(self, txn: LoggingTransaction, event: EventBase) -> None:
if isinstance(event.content.get("topic"), str):
self.store_event_search_txn(
Expand Down