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

Allow selecting "prejoin" events by state keys #14642

Merged
merged 15 commits into from
Dec 13, 2022

Commits on Dec 7, 2022

  1. Declare new config

    David Robertson committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    f03b305 View commit details
    Browse the repository at this point in the history
  2. Parse new config

    David Robertson committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    c801ce7 View commit details
    Browse the repository at this point in the history
  3. Read new config

    David Robertson committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    8ed2d93 View commit details
    Browse the repository at this point in the history
  4. Don't use trial/our TestCase where it's not needed

    Before:
    
    ```
    $ time trial tests/events/test_utils.py > /dev/null
    
    real	0m2.277s
    user	0m2.186s
    sys	0m0.083s
    ```
    
    After:
    ```
    $ time trial tests/events/test_utils.py > /dev/null
    
    real	0m0.566s
    user	0m0.508s
    sys	0m0.056s
    ```
    David Robertson committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    eb0bbbe View commit details
    Browse the repository at this point in the history
  5. Helper to upsert to event fields

    without exceeding size limits.
    David Robertson committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    c6199a3 View commit details
    Browse the repository at this point in the history
  6. Use helper when adding invite/knock state

    Now that we allow admins to include events in prejoin room state with
    arbitrary state keys, be a good Matrix citizen and ensure they don't
    accidentally create an oversized event.
    David Robertson committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    ddc563c View commit details
    Browse the repository at this point in the history
  7. Changelog

    David Robertson committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    33a559f View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. Merge branch 'develop' into dmr/more-specific-prejoin-state

    David Robertson authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    a5f6178 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'origin/develop' into dmr/more-specific-…

    …prejoin-state
    David Robertson committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    d4b86c1 View commit details
    Browse the repository at this point in the history
  3. Move StateFilter tests

    should have done this in #14668
    David Robertson committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    fe30c5d View commit details
    Browse the repository at this point in the history
  4. Add extra methods to StateFilter

    David Robertson committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    1bc0f13 View commit details
    Browse the repository at this point in the history
  5. Use StateFilter

    David Robertson committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    11124ed View commit details
    Browse the repository at this point in the history
  6. Ensure test file enforces typed defs; alphabetise

    David Robertson committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    af032d2 View commit details
    Browse the repository at this point in the history
  7. Workaround surprising get_current_state_ids

    David Robertson committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    837f6c2 View commit details
    Browse the repository at this point in the history
  8. Whoops, fix mypy

    David Robertson committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    23ca964 View commit details
    Browse the repository at this point in the history