Skip to content

Commit 30ebe75

Browse files
make extract_bot_id return None in case validation fails
1 parent 6108e35 commit 30ebe75

3 files changed

Lines changed: 9 additions & 5 deletions

File tree

telebot/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,11 @@ def __init__(
191191
self.allow_sending_without_reply = allow_sending_without_reply
192192
self.webhook_listener = None
193193
self._user = None
194-
self.bot_id: int = None
195194

196195
if validate_token:
197196
util.validate_token(self.token)
198-
self.bot_id = util.extract_bot_id(self.token) # subject to change in future, unspecified
197+
198+
self.bot_id: Union[int, None] = util.extract_bot_id(self.token) # subject to change in future, unspecified
199199

200200
# logs-related
201201
if colorful_logs:

telebot/async_telebot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,11 @@ def __init__(self, token: str, parse_mode: Optional[str]=None, offset: Optional[
189189
self.middlewares = []
190190

191191
self._user = None # set during polling
192-
self.bot_id: int = None
193192

194193
if validate_token:
195194
util.validate_token(self.token)
196-
self.bot_id: int = util.extract_bot_id(self.token) # subject to change, unspecified
195+
196+
self.bot_id: Union[int, None] = util.extract_bot_id(self.token) # subject to change, unspecified
197197

198198

199199
@property

telebot/util.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,11 @@ def validate_token(token) -> bool:
698698

699699
return True
700700

701-
def extract_bot_id(token) -> str:
701+
def extract_bot_id(token) -> Union[int, None]:
702+
try:
703+
validate_token(token)
704+
except ValueError:
705+
return None
702706
return int(token.split(':')[0])
703707

704708

0 commit comments

Comments
 (0)