Handle all m.room.aliases chunk, not only first #270
Conversation
slipeer
changed the title
matrix_client/room.py
Outdated
| @@ -454,17 +454,20 @@ def update_aliases(self): | |||
| Returns: | |||
| boolean: True if the aliases changed, False if not | |||
| """ | |||
| response = None | |||
There was a problem hiding this comment.
I'm having trouble understanding why this is necessary. If try block below is successful, response will be bound to something, and if it isn't successful, the method terminates without going further.
There was a problem hiding this comment.
I agree this is an excessive reinsurance
test/client_test.py
Outdated
| @@ -73,7 +73,7 @@ def test_state_event(): | |||
|
|
|||
| room.name = False | |||
| room.topic = False | |||
| room.aliases = False | |||
| room.aliases = [] | |||
There was a problem hiding this comment.
I found that when initializing aliases in rooms.py used empty list
matrix-python-sdk/matrix_client/room.py
Line 43 in 00186ba
False here doesn't look correct.
|
|
||
| aliases = ["#foo:matrix.org", "#bar:matrix.org"] | ||
| ev["content"]["aliases"] = aliases | ||
| room._process_state_event(ev) | ||
| assert room.aliases is aliases | ||
| assert room.aliases == aliases |
There was a problem hiding this comment.
Since now we are processing list element by element, is will no longer work here.
| @@ -97,12 +97,12 @@ def test_state_event(): | |||
|
|
|||
| ev["type"] = "m.room.aliases" | |||
| room._process_state_event(ev) | |||
| assert room.aliases is None | |||
| assert room.aliases == [] | |||
There was a problem hiding this comment.
Since aliases is initialized as an empty list, it can no longer be None.
| @@ -73,7 +73,6 @@ def test_state_event(): | |||
|
|
|||
| room.name = False | |||
| room.topic = False | |||
| room.aliases = False | |||
There was a problem hiding this comment.
I found that when initializing aliases in rooms.py used empty list
matrix-python-sdk/matrix_client/room.py
Line 43 in 00186ba
False here doesn't look correct.
| except MatrixRequestError: | ||
| return False | ||
| self.aliases = [] |
There was a problem hiding this comment.
I'd rather have self.aliases.clear() here.
| for alias in chunk["content"]["aliases"]: | ||
| if alias not in self.aliases: | ||
| self.aliases.append(alias) | ||
| changed = True |
There was a problem hiding this comment.
I don't think this works as expected. Since self.aliases will always be empty because of self.aliases = [] above, changed will always be True as long as there is at least one alias, even if it's the same as before.
|
Is there a reason why |
This is fix for #106 issue
Rooom state server reply may contain more then one
m.room.aliasesupdate_aliases() method must collect aliases from all of them.Additionally in this code only
get_room_state()can raiseMatrixRequestError- there is no need to enclose to try block more strings.Signed-off-by: Pavel Kardash [email protected]