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

Update LeftBanner, fix forget button crash

Browse Source
This commit is contained in:
miruka 2019-08-15 13:00:15 -04:00
parent 3270c6dd19
commit 6a7376d498
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/python/matrix_client.py
View File

@ -258,8 +258,8 @@ class MatrixClient(nio.AsyncClient):
async def room_forget(self, room_id: str) -> None: async def room_forget(self, room_id: str) -> None:
await super().room_forget(room_id) await super().room_forget(room_id)
self.models[Room, self.user_id].pop(room_id, None) self.models[Room, self.user_id].pop(room_id, None)
self.models.pop([Event, self.user_id, room_id], None) self.models.pop((Event, self.user_id, room_id), None)
self.models.pop([Member, room_id], None) self.models.pop((Member, room_id), None)
async def upload_file(self, path: Union[Path, str]) -> str: async def upload_file(self, path: Union[Path, str]) -> str:
@ -335,7 +335,6 @@ class MatrixClient(nio.AsyncClient):
inviter = getattr(room, "inviter", "") or "" inviter = getattr(room, "inviter", "") or ""
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 = name, display_name = name,

6
src/qml/Chat/Banners/LeftBanner.qml
View File

@ -2,12 +2,12 @@ import QtQuick 2.12
import "../../Base" import "../../Base"
Banner { Banner {
property string userId: ""
color: theme.chat.leftBanner.background color: theme.chat.leftBanner.background
// TODO: avatar func auto // TODO: avatar func auto
avatar.userId: userId avatar.userId: chatPage.userId
avatar.displayName: chatPage.userInfo.display_name
avatar.avatarUrl: chatPage.userInfo.avatar_url
labelText: qsTr("You are not part of this room anymore.") labelText: qsTr("You are not part of this room anymore.")
buttonModel: [ buttonModel: [

6
src/qml/Chat/Chat.qml
View File

@ -9,7 +9,11 @@ HPage {
property string userId: "" property string userId: ""
property string roomId: "" property string roomId: ""
property bool ready: roomInfo !== "waiting" property bool ready: userInfo !== "waiting" && roomInfo !== "waiting"
readonly property var userInfo:
Utils.getItem(modelSources["Account"] || [], "user_id", userId) ||
"waiting"
readonly property var roomInfo: Utils.getItem( readonly property var roomInfo: Utils.getItem(
modelSources[["Room", userId]] || [], "room_id", roomId modelSources[["Room", userId]] || [], "room_id", roomId

6
src/qml/Chat/ChatSplitView.qml
View File

@ -15,7 +15,6 @@ HSplitView {
EventList { EventList {
// Avoid a certain binding loop // Avoid a certain binding loop
Layout.minimumWidth: theme.minimumSupportedWidth Layout.minimumWidth: theme.minimumSupportedWidth
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
} }
@ -26,9 +25,8 @@ HSplitView {
InviteBanner { InviteBanner {
id: inviteBanner id: inviteBanner
visible: Boolean(inviterId) visible: ! chatPage.roomInfo.left && inviterId
inviterId: chatPage.roomInfo.inviter_id inviterId: chatPage.roomInfo.inviter_id
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -40,8 +38,6 @@ HSplitView {
LeftBanner { LeftBanner {
id: leftBanner id: leftBanner
visible: chatPage.roomInfo.left visible: chatPage.roomInfo.left
userId: chatPage.userId
Layout.fillWidth: true Layout.fillWidth: true
} }
} }