emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

history improvements

Browse source
This commit is contained in:
ingvar1995 2018-03-12 00:32:46 +03:00
parent 20bb694c7e
commit 1bead7d55d
8 changed files with 189 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

34
toxygen/messenger/messages.py
View file

@ -5,18 +5,17 @@ MESSAGE_TYPE = {
'ACTION': 1,
'FILE_TRANSFER': 2,
'INLINE': 3,
'INFO_MESSAGE': 4,
'GC_TEXT': 5,
'GC_ACTION': 6
'INFO_MESSAGE': 4
}
class Message:
def __init__(self, message_type, owner, time):
def __init__(self, message_id, message_type, owner, time):
self._time = time
self._type = message_type
self._owner = owner
self._message_id = message_id
def get_type(self):
return self._type
@ -27,14 +26,19 @@ class Message:
def mark_as_sent(self):
self._owner = 0
def get_message_id(self):
return self._message_id
message_id = property(get_message_id)
class TextMessage(Message):
"""
Plain text or action message
"""
def __init__(self, message, owner, time, message_type):
super(TextMessage, self).__init__(message_type, owner, time)
def __init__(self, id, message, owner, time, message_type):
super(TextMessage, self).__init__(id, message_type, owner, time)
self._message = message
def get_data(self):
@ -43,8 +47,8 @@ class TextMessage(Message):
class GroupChatMessage(TextMessage):
def __init__(self, message, owner, time, message_type, name):
super().__init__(message, owner, time, message_type)
def __init__(self, id, message, owner, time, message_type, name):
super().__init__(id, message, owner, time, message_type)
self._user_name = name
def get_data(self):
@ -56,7 +60,7 @@ class TransferMessage(Message):
Message with info about file transfer
"""
def __init__(self, owner, time, status, size, name, friend_number, file_number):
def __init__(self, id, owner, time, status, size, name, friend_number, file_number):
super(TransferMessage, self).__init__(MESSAGE_TYPE['FILE_TRANSFER'], owner, time)
self._status = status
self._size = size
@ -83,8 +87,8 @@ class TransferMessage(Message):
class UnsentFile(Message):
def __init__(self, path, data, time):
super(UnsentFile, self).__init__(MESSAGE_TYPE['FILE_TRANSFER'], 0, time)
def __init__(self, id, path, data, time):
super(UnsentFile, self).__init__(id, MESSAGE_TYPE['FILE_TRANSFER'], 0, time)
self._data, self._path = data, path
def get_data(self):
@ -99,8 +103,8 @@ class InlineImage(Message):
Inline image
"""
def __init__(self, data):
super(InlineImage, self).__init__(MESSAGE_TYPE['INLINE'], None, None)
def __init__(self, id, data):
super(InlineImage, self).__init__(id, MESSAGE_TYPE['INLINE'], None, None)
self._data = data
def get_data(self):
@ -109,5 +113,5 @@ class InlineImage(Message):
class InfoMessage(TextMessage):
def __init__(self, message, time):
super(InfoMessage, self).__init__(message, None, time, MESSAGE_TYPE['INFO_MESSAGE'])
def __init__(self, id, message, time):
super(InfoMessage, self).__init__(id, message, None, time, MESSAGE_TYPE['INFO_MESSAGE'])