Resolve room alias to ID after setting defaults

tags/patrix-0.1.7-1
Daniel Berteaud 7 years ago
parent 6278cc6d9a
commit b72ca6776f
  1. 14
      scripts/patrix

@ -86,13 +86,6 @@ if (!-t STDIN){
$stdin = 1; $stdin = 1;
} }
# If the given room starts with #, then it's an alias
# Lets resolve this to the room ID
if ($opt->{room} && $opt->{room} =~ m/^#/){
$opt->{room} = room_alias_to_id($opt->{room});
debug('Room ID is ' . $opt->{room});
}
foreach (@{$opt->{file}}){ foreach (@{$opt->{file}}){
# Handle ~ # Handle ~
$_ =~ s/^~(\w*)/(getpwnam( $1 || $ENV{USER}))[7]/e; $_ =~ s/^~(\w*)/(getpwnam( $1 || $ENV{USER}))[7]/e;
@ -524,6 +517,13 @@ if (!$opt->{access_token}){
# Set defaults values # Set defaults values
set_defaults(); set_defaults();
# If the given room starts with #, then it's an alias
# Lets resolve this to the room ID
if ($opt->{room} && $opt->{room} =~ m/^#/){
$opt->{room} = room_alias_to_id($opt->{room});
debug('Room ID is ' . $opt->{room});
}
# If we ask for a new access token, then we must login, and ignore any # If we ask for a new access token, then we must login, and ignore any
# access_token from the config file # access_token from the config file
$opt->{access_token} = undef if ($opt->{action} eq 'get-access-token'); $opt->{access_token} = undef if ($opt->{action} eq 'get-access-token');

Loading…
Cancel
Save