rpms
/
patrix
mirror of https://github.com/dani/patrix.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolve room alias to ID after setting defaults

This commit is contained in:
Daniel Berteaud 2017-11-23 07:51:42 +01:00
parent 6278cc6d9a
commit b72ca6776f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/patrix
View File

@ -86,13 +86,6 @@ if (!-t STDIN){
$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}}){
# Handle ~
$_ =~ s/^~(\w*)/(getpwnam( $1 || $ENV{USER}))[7]/e;
@ -524,6 +517,13 @@ if (!$opt->{access_token}){
# Set defaults values
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
# access_token from the config file
$opt->{access_token} = undef if ($opt->{action} eq 'get-access-token');