Skip to content
Snippets Groups Projects
Commit 7d59a515 authored by Patrick Cloke's avatar Patrick Cloke
Browse files

Properly return the thread ID down sync. (#14159)

Fix a broken conflict in e6e876b9,
by not stomping over a field right after creating it.
parent 3bbe532a
No related branches found
No related tags found
No related merge requests found
...@@ -416,10 +416,10 @@ class ReceiptsWorkerStore(SQLBaseStore): ...@@ -416,10 +416,10 @@ class ReceiptsWorkerStore(SQLBaseStore):
# {"$foo:bar": { "read": { "@user:host": <receipt> }, .. }, .. } # {"$foo:bar": { "read": { "@user:host": <receipt> }, .. }, .. }
event_entry = room_event["content"].setdefault(row["event_id"], {}) event_entry = room_event["content"].setdefault(row["event_id"], {})
receipt_type = event_entry.setdefault(row["receipt_type"], {}) receipt_type = event_entry.setdefault(row["receipt_type"], {})
if row["thread_id"]:
receipt_type[row["user_id"]]["thread_id"] = row["thread_id"]
receipt_type[row["user_id"]] = db_to_json(row["data"]) receipt_type[row["user_id"]] = db_to_json(row["data"])
if row["thread_id"]:
receipt_type[row["user_id"]]["thread_id"] = row["thread_id"]
results = { results = {
room_id: [results[room_id]] if room_id in results else [] room_id: [results[room_id]] if room_id in results else []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment