Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct "Empty room" display

Browse Source
This commit is contained in:
miruka 2019-11-27 10:03:49 -04:00
parent 81ce4635fc
commit 710dd56109
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
TODO.md
View File

@ -176,26 +176,25 @@
- Fetch all members when using the filter members bar - Fetch all members when using the filter members bar
- Direct chats category - Direct chats category
- When inviting someone to direct chat, room is "Empty room" until accepted,
it should be the peer's display name instead. it should be the peer's display name instead.
- Animate RoomEventDelegate DayBreak apparition - Animate RoomEventDelegate DayBreak apparition
- Live-reloading accounts.json - Live-reloading accounts.json
- nio - nio
- RoomMessageMedia info attribute
- `AsyncClient.share_group_session`: send device batches concurrently
- Running blocking DB function calls in executor - Running blocking DB function calls in executor
- Guard against asyncio OSError Network unreachable - `AsyncClient.share_group_session`: send device batches concurrently
- RoomMessageMedia and RoomAvatarEvent info attributes
- `m.room.aliases` events
- MatrixRoom invited members list - MatrixRoom invited members list
- When inviting someone to direct chat, room is "Empty room" until accepted,
- Left room events after client reboot - Left room events after client reboot
- `org.matrix.room.preview_urls` events - `org.matrix.room.preview_urls` events
- `m.room.aliases` events
- Support "Empty room (was ...)" after peer left - Support "Empty room (was ...)" after peer left
- Previewing room without joining - Previewing room without joining
- get content repo config API - Get content repo config API
- add the `resume()` method - Add the `resume()` method
- See if we can turn all the Error classes into actual exceptions - See if we can turn all the Error classes into actual exceptions

2
src/python/matrix_client.py
View File

@ -713,7 +713,7 @@ class MatrixClient(nio.AsyncClient):
self.models[Room, self.user_id][room.room_id] = Room( self.models[Room, self.user_id][room.room_id] = Room(
room_id = room.room_id, room_id = room.room_id,
display_name = room.display_name, display_name = room.display_name or "",
avatar_url = room.gen_avatar_url or "", avatar_url = room.gen_avatar_url or "",
topic = HTML_FILTER.filter_inline(room.topic or ""), topic = HTML_FILTER.filter_inline(room.topic or ""),
inviter_id = inviter, inviter_id = inviter,

2
src/qml/Chat/RoomHeader.qml
View File

@ -30,7 +30,7 @@ Rectangle {
HLabel { HLabel {
id: roomName id: roomName
text: chatPage.roomInfo.display_name text: chatPage.roomInfo.display_name || qsTr("Empty room")
font.pixelSize: theme.fontSize.big font.pixelSize: theme.fontSize.big
color: theme.chat.roomHeader.name color: theme.chat.roomHeader.name
elide: Text.ElideRight elide: Text.ElideRight

3
src/qml/SidePane/RoomDelegate.qml
View File

@ -37,8 +37,7 @@ HTileDelegate {
} }
title.color: theme.sidePane.room.name title.color: theme.sidePane.room.name
title.text: model.data.display_name || "<i>Empty room</i>" title.text: model.data.display_name || qsTr("Empty room")
title.textFormat: model.data.display_name? Text.PlainText : Text.StyledText
additionalInfo.children: HIcon { additionalInfo.children: HIcon {
svgName: "invite-received" svgName: "invite-received"