-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Conversation
@@ -316,6 +327,8 @@ def send(etype, content, **kwargs): | |||
for invitee in invite_list: | |||
power_level_content["users"][invitee] = 100 | |||
|
|||
power_level_content.update(power_level_content_override) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean for the power_level_content to end up in this PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess it would have been nice to split the PR in two.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I see that you are using the overrides as part of the shutdown API.
The override stuff is trivial enough for me to to review as part of this PR.
It just looked orthogonal to me at first, hence me asking whether you meant to push it as part of the PR :)
Do we also need to worry about the calls to send_membership_event? synapse/synapse/handlers/federation.py Line 2065 in 36e51aa
synapse/synapse/handlers/federation.py Line 2099 in 36e51aa
|
keyvalues={ | ||
"room_id": room_id, | ||
}, | ||
retcol="1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is slightly evil, I suspect that people looking at the _simple_select_one_onecol wouldn't expect someone to pass "1" as a column ID. But it's probably fine for now. :(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
||
DEFAULT_MESSAGE = ( | ||
"Sharing illegal content on this server is not permitted and rooms in" | ||
" violatation will be blocked." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"violation"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fwiw, later on in this file is This need a user have a administrator access in Synapse
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed now.
Tested by: matrix-org/sytest#360