Improve get_history_count

delivrance · delivrance · commit b86373d28c0d · 2019-06-12T11:43:24.000+02:00
diff --git a/pyrogram/client/methods/messages/get_history_count.py b/pyrogram/client/methods/messages/get_history_count.py
@@ -17,12 +17,10 @@
 # along with Pyrogram.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import time
 from typing import Union
 
 from pyrogram.api import types, functions
 from pyrogram.client.ext import BaseClient
-from pyrogram.errors import FloodWait
 
 log = logging.getLogger(__name__)
 
@@ -51,34 +49,20 @@ def get_history_count(
             RPCError: In case of a Telegram RPC error.
         """
 
-        peer = self.resolve_peer(chat_id)
-
-        if not isinstance(peer, types.InputPeerChannel):
-            offset = 0
-            limit = 100
-
-            while True:
-                try:
-                    r = self.send(
-                        functions.messages.GetHistory(
-                            peer=peer,
-                            offset_id=1,
-                            offset_date=0,
-                            add_offset=-offset - limit,
-                            limit=limit,
-                            max_id=0,
-                            min_id=0,
-                            hash=0
-                        )
-                    )
-                except FloodWait as e:
-                    log.warning("Sleeping for {}s".format(e.x))
-                    time.sleep(e.x)
-                    continue
-
-                if not r.messages:
-                    return offset
-
-                offset += len(r.messages)
-
-        return self.get_history(chat_id=chat_id, limit=1).total_count
+        r = self.send(
+            functions.messages.GetHistory(
+                peer=self.resolve_peer(chat_id),
+                offset_id=0,
+                offset_date=0,
+                add_offset=0,
+                limit=1,
+                max_id=0,
+                min_id=0,
+                hash=0
+            )
+        )
+
+        if isinstance(r, types.messages.Messages):
+            return len(r.messages)
+        else:
+            return r.count
