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 API to quarantine media #2292

Merged
merged 2 commits into from Jun 19, 2017

Conversation

Projects
None yet
2 participants
Owner

erikjohnston commented Jun 19, 2017

No description provided.

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

Open

Add quarantine media API test #361

synapse/storage/room.py
+ next_token = stream_ordering
+ content = json.loads(content_json)
+
+ url = content.get("url")
@NegativeMjark

NegativeMjark Jun 19, 2017

Contributor

Do we also have to worry about client generated thumbnails?

@erikjohnston erikjohnston merged commit 7d69f2d into develop Jun 19, 2017

5 of 8 checks passed

Sytest Dendron (Commit) Build #2348 origin/erikj/quarantine_media failed in 10 min
Details
Sytest Postgres (Commit) Build #3185 origin/erikj/quarantine_media failed in 8 min 24 sec
Details
Sytest SQLite (Commit) Build #3267 origin/erikj/quarantine_media failed in 1 min 38 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Merged PR) Build finished.
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

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

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