useless function taken down
This commit is contained in:
parent
6524b42a1d
commit
6fc91e291e
|
@ -130,7 +130,7 @@ def cycle():
|
||||||
log(True, "Bot object is not exist: "+str(e))
|
log(True, "Bot object is not exist: "+str(e))
|
||||||
elif command[1][0] == "create":
|
elif command[1][0] == "create":
|
||||||
try:
|
try:
|
||||||
dan63047VKbot.create_new_bot_object(command[1][1])
|
dan63047VKbot.bot[user_id] = dan63047VKbot.VkBot(command[1][1])
|
||||||
log(False, "Bot-object has been created")
|
log(False, "Bot-object has been created")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
log(True, "Can't create bot-object - "+str(e))
|
log(True, "Can't create bot-object - "+str(e))
|
||||||
|
|
|
@ -120,9 +120,6 @@ class Database_worker():
|
||||||
self.set_new_user(str(from_id))
|
self.set_new_user(str(from_id))
|
||||||
return self._DATA_DIST['users'][str(from_id)]
|
return self._DATA_DIST['users'][str(from_id)]
|
||||||
|
|
||||||
def get_game_stat(self):
|
|
||||||
return self._DATA_DIST['users']
|
|
||||||
|
|
||||||
def update_user(self, chat_id, thing, new_value):
|
def update_user(self, chat_id, thing, new_value):
|
||||||
self._DATA_DIST['users'][str(chat_id)][thing] = new_value
|
self._DATA_DIST['users'][str(chat_id)][thing] = new_value
|
||||||
open("data.json", "w").write(json.dumps(self._DATA_DIST))
|
open("data.json", "w").write(json.dumps(self._DATA_DIST))
|
||||||
|
@ -166,11 +163,6 @@ class MyVkLongPoll(VkBotLongPoll):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
||||||
def create_new_bot_object(chat_id):
|
|
||||||
bot[chat_id] = VkBot(chat_id)
|
|
||||||
db.set_new_user(chat_id)
|
|
||||||
|
|
||||||
|
|
||||||
def get_weather(place):
|
def get_weather(place):
|
||||||
try:
|
try:
|
||||||
weather_request = mgr.weather_at_place(place)
|
weather_request = mgr.weather_at_place(place)
|
||||||
|
@ -197,7 +189,7 @@ class VkBot:
|
||||||
admin_mode -- flag of moderating function, which moderate conversation. Defalt: False. Bool
|
admin_mode -- flag of moderating function, which moderate conversation. Defalt: False. Bool
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, peer_id, midnight=False, awaiting=None, access=True, new_post=False, admin_mode=False, banned=False):
|
def __init__(self, peer_id):
|
||||||
"""Initialise the bot object\n\n
|
"""Initialise the bot object\n\n
|
||||||
|
|
||||||
Keyword arguments:\n
|
Keyword arguments:\n
|
||||||
|
@ -209,13 +201,14 @@ class VkBot:
|
||||||
admin_mode -- flag of moderating function, which moderate conversation. Defalt: False. Bool
|
admin_mode -- flag of moderating function, which moderate conversation. Defalt: False. Bool
|
||||||
"""
|
"""
|
||||||
log(False, f"[BOT_{peer_id}] Created new bot-object")
|
log(False, f"[BOT_{peer_id}] Created new bot-object")
|
||||||
|
db_entry = db.get_from_users(int(peer_id))
|
||||||
self._CHAT_ID = peer_id
|
self._CHAT_ID = peer_id
|
||||||
self._AWAITING_INPUT_MODE = awaiting
|
self._AWAITING_INPUT_MODE = db_entry['awaiting']
|
||||||
self._ACCESS_TO_ALL = access
|
self._ACCESS_TO_ALL = bool(db_entry['access'])
|
||||||
self._MIDNIGHT_EVENT = midnight
|
self._MIDNIGHT_EVENT = bool(db_entry['midnight'])
|
||||||
self._NEW_POST = new_post
|
self._NEW_POST = bool(db_entry['new_post'])
|
||||||
self._ADMIN_MODE = admin_mode
|
self._ADMIN_MODE = bool(db_entry['admin_mode'])
|
||||||
self._BANNED = banned
|
self._BANNED = bool(db_entry['banned'])
|
||||||
self._OWNER = int(self._CHAT_ID) == int(config.owner_id)
|
self._OWNER = int(self._CHAT_ID) == int(config.owner_id)
|
||||||
self._COMMANDS = ["!image", "!my_id", "!h", "!help", "!user_id", "!group_id", "!weather", "!wiki", "!byn", "!echo", "!game",
|
self._COMMANDS = ["!image", "!my_id", "!h", "!help", "!user_id", "!group_id", "!weather", "!wiki", "!byn", "!echo", "!game",
|
||||||
"!debug", "!midnight", "!access", "!turnoff", "!ban", "!subscribe", "!random", "!admin_mode", "!resist", "!restore",
|
"!debug", "!midnight", "!access", "!turnoff", "!ban", "!subscribe", "!random", "!admin_mode", "!resist", "!restore",
|
||||||
|
@ -497,7 +490,7 @@ class VkBot:
|
||||||
victum = victum[0][2:]
|
victum = victum[0][2:]
|
||||||
if int(victum) != int(config.owner_id):
|
if int(victum) != int(config.owner_id):
|
||||||
if int(victum) not in bot:
|
if int(victum) not in bot:
|
||||||
create_new_bot_object(int(victum))
|
bot[user_id] = VkBot(int(victum))
|
||||||
db.set_new_user(int(victum))
|
db.set_new_user(int(victum))
|
||||||
if not db.get_from_users(int(victum))["banned"]:
|
if not db.get_from_users(int(victum))["banned"]:
|
||||||
bot[int(victum)].change_flag("banned", True)
|
bot[int(victum)].change_flag("banned", True)
|
||||||
|
@ -522,7 +515,7 @@ class VkBot:
|
||||||
victum = re.search(r'id\d+', message[1])
|
victum = re.search(r'id\d+', message[1])
|
||||||
victum = victum[0][2:]
|
victum = victum[0][2:]
|
||||||
if int(victum) not in bot:
|
if int(victum) not in bot:
|
||||||
create_new_bot_object(int(victum))
|
bot[user_id] = VkBot(int(victum))
|
||||||
db.set_new_user(int(victum))
|
db.set_new_user(int(victum))
|
||||||
if int(victum) != int(config.owner_id):
|
if int(victum) != int(config.owner_id):
|
||||||
if db.get_from_users(int(victum))["banned"]:
|
if db.get_from_users(int(victum))["banned"]:
|
||||||
|
|
|
@ -44,10 +44,10 @@ def bots():
|
||||||
if event.message.peer_id not in dan63047VKbot.bot:
|
if event.message.peer_id not in dan63047VKbot.bot:
|
||||||
u = dan63047VKbot.db.get_all_users()
|
u = dan63047VKbot.db.get_all_users()
|
||||||
if str(event.message.peer_id) not in u:
|
if str(event.message.peer_id) not in u:
|
||||||
dan63047VKbot.create_new_bot_object(event.message.peer_id)
|
dan63047VKbot.bot[user_id] = dan63047VKbot.VkBot(event.message.peer_id)
|
||||||
else:
|
else:
|
||||||
i = dan63047VKbot.db.get_from_users(event.message.peer_id)
|
i = dan63047VKbot.db.get_from_users(event.message.peer_id)
|
||||||
dan63047VKbot.bot[event.message.peer_id] = dan63047VKbot.VkBot(event.message.peer_id, bool(i['midnight']), i['awaiting'], int(i['access']), bool(i['new_post']), bool(i['admin_mode']), bool(i['banned']))
|
dan63047VKbot.bot[event.message.peer_id] = dan63047VKbot.VkBot(event.message.peer_id)
|
||||||
dan63047VKbot.bot[event.message.peer_id].get_message(event)
|
dan63047VKbot.bot[event.message.peer_id].get_message(event)
|
||||||
elif event.type == dan63047VKbot.VkBotEventType.WALL_POST_NEW:
|
elif event.type == dan63047VKbot.VkBotEventType.WALL_POST_NEW:
|
||||||
if event.object.post_type == "post":
|
if event.object.post_type == "post":
|
||||||
|
|
Loading…
Reference in New Issue