More accurate login check

This commit is contained in:
Kylmakalle 2017-07-02 18:39:23 +03:00
parent bc95507d8c
commit 12c7268c6f

7
bot.py
View File

@ -223,10 +223,12 @@ def info_extractor(info):
@bot.message_handler(commands=['chat']) @bot.message_handler(commands=['chat'])
def chat_command(message): def chat_command(message):
if logged(message):
if str(message.from_user.id) in currentchat: if str(message.from_user.id) in currentchat:
if 'group' in currentchat[str(message.from_user.id)]: if 'group' in currentchat[str(message.from_user.id)]:
session = VkMessage(vk_tokens.get(str(message.from_user.id))).session session = VkMessage(vk_tokens.get(str(message.from_user.id))).session
chat = vk.API(session).messages.getChat(chat_id=currentchat[str(message.from_user.id)].split('group')[1], chat = vk.API(session).messages.getChat(
chat_id=currentchat[str(message.from_user.id)].split('group')[1],
fields=[]) fields=[])
if chat['title'].replace('\\', ''): if chat['title'].replace('\\', ''):
chat['title'] = chat['title'].replace('\\', '') chat['title'] = chat['title'].replace('\\', '')
@ -247,6 +249,7 @@ def chat_command(message):
@bot.message_handler(commands=['leave']) @bot.message_handler(commands=['leave'])
def leave_command(message): def leave_command(message):
if logged(message):
if str(message.from_user.id) in currentchat: if str(message.from_user.id) in currentchat:
currentchat.pop(str(message.from_user.id), None) currentchat.pop(str(message.from_user.id), None)
bot.send_message(message.from_user.id, bot.send_message(message.from_user.id,
@ -260,6 +263,7 @@ def leave_command(message):
@bot.message_handler(commands=['dialogs']) @bot.message_handler(commands=['dialogs'])
def dialogs_command(message): def dialogs_command(message):
if logged(message):
session = VkMessage(vk_tokens.get(str(message.from_user.id))).session session = VkMessage(vk_tokens.get(str(message.from_user.id))).session
request_user_dialogs(session, message.from_user.id) request_user_dialogs(session, message.from_user.id)
create_markup(message, message.from_user.id, 0) create_markup(message, message.from_user.id, 0)
@ -267,6 +271,7 @@ def dialogs_command(message):
@bot.message_handler(commands=['search']) @bot.message_handler(commands=['search'])
def search_command(message): def search_command(message):
if logged(message):
markup = types.ForceReply(selective=False) markup = types.ForceReply(selective=False)
if telebot.util.extract_arguments(message.text): if telebot.util.extract_arguments(message.text):
search_users(message, telebot.util.extract_arguments(message.text)) search_users(message, telebot.util.extract_arguments(message.text))