/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

Persist rejection of invites over federation #646

Merged
merged 2 commits into from Mar 15, 2016

Conversation

Reviewers
No reviews
Assignees

@NegativeMjark NegativeMjark

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@erikjohnston @NegativeMjark
@erikjohnston
Owner

erikjohnston commented Mar 15, 2016

No description provided.

@erikjohnston
Persist rejection of invites over federation

Some checks were not successful

2 errored, 2 failing, and 4 successful checks
@matrixbot
Sytest Postgres (Commit) — Build #132 origin/erikj/reject_invite_federation failed in 4 min 55 sec
Details
@matrixbot
Sytest SQLite (Commit) — Build #133 origin/erikj/reject_invite_federation failed in 3 min 50 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Flake8 + Packaging (Commit) — Build #129 origin/erikj/reject_invite_federation succeeded in 26 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #174 origin/erikj/reject_invite_federation succeeded in 1 min 10 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
9e98275

@erikjohnston erikjohnston assigned NegativeMjark Mar 15, 2016

@erikjohnston erikjohnston referenced this pull request in matrix-org/sytest Mar 15, 2016

Merged

Invite rejections: test that invitee no longer gets the invite down /sync #212

@NegativeMjark NegativeMjark and 1 other commented on an outdated diff Mar 15, 2016

View full outdated diff
synapse/handlers/federation.py
@@ -813,7 +813,23 @@ def do_remotely_reject_invite(self, target_hosts, room_id, user_id):
target_hosts,
signed_event
)
- defer.returnValue(None)
+
+ context = yield self.state_handler.compute_event_context(event)
+
+ event_stream_id, max_stream_id = yield self.store.persist_event(
+ event,
+ context=context,
+ backfilled=False,
+ )
+
+ target_user = UserID.from_string(event.state_key)
+ with PreserveLoggingContext():
@NegativeMjark

NegativeMjark Mar 15, 2016

Contributor

I thought that the notifier preserved the logging context.

@erikjohnston

erikjohnston Mar 15, 2016

Owner

Eh, I c+p'd from above. /me looks
@erikjohnston
Remove needless PreserveLoggingContext

All checks have passed

8 successful checks
@matrixbot
Flake8 + Packaging (Commit) — Build #130 origin/erikj/reject_invite_federation succeeded in 30 sec
Details
@matrixbot
Flake8 + Packaging (Merged PR) — Build finished.
Details
@matrixbot
Sytest Postgres (Commit) — Build #133 origin/erikj/reject_invite_federation succeeded in 5 min 15 sec
Details
@matrixbot
Sytest Postgres (Merged PR) — Build finished.
Details
@matrixbot
Sytest SQLite (Commit) — Build #134 origin/erikj/reject_invite_federation succeeded in 4 min 21 sec
Details
@matrixbot
Sytest SQLite (Merged PR) — Build finished.
Details
@matrixbot
Unit Tests (Commit) — Build #175 origin/erikj/reject_invite_federation succeeded in 1 min 12 sec
Details
@matrixbot
Unit Tests (Merged PR) — Build finished.
Details
e5f0e58
@NegativeMjark
Contributor

NegativeMjark commented Mar 15, 2016

LGTM

erikjohnston added a commit that referenced this pull request Mar 15, 2016

@erikjohnston
Merge pull request #646 from matrix-org/erikj/reject_invite_federation 
Persist rejection of invites over federation

All checks have passed

4 successful checks
@matrixbot
Flake8 + Packaging (Commit) — Build #131 origin/develop succeeded in 29 sec
Details
@matrixbot
Sytest Postgres (Commit) — Build #134 origin/develop succeeded in 5 min 29 sec
Details
@matrixbot
Sytest SQLite (Commit) — Build #135 origin/develop succeeded in 4 min 33 sec
Details
@matrixbot
Unit Tests (Commit) — Build #176 origin/develop succeeded in 1 min 9 sec
Details
91779b4

@erikjohnston erikjohnston merged commit 91779b4 into develop Mar 15, 2016
8 checks passed

8 checks passed

Flake8 + Packaging (Commit) Build #130 origin/erikj/reject_invite_federation succeeded in 30 sec
Details
Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #133 origin/erikj/reject_invite_federation succeeded in 5 min 15 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #134 origin/erikj/reject_invite_federation succeeded in 4 min 21 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Commit) Build #175 origin/erikj/reject_invite_federation succeeded in 1 min 12 sec
Details
Unit Tests (Merged PR) Build finished.
Details

@richvdh richvdh deleted the erikj/reject_invite_federation branch Dec 1, 2016

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