diff options
| author | Till <2353100+S7evinK@users.noreply.github.com> | 2024-12-17 19:19:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-17 19:19:35 +0100 |
| commit | f87464922f145bcf07ce787c79041abb475a2956 (patch) | |
| tree | 2cc189077543520f48378baab09ed4ccb23014e4 /userapi | |
| parent | 78dbf21c5f92bf8245d456a18c21f0771f994618 (diff) | |
Fetch oldest OTKs first (MSC4225) (#3452)
As per https://github.com/matrix-org/matrix-spec-proposals/pull/4225,
fetch the oldest OTKs first.
Diffstat (limited to 'userapi')
| -rw-r--r-- | userapi/storage/postgres/one_time_keys_table.go | 2 | ||||
| -rw-r--r-- | userapi/storage/sqlite3/one_time_keys_table.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/userapi/storage/postgres/one_time_keys_table.go b/userapi/storage/postgres/one_time_keys_table.go index dde63a17..a38da25b 100644 --- a/userapi/storage/postgres/one_time_keys_table.go +++ b/userapi/storage/postgres/one_time_keys_table.go @@ -53,7 +53,7 @@ const deleteOneTimeKeySQL = "" + "DELETE FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2 AND algorithm = $3 AND key_id = $4" const selectKeyByAlgorithmSQL = "" + - "SELECT key_id, key_json FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2 AND algorithm = $3 LIMIT 1" + "SELECT key_id, key_json FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2 AND algorithm = $3 ORDER BY ts_added_secs ASC LIMIT 1" const deleteOneTimeKeysSQL = "" + "DELETE FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2" diff --git a/userapi/storage/sqlite3/one_time_keys_table.go b/userapi/storage/sqlite3/one_time_keys_table.go index 0ef4639e..bb2df83b 100644 --- a/userapi/storage/sqlite3/one_time_keys_table.go +++ b/userapi/storage/sqlite3/one_time_keys_table.go @@ -52,7 +52,7 @@ const deleteOneTimeKeySQL = "" + "DELETE FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2 AND algorithm = $3 AND key_id = $4" const selectKeyByAlgorithmSQL = "" + - "SELECT key_id, key_json FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2 AND algorithm = $3 LIMIT 1" + "SELECT key_id, key_json FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2 AND algorithm = $3 ORDER BY ts_added_secs ASC LIMIT 1" const deleteOneTimeKeysSQL = "" + "DELETE FROM keyserver_one_time_keys WHERE user_id = $1 AND device_id = $2" |