Skip to content

Use sender instead of user_id for any stripped state event usages #1424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MadLittleMods wants to merge 1 commit into from
Closed

Use sender instead of user_id for any stripped state event usages #1424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions tests/30rooms/12thirdpartyinvite.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
do => sub {
my ( $inviter, $invitee, $id_server ) = @_;

my $invitee_mxid = $invitee->user_id;
my $invitee_mxid = $invitee->sender;

my $room_id;
my $id_access_token = $id_server->get_access_token;
Expand Down Expand Up @@ -50,7 +50,7 @@
do => sub {
my ( $creator, $inviter, $invitee, $id_server ) = @_;

my $invitee_mxid = $invitee->user_id;
my $invitee_mxid = $invitee->sender;

my $room_id;
my $id_access_token = $id_server->get_access_token;
Expand Down Expand Up @@ -99,7 +99,7 @@
do => sub {
my ( $inviter, $invitee, $id_server ) = @_;

my $invitee_mxid = $invitee->user_id;
my $invitee_mxid = $invitee->sender;

my $room_id;
my $id_access_token = $id_server->get_access_token;
Expand Down Expand Up @@ -226,11 +226,11 @@ sub can_invite_unbound_3pid
$_->{state_key} => $_
} grep { $_->{type} eq "m.room.member" } @{ $body->{invite_state}{events} };

exists $members{ $inviter->user_id } or die "No inviter member invite state";
exists $members{ $inviter->sender } or die "No inviter member invite state";

matrix_get_room_state( $inviter, $room_id,
type => "m.room.member",
state_key => $invitee->user_id,
state_key => $invitee->sender,
)
})->then( sub {
my ( $body ) = @_;
Expand All @@ -245,7 +245,7 @@ sub can_invite_unbound_3pid
retry_until_success {
matrix_get_room_state( $inviter, $room_id,
type => "m.room.member",
state_key => $invitee->user_id,
state_key => $invitee->sender,
)->followed_by( assert_membership( "join" ) )
}
})
Expand Down Expand Up @@ -278,7 +278,7 @@ sub can_invite_unbound_3pid
await_event_for( $inviter, filter => sub {
my ( $event ) = @_;
return unless $event->{type} eq "m.room.member";
return unless $event->{state_key} eq $invitee->user_id;
return unless $event->{state_key} eq $invitee->sender;

assert_eq( $event->{content}{membership}, "invite" );

Expand All @@ -287,7 +287,7 @@ sub can_invite_unbound_3pid
})->then( sub {
matrix_get_room_state( $inviter, $room_id,
type => "m.room.member",
state_key => $invitee->user_id,
state_key => $invitee->sender,
)
})->then( sub {
my ( $body ) = @_;
Expand All @@ -302,7 +302,7 @@ sub can_invite_unbound_3pid
await_event_for( $inviter, filter => sub {
my ( $event ) = @_;
return unless $event->{type} eq "m.room.member";
return unless $event->{state_key} eq $invitee->user_id;
return unless $event->{state_key} eq $invitee->sender;

assert_eq( $event->{content}{membership}, "join" );

Expand All @@ -312,7 +312,7 @@ sub can_invite_unbound_3pid
retry_until_success {
matrix_get_room_state( $inviter, $room_id,
type => "m.room.member",
state_key => $invitee->user_id,
state_key => $invitee->sender,
)->followed_by( assert_membership( "join" ) )
}
});
Expand Down Expand Up @@ -346,7 +346,7 @@ sub can_invite_unbound_3pid
})->then( sub {
matrix_get_room_state( $other_member, $room_id,
type => "m.room.member",
state_key => $invitee->user_id,
state_key => $invitee->sender,
)
})->followed_by( assert_membership( "join" ) );
};
Expand Down Expand Up @@ -377,8 +377,8 @@ sub can_invite_unbound_3pid
my $token = $invite_event->{state_key};

my %req = (
mxid => $invitee->user_id,
sender => $inviter->user_id,
mxid => $invitee->sender,
sender => $inviter->sender,
token => $token,
);

Expand All @@ -390,7 +390,7 @@ sub can_invite_unbound_3pid
})->then( sub {
matrix_get_room_state( $inviter, $room_id,
type => "m.room.member",
state_key => $invitee->user_id,
state_key => $invitee->sender,
)
})->followed_by( assert_membership( "join" ) );
};
Expand Down Expand Up @@ -465,7 +465,7 @@ sub invite_should_fail {
})->then( sub {
matrix_get_room_state( $inviter, $room_id,
type => "m.room.member",
state_key => $invitee->user_id,
state_key => $invitee->sender,
)
})->followed_by(assert_membership( undef ) );
}
Expand Down
Loading