mirror of
https://github.com/element-hq/synapse
synced 2024-09-04 10:10:06 +00:00
Merge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard
Support wildcard device_ids for direct to device messages
This commit is contained in:
commit
91ec972277
1 changed files with 36 additions and 18 deletions
|
@ -130,11 +130,26 @@ class DeviceInboxStore(SQLBaseStore):
|
||||||
|
|
||||||
def _add_messages_to_local_device_inbox_txn(self, txn, stream_id,
|
def _add_messages_to_local_device_inbox_txn(self, txn, stream_id,
|
||||||
messages_by_user_then_device):
|
messages_by_user_then_device):
|
||||||
local_users_and_devices = set()
|
local_by_user_then_device = {}
|
||||||
for user_id, messages_by_device in messages_by_user_then_device.items():
|
for user_id, messages_by_device in messages_by_user_then_device.items():
|
||||||
|
messages_json_for_user = {}
|
||||||
devices = messages_by_device.keys()
|
devices = messages_by_device.keys()
|
||||||
|
if len(devices) == 1 and devices[0] == "*":
|
||||||
|
# Handle wildcard device_ids.
|
||||||
sql = (
|
sql = (
|
||||||
"SELECT user_id, device_id FROM devices"
|
"SELECT device_id FROM devices"
|
||||||
|
" WHERE user_id = ?"
|
||||||
|
)
|
||||||
|
txn.execute(sql, (user_id,))
|
||||||
|
message_json = ujson.dumps(messages_by_device["*"])
|
||||||
|
for row in txn.fetchall():
|
||||||
|
# Add the message for all devices for this user on this
|
||||||
|
# server.
|
||||||
|
device = row[0]
|
||||||
|
messages_json_for_user[device] = message_json
|
||||||
|
else:
|
||||||
|
sql = (
|
||||||
|
"SELECT device_id FROM devices"
|
||||||
" WHERE user_id = ? AND device_id IN ("
|
" WHERE user_id = ? AND device_id IN ("
|
||||||
+ ",".join("?" * len(devices))
|
+ ",".join("?" * len(devices))
|
||||||
+ ")"
|
+ ")"
|
||||||
|
@ -142,7 +157,14 @@ class DeviceInboxStore(SQLBaseStore):
|
||||||
# TODO: Maybe this needs to be done in batches if there are
|
# TODO: Maybe this needs to be done in batches if there are
|
||||||
# too many local devices for a given user.
|
# too many local devices for a given user.
|
||||||
txn.execute(sql, [user_id] + devices)
|
txn.execute(sql, [user_id] + devices)
|
||||||
local_users_and_devices.update(map(tuple, txn.fetchall()))
|
for row in txn.fetchall():
|
||||||
|
# Only insert into the local inbox if the device exists on
|
||||||
|
# this server
|
||||||
|
device = row[0]
|
||||||
|
message_json = ujson.dumps(messages_by_device[device])
|
||||||
|
messages_json_for_user[device] = message_json
|
||||||
|
|
||||||
|
local_by_user_then_device[user_id] = messages_json_for_user
|
||||||
|
|
||||||
sql = (
|
sql = (
|
||||||
"INSERT INTO device_inbox"
|
"INSERT INTO device_inbox"
|
||||||
|
@ -150,12 +172,8 @@ class DeviceInboxStore(SQLBaseStore):
|
||||||
" VALUES (?,?,?,?)"
|
" VALUES (?,?,?,?)"
|
||||||
)
|
)
|
||||||
rows = []
|
rows = []
|
||||||
for user_id, messages_by_device in messages_by_user_then_device.items():
|
for user_id, messages_by_device in local_by_user_then_device.items():
|
||||||
for device_id, message in messages_by_device.items():
|
for device_id, message_json in messages_by_device.items():
|
||||||
message_json = ujson.dumps(message)
|
|
||||||
# Only insert into the local inbox if the device exists on
|
|
||||||
# this server
|
|
||||||
if (user_id, device_id) in local_users_and_devices:
|
|
||||||
rows.append((user_id, device_id, stream_id, message_json))
|
rows.append((user_id, device_id, stream_id, message_json))
|
||||||
|
|
||||||
txn.executemany(sql, rows)
|
txn.executemany(sql, rows)
|
||||||
|
|
Loading…
Reference in a new issue