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

Make the room_id part of the kwargs in the MatrixMessage class.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-02-08 15:47:25 +01:00
parent 1a804a4dc3
commit 4c9069a8b1
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.py
View file

@ -416,8 +416,7 @@ def room_input_cb(server_name, buffer, input_data):
} }
message = MatrixMessage(server, OPTIONS, MessageType.SEND, room_id=room_id, message = MatrixMessage(server, OPTIONS, MessageType.SEND, room_id=room_id,
formatted_message=formatted_data, formatted_message=formatted_data)
extra_data=extra_data)
server.send_or_queue(message) server.send_or_queue(message)
return W.WEECHAT_RC_OK return W.WEECHAT_RC_OK

26
matrix/api.py
View file

@ -222,7 +222,6 @@ class MatrixMessage:
server, # type: MatrixServer server, # type: MatrixServer
options, # type: PluginOptions options, # type: PluginOptions
message_type, # type: MessageType message_type, # type: MessageType
room_id=None, # type: str
**kwargs **kwargs
): ):
# type: (...) -> None # type: (...) -> None
@ -257,6 +256,7 @@ class MatrixMessage:
self.request = server.client.sync(server.next_batch, sync_filter) self.request = server.client.sync(server.next_batch, sync_filter)
elif message_type == MessageType.SEND: elif message_type == MessageType.SEND:
assert self.room_id
assert self.formatted_message assert self.formatted_message
data = {"content": formatted_to_plain(self.formatted_message)} data = {"content": formatted_to_plain(self.formatted_message)}
@ -265,40 +265,48 @@ class MatrixMessage:
data["formatted_content"] = formatted_to_html( data["formatted_content"] = formatted_to_html(
self.formatted_message) self.formatted_message)
self.room_id = room_id self.request = server.client.room_send_message(
self.request = server.client.room_send_message(room_id, **data) self.room_id,
**data
)
elif message_type == MessageType.TOPIC: elif message_type == MessageType.TOPIC:
assert self.room_id
assert self.topic assert self.topic
self.request = server.client.room_topic(room_id, self.topic) self.request = server.client.room_topic(self.room_id, self.topic)
elif message_type == MessageType.REDACT: elif message_type == MessageType.REDACT:
assert self.room_id
assert self.event_id assert self.event_id
self.request = server.client.room_redact( self.request = server.client.room_redact(
room_id, self.room_id,
self.event_id, self.event_id,
self.reason self.reason
) )
elif message_type == MessageType.ROOM_MSG: elif message_type == MessageType.ROOM_MSG:
assert self.room_id
assert self.token assert self.token
self.request = server.client.room_get_messages( self.request = server.client.room_get_messages(
room_id, self.room_id,
start_token=self.token, start_token=self.token,
limit=options.backlog_limit, limit=options.backlog_limit,
) )
elif message_type == MessageType.JOIN: elif message_type == MessageType.JOIN:
self.request = server.client.room_join(room_id) assert self.room_id
self.request = server.client.room_join(self.room_id)
elif message_type == MessageType.PART: elif message_type == MessageType.PART:
self.request = server.client.room_leave(room_id) assert self.room_id
self.request = server.client.room_leave(self.room_id)
elif message_type == MessageType.INVITE: elif message_type == MessageType.INVITE:
assert self.room_id
assert self.user_id assert self.user_id
self.request = server.client.room_invite(room_id, self.user_id) self.request = server.client.room_invite(self.room_id, self.user_id)
class MatrixUser: class MatrixUser: