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

Support redactions and relations of/with unsent events. #947

Merged
merged 21 commits into from
Jun 13, 2019
Merged

Support redactions and relations of/with unsent events. #947

merged 21 commits into from
Jun 13, 2019

Commits on Jun 13, 2019

  1. enqueue relations and redactions as well 

    as they might need to wait until their target has been sent
    @bwindels
    bwindels committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    e222fb1 View commit details
    Browse the repository at this point in the history

  2. give the client a chance to run room.updatePendingEvent after sending 

    before the next event is sent. This is needed to update the target id
if it was the local id of the event that was just sent.
    @bwindels
    bwindels committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    c58db66 View commit details
    Browse the repository at this point in the history

  3. first look in pending event list for event being redacted 

    in case the redacted event hasn't been sent yet
    @bwindels
    bwindels committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    6eb229a View commit details
    Browse the repository at this point in the history

  4. emit remote id once received so enqueued relations have it when sent

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

  5. emit Relations.redaction synchronously, timeout should not be needed 

    listeners shouldn't care about the original event, as it's removed
from the Relations collection already.
    @bwindels
    bwindels committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    7a10d50 View commit details
    Browse the repository at this point in the history

  6. rename target id to related id and add jsdoc comments

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

  7. fix lint

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

  8. fix tests

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

  9. get the txnId from the correct place to delete event after remote echo

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

  10. preserve (locally) redacted state after applying remote echo 

    because the RedactionDimensions was trying to redact an event
that was already redacted after it's remote echo had come in
but it's redaction hadn't synced yet.
    @bwindels
    bwindels committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    6d9fba8 View commit details
    Browse the repository at this point in the history

  11. don't add events from /sync that have been locally redacted 

    it'll cause the reactions counter to go up and down while reactions
and redactions come in.

In case the local redaction gets cancelled,
Room._revertRedactionLocalEcho will add the relation back to
the relations collection.
    @bwindels
    bwindels committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    930de64 View commit details
    Browse the repository at this point in the history

  12. make sure where not re-adding cancelled events when undoing local red.

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

  13. comment typo 

    Co-Authored-By: J. Ryan Stinnett <[email protected]>
    @bwindels @jryans
    bwindels and jryans committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    a9f9e2c View commit details
    Browse the repository at this point in the history

  14. comment typo 

    Co-Authored-By: J. Ryan Stinnett <[email protected]>
    @bwindels @jryans
    bwindels and jryans committed Jun 13, 2019
    Configuration menu
    Copy the full SHA
    b005b75 View commit details
    Browse the repository at this point in the history

  15. clarify why we need to listen for remote echo of related event

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

  16. rename related id to associated id

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

  17. add isRedaction helper on Event

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

  18. whitespace, newlines

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

  19. expand comment why need to preserve redaction local echo on remote echo

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

  20. add hasAssociation helper

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

  21. move CANCELLED check deeper into aggregation path

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