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

Error messages for the /redact command.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-01-12 16:38:02 +01:00
parent fdc44ba1f9
commit 44c73b7cad
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
weechat-matrix.py
View file

@ -1826,7 +1826,6 @@ def matrix_command_topic_cb(data, buffer, command):
if len(split_command) == 2: if len(split_command) == 2:
topic = split_command[1] topic = split_command[1]
# TODO print out topic in channel
if not topic: if not topic:
room = server.rooms[room_id] room = server.rooms[room_id]
if room.topic: if room.topic:
@ -1941,6 +1940,10 @@ def matrix_redact_command_cb(data, buffer, args):
matches = re.match(r"(\d+)(:\".*\")? ?(.*)?", args) matches = re.match(r"(\d+)(:\".*\")? ?(.*)?", args)
if not matches: if not matches:
message = ("{prefix}matrix: Invalid command arguments (see "
"the help for the command /help redact)").format(
prefix=W.prefix("error"))
W.prnt("", message)
return W.WEECHAT_RC_ERROR return W.WEECHAT_RC_ERROR
line_string, _, reason = matches.groups() line_string, _, reason = matches.groups()
@ -1952,7 +1955,12 @@ def matrix_redact_command_cb(data, buffer, args):
event_id = event_id_from_line(buffer, line) event_id = event_id_from_line(buffer, line)
if not event_id: if not event_id:
print("EERRRRRORRRR") message = ("{prefix}matrix: No such message with number "
"{number} found").format(
prefix=W.prefix("error"),
number=line)
W.prnt("", message)
return W.WEECHAT_RC_OK
message = MatrixMessage( message = MatrixMessage(
server, server,
@ -1963,13 +1971,13 @@ def matrix_redact_command_cb(data, buffer, args):
) )
send_or_queue(server, message) send_or_queue(server, message)
return W.WEECHAT_RC_OK_EAT return W.WEECHAT_RC_OK
elif buffer == server.server_buffer: elif buffer == server.server_buffer:
message = ("{prefix}matrix: command \"redact\" must be " message = ("{prefix}matrix: command \"redact\" must be "
"executed on a Matrix channel buffer").format( "executed on a Matrix channel buffer").format(
prefix=W.prefix("error")) prefix=W.prefix("error"))
W.prnt(buffer, message) W.prnt("", message)
return W.WEECHAT_RC_OK return W.WEECHAT_RC_OK
return W.WEECHAT_RC_OK return W.WEECHAT_RC_OK