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

Add is_dm room field to Sliding Sync /sync #17429

Merged
merged 28 commits into from
Jul 11, 2024
Merged

Add is_dm room field to Sliding Sync /sync #17429

merged 28 commits into from
Jul 11, 2024

Commits on Jul 8, 2024

  1. Initial work of adding name/avatar to rooms response

    @MadLittleMods
    MadLittleMods committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    9deb387 View commit details
    Browse the repository at this point in the history

  2. Add tests

    @MadLittleMods
    MadLittleMods committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b0bb37f View commit details
    Browse the repository at this point in the history

  3. Add changelog

    @MadLittleMods
    MadLittleMods committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b6e36ef View commit details
    Browse the repository at this point in the history

  4. Actually test that invited should see current state

    @MadLittleMods
    MadLittleMods committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6ef39dd View commit details
    Browse the repository at this point in the history

  5. Start of heroes in Sliding Sync

    @MadLittleMods
    MadLittleMods committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    32c5409 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into madlittlemods/sliding-sync-room-name-avatar

    @MadLittleMods
    MadLittleMods committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    9641ca7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'madlittlemods/sliding-sync-room-name-avatar' into madli… 

    …ttlemods/sliding-sync-heroes
    @MadLittleMods
    MadLittleMods committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    9692c76 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Merge branch 'develop' into madlittlemods/sliding-sync-heroes 

    Conflicts:
	synapse/handlers/sliding_sync.py
    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    ee9114c View commit details
    Browse the repository at this point in the history

  2. heroes is not required_state for now 

    Discussion tracking this: matrix-org/matrix-spec-proposals#3575 (comment)

It's also hard because we may not have any full membership events
when you're the first one on your server to be invited to a new room over federation.
    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    f58d6fc View commit details
    Browse the repository at this point in the history

  3. Add changelog

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    82bf80c View commit details
    Browse the repository at this point in the history

  4. Add tests

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    10f8540 View commit details
    Browse the repository at this point in the history

  5. Remove unncessary check

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    62925b6 View commit details
    Browse the repository at this point in the history

  6. Test joined_count/invited_count

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b9f1eb1 View commit details
    Browse the repository at this point in the history

  7. Test invite before/after ban

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    e50bf86 View commit details
    Browse the repository at this point in the history

  8. Sort leave before knock 

    See #17419 (comment)
    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    2fb77b3 View commit details
    Browse the repository at this point in the history

  9. Explain the order

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    275da50 View commit details
    Browse the repository at this point in the history

  10. Add test to make sure we only return 5 heroes

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    6060408 View commit details
    Browse the repository at this point in the history

  11. Fix lint

    @MadLittleMods
    MadLittleMods committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    91cefaa View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Add is_dm fields to Sliding Sync

    @MadLittleMods
    MadLittleMods committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    4205159 View commit details
    Browse the repository at this point in the history

  2. Add tests for is_dm

    @MadLittleMods
    MadLittleMods committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1bd953b View commit details
    Browse the repository at this point in the history

  3. Add changelog

    @MadLittleMods
    MadLittleMods committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8681b7d View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Revert heroes order changes

    @MadLittleMods
    MadLittleMods committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    868dcdc View commit details
    Browse the repository at this point in the history

  2. Better comment on what we expect

    @MadLittleMods
    MadLittleMods committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    a4753bf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into madlittlemods/sliding-sync-heroes

    @MadLittleMods
    MadLittleMods committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    5583ac1 View commit details
    Browse the repository at this point in the history

  4. Have to use basic assertion for now 

    See #17419 (comment)
    @MadLittleMods
    MadLittleMods committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e2138b7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into madlittlemods/sliding-sync-rooms-is-dm 

    Conflicts:
	synapse/handlers/sliding_sync.py
	tests/rest/client/test_sync.py
    @MadLittleMods
    MadLittleMods committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    8ffddd5 View commit details
    Browse the repository at this point in the history

  6. Fix merge

    @MadLittleMods
    MadLittleMods committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    2b7ec13 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'madlittlemods/sliding-sync-heroes' into madlittlemods/s… 

    …liding-sync-rooms-is-dm
    @MadLittleMods
    MadLittleMods committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    5850e59 View commit details
    Browse the repository at this point in the history