message splitting bug fix

This commit is contained in:
ingvar1995 2017-03-26 18:28:30 +03:00
parent 5fea3e918d
commit ba390eda91

View File

@ -417,20 +417,20 @@ class Profile(basecontact.BaseContact, Singleton):
def split_and_send(self, number, message_type, message): def split_and_send(self, number, message_type, message):
""" """
Message splitting Message splitting. Message length cannot be > TOX_MAX_MESSAGE_LENGTH
:param number: friend's number :param number: friend's number
:param message_type: type of message :param message_type: type of message
:param message: message text :param message: message text
""" """
while len(message) > TOX_MAX_MESSAGE_LENGTH: while len(message) > TOX_MAX_MESSAGE_LENGTH:
size = TOX_MAX_MESSAGE_LENGTH * 4 / 5 size = TOX_MAX_MESSAGE_LENGTH * 4 // 5
last_part = message[size:TOX_MAX_MESSAGE_LENGTH] last_part = message[size:TOX_MAX_MESSAGE_LENGTH]
if ' ' in last_part: if b' ' in last_part:
index = last_part.index(' ') index = last_part.index(b' ')
elif ',' in last_part: elif b',' in last_part:
index = last_part.index(',') index = last_part.index(b',')
elif '.' in last_part: elif b'.' in last_part:
index = last_part.index('.') index = last_part.index(b'.')
else: else:
index = TOX_MAX_MESSAGE_LENGTH - size - 1 index = TOX_MAX_MESSAGE_LENGTH - size - 1
index += size + 1 index += size + 1