Skip to content

Commit 9695b71

Browse files
committed
VkLongPoll: Disable preload_messages by default
1 parent c00094c commit 9695b71

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

vk_api/longpoll.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,7 @@ class VkLongPoll(object):
269269
VkEventType.MESSAGE_EDIT
270270
]
271271

272-
def __init__(self, vk, wait=25, mode=DEFAULT_MODE, preload_messages=True):
273-
272+
def __init__(self, vk, wait=25, mode=DEFAULT_MODE, preload_messages=False):
274273
self.vk = vk
275274
self.wait = wait
276275
self.mode = mode
@@ -329,7 +328,12 @@ def check(self):
329328
if self.pts:
330329
self.pts = response['pts']
331330

332-
return [Event(raw_event) for raw_event in response['updates']]
331+
events = [Event(raw_event) for raw_event in response['updates']]
332+
333+
if self.preload_messages:
334+
self.preload_message_events_data(events)
335+
336+
return events
333337

334338
elif response['failed'] == 1:
335339
self.ts = response['ts']
@@ -371,13 +375,7 @@ def listen(self):
371375
"""
372376

373377
while True:
374-
events = self.check()
375-
376-
# Мне кажется, это должно быть в check
377-
if self.preload_messages:
378-
self.preload_message_events_data(events)
379-
380-
for event in events:
378+
for event in self.check():
381379
yield event
382380

383381

vk_api/vk_api.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ def __init__(self, login=None, password=None, token=None,
9393
config=jconfig.Config, config_filename='vk_config.v2.json',
9494
api_version='5.73', app_id=6222115, scope=DEFAULT_USER_SCOPE,
9595
client_secret=None):
96-
# TODO: убрать config_filename, в качестве config брать объект, а не класс
9796

9897
self.login = login
9998
self.password = password

0 commit comments

Comments
 (0)