From 3545c692e115360c814484a0dc56dc86941417b5 Mon Sep 17 00:00:00 2001
From: annelin <devnull@localhost>
Date: Sun, 5 May 2019 01:42:59 +0300
Subject: [PATCH] Release v1.0-beta3

[FIX] Correct behaviour of /connect and /disconnect commands that also affects Jabber presences
---
 inc/telegramclient.rb | 22 +++++++++++-----------
 inc/xmppcomponent.rb  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/inc/telegramclient.rb b/inc/telegramclient.rb
index 4d5c749..c400805 100644
--- a/inc/telegramclient.rb
+++ b/inc/telegramclient.rb
@@ -27,9 +27,9 @@ class TelegramClient
     
     # instance initialization #
     def initialize(xmpp, jid, login)
-        return if not @@loglevel # call .configure() first
-    
+        return if not @@loglevel # call .configure() first    
         @logger = Logger.new(STDOUT); @logger.level = @@loglevel; @logger.progname = '[TelegramClient: %s/%s]' % [jid, login] # create logger
+        @logger.info 'Starting Telegram client..'
         @xmpp = xmpp # XMPP stream 
         @jid = jid # user JID 
         @timezone = '-00:00' # default timezone is UTC
@@ -39,9 +39,12 @@ class TelegramClient
         @auth_state = 'nil' # too.
         @cache = {chats: {}, users: {}, users_fullinfo: {}, userpics: {}, unread_msg: {} } # cache storage 
         @files_dir = File.dirname(__FILE__) + '/../sessions/' + @jid + '/files/'
-
-        # spawn telegram client and specify callback handlers 
-        @logger.info 'Starting Telegram client..'
+    end
+    
+    # initialize and connect telegram client #
+    def connect()
+        return if @client and @client.ready? 
+        @logger.info 'Connecting to Telegram network..' 
         @client = TD::Client.new(database_directory: 'sessions/' + @jid, files_directory: 'sessions/' + @jid + '/files/') # create telegram client instance
         @client.on(TD::Types::Update::AuthorizationState) do |update| self.auth_handler(update) end # register auth update handler 
         @client.on(TD::Types::Update::NewMessage) do |update| self.message_handler(update) end # register new message update handler 
@@ -51,15 +54,12 @@ class TelegramClient
         @client.on(TD::Types::Update::NewChat) do |update| self.new_chat_handler(update) end # register new chat handler 
         @client.on(TD::Types::Update::User) do |update| self.user_handler(update) end # new user update? 
         @client.on(TD::Types::Update::UserStatus) do |update| self.status_update_handler(update) end # register status handler 
-    end
-    
-    # connect/disconnect #
-    def connect()
-        @logger.info 'Connecting to Telegram network..' if not @client.ready?
-        @client.connect() if not @client.ready?
+        @client.connect() 
     end
 
+    # disconnect and destroy telegram client #
     def disconnect(logout = false)
+        return if not @client 
         @logger.info 'Disconnecting..'
         @cache[:chats].each_key do |chat_id| @xmpp.presence(@jid, chat_id.to_s, :unavailable) end # send offline presences
         (logout) ? @client.log_out : @client.dispose # logout if needed  
diff --git a/inc/xmppcomponent.rb b/inc/xmppcomponent.rb
index c53c4a8..0cc89e9 100644
--- a/inc/xmppcomponent.rb
+++ b/inc/xmppcomponent.rb
@@ -197,7 +197,7 @@ class XMPPComponent
     def process_command(from, body)
         case body.split[0] # /command argument = [command, argument]
         when '/login'  # create new session 
-            @sessions[from.bare.to_s] = TelegramClient.new(self, from.bare.to_s, body.split[1]) if not @sessions.key? from.bare.to_s
+            @sessions[from.bare.to_s] = TelegramClient.new(self, from.bare.to_s, body.split[1]) if not (@sessions.key? from.bare.to_s and @sessions[from.bare.to_s].online?)
             @sessions[from.bare.to_s].connect()
             self.request_tz(from)
             self.update_db(from.bare.to_s)