diff --git a/telethon/client/dialogs.py b/telethon/client/dialogs.py index 44e57c34..3665c94e 100644 --- a/telethon/client/dialogs.py +++ b/telethon/client/dialogs.py @@ -370,7 +370,7 @@ class DialogMethods: await client.edit_folder(dialogs, [0, 1]) # Un-archiving all dialogs - await client.archive(unpack=1) + await client.edit_folder(unpack=1) """ if (entity is None) == (unpack is None): raise ValueError('You can only set either entities or unpack, not both') diff --git a/telethon/client/downloads.py b/telethon/client/downloads.py index f76129ee..1bce3062 100644 --- a/telethon/client/downloads.py +++ b/telethon/client/downloads.py @@ -142,12 +142,12 @@ class _DirectDownloadIter(RequestIter): class _GenericDownloadIter(_DirectDownloadIter): - async def _load_next_chunk(self, mask=MIN_CHUNK_SIZE - 1): + async def _load_next_chunk(self): # 1. Fetch enough for one chunk data = b'' # 1.1. ``bad`` is how much into the data we have we need to offset - bad = self.request.offset & mask + bad = self.request.offset % self.request.limit before = self.request.offset # 1.2. We have to fetch from a valid offset, so remove that bad part @@ -702,7 +702,8 @@ class DownloadMethods: if chunk_size == request_size \ and offset % MIN_CHUNK_SIZE == 0 \ - and stride % MIN_CHUNK_SIZE == 0: + and stride % MIN_CHUNK_SIZE == 0 \ + and offset % limit == 0: cls = _DirectDownloadIter self._log[__name__].info('Starting direct file download in chunks of ' '%d at %d, stride %d', request_size, offset, stride) diff --git a/telethon/tl/custom/sendergetter.py b/telethon/tl/custom/sendergetter.py index f0fa4168..673cab25 100644 --- a/telethon/tl/custom/sendergetter.py +++ b/telethon/tl/custom/sendergetter.py @@ -44,7 +44,7 @@ class SenderGetter(abc.ABC): # in which case we want to force fetch the entire thing because # the user explicitly called a method. If the user is okay with # cached information, they may use the property instead. - if (self._sender is None or self._sender.min) \ + if (self._sender is None or getattr(self._sender, 'min', None)) \ and await self.get_input_sender(): try: self._sender =\