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

lazyload aware /messages #3589

Merged
merged 73 commits into from
Aug 16, 2018
Merged

lazyload aware /messages #3589

merged 73 commits into from
Aug 16, 2018

Commits on Jun 3, 2018

  1. untested attempt at deduplicating lazy-loaded members 

    as per the proposal; we can deduplicate redundant lazy-loaded members
which are sent in the same sync sequence. we do this heuristically
rather than requiring the client to somehow tell us which members it
has chosen to cache, by instead caching the last N members sent to
a client, and not sending them again.  For now we hardcode N to 100.
Each cache for a given (user,device) tuple is in turn cached for up to
X minutes (to avoid the caches building up).  For now we hardcode X to 30.
    @ara4n
    ara4n committed Jun 3, 2018
    Configuration menu
    Copy the full SHA
    7b7fd27 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2018

  1. Merge branch 'develop' into matthew/remove_redundant_lazy_members

    @ara4n
    ara4n committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    c341d81 View commit details
    Browse the repository at this point in the history

  2. add include_redundant_members filter option & make it work

    @ara4n
    ara4n committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    f7bd5da View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. merge and apply isort

    @ara4n
    ara4n committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    589e5aa View commit details
    Browse the repository at this point in the history

  2. merge in #2970

    @ara4n
    ara4n committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    8e66dd1 View commit details
    Browse the repository at this point in the history

  3. fix bad merge

    @ara4n
    ara4n committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    a08b37b View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. make /context lazyload & filter aware

    @ara4n
    ara4n committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    7362e6c View commit details
    Browse the repository at this point in the history

  2. speed up /members and add at= and membership params

    @ara4n
    ara4n committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    cd28d2f View commit details
    Browse the repository at this point in the history

  3. make it work

    @ara4n
    ara4n committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    a17f0b6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'matthew/lazy_load_apis' into matthew/members_at

    @ara4n
    ara4n committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    9ba6ef2 View commit details
    Browse the repository at this point in the history

  5. make it work

    @ara4n
    ara4n committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    c6117fa View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2018

  1. make filtering work

    @ara4n
    ara4n committed Jul 21, 2018
    Configuration menu
    Copy the full SHA
    8f1585d View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2018

  1. initial cut at a room summary API 

    works, although considers all room membership events rather than just joined
ones as i'm failing to see a nice way to filter based on membership
    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    42308c0 View commit details
    Browse the repository at this point in the history

  2. remove debug log

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    0beeecf View commit details
    Browse the repository at this point in the history

  3. namespace the summary fields correctly

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    63ce31b View commit details
    Browse the repository at this point in the history

  4. fix key typo

    @bwindels
    bwindels committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    c8cbede View commit details
    Browse the repository at this point in the history

  5. Merge branch 'matthew/filter_members' into matthew/remove_redundant_l… 

    …azy_members
    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    f9c3c26 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'matthew/remove_redundant_lazy_members' into matthew/laz… 

    …y_load_apis
    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    c2870ab View commit details
    Browse the repository at this point in the history

  7. Merge branch 'matthew/lazy_load_apis' into matthew/members_at

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    ffb7a4c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'matthew/members_at' into matthew/room_summary

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    c1c6ff1 View commit details
    Browse the repository at this point in the history

  9. changelog

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    7d99b0e View commit details
    Browse the repository at this point in the history

  10. changelog

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    cd27a77 View commit details
    Browse the repository at this point in the history

  11. changelog

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    4018a6d View commit details
    Browse the repository at this point in the history

  12. changelog

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    c238a88 View commit details
    Browse the repository at this point in the history

  13. first cut at lazyload aware /messages

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    e1daddd View commit details
    Browse the repository at this point in the history

  14. make it work

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    dd2c0e1 View commit details
    Browse the repository at this point in the history

  15. changelog

    @ara4n
    ara4n committed Jul 23, 2018
    Configuration menu
    Copy the full SHA
    40e61d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. return the correct counts & self-exclude from heros

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    1ba3683 View commit details
    Browse the repository at this point in the history

  2. spell heroes correctly

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    f129390 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'matthew/room_summary' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    bfbebec View commit details
    Browse the repository at this point in the history

  4. remember to filter state events

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    4c2edd1 View commit details
    Browse the repository at this point in the history

  5. fix heroes definition to match MSC

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    e61071a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'matthew/filter_members' into matthew/remove_redundant_l… 

    …azy_members
    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    d32e5f8 View commit details
    Browse the repository at this point in the history

  7. deduplicating redundant members via event_id rather than mxid

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    238f750 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'matthew/remove_redundant_lazy_members' into matthew/laz… 

    …y_load_apis
    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    2a79e1a View commit details
    Browse the repository at this point in the history

  9. Merge branch 'matthew/lazy_load_apis' into matthew/members_at

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    48f3e43 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'matthew/members_at' into matthew/room_summary

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    7cc81ed View commit details
    Browse the repository at this point in the history

  11. Merge branch 'matthew/room_summary' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    96d1f3c View commit details
    Browse the repository at this point in the history

  12. fix merge fail

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    08af91d View commit details
    Browse the repository at this point in the history

  13. Merge branch 'matthew/members_at' into matthew/room_summary

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    e76254b View commit details
    Browse the repository at this point in the history

  14. Merge branch 'matthew/room_summary' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    4e33d06 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2018

  1. Merge branch 'matthew/room_summary' of github.com:matrix-org/synapse … 

    …into matthew/lazy_load_messages_api
    @erikjohnston
    erikjohnston committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    58529df View commit details
    Browse the repository at this point in the history

  2. Merge branch 'matthew/lazy_load_messages_api' of git+ssh://github.com… 

    …/matrix-org/synapse into matthew/lazy_load_messages_api
    @ara4n
    ara4n committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    9637ae4 View commit details
    Browse the repository at this point in the history

  3. fix missing import

    @ara4n
    ara4n committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    d5b1842 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2018

  1. incorporate review

    @ara4n
    ara4n committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    e952368 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2018

  1. add null check for state

    @ara4n
    ara4n committed Aug 7, 2018
    Configuration menu
    Copy the full SHA
    423c512 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2018

  1. Merge branch 'develop' into matthew/members_at

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    2d9c062 View commit details
    Browse the repository at this point in the history

  2. convert /members?at= to take a stream token 

    this feels much clunkier and more complicated for both clients
