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

rooms: Don't use room aliases to change the buffer name.

Browse source
This commit is contained in:
poljar (Damir Jelić) 2018-03-06 16:53:44 +01:00
parent 9a656d0432
commit e5b08f653a
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
matrix/rooms.py
View file

@ -175,8 +175,6 @@ class RoomInfo():
other_events.append(RoomRedactionEvent.from_dict(event)) other_events.append(RoomRedactionEvent.from_dict(event))
elif event["type"] == "m.room.name": elif event["type"] == "m.room.name":
other_events.append(RoomNameEvent.from_dict(event)) other_events.append(RoomNameEvent.from_dict(event))
elif event["type"] == "m.room.aliases":
other_events.append(RoomAliasEvent.from_dict(event))
elif event["type"] == "m.room.encryption": elif event["type"] == "m.room.encryption":
other_events.append(RoomEncryptionEvent.from_dict(event)) other_events.append(RoomEncryptionEvent.from_dict(event))
except (ValueError, TypeError, KeyError) as error: except (ValueError, TypeError, KeyError) as error:
@ -732,22 +730,6 @@ class RoomNameEvent(RoomEvent):
W.buffer_set(buff, "localvar_set_channel", self.name) W.buffer_set(buff, "localvar_set_channel", self.name)
class RoomAliasEvent(RoomNameEvent):
def __init__(self, event_id, sender, timestamp, name):
RoomNameEvent.__init__(self, event_id, sender, timestamp, name)
@classmethod
def from_dict(cls, event_dict):
event_id = sanitize_id(event_dict["event_id"])
sender = sanitize_id(event_dict["sender"])
timestamp = sanitize_ts(event_dict["origin_server_ts"])
name = sanitize_id(event_dict['content']['aliases'][-1])
return cls(event_id, sender, timestamp, name)
class RoomEncryptionEvent(RoomEvent): class RoomEncryptionEvent(RoomEvent):
@classmethod @classmethod