This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
make sure etag is a string for GET room_keys/version #7691
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Uhm... Someone broke CI... /me throws it in the review queue and slowly walks away |
clokep
reviewed
Jun 12, 2020
|
Note that the broken build is from a busted virtualenv release. Seems like they're fixing it. |
clokep
reviewed
Jun 15, 2020
| @@ -351,6 +351,7 @@ def get_version_info(self, user_id, version=None): | |||
| raise | |||
|
|
|||
| res["count"] = yield self.store.count_e2e_room_keys(user_id, res["version"]) | |||
| res["etag"] = str(res["etag"]) | |||
There was a problem hiding this comment.
I checked briefly on Friday and this matches the other places we call get_e2e_room_keys_version_info.
clokep
approved these changes
Jun 15, 2020
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit '03619324f': Create a ListenerConfig object (#7681) Fix changelog wording 1.15.1 Wrap register_device coroutine in an ensureDeferred (#7684) Ensure the body is a string before comparing push rules. (#7701) Ensure etag is a string for GET room_keys/version response (#7691) Update m.id.phone to use 'phone' instead of 'number' (#7687) Fix "There was no active span when trying to log." error (#7698) Enable 3PID add/bind/unbind endpoints on r0 routes Discard RDATA from already seen positions. (#7648) Replace iteritems/itervalues/iterkeys with native versions. (#7692) Fix warnings about losing log context during UI auth. (#7688) Fix a typo when comparing the URI & method during UI Auth. (#7689) Remove "user_id" from GET /presence. (#7606) Increase the default SAML session expirary time to 15 minutes. (#7664) fix typo in sample_config.yaml (#7652) Take out a lock before modifying _CACHES (#7663) Add option to enable encryption by default for new rooms (#7639) Clean-up the fallback login code. (#7657)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks to sorunome for noticing.
The spec says that
etagshould be a string, but it's stored in the DB as an int, so we need to convert it before we return it.