From b72ca6776f3979affe8a798726d4fddcba1a93bd Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 23 Nov 2017 07:51:42 +0100
Subject: [PATCH] Resolve room alias to ID after setting defaults

---
 scripts/patrix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/patrix b/scripts/patrix
index 01b12ce..1d7aded 100644
--- a/scripts/patrix
+++ b/scripts/patrix
@@ -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');