Merge remote-tracking branch 'origin/master' into cross-signing

CMakeLists.txt

@@ -305,7 +305,6 @@ set(SRC_FILES
 	src/SideBarActions.cpp
 	src/Splitter.cpp
 	src/TextInputWidget.cpp
-	src/TopRoomBar.cpp
 	src/TrayIcon.cpp
 	src/UserInfoWidget.cpp
 	src/UserSettingsPage.cpp
@@ -514,7 +513,6 @@ qt5_wrap_cpp(MOC_HEADERS
 	src/SideBarActions.h
 	src/Splitter.h
 	src/TextInputWidget.h
-	src/TopRoomBar.h
 	src/TrayIcon.h
 	src/UserInfoWidget.h
 	src/UserSettingsPage.h

README.md

@@ -132,6 +132,7 @@ Nheko can use bundled version for most of those libraries automatically, if the
 To use them, you can enable the hunter integration by passing `-DHUNTER_ENABLED=ON`.
 It is probably wise to link those dependencies statically by passing `-DBUILD_SHARED_LIBS=OFF`
 You can select which bundled dependencies you want to use py passing various `-DUSE_BUNDLED_*` flags. By default all dependencies are bundled *if* you enable hunter.
+If you experience build issues and you are trying to link `mtxclient` library without hunter, make sure the library version(commit) as mentioned in the `CMakeList.txt` is used. Sometimes we have to make breaking changes in `mtxclient` and for that period the master branch of both repos may not be compatible.
 
 The bundle flags are currently:
 

resources/qml/Avatar.qml

@@ -16,7 +16,7 @@ Rectangle {
 
 	Label {
 		anchors.fill: parent
-		text: chat.model.escapeEmoji(String.fromCodePoint(displayName.codePointAt(0)))
+		text: TimelineManager.escapeEmoji(String.fromCodePoint(displayName.codePointAt(0)))
 		textFormat: Text.RichText
 		font.pixelSize: avatar.height/2
 		verticalAlignment: Text.AlignVCenter
@@ -52,6 +52,8 @@ Rectangle {
 		anchors.bottom: avatar.bottom
 		anchors.right: avatar.right
 
+		visible: !!userid
+
 		height: avatar.height / 6
 		width: height
 		radius: Settings.avatarCircles ? height / 2 : height / 4

resources/qml/delegates/FileMessage.qml

@@ -41,7 +41,7 @@ Item {
 			Text {
 				id: filename
 				Layout.fillWidth: true
-				text: model.data.body
+				text: model.data.filename
 				textFormat: Text.PlainText
 				elide: Text.ElideRight
 				color: colors.text