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

Prevent local quarantined media from being claimed by media retention #12972

Merged
merged 11 commits into from
Jun 7, 2022
Merged

Prevent local quarantined media from being claimed by media retention #12972

merged 11 commits into from
Jun 7, 2022

Commits on Jun 6, 2022

  1. Prevent local quarantined media from being claimed by media retention

    @anoadragon453
    anoadragon453 committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    b51107a View commit details
    Browse the repository at this point in the history

  2. Protect remote quarantined media from media retention

    @anoadragon453
    anoadragon453 committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    d0d3a69 View commit details
    Browse the repository at this point in the history

  3. Test that media retention does not remove quarantined media

    @anoadragon453
    anoadragon453 committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    62b17cd View commit details
    Browse the repository at this point in the history

  4. Rename *_before methods, as they do more these days

    @anoadragon453
    anoadragon453 committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    2d837fc View commit details
    Browse the repository at this point in the history

  5. Remove 'local' from log line about potentially remote media

    @anoadragon453
    anoadragon453 committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    e60beb9 View commit details
    Browse the repository at this point in the history

  6. Changelog

    @anoadragon453
    anoadragon453 committed Jun 6, 2022
    Configuration menu
    Copy the full SHA
    e4837e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2022

  1. Additionally prevent protected media from being purged

    @anoadragon453
    anoadragon453 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    97f0c5d View commit details
    Browse the repository at this point in the history

  2. Update media retention tests to include protected media

    @anoadragon453
    anoadragon453 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    bfba18b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:matrix-org/synapse into anoa/med… 

    …ia_retention_quarantine_support
    @anoadragon453
    anoadragon453 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    548b333 View commit details
    Browse the repository at this point in the history

  4. Add missing arg to docstring

    @anoadragon453
    anoadragon453 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    66c33bf View commit details
    Browse the repository at this point in the history

  5. Use false, not 0, in SQL to check booleans

    @anoadragon453
    anoadragon453 committed Jun 7, 2022
    Configuration menu
    Copy the full SHA
    45a8d38 View commit details
    Browse the repository at this point in the history