matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename MatrixGenericMessage class.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-02-12 14:20:18 +01:00
parent 49b356f510
commit 6f97ba1425
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
matrix/api.py
View file

@ -216,7 +216,7 @@ class MatrixClient:
return HttpRequest(RequestType.POST, self.host, path, content) return HttpRequest(RequestType.POST, self.host, path, content)
class MatrixGenericMessage(): class MatrixMessage():
def __init__( def __init__(
self, self,
message_type, # type: MessageType message_type, # type: MessageType
@ -237,7 +237,7 @@ class MatrixGenericMessage():
self.request = request_func(**func_args) self.request = request_func(**func_args)
class MatrixLoginMessage(MatrixGenericMessage): class MatrixLoginMessage(MatrixMessage):
def __init__(self, client, user, password, device_name, device_id=None): def __init__(self, client, user, password, device_name, device_id=None):
data = { data = {
"user": user, "user": user,
@ -248,7 +248,7 @@ class MatrixLoginMessage(MatrixGenericMessage):
if device_id: if device_id:
data["device_id"] = device_id data["device_id"] = device_id
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.LOGIN, MessageType.LOGIN,
client.login, client.login,
@ -256,7 +256,7 @@ class MatrixLoginMessage(MatrixGenericMessage):
) )
class MatrixSyncMessage(MatrixGenericMessage): class MatrixSyncMessage(MatrixMessage):
def __init__(self, client, next_batch=None, limit=None): def __init__(self, client, next_batch=None, limit=None):
data = {} data = {}
@ -268,7 +268,7 @@ class MatrixSyncMessage(MatrixGenericMessage):
"room": {"timeline": {"limit": limit}} "room": {"timeline": {"limit": limit}}
} }
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.SYNC, MessageType.SYNC,
client.sync, client.sync,
@ -276,7 +276,7 @@ class MatrixSyncMessage(MatrixGenericMessage):
) )
class MatrixSendMessage(MatrixGenericMessage): class MatrixSendMessage(MatrixMessage):
def __init__(self, client, room_id, formatted_message): def __init__(self, client, room_id, formatted_message):
self.room_id = room_id self.room_id = room_id
self.formatted_message = formatted_message self.formatted_message = formatted_message
@ -292,7 +292,7 @@ class MatrixSendMessage(MatrixGenericMessage):
if self.formatted_message.is_formatted: if self.formatted_message.is_formatted:
data["formatted_content"] = self.formatted_message.to_html() data["formatted_content"] = self.formatted_message.to_html()
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.SEND, MessageType.SEND,
client.room_send_message, client.room_send_message,
@ -300,7 +300,7 @@ class MatrixSendMessage(MatrixGenericMessage):
) )
class MatrixTopicMessage(MatrixGenericMessage): class MatrixTopicMessage(MatrixMessage):
def __init__(self, client, room_id, topic): def __init__(self, client, room_id, topic):
self.room_id = room_id self.room_id = room_id
self.topic = topic self.topic = topic
@ -310,7 +310,7 @@ class MatrixTopicMessage(MatrixGenericMessage):
"topic": self.topic "topic": self.topic
} }
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.TOPIC, MessageType.TOPIC,
client.room_topic, client.room_topic,
@ -318,7 +318,7 @@ class MatrixTopicMessage(MatrixGenericMessage):
) )
class MatrixRedactMessage(MatrixGenericMessage): class MatrixRedactMessage(MatrixMessage):
def __init__(self, client, room_id, event_id, reason=None): def __init__(self, client, room_id, event_id, reason=None):
self.room_id = room_id self.room_id = room_id
self.event_id = event_id self.event_id = event_id
@ -331,7 +331,7 @@ class MatrixRedactMessage(MatrixGenericMessage):
if reason: if reason:
data["reason"] = reason data["reason"] = reason
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.REDACT, MessageType.REDACT,
client.room_redact, client.room_redact,
@ -339,7 +339,7 @@ class MatrixRedactMessage(MatrixGenericMessage):
) )
class MatrixBacklogMessage(MatrixGenericMessage): class MatrixBacklogMessage(MatrixMessage):
def __init__(self, client, room_id, token, limit): def __init__(self, client, room_id, token, limit):
self.room_id = room_id self.room_id = room_id
@ -350,7 +350,7 @@ class MatrixBacklogMessage(MatrixGenericMessage):
"limit": limit "limit": limit
} }
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.ROOM_MSG, MessageType.ROOM_MSG,
client.room_get_messages, client.room_get_messages,
@ -358,13 +358,13 @@ class MatrixBacklogMessage(MatrixGenericMessage):
) )
class MatrixJoinMessage(MatrixGenericMessage): class MatrixJoinMessage(MatrixMessage):
def __init__(self, client, room_id): def __init__(self, client, room_id):
self.room_id = room_id self.room_id = room_id
data = {"room_id": self.room_id} data = {"room_id": self.room_id}
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.JOIN, MessageType.JOIN,
client.room_join, client.room_join,
@ -372,13 +372,13 @@ class MatrixJoinMessage(MatrixGenericMessage):
) )
class MatrixPartMessage(MatrixGenericMessage): class MatrixPartMessage(MatrixMessage):
def __init__(self, client, room_id): def __init__(self, client, room_id):
self.room_id = room_id self.room_id = room_id
data = {"room_id": self.room_id} data = {"room_id": self.room_id}
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.PART, MessageType.PART,
client.room_leave, client.room_leave,
@ -386,14 +386,14 @@ class MatrixPartMessage(MatrixGenericMessage):
) )
class MatrixInviteMessage(MatrixGenericMessage): class MatrixInviteMessage(MatrixMessage):
def __init__(self, client, room_id, user_id): def __init__(self, client, room_id, user_id):
self.room_id = room_id self.room_id = room_id
data = {"room_id": self.room_id, data = {"room_id": self.room_id,
"user_id": user_id} "user_id": user_id}
MatrixGenericMessage.__init__( MatrixMessage.__init__(
self, self,
MessageType.INVITE, MessageType.INVITE,
client.room_invite, client.room_invite,