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

Fix messages from multiple senders in historical chunk (MSC2716) #10276

Merged
merged 14 commits into from
Jul 13, 2021
Merged

Fix messages from multiple senders in historical chunk (MSC2716) #10276

merged 14 commits into from
Jul 13, 2021

Commits on Jun 25, 2021

  1. Add base starting insertion point when no chunk ID is provided 

    This is so we can have the marker event point to this initial
insertion event and be able to traverse the events in the first chunk.
    @MadLittleMods
    MadLittleMods committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    ceec7f7 View commit details
    Browse the repository at this point in the history

  2. Add changelog

    @MadLittleMods
    MadLittleMods committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    3083660 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

  1. Merge branch 'develop' into madlittlemods/2716-base-insertion-event

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

Commits on Jul 7, 2021

  1. Add more better comments

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

  2. Fix messages from multiple senders in historical chunk 

    Follow-up to #9247

Part of MSC2716: matrix-org/matrix-spec-proposals#2716

---

Previously, Synapse would throw a 403,
`Cannot force another user to join.`,
because we were trying to use `?user_id` from a single virtual user
which did not match with messages from other users in the chunk.
    @MadLittleMods
    MadLittleMods committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    14cd25d View commit details
    Browse the repository at this point in the history

  3. Remove debug lines

    @MadLittleMods
    MadLittleMods committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    254a2f3 View commit details
    Browse the repository at this point in the history

  4. Add changelog

    @MadLittleMods
    MadLittleMods committed Jul 7, 2021
    Configuration menu
    Copy the full SHA
    bb92d87 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2021

  1. Make a fake requester with just what we need 

    See #10276 (comment)
    @MadLittleMods
    MadLittleMods committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    d7eb538 View commit details
    Browse the repository at this point in the history

  2. Make base insertion event float off on its own 

    See #10250 (comment)
    @MadLittleMods
    MadLittleMods committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    4dfa4ff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'madlittlemods/2716-base-insertion-event' into madlittle… 

    …mods/2716-multiple-senders-in-chunk

Conflicts:
	synapse/rest/client/v1/room.py
    @MadLittleMods
    MadLittleMods committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    85b3eb2 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. Validate that the app service can actually control the given user 

    See #10276 (comment)
    @MadLittleMods
    MadLittleMods committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    dae35d1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into madlittlemods/2716-multiple-senders-in-chunk 

    Conflicts:
	synapse/rest/client/v1/room.py
    @MadLittleMods
    MadLittleMods committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    c0909de View commit details
    Browse the repository at this point in the history

  3. Add some better comments on what we're trying to check for

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

Commits on Jul 12, 2021

  1. Share validation logic

    @MadLittleMods
    MadLittleMods committed Jul 12, 2021
    Configuration menu
    Copy the full SHA
    21a5d6a View commit details
    Browse the repository at this point in the history