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

Remove usage of old MatrixRoom.alias attribute in remaining places.

Browse source 
* Use calculated display name in the bar item.
* Don't mention the room name in topic messages for groups.
This commit is contained in:
Denis Kasak 2018-03-12 11:58:46 +01:00
parent 654e39077d
commit 02bb64feab
3 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
matrix/bar_items.py
View file

@ -49,7 +49,9 @@ def matrix_bar_item_name(data, item, window, buffer, extra_info):
room = server.rooms[room_id] room = server.rooms[room_id]
return "{color}{name}".format(color=W.color(color), name=room.alias) return "{color}{name}".format(
color=W.color(color),
name=room.display_name())
elif buffer == server.server_buffer: elif buffer == server.server_buffer:
color = ("status_name_ssl" color = ("status_name_ssl"

19
matrix/commands.py
View file

@ -918,13 +918,18 @@ def matrix_command_topic_cb(data, buffer, command):
if not room.topic: if not room.topic:
return W.WEECHAT_RC_OK return W.WEECHAT_RC_OK
message = ("{prefix}Topic for {color}{room}{ncolor} is " if room.is_named():
"\"{topic}\"").format( message = ('{prefix}Topic for {color}{room}{ncolor} is '
prefix=W.prefix("network"), '"{topic}"').format(
color=W.color("chat_buffer"), prefix=W.prefix("network"),
ncolor=W.color("reset"), color=W.color("chat_buffer"),
room=room.alias, ncolor=W.color("reset"),
topic=room.topic) room=room.named_room_name(),
topic=room.topic)
else:
message = ('{prefix}Topic is "{topic}"').format(
prefix=W.prefix("network"),
topic=room.topic)
date = int(time.time()) date = int(time.time())
topic_date = room.topic_date.strftime("%a, %d %b %Y " topic_date = room.topic_date.strftime("%a, %d %b %Y "

25
matrix/rooms.py
View file

@ -706,15 +706,22 @@ class RoomTopicEvent(RoomEvent):
nick_color=W.color(color_name), user=nick, ncolor=W.color("reset")) nick_color=W.color(color_name), user=nick, ncolor=W.color("reset"))
# TODO print old topic if configured so # TODO print old topic if configured so
message = ("{prefix}{nick} has changed " if room.is_named():
"the topic for {chan_color}{room}{ncolor} " message = ("{prefix}{nick} has changed "
"to \"{topic}\"").format( "the topic for {chan_color}{room}{ncolor} "
prefix=W.prefix("network"), "to \"{topic}\"").format(
nick=author, prefix=W.prefix("network"),
chan_color=W.color("chat_channel"), nick=author,
ncolor=W.color("reset"), chan_color=W.color("chat_channel"),
room=room.display_name(server.user_id), ncolor=W.color("reset"),
topic=topic) room=room.named_room_name(),
topic=topic)
else:
message = ('{prefix}{nick} has changed the topic to '
'"{topic}"').format(
prefix=W.prefix("network"),
nick=author,
topic=topic)
tags = ["matrix_topic", "log3", "matrix_id_{}".format(self.event_id)] tags = ["matrix_topic", "log3", "matrix_id_{}".format(self.event_id)]