From 2b8d6ff688ec33ceb6af6208d58e176cbcefe505 Mon Sep 17 00:00:00 2001 From: Darin McBride Date: Tue, 2 Dec 2014 14:29:06 -0700 Subject: [PATCH] If there is no chat, i.e., private server, don't try to set it up. --- lib/Lacuna/RPC/Chat.pm | 1 + lib/Lacuna/RPC/Empire.pm | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/Lacuna/RPC/Chat.pm b/lib/Lacuna/RPC/Chat.pm index c2cd1c67..3703e4de 100644 --- a/lib/Lacuna/RPC/Chat.pm +++ b/lib/Lacuna/RPC/Chat.pm @@ -16,6 +16,7 @@ sub init_chat { my $config = Lacuna->config; my $firebase_config = $config->get('firebase'); + return undef unless $firebase_config; my $chat_auth = Firebase::Auth->new( secret => $firebase_config->{auth}{secret}, # debug => \1, diff --git a/lib/Lacuna/RPC/Empire.pm b/lib/Lacuna/RPC/Empire.pm index 9ffe3fba..fa061fc4 100644 --- a/lib/Lacuna/RPC/Empire.pm +++ b/lib/Lacuna/RPC/Empire.pm @@ -86,15 +86,18 @@ sub login { } my $config = Lacuna->config; my $firebase_config = $config->get('firebase'); - my $auth_code = Firebase::Auth->new( - secret => $firebase_config->{auth}{secret}, - data => { - uid => $empire->id, - isModerator => $empire->chat_admin ? \1 : \0, - isStaff => $empire->is_admin ? \1 : \0, - } - # data => $data, - )->create_token; + if ($firebase_config) + { + my $auth_code = Firebase::Auth->new( + secret => $firebase_config->{auth}{secret}, + data => { + uid => $empire->id, + isModerator => $empire->chat_admin ? \1 : \0, + isStaff => $empire->is_admin ? \1 : \0, + } + # data => $data, + )->create_token; + } if ($empire->is_password_valid($password)) { if ($empire->stage eq 'new') { -- 2.51.2