This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Fall back to 'username' if 'user' is not given for appservice registration. #927
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
|
Can one of the admins verify this patch? |
4 similar comments
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
Can one of the admins verify this patch? |
|
ok to test |
| @@ -134,9 +134,11 @@ def on_POST(self, request): | |||
| # fallback to 'username' if they gave one. | |||
| if isinstance(body.get("user"), basestring): | |||
| desired_username = body["user"] | |||
There was a problem hiding this comment.
would be sorely tempted to change this line to:
desired_username = body.get("user", desired_username)As all the isinstance(..., basestring) is making me sad
Half-Shot
force-pushed
the
develop
branch
2 times, most recently
from
d31412f
to
60656ae
Compare
|
LGTM. Can you sign off the commit? |
|
Signed-off-by: Will Hunt [email protected] |
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.
It's stated in the comments that (quite sensibly) we should fallback to 'username' if user isn't given, yet this didn't appear to be implemented. This allows for either key with a preference for 'user'.