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

Get rid of the extra_id in the MatrixMessage class.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-02-08 13:37:48 +01:00
parent 51102dd171
commit f83e02df13
2 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
matrix/api.py
View file

@ -213,13 +213,17 @@ class MatrixMessage:
options, # type: PluginOptions options, # type: PluginOptions
message_type, # type: MessageType message_type, # type: MessageType
room_id=None, # type: str room_id=None, # type: str
extra_id=None, # type: str
data={}, # type: Dict[str, Any] data={}, # type: Dict[str, Any]
extra_data=None # type: Dict[str, Any] extra_data=None, # type: Dict[str, Any]
**kwargs
): ):
# type: (...) -> None # type: (...) -> None
# pylint: disable=dangerous-default-value # pylint: disable=dangerous-default-value
self.type = message_type # type: MessageType self.type = message_type # type: MessageType
for key, value in kwargs.items():
setattr(self, key, value)
self.request = None # type: HttpRequest self.request = None # type: HttpRequest
self.response = None # type: HttpResponse self.response = None # type: HttpResponse
self.extra_data = extra_data # type: Dict[str, Any] self.extra_data = extra_data # type: Dict[str, Any]
@ -248,15 +252,24 @@ class MatrixMessage:
self.request = server.client.room_send_message(room_id, data) self.request = server.client.room_send_message(room_id, data)
elif message_type == MessageType.TOPIC: elif message_type == MessageType.TOPIC:
self.request = server.client.room_topic(room_id, data) assert self.topic
self.request = server.client.room_topic(room_id, self.topic)
elif message_type == MessageType.REDACT: elif message_type == MessageType.REDACT:
self.request = server.client.room_redact(room_id, extra_id, data) assert self.event_id
self.request = server.client.room_redact(
room_id,
self.event_id,
self.reason
)
elif message_type == MessageType.ROOM_MSG: elif message_type == MessageType.ROOM_MSG:
assert self.token
self.request = server.client.room_get_messages( self.request = server.client.room_get_messages(
room_id, room_id,
start_token=extra_id, start_token=self.token,
limit=options.backlog_limit, limit=options.backlog_limit,
) )

10
matrix/commands.py
View file

@ -106,7 +106,7 @@ def matrix_fetch_old_messages(server, room_id):
return return
message = MatrixMessage(server, OPTIONS, MessageType.ROOM_MSG, message = MatrixMessage(server, OPTIONS, MessageType.ROOM_MSG,
room_id=room_id, extra_id=prev_batch) room_id=room_id, token=prev_batch)
server.send_or_queue(message) server.send_or_queue(message)
@ -345,9 +345,9 @@ def matrix_redact_command_cb(data, buffer, args):
server, server,
OPTIONS, OPTIONS,
MessageType.REDACT, MessageType.REDACT,
data=reason,
room_id=room_id, room_id=room_id,
extra_id=event_id event_id=event_id,
reason=reason
) )
server.send_or_queue(message) server.send_or_queue(message)
@ -911,8 +911,8 @@ def matrix_command_topic_cb(data, buffer, command):
server, server,
OPTIONS, OPTIONS,
MessageType.TOPIC, MessageType.TOPIC,
data=topic, room_id=room_id,
room_id=room_id topic=topic
) )
server.send_or_queue(message) server.send_or_queue(message)