Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 02:54:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix public room joining by making sure replaces_state never points to itself.

Browse source
This commit is contained in:
Erik Johnston 2014-12-11 15:56:01 +00:00
parent 9191292b0f
commit 0b04369238
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/storage/_base.py
View file

@ -451,7 +451,8 @@ class SQLBaseStore(object):
return events
def _get_event_txn(self, txn, event_id, check_redacted=True):
def _get_event_txn(self, txn, event_id, check_redacted=True,
get_prev_content=True):
sql = (
"SELECT json, r.event_id FROM event_json as e "
"LEFT JOIN redactions as r ON e.event_id = r.redacts "
@ -487,10 +488,11 @@ class SQLBaseStore(object):
if because:
ev.unsigned["redacted_because"] = because
if "replaces_state" in ev.unsigned:
if get_prev_content and "replaces_state" in ev.unsigned:
ev.unsigned["prev_content"] = self._get_event_txn(
txn,
ev.unsigned["replaces_state"],
get_prev_content=False,
).get_dict()["content"]
return ev