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

Allow local media to be marked as safe from being quarantined #7718

Merged
merged 16 commits into from
Jun 22, 2020
Merged

Allow local media to be marked as safe from being quarantined #7718

merged 16 commits into from
Jun 22, 2020

Commits on Jun 17, 2020

  1. Use a shared method for quarantine by user and room.

    @clokep
    clokep committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    97f81e7 View commit details
    Browse the repository at this point in the history

  2. Allow media to be safe from quarantining.

    @clokep
    clokep committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    4149bbc View commit details
    Browse the repository at this point in the history

  3. De-duplicate some code.

    @clokep
    clokep committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    ebd1daf View commit details
    Browse the repository at this point in the history

  4. Add a test for marking media as safe from quarantine.

    @clokep
    clokep committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    ca6a6eb View commit details
    Browse the repository at this point in the history

  5. Add a newsfragment.

    @clokep
    clokep committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    c3abb11 View commit details
    Browse the repository at this point in the history

  6. Note that the added column is a boolean for the port script.

    @clokep
    clokep committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    193576b View commit details
    Browse the repository at this point in the history

  7. Let the DB library convert False.

    @clokep
    clokep committed Jun 17, 2020
    Configuration menu
    Copy the full SHA
    15d2056 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2020

  1. Use the standard cursor interfaces, not sqlite-specific ones.

    @clokep
    clokep committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    384160b View commit details
    Browse the repository at this point in the history

  2. Use =, not is for comparison.

    @clokep
    clokep committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    8df681d View commit details
    Browse the repository at this point in the history

  3. More boolean shenanigans.

    @clokep
    clokep committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    09174f1 View commit details
    Browse the repository at this point in the history

  4. Another try.

    @clokep
    clokep committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    a5e27f1 View commit details
    Browse the repository at this point in the history

  5. Another try?

    @clokep
    clokep committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    c5857d4 View commit details
    Browse the repository at this point in the history

  6. Separate postgres and sqlite deltas.

    @clokep
    clokep committed Jun 18, 2020
    Configuration menu
    Copy the full SHA
    fd3ea1d View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. Fix using rowcount when no rows are affected.

    @clokep
    clokep committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    bb58a23 View commit details
    Browse the repository at this point in the history

  2. Let the DB library convert False.

    @clokep
    clokep committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    b78667e View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Apply suggestions from code review 

    Co-authored-by: Erik Johnston <erik@matrix.org>
    @clokep @erikjohnston
    clokep and erikjohnston authored Jun 22, 2020
    Configuration menu
    Copy the full SHA
    24c08d1 View commit details
    Browse the repository at this point in the history