and senders than just querying based on event_id, and i'm failing
to see any way it's more correct than querying based on event_id.

also fixes a thinko to check whether the user is allowed to view
membership as of the given token
    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    eebee08 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into matthew/room_summary

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    5df2c36 View commit details
    Browse the repository at this point in the history

  4. incorporate all the review feedback

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    d0c0d72 View commit details
    Browse the repository at this point in the history

  5. fix use of get_recent_event_ids_for_room

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    b327e07 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'matthew/room_summary' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    c6fd400 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'matthew/members_at' into matthew/room_summary

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    9e4acb7 View commit details
    Browse the repository at this point in the history

  8. add cap neg to /versions for LL

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    e235005 View commit details
    Browse the repository at this point in the history

  9. fix english

    @ara4n
    ara4n committed Aug 12, 2018
    Configuration menu
    Copy the full SHA
    db333cc View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. return early rather than big if blocks

    @ara4n
    ara4n committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    32bf4fa View commit details
    Browse the repository at this point in the history

  2. incorporate PR review

    @ara4n
    ara4n committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    859ad35 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'matthew/members_at' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    ab31a44 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into matthew/members_at

    @ara4n
    ara4n committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    dd4498f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'matthew/members_at' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Aug 14, 2018
    Configuration menu
    Copy the full SHA
    53cce23 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2018

  1. don't remove old versions from /versions for now

    @ara4n
    ara4n committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    65d4521 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'matthew/room_summary' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    fe9ed88 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into matthew/members_at

    @ara4n
    ara4n committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    217d5dd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'matthew/members_at' into matthew/room_summary

    @ara4n
    ara4n committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    8442478 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'matthew/room_summary' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    0cbe5a2 View commit details
    Browse the repository at this point in the history

  6. remove incorrectly reintroduced method

    @richvdh
    richvdh committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    f5189b9 View commit details
    Browse the repository at this point in the history

  7. cleanups

    @richvdh
    richvdh committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    0d5770d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'matthew/members_at' into matthew/room_summary

    @richvdh
    richvdh committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    c2d9c96 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/develop' into matthew/room_summary

    @richvdh
    richvdh committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    dc085c0 View commit details
    Browse the repository at this point in the history

  10. remove spurious changelogs 

    These are no longer relevant as the changes were in 0.33.2.
    @richvdh
    richvdh committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    7306074 View commit details
    Browse the repository at this point in the history

  11. factor out get_lazy_loaded_members_cache

    @ara4n
    ara4n committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    c3cdc21 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'matthew/room_summary' into matthew/lazy_load_messages_api

    @ara4n
    ara4n committed Aug 15, 2018
    Configuration menu
    Copy the full SHA
    33fdfa7 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2018

  1. Merge branch 'develop' into matthew/lazy_load_messages_api

    @richvdh
    richvdh committed Aug 16, 2018
    Configuration menu
    Copy the full SHA
    62d8ce7 View commit details
    Browse the repository at this point in the history