MSC4140: don't cancel delayed state on own state (matrix-org#768)

When a user sends a state event, do not cancel their own delayed events
for the same piece of state.

Author: AndrewFerr

tests/msc4140/delayed_event_test.go

@@ -372,35 +372,35 @@ func TestDelayedEvents(t *testing.T) {
 		})
 	})
 
-	t.Run("delayed state events are cancelled by a more recent state event from the same user", func(t *testing.T) {
+	t.Run("delayed state is not cancelled by new state from the same user", func(t *testing.T) {
 		var res *http.Response
 
-		stateKey := "to_be_cancelled_by_same_user"
+		stateKey := "to_not_be_cancelled_by_same_user"
 
 		defer cleanupDelayedEvents(t, user)
 
 		setterKey := "setter"
+		setterExpected := "on_timeout"
 		user.MustDo(
 			t,
 			"PUT",
 			getPathForState(roomID, eventType, stateKey),
 			client.WithJSONBody(t, map[string]interface{}{
-				setterKey: "on_timeout",
+				setterKey: setterExpected,
 			}),
 			getDelayQueryParam("900"),
 		)
 		matchDelayedEvents(t, user, 1)
 
-		setterExpected := "manual"
 		user.MustDo(
 			t,
 			"PUT",
 			getPathForState(roomID, eventType, stateKey),
 			client.WithJSONBody(t, map[string]interface{}{
-				setterKey: setterExpected,
+				setterKey: "manual",
 			}),
 		)
-		matchDelayedEvents(t, user, 0)
+		matchDelayedEvents(t, user, 1)
 
 		time.Sleep(1 * time.Second)
 		res = user.MustDo(t, "GET", getPathForState(roomID, eventType, stateKey))
@@ -411,7 +411,7 @@ func TestDelayedEvents(t *testing.T) {
 		})
 	})
 
-	t.Run("delayed state events are cancelled by a more recent state event from another user", func(t *testing.T) {
+	t.Run("delayed state is cancelled by new state from another user", func(t *testing.T) {
 		var res *http.Response
 
 		stateKey := "to_be_cancelled_by_other_user"