Replace most non-synced actions (#1249)

As explained in #1247, this PR changes most non-synced versions with the synced version.
matrix_create_room_synced now also returns the room alias.

tests/10apidoc/30room-create.pl

@@ -419,14 +419,16 @@ sub remote_room_alias_fixture
 =head2 matrix_create_room_synced
 
     matrix_create_room_synced( $creator, %params )->then( sub {
-        my ( $room_id ) = @_;
+        my ( $room_id, $room_alias ) = @_;
     });
 
 Creates a new room, and waits for it to appear in the /sync response.
 
 The parameters are passed through to C<matrix_create_room>.
 
-The resultant future completes with the room_id.
+The resultant future completes with the room_id and a room_alias. If
+C<room_alias_name> is present in C<%params>, an alias will be built with the given 
+alias and user's server name. Otherwise, it will return C<undef>.
 
 =cut
 
@@ -440,7 +442,7 @@ sub matrix_create_room_synced
    # The easiest way to do that is to send a sentinel message in the room and wait for
    # that to turn up.
    matrix_create_room( $user, %params )->then( sub {
-      my ( $room_id ) = @_;
+      my ( $room_id, $room_alias ) = @_;
 
       matrix_do_and_wait_for_sync( $user,
          do => sub {
@@ -461,6 +463,6 @@ sub matrix_create_room_synced
                $_[0]->{event_id} eq $event_id
             });
          },
-      )->then_done( $room_id );
+      )->then_done( $room_id, $room_alias );
    });
 }

tests/10apidoc/31room-state.pl

@@ -14,7 +14,7 @@
    setup => sub {
       my ( $user, $room_alias_name ) = @_;
 
-      matrix_create_room( $user,
+      matrix_create_room_synced( $user,
          room_alias_name => $room_alias_name,
          visibility      => "public",
       );

tests/10apidoc/32room-alias.pl

@@ -6,7 +6,7 @@
    setup => sub {
       my ( $user ) = @_;
 
-      matrix_create_room( $user )->then( sub {
+      matrix_create_room_synced( $user )->then( sub {
          my ( $room_id, undef ) = @_;
          Future->done( $room_id );  # Don't return the alias
       });
@@ -56,7 +56,7 @@
       my ( $user, $room_alias ) = @_;
       my ( $room_id );
 
-      matrix_create_room( $user )->then( sub {
+      matrix_create_room_synced( $user )->then( sub {
          ( $room_id ) = @_;
 
          # the list should be empty initially

tests/10apidoc/33room-members.pl

@@ -11,7 +11,7 @@
    setup => sub {
       my ( $user, $room_alias_name ) = @_;
 
-      matrix_create_room( $user,
+      matrix_create_room_synced( $user,
          room_alias_name => $room_alias_name,
       );
    },
@@ -242,7 +242,7 @@ sub matrix_join_room
    do => sub {
       my ( $joiner_to_leave, $room_id, undef ) = @_;
 
-      matrix_join_room( $joiner_to_leave, $room_id )
+      matrix_join_room_synced( $joiner_to_leave, $room_id )
       ->then( sub {
          do_request_json_for( $joiner_to_leave,
             method => "POST",
@@ -401,7 +401,7 @@ sub _invite_users
    Future->needs_all(
      ( map {
          my $user = $_;
-         matrix_invite_user_to_room( $creator, $user, $room_id );
+         matrix_invite_user_to_room_synced( $creator, $user, $room_id );
       } @other_members)
    );
 }
@@ -465,7 +465,7 @@ sub matrix_create_and_join_room
    my $with_invite = delete $options{with_invite};
    my $with_alias = delete $options{with_alias};
 
-   matrix_create_room( $creator,
+   matrix_create_room_synced( $creator,
       %options,
       room_alias_name => $room_alias_name,
    )->then( sub {

tests/10apidoc/34room-messages.pl

@@ -137,7 +137,7 @@ sub matrix_send_room_text_message
    check => sub {
       my ( $user, $room_id ) = @_;
 
-      matrix_send_room_text_message( $user, $room_id,
+      matrix_send_room_text_message_synced( $user, $room_id,
          body => "Here is the message content",
       )->then( sub {
          matrix_sync( $user )
@@ -175,7 +175,7 @@ sub matrix_send_room_text_message
    check => sub {
       my ( $user, $room_id ) = @_;
 
-      matrix_send_room_text_message( $user, $room_id,
+      matrix_send_room_text_message_synced( $user, $room_id,
          body => "Here is the message content",
       )->then( sub {
          matrix_sync( $user )

tests/30rooms/01state.pl

@@ -10,7 +10,7 @@
    setup => sub {
       my ( $user ) = @_;
 
-      matrix_create_room( $user,
+      matrix_create_room_synced( $user,
          visibility => "public",
       );
    },

tests/30rooms/02members-local.pl

@@ -21,11 +21,11 @@
       Future->needs_all(
          map { flush_events_for( $_ ) } $creator, $local_user
       )->then( sub {
-         matrix_create_room( $creator )
+         matrix_create_room_synced( $creator )
       })->then( sub {
          my ( $room_id ) = @_;
 
-         matrix_join_room( $local_user, $room_id )
+         matrix_join_room_synced( $local_user, $room_id )
             ->then_done( $room_id );
       });
    },

tests/30rooms/03members-remote.pl

@@ -20,7 +20,7 @@
    setup => sub {
       my ( $user, $room_alias_name ) = @_;
 
-      matrix_create_room( $user,
+      matrix_create_room_synced( $user,
          room_alias_name => $room_alias_name,
       );
    },
@@ -255,7 +255,7 @@
    check => sub {
       my ( $creator, $remote_user, $room_alias_name ) = @_;
 
-      matrix_create_room( $creator,
+      matrix_create_room_synced( $creator,
          room_alias_name  => $room_alias_name,
          creation_content => {
             "m.federate" => JSON::false,

tests/30rooms/04messages.pl

@@ -211,7 +211,7 @@
       my ( $user, $room_id ) = @_;
 
       ( repeat {
-         matrix_send_room_text_message( $user, $room_id,
+         matrix_send_room_text_message_synced( $user, $room_id,
             body => "Message number $_[0]"
          )
       } foreach => [ 1 .. 20 ] )->then( sub {
@@ -276,13 +276,13 @@
       my ( $creator, $room_id, $room_alias, $remote_user ) = @_;
 
       ( repeat {
-         matrix_send_room_text_message( $creator, $room_id,
+         matrix_send_room_text_message_synced( $creator, $room_id,
             body => "Message number $_[0]"
          )
       } foreach => [ 1 .. 20 ] )->then( sub {
          matrix_sync( $remote_user )
       })->then( sub {
-         matrix_join_room( $remote_user, $room_alias );
+         matrix_join_room_synced( $remote_user, $room_alias );
       })->then( sub {
          # We wait until we see our join to the room.
          await_sync_timeline_contains( $remote_user, $room_id, check => sub {
@@ -338,7 +338,7 @@
          assert_eq( $chunk->[4]{content}{body}, "Message number 11",
             'chunk[4] content body' );
 
-         matrix_send_room_text_message( $creator, $room_id,
+         matrix_send_room_text_message_synced( $creator, $room_id,
             body => "Marker message"
          )
       })->then( sub {

tests/30rooms/05aliases.pl

@@ -78,7 +78,7 @@
 
       my ( $room_id, $room_alias );
 
-      matrix_create_room( $user,
+      matrix_create_room_synced( $user,
          room_alias_name => $room_alias_name,
       )->then( sub {
          ( $room_id, $room_alias ) = @_;
@@ -122,7 +122,7 @@
 
       my ( $room_id, $room_alias );
 
-      matrix_create_room( $user,
+      matrix_create_room_synced( $user,
          room_alias_name => $room_alias_name,
       )->then( sub {
          ( $room_id, $room_alias ) = @_;
@@ -162,7 +162,7 @@
          # Create a second room with an alias on it.
          my $other_alias_name = $room_alias_name . "2";
 
-         matrix_create_room( $user,
+         matrix_create_room_synced( $user,
             room_alias_name => $other_alias_name,
          )->then( sub {
             my ( $other_room_id, $other_room_alias ) = @_;

tests/30rooms/06invite.pl

@@ -10,7 +10,7 @@ sub inviteonly_room_fixture
       setup => sub {
          my ( $creator ) = @_;
 
-         matrix_create_room( $creator,
+         matrix_create_room_synced( $creator,
             preset => "private_chat",
          )->then( sub {
             my ( $room_id ) = @_;
@@ -46,7 +46,7 @@ sub inviteonly_room_fixture
    do => sub {
       my ( $creator, $invitee, $room_id ) = @_;
 
-      matrix_invite_user_to_room( $creator, $invitee, $room_id )
+      matrix_invite_user_to_room_synced( $creator, $invitee, $room_id )
          ->SyTest::pass_on_done( "Sent invite" )
       ->then( sub {
          await_sync( $invitee, check => sub {
@@ -57,7 +57,7 @@ sub inviteonly_room_fixture
             return 1;
          })
       })->then( sub {
-         matrix_join_room( $invitee, $room_id )
+         matrix_join_room_synced( $invitee, $room_id )
             ->SyTest::pass_on_done( "Joined room" )
       })->then( sub {
          matrix_get_room_state( $invitee, $room_id,
@@ -194,13 +194,13 @@ sub invited_user_can_reject_invite_for_empty_room
 {
    my ( $invitee, $creator, $room_id ) = @_;
 
-   matrix_invite_user_to_room( $creator, $invitee, $room_id )
+   matrix_invite_user_to_room_synced( $creator, $invitee, $room_id )
    ->then( sub {
       # wait for the leave to come down to make sure we're testing an empty room
       matrix_leave_room_synced( $creator, $room_id )
    })
    ->then( sub {
-      matrix_leave_room( $invitee, $room_id )
+      matrix_leave_room_synced( $invitee, $room_id )
    })->then( sub {
       matrix_sync( $invitee )
    })->then( sub {
@@ -227,12 +227,12 @@ sub invited_user_can_reject_invite_for_empty_room
    do => sub {
       my ( $invitee, $creator, $room_id ) = @_;
 
-      matrix_invite_user_to_room( $creator, $invitee, $room_id )
+      matrix_invite_user_to_room_synced( $creator, $invitee, $room_id )
       ->then( sub {
          # wait for the leave to come down to make sure we're testing an empty room
          matrix_leave_room_synced( $creator, $room_id );
       })->then( sub {
-         matrix_leave_room( $invitee, $room_id );
+         matrix_leave_room_synced( $invitee, $room_id );
       })->then( sub {
          # there's nobody left who can look at the room state, but the
          # important thing is that a /sync for the invitee should not include
@@ -270,7 +270,7 @@ sub invited_user_can_reject_invite_for_empty_room
             content => { url => "http://something" },
          ),
       )->then( sub {
-         matrix_invite_user_to_room( $creator, $invitee, $room_id );
+         matrix_invite_user_to_room_synced( $creator, $invitee, $room_id );
       })->then( sub {
          await_sync( $invitee, check => sub {
             my ( $body ) = @_;
@@ -406,7 +406,7 @@ sub invited_user_can_reject_invite_for_empty_room
    do => sub {
       my ( $creator, $room_id, $invitee ) = @_;
 
-      matrix_join_room( $invitee, $room_id )->then( sub {
+      matrix_join_room_synced( $invitee, $room_id )->then( sub {
          matrix_invite_user_to_room( $creator, $invitee, $room_id )
             ->main::expect_http_403;
       });
@@ -421,7 +421,7 @@ sub invited_user_can_reject_invite_for_empty_room
 
       my $room_id;
 
-      matrix_create_room( $user_1 )
+      matrix_create_room_synced( $user_1 )
          ->SyTest::pass_on_done( "User A created a room" )
       ->then( sub {
          ( $room_id ) = @_;
@@ -432,7 +432,7 @@ sub invited_user_can_reject_invite_for_empty_room
          )->SyTest::pass_on_done( "User A set the join rules to 'invite'" )
       })->then( sub {
 
-         matrix_invite_user_to_room( $user_1, $user_2, $room_id )
+         matrix_invite_user_to_room_synced( $user_1, $user_2, $room_id )
             ->SyTest::pass_on_done( "User A invited user B" )
       })->then( sub {
 
@@ -444,7 +444,7 @@ sub invited_user_can_reject_invite_for_empty_room
          })->SyTest::pass_on_done( "User B received the invite from A" )
       })->then( sub {
 
-         matrix_join_room( $user_2, $room_id )
+         matrix_join_room_synced( $user_2, $room_id )
             ->SyTest::pass_on_done( "User B joined the room" )
       })->then( sub {
 
@@ -455,7 +455,7 @@ sub invited_user_can_reject_invite_for_empty_room
          })->SyTest::pass_on_done( "User A set user B's power level to 100" )
       })->then( sub {
 
-         matrix_leave_room( $user_1, $room_id )
+         matrix_leave_room_synced( $user_1, $room_id )
             ->SyTest::pass_on_done( "User A left the room" )
       })->then( sub {
          await_sync_timeline_contains( $user_2, $room_id,  check => sub {
@@ -465,7 +465,7 @@ sub invited_user_can_reject_invite_for_empty_room
          })->SyTest::pass_on_done( "User B received the leave event" )
       })->then( sub {
 
-         matrix_invite_user_to_room( $user_2, $user_1, $room_id )
+         matrix_invite_user_to_room_synced( $user_2, $user_1, $room_id )
             ->SyTest::pass_on_done( "User B invited user A back to the room" )
       })->then( sub {
 
@@ -478,7 +478,7 @@ sub invited_user_can_reject_invite_for_empty_room
       })->then( sub {
 
          retry_until_success {
-            matrix_join_room( $user_1, $room_id )
+            matrix_join_room_synced( $user_1, $room_id )
          }->SyTest::pass_on_done( "User A joined the room" )
       })->then_done(1);
    };

tests/30rooms/08levels.pl

@@ -91,7 +91,7 @@ sub test_powerlevel
 ##    try => sub {
 ##       my ( $test_user, $room_id ) = @_;
 ## 
-##       matrix_invite_user_to_room( $test_user, '@random-invitee:$BIND_HOST:8001', $room_id );
+##       matrix_invite_user_to_room_synced( $test_user, '@random-invitee:$BIND_HOST:8001', $room_id );
 ##    };
 
 test_powerlevel "setting 'm.room.name' respects room powerlevel",

tests/30rooms/09eventstream.pl

@@ -13,7 +13,7 @@
       my $room_id;
 
       # Have Alice create a new private room
-      matrix_create_room( $alice,
+      matrix_create_room_synced( $alice,
          visibility => "private",
       )->SyTest::pass_on_done( "Created a room" )
       ->then( sub {
@@ -52,7 +52,7 @@
       my ( $user ) = @_;
       my ( $room_id, @expected_event_ids );
 
-      matrix_create_room( $user,
+      matrix_create_room_synced( $user,
         visibility => "private",
       )
       ->then( sub {

tests/30rooms/10redactions.pl

@@ -164,7 +164,7 @@ sub matrix_redact_event_synced
    do => sub {
       my ( $user1, $room1, $user2, $room2 ) = @_;
 
-      matrix_send_room_text_message( $user1, $room1,
+      matrix_send_room_text_message_synced( $user1, $room1,
          body => "test"
       )->then( sub {
          my ( $event_id ) = @_;