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

buffer: Fix incorrect number of arguments for notices.

Browse source
This commit is contained in:
Damir Jelić 2018-08-09 13:58:55 +02:00
parent 94330922eb
commit 1475572c06
1 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
matrix/buffer.py
View file

@ -151,6 +151,11 @@ class WeechatChannelBuffer(object):
"notify_message", "notify_message",
"log1", "log1",
], ],
"notice": [
SCRIPT_NAME + "_notice",
"notify_message",
"log1",
],
"old_message": [ "old_message": [
SCRIPT_NAME + "_message", SCRIPT_NAME + "_message",
"notify_message", "notify_message",
@ -288,7 +293,7 @@ class WeechatChannelBuffer(object):
W.hdata_update(self._hdata, self._ptr, new_data) W.hdata_update(self._hdata, self._ptr, new_data)
def __init__(self, name, server_name, user): def __init__(self, name, server_name, user):
# type: (str, str, str) # type: (str, str, str) -> None
self._ptr = W.buffer_new( self._ptr = W.buffer_new(
name, name,
"room_buffer_input_cb", "room_buffer_input_cb",
@ -427,7 +432,7 @@ class WeechatChannelBuffer(object):
color = self._color_for_tags(user.color) color = self._color_for_tags(user.color)
if message_type != "action": if message_type != "action" and message_type != "notice":
tags.append("prefix_nick_{color}".format(color=color)) tags.append("prefix_nick_{color}".format(color=color))
return tags return tags
@ -463,13 +468,32 @@ class WeechatChannelBuffer(object):
self._print_message(user, message, date, tags) self._print_message(user, message, date, tags)
def notice(self, nick, message, date, extra_tags=None): def notice(self, nick, message, date, extra_tags=None):
# type: (str, str, int) -> None # type: (str, str, int, Optional[List[str]]) -> None
data = "{color}{message}{ncolor}".format( user = self._get_user(nick)
color=W.color("irc.color.notice"), user_prefix = ("" if not user.prefix else "{}{}{}".format(
message=message, W.color(self._get_prefix_color(user.prefix)),
ncolor=W.color("reset")) user.prefix,
W.color("reset")
))
self.message(nick, data, date, extra_tags) user_string = "{}{}{}{}".format(
user_prefix,
user.color,
user.nick,
W.color("reset")
)
data = ("{prefix}\t{color}Notice"
"{del_color}({ncolor}{user}{del_color}){ncolor}"
": {message}").format(prefix=W.prefix("network"),
color=W.color("irc.color.notice"),
del_color=W.color("chat_delimiters"),
ncolor=W.color("reset"),
user=user_string,
message=message)
tags = self._message_tags(user, "notice") + (extra_tags or [])
self.print_date_tags(data, date, tags)
def _print_action(self, user, message, date, tags): def _print_action(self, user, message, date, tags):
nick_prefix = ("" if not user.prefix else "{}{}{}".format( nick_prefix = ("" if not user.prefix else "{}{}{}".format(
@ -490,7 +514,7 @@ class WeechatChannelBuffer(object):
self.print_date_tags(data, date, tags) self.print_date_tags(data, date, tags)
def action(self, nick, message, date, extra_tags=[]): def action(self, nick, message, date, extra_tags=[]):
# type: (str, str, int) -> None # type: (str, str, int, Optional[List[str]]) -> None
user = self._get_user(nick) user = self._get_user(nick)
tags = self._message_tags(user, "action") + extra_tags tags = self._message_tags(user, "action") + extra_tags
self._print_action(user, message, date, tags) self._print_action(user, message, date, tags)