Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add shutdown room API #2291

Merged
merged 5 commits into from
Jun 19, 2017
Merged

Add shutdown room API #2291

merged 5 commits into from
Jun 19, 2017

Conversation

erikjohnston
Copy link
Member

@@ -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)
Copy link
Contributor

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?

Copy link
Member Author

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.

Copy link
Contributor

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 :)

@NegativeMjark
Copy link
Contributor

Do we also need to worry about the calls to send_membership_event?

yield member_handler.send_membership_event(None, event, context)

yield member_handler.send_membership_event(None, event, context)

@erikjohnston
Copy link
Member Author

Do we also need to worry about the calls to send_membership_event?

cat_fuck

keyvalues={
"room_id": room_id,
},
retcol="1",
Copy link
Contributor

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. :(

Copy link
Contributor

@NegativeMjark NegativeMjark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@erikjohnston erikjohnston merged commit b5f665d into develop Jun 19, 2017

DEFAULT_MESSAGE = (
"Sharing illegal content on this server is not permitted and rooms in"
" violatation will be blocked."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"violation"

Copy link
Member

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed now.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants