Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Local echo for redactions #937

Merged
merged 11 commits into from
Jun 5, 2019
Merged

Local echo for redactions #937

merged 11 commits into from
Jun 5, 2019

Commits on Jun 3, 2019

  1. support marking an event as redacted in a way we can undo it later 

    in case the redaction can't be sent
    @bwindels
    bwindels committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    465032d View commit details
    Browse the repository at this point in the history

  2. handle redactions in room pending event logic

    @bwindels
    bwindels committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    2eecea9 View commit details
    Browse the repository at this point in the history

  3. make redactEvent go through same local-echo aware path as other events

    @bwindels
    bwindels committed Jun 3, 2019
    Configuration menu
    Copy the full SHA
    8194287 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. also look for redaction local echo event in pendingList 

    also re-aggregate the relation if it's redaction has been cancelled
    @bwindels
    bwindels committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    78cf175 View commit details
    Browse the repository at this point in the history

  2. also set redacted_because with redaction local echo

    @bwindels
    bwindels committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    a8b6be3 View commit details
    Browse the repository at this point in the history

  3. remove unused method

    @bwindels
    bwindels committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    b5df016 View commit details
    Browse the repository at this point in the history

  4. unneeded check, as redacted_because is now also set for local echo

    @bwindels
    bwindels committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    b83c7d3 View commit details
    Browse the repository at this point in the history

  5. improve naming and commenting for _aggregateNonLiveRelation

    @bwindels
    bwindels committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    d33395e View commit details
    Browse the repository at this point in the history

  6. remove leftover newline

    @bwindels
    bwindels committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    c0c9f01 View commit details
    Browse the repository at this point in the history

  7. emit Room.redactionCancelled event when undoing redaction local echo

    @bwindels
    bwindels committed Jun 4, 2019
    1 Configuration menu
    Copy the full SHA
    58f163e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. correct comments about redaction events

    @bwindels
    bwindels committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    4e040f8 View commit details
    Browse the repository at this point in the history