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

Implement changes to MSC2285 (hidden read receipts) #12168

Merged
merged 58 commits into from
May 4, 2022
Merged

Implement changes to MSC2285 (hidden read receipts) #12168

merged 58 commits into from
May 4, 2022

Commits on Mar 5, 2022

  1. Changelog 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    bc2a3db View commit details
    Browse the repository at this point in the history

  2. Implement changes to MSC2285 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    926bd84 View commit details
    Browse the repository at this point in the history

  3. Improve tests 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 5, 2022
    Configuration menu
    Copy the full SHA
    4bf0a36 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2022

  1. Add checks for msc2285_enabled 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    b4e6eea View commit details
    Browse the repository at this point in the history

  2. Simplifie filter_out_hidden() 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    18a96d2 View commit details
    Browse the repository at this point in the history

  3. Don't recheck msc2285_enabled 

    `m.read.private` shouldn't even get here if `msc2285_enabled` is disabled

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    6d017ce View commit details
    Browse the repository at this point in the history

  4. Add some comments 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    77879c0 View commit details
    Browse the repository at this point in the history

  5. Add a comment regarding parse_json_object_from_request() 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 10, 2022
    Configuration menu
    Copy the full SHA
    c574c86 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2022

  1. Make handling of multiple receipt types sound 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    5f1a963 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    a7845c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Mar 16, 2022
    Configuration menu
    Copy the full SHA
    bce411c View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2022

  1. Simplifie code 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    533421c View commit details
    Browse the repository at this point in the history

  2. Only handle m.read.private if MSC enabled 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    d060e12 View commit details
    Browse the repository at this point in the history

  3. Use f-strings 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    c73005f View commit details
    Browse the repository at this point in the history

  4. Make things more readable - don't use "reverse" 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    100120f View commit details
    Browse the repository at this point in the history

  5. Remove test_does_not_filter_out_our_hidden_receipt() as `test_leave… 

    …s_our_hidden_and_their_public()` already does all the work

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    3527966 View commit details
    Browse the repository at this point in the history

  6. Test that the read receipt doesn't go up for either receipt type 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    1d7e274 View commit details
    Browse the repository at this point in the history

  7. Test that we can't override private read receipts 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    26aae3e View commit details
    Browse the repository at this point in the history

  8. Make sure read receipts don't go up 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    245b723 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Mar 17, 2022
    Configuration menu
    Copy the full SHA
    5732c35 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Mar 18, 2022
    Configuration menu
    Copy the full SHA
    d4a2d85 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    fd277aa View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    3713dcd View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    38db694 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    678adcd View commit details
    Browse the repository at this point in the history

  2. Fix tests 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    2044845 View commit details
    Browse the repository at this point in the history

  3. Simplify code and improve comment 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    21754ea View commit details
    Browse the repository at this point in the history

  4. Use parameterized instead of a for loop 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    7aca89c View commit details
    Browse the repository at this point in the history

  5. Delint 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    88f47b6 View commit details
    Browse the repository at this point in the history

  6. Throw when receipt type is not known 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    ac3c0ea View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2022

  1. Replace _check_no_room_changes() 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    85aa704 View commit details
    Browse the repository at this point in the history

  2. Test receipt overriding 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    f837981 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    cc3e273 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Support specifying the receipt types we want 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    21ac95e View commit details
    Browse the repository at this point in the history

  2. Improve SlavedReceiptTestCase 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    373f0b7 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    2c8c550 View commit details
    Browse the repository at this point in the history

  4. Use GROUP BY 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    455d500 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    90ea618 View commit details
    Browse the repository at this point in the history

  2. Use ORDER BY and LIMIT 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    809596a View commit details
    Browse the repository at this point in the history

  3. Fix GROUP BY error? 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    2e198fe View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    958ff56 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. Make get_receipts_for_user_with_orderings() handle multiple receipt… 

    … types

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    116d1c9 View commit details
    Browse the repository at this point in the history

  2. Be smarter when handling non-allowed keys 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    7c22108 View commit details
    Browse the repository at this point in the history

  3. Fix types 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    0f117e4 View commit details
    Browse the repository at this point in the history

  4. Fix types (again) 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    084b7ce View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    2da9935 View commit details
    Browse the repository at this point in the history

  2. Fix typo 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    91a4bf1 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2022

  1. Merge remote-tracking branch 'origin/develop' into feature/private-re… 

    …ad-receipts
    @clokep
    clokep committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    d48fc99 View commit details
    Browse the repository at this point in the history

  2. Add some notes.

    @clokep
    clokep committed Apr 27, 2022
    Configuration menu
    Copy the full SHA
    ae0bf97 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2022

  1. Add caching back to get_last_receipt_event_id_for_user.

    @clokep
    clokep committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    4e255a6 View commit details
    Browse the repository at this point in the history

  2. Add caching back to get_latest_receipts_for_user.

    @clokep
    clokep committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    e9055ac View commit details
    Browse the repository at this point in the history

  3. Rename get_latest_receipts_for_user back to get_receipts_for_user to … 

    …reduce diff.
    @clokep
    clokep committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    8041f82 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/develop' into feature/private-re… 

    …ad-receipts
    @clokep
    clokep committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    25632cf View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2022

  1. Improve docstrings.

    @clokep
    clokep committed Apr 29, 2022
    Configuration menu
    Copy the full SHA
    670e3e4 View commit details
    Browse the repository at this point in the history

  2. Document behavior of ordering of receipt types mattering.

    @clokep
    clokep committed Apr 29, 2022
    Configuration menu
    Copy the full SHA
    9e60cdb View commit details
    Browse the repository at this point in the history

  3. Minor refactoring.

    @clokep
    clokep committed Apr 29, 2022
    Configuration menu
    Copy the full SHA
    10822e1 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2022

  1. Fix comment 

    Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
    @SimonBrandner
    SimonBrandner committed Apr 30, 2022
    Configuration menu
    Copy the full SHA
    40782b8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/develop' into feature/private-… 

    …read-receipts
    @SimonBrandner
    SimonBrandner committed Apr 30, 2022
    Configuration menu
    Copy the full SHA
    1b3987e View commit details
    Browse the repository at this point in the history