From 52b419cc1f3aed7e11b9e3fffbb3fce5835c35b9 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 19 Feb 2020 12:51:55 -0500
Subject: [PATCH 1/2] Add tests for moving alt_aliases to an upgraded room.

---
 tests/30rooms/60version_upgrade.pl | 33 ++++++------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/tests/30rooms/60version_upgrade.pl b/tests/30rooms/60version_upgrade.pl
index 4e847e5c2..d2f65c649 100644
--- a/tests/30rooms/60version_upgrade.pl
+++ b/tests/30rooms/60version_upgrade.pl
@@ -679,7 +679,8 @@ sub upgrade_room_synced {
          matrix_put_room_state( $creator, $room_id,
             type    => "m.room.canonical_alias",
             content => {
-               alias => $room_alias_1,
+                alias => $room_alias_1,
+                alt_aliases => [$room_alias_2],
             },
          );
       })->then( sub {
@@ -692,17 +693,6 @@ sub upgrade_room_synced {
          );
       })->then( sub {
          ( $new_room_id ) = @_;
-
-      # m.room.aliases are filtered out until a better solution to mitigating abuse is is specced.
-      #
-      #    matrix_get_room_state(
-      #       $creator, $room_id,
-      #       type=>'m.room.aliases', state_key=>$server_name,
-      #    );
-      # })->then( sub {
-      #    my ( $old_aliases ) = @_;
-      #    assert_deeply_eq( $old_aliases, {aliases => []}, "aliases on old room" );
-
          matrix_get_room_state( $creator, $room_id, type=>'m.room.canonical_alias' );
       })->then( sub {
          my ( $old_canonical_alias ) = @_;
@@ -710,20 +700,6 @@ sub upgrade_room_synced {
             $old_canonical_alias, {}, "canonical_alias on old room",
          );
 
-      # m.room.aliases are filtered out until a better solution to mitigating abuse is is specced.
-      #
-      #    matrix_get_room_state(
-      #       $creator, $new_room_id,
-      #       type=>'m.room.aliases', state_key=>$server_name,
-      #    );
-      # })->then( sub {
-      #    my ( $new_aliases ) = @_;
-      #    assert_deeply_eq(
-      #       [ sort( @{ $new_aliases->{aliases} } ) ],
-      #       [ sort( $room_alias_1, $room_alias_2 ) ],
-      #       "aliases on new room",
-      #    );
-
          matrix_get_room_state(
             $creator, $new_room_id, type=>'m.room.canonical_alias',
          );
@@ -731,7 +707,10 @@ sub upgrade_room_synced {
          my ( $new_canonical_alias ) = @_;
          assert_deeply_eq(
             $new_canonical_alias,
-            { alias => $room_alias_1 },
+            {
+               alias => $room_alias_1,
+               alt_aliases => [$room_alias_2],
+            },
             "canonical_alias on new room",
          );
 

From a55b987dc02cafc15f3a95cb216732e0fe3217fc Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Thu, 20 Feb 2020 11:03:00 -0500
Subject: [PATCH 2/2] Fix formatting from review.

---
 tests/30rooms/60version_upgrade.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/30rooms/60version_upgrade.pl b/tests/30rooms/60version_upgrade.pl
index d2f65c649..f0fafd06d 100644
--- a/tests/30rooms/60version_upgrade.pl
+++ b/tests/30rooms/60version_upgrade.pl
@@ -679,8 +679,8 @@ sub upgrade_room_synced {
          matrix_put_room_state( $creator, $room_id,
             type    => "m.room.canonical_alias",
             content => {
-                alias => $room_alias_1,
-                alt_aliases => [$room_alias_2],
+               alias => $room_alias_1,
+               alt_aliases => [ $room_alias_2 ],
             },
          );
       })->then( sub {
@@ -709,7 +709,7 @@ sub upgrade_room_synced {
             $new_canonical_alias,
             {
                alias => $room_alias_1,
-               alt_aliases => [$room_alias_2],
+               alt_aliases => [ $room_alias_2 ],
             },
             "canonical_alias on new room",
          );