/synapse

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Add shutdown room API #2291

Merged
merged 5 commits into from Jun 19, 2017

Conversation

Reviewers

@turt2live turt2live

@ara4n ara4n

@NegativeMjark NegativeMjark

Assignees

@NegativeMjark NegativeMjark

Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@erikjohnston @NegativeMjark @turt2live @ara4n
@erikjohnston
Owner

erikjohnston commented Jun 19, 2017

Tested by: matrix-org/sytest#360
@erikjohnston
Add shutdown room API

Some checks were not successful

2 failing and 6 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #2341 origin/erikj/shutdown_room succeeded in 10 min
Details
@matrixbot
Sytest Postgres (Commit) — Build #3178 origin/erikj/shutdown_room succeeded in 7 min 33 sec
Details
@matrixbot
Sytest SQLite (Commit) — Build #3260 origin/erikj/shutdown_room succeeded in 6 min 13 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
d7fe6b3

@erikjohnston erikjohnston assigned NegativeMjark Jun 19, 2017

@erikjohnston erikjohnston referenced this pull request in matrix-org/sytest Jun 19, 2017

Merged

Add tests for room shutdown api #360

@erikjohnston
Forget room

All checks have passed

8 successful checks
@matrixbot
Sytest Dendron (Commit) — Build #2342 origin/erikj/shutdown_room succeeded in 9 min 6 sec
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #3179 origin/erikj/shutdown_room succeeded in 7 min 57 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #3261 origin/erikj/shutdown_room succeeded in 1 min 51 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
5db7070

@erikjohnston erikjohnston unassigned NegativeMjark Jun 19, 2017

@erikjohnston
Change to create new room and join other users

Some checks were not successful

2 failing and 6 successful checks
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
continuous-integration/travis-ci/push — The Travis CI build failed
Details
@matrixbot
Sytest Dendron (Commit) — Build #2343 origin/erikj/shutdown_room succeeded in 10 min
Details
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #3180 origin/erikj/shutdown_room succeeded in 7 min 4 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #3262 origin/erikj/shutdown_room succeeded in 1 min 42 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
b490299

@erikjohnston erikjohnston assigned NegativeMjark Jun 19, 2017

@erikjohnston
Remove unused import

Some checks were not successful

1 failing and 7 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #2344 origin/erikj/shutdown_room succeeded in 10 min
Details
@matrixbot
Sytest Postgres (Commit) — Build #3181 origin/erikj/shutdown_room succeeded in 10 min
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #3263 origin/erikj/shutdown_room succeeded in 1 min 42 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
36e51aa
synapse/handlers/room.py
@@ -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)
@NegativeMjark

NegativeMjark Jun 19, 2017

Contributor

Did you mean for the power_level_content to end up in this PR?

@erikjohnston

erikjohnston Jun 19, 2017

Owner

I guess it would have been nice to split the PR in two.

@NegativeMjark

NegativeMjark Jun 19, 2017

Contributor

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
Contributor

NegativeMjark commented Jun 19, 2017

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

synapse/synapse/handlers/federation.py

Line 2065 in 36e51aa

yield member_handler.send_membership_event(None, event, context)

synapse/synapse/handlers/federation.py

Line 2099 in 36e51aa

yield member_handler.send_membership_event(None, event, context)

@erikjohnston
Owner

erikjohnston commented Jun 19, 2017

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

cat_fuck
@erikjohnston
Handle all cases of sending membership events

Some checks were not successful

2 failing and 6 successful checks
@matrixbot
Sytest Dendron (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest Dendron (Commit) — Build #2345 origin/erikj/shutdown_room succeeded in 9 min 57 sec
Details
@matrixbot
Sytest Postgres (Commit) — Build #3182 origin/erikj/shutdown_room succeeded in 9 min 2 sec
Details
@matrixbot
Sytest SQLite (Commit) — Build #3264 origin/erikj/shutdown_room succeeded in 1 min 42 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
continuous-integration/travis-ci/push — The Travis CI build passed
Details
e5ae386
synapse/storage/room.py
+ keyvalues={
+ "room_id": room_id,
+ },
+ retcol="1",
@NegativeMjark

NegativeMjark Jun 19, 2017

Contributor

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

@erikjohnston erikjohnston merged commit b5f665d into develop Jun 19, 2017
5 of 8 checks passed

5 of 8 checks passed

Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest Dendron (Commit) Build #2345 origin/erikj/shutdown_room in progress...
Details
Sytest Postgres (Commit) Build #3182 origin/erikj/shutdown_room succeeded in 9 min 2 sec
Details
Sytest SQLite (Commit) Build #3264 origin/erikj/shutdown_room succeeded in 1 min 42 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
synapse/rest/client/v1/admin.py
+
+ DEFAULT_MESSAGE = (
+ "Sharing illegal content on this server is not permitted and rooms in"
+ " violatation will be blocked."
@ara4n

ara4n Jun 19, 2017

Owner

"violation"

@turt2live

turt2live Jun 19, 2017

fwiw, later on in this file is This need a user have a administrator access in Synapse.

@ara4n

ara4n Aug 4, 2017

Owner

fixed now.

@turt2live turt2live referenced this pull request Jul 28, 2017

Open

Blacklist room ID from federating #2392

@erikjohnston erikjohnston deleted the erikj/shutdown_room branch Oct 26, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment