diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-10 14:25:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-10 14:25:54 +0100 |
| commit | 49ae42bbe1176b9061c17cf7e3829008f608c0a4 (patch) | |
| tree | d233638a43fc49eae6cadacf7b6df5055096c250 /synapse/storage | |
| parent | Merge pull request #274 from matrix-org/add_threepid_fix (diff) | |
| download | synapse-49ae42bbe1176b9061c17cf7e3829008f608c0a4.tar.xz | |
Bundle in some room state in the unsigned bit of the invite when sending to invited servers
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/roommember.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 8eee2dfbcc..2a59ee7d6d 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -30,7 +30,7 @@ logger = logging.getLogger(__name__) RoomsForUser = namedtuple( "RoomsForUser", - ("room_id", "sender", "membership") + ("room_id", "sender", "membership", "event_id") ) @@ -141,7 +141,7 @@ class RoomMemberStore(SQLBaseStore): args.extend(membership_list) sql = ( - "SELECT m.room_id, m.sender, m.membership" + "SELECT m.event_id, m.room_id, m.sender, m.membership" " FROM room_memberships as m" " INNER JOIN current_state_events as c" " ON m.event_id = c.event_id " |