diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b6c08b7..85726fed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -385,7 +385,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
- GIT_TAG ef741d7dceed11ccd46a553a4c886491aedc973b
+ GIT_TAG b452a984b0fc522c21bb8df7d320bf13960974d0
)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index a1d96db7..4b0f7bf3 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -163,7 +163,7 @@ modules:
buildsystem: cmake-ninja
name: mtxclient
sources:
- - commit: ef741d7dceed11ccd46a553a4c886491aedc973b
+ - commit: b452a984b0fc522c21bb8df7d320bf13960974d0
type: git
url: https://github.com/Nheko-Reborn/mtxclient.git
- config-opts:
diff --git a/resources/langs/nheko_et.ts b/resources/langs/nheko_et.ts
index 89fffc87..bd772b55 100644
--- a/resources/langs/nheko_et.ts
+++ b/resources/langs/nheko_et.ts
@@ -1117,7 +1117,7 @@ Näiteks: https://server.minu:8787</translation>
<message>
<location line="+43"/>
<source>&Go to quoted message</source>
- <translation type="unfinished"></translation>
+ <translation>&Vaata tsiteeritud sõnumit</translation>
</message>
</context>
<context>
@@ -1183,7 +1183,7 @@ Näiteks: https://server.minu:8787</translation>
<message>
<location filename="../qml/NotificationWarning.qml" line="+32"/>
<source>You will be pinging the whole room</source>
- <translation type="unfinished"></translation>
+ <translation>Sa saadad viitesõnumi tervele jututoale</translation>
</message>
</context>
<context>
@@ -2215,37 +2215,37 @@ Näiteks: https://server.minu:8787</translation>
<message>
<location line="+38"/>
<source>Change avatar globally.</source>
- <translation type="unfinished"></translation>
+ <translation>Muuda oma tunnuspilti kõikjal.</translation>
</message>
<message>
<location line="+0"/>
<source>Change avatar. Will only apply to this room.</source>
- <translation type="unfinished"></translation>
+ <translation>Muuda oma tunnuspilti vaid selles jututoas.</translation>
</message>
<message>
<location line="+79"/>
<source>Change display name globally.</source>
- <translation type="unfinished"></translation>
+ <translation>Muuda oma kuvatavat nime kõikjal.</translation>
</message>
<message>
<location line="+0"/>
<source>Change display name. Will only apply to this room.</source>
- <translation type="unfinished"></translation>
+ <translation>Muuda oma kuvatavat nime vaid selles jututoas.</translation>
</message>
<message>
<location line="+28"/>
<source>Room: %1</source>
- <translation type="unfinished"></translation>
+ <translation>Jututuba: %1</translation>
</message>
<message>
<location line="+1"/>
<source>This is a room-specific profile. The user's name and avatar may be different from their global versions.</source>
- <translation type="unfinished"></translation>
+ <translation>See kasutajaprofiil on vaid selle jututoa kohane. Kasutaja kuvatav nimi ja tunnuspilt võivad muudes jutubades olla teistsugused.</translation>
</message>
<message>
<location line="+11"/>
<source>Open the global profile for this user.</source>
- <translation type="unfinished"></translation>
+ <translation>Vaata selle kasutaja üldist profiili.</translation>
</message>
<message>
<location line="+8"/>
@@ -2256,17 +2256,17 @@ Näiteks: https://server.minu:8787</translation>
<message>
<location line="-72"/>
<source>Start a private chat.</source>
- <translation type="unfinished"></translation>
+ <translation>Alusta privaatset vestlust.</translation>
</message>
<message>
<location line="+8"/>
<source>Kick the user.</source>
- <translation type="unfinished"></translation>
+ <translation>Müksa kasutaja välja.</translation>
</message>
<message>
<location line="+9"/>
<source>Ban the user.</source>
- <translation type="unfinished"></translation>
+ <translation>Sea kasutajale suhtluskeeld.</translation>
</message>
<message>
<location line="+55"/>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index eef0a03e..b67b1489 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -328,7 +328,7 @@
<message>
<location line="+2"/>
<source>Rooms you have favourited.</source>
- <translation>Suosikkihuoneesi</translation>
+ <translation>Suosikkihuoneesi.</translation>
</message>
<message>
<location line="+7"/>
@@ -619,7 +619,7 @@
<message>
<location line="+7"/>
<source>Stickers (*.png *.webp *.gif)</source>
- <translation type="unfinished"></translation>
+ <translation>Tarrat (*.png *.webp *.gif)</translation>
</message>
<message>
<location line="+60"/>
@@ -666,12 +666,12 @@
<message>
<location line="+4"/>
<source>Remove</source>
- <translation type="unfinished"></translation>
+ <translation>Poista</translation>
</message>
<message>
<location line="+26"/>
<source>Cancel</source>
- <translation type="unfinished">Peruuta</translation>
+ <translation>Peruuta</translation>
</message>
<message>
<location line="+6"/>
@@ -724,12 +724,12 @@
<message>
<location line="+10"/>
<source>Edit</source>
- <translation type="unfinished">Muokkaa</translation>
+ <translation>Muokkaa</translation>
</message>
<message>
<location line="+64"/>
<source>Close</source>
- <translation type="unfinished">Sulje</translation>
+ <translation>Sulje</translation>
</message>
</context>
<context>
@@ -760,7 +760,7 @@
<message>
<location line="+24"/>
<source>User ID to invite</source>
- <translation type="unfinished">Käyttäjätunnus kutsuttavaksi</translation>
+ <translation>Käyttäjätunnus kutsuttavaksi</translation>
</message>
<message>
<location line="+14"/>
@@ -781,7 +781,7 @@
<message>
<location line="+7"/>
<source>Cancel</source>
- <translation type="unfinished">Peruuta</translation>
+ <translation>Peruuta</translation>
</message>
</context>
<context>
@@ -1057,7 +1057,7 @@ Esimerkki: https://server.my:8787</translation>
<message>
<location line="-110"/>
<source>Re&act</source>
- <translation>Re&act</translation>
+ <translation>Rea&goi</translation>
</message>
<message>
<location line="+8"/>
@@ -1294,7 +1294,7 @@ Esimerkki: https://server.my:8787</translation>
<message>
<location filename="../qml/ReadReceipts.qml" line="+40"/>
<source>Read receipts</source>
- <translation type="unfinished">Lukukuittaukset</translation>
+ <translation>Lukukuittaukset</translation>
</message>
</context>
<context>
@@ -1865,7 +1865,7 @@ Esimerkki: https://server.my:8787</translation>
<message>
<location filename="../qml/emoji/StickerPicker.qml" line="+70"/>
<source>Search</source>
- <translation type="unfinished">Hae</translation>
+ <translation>Hae</translation>
</message>
</context>
<context>
@@ -1956,7 +1956,7 @@ Esimerkki: https://server.my:8787</translation>
<message>
<location line="+2"/>
<source>%1 has closed the room to guest access.</source>
- <translation>%1 on sulkenut huoneen vierailta</translation>
+ <translation>%1 on sulkenut huoneen vierailta.</translation>
</message>
<message>
<location line="+23"/>
@@ -2256,17 +2256,17 @@ Esimerkki: https://server.my:8787</translation>
<message>
<location line="-72"/>
<source>Start a private chat.</source>
- <translation type="unfinished"></translation>
+ <translation>Aloita yksityinen keskustelu.</translation>
</message>
<message>
<location line="+8"/>
<source>Kick the user.</source>
- <translation type="unfinished"></translation>
+ <translation>Potki käyttäjä.</translation>
</message>
<message>
<location line="+9"/>
<source>Ban the user.</source>
- <translation type="unfinished"></translation>
+ <translation>Anna käyttäjälle porttikielto.</translation>
</message>
<message>
<location line="+55"/>
@@ -2370,7 +2370,7 @@ Esimerkki: https://server.my:8787</translation>
<source>Change the appearance of user avatars in chats.
OFF - square, ON - Circle.</source>
<translation>Muuta käyttäjien avatarien ulkonäköä keskusteluissa.
-POIS PÄÄLTÄ - neliö, PÄÄLLÄ - pyöreä</translation>
+POIS PÄÄLTÄ - neliö, PÄÄLLÄ - pyöreä.</translation>
</message>
<message>
<location line="+3"/>
@@ -2615,7 +2615,7 @@ Tämä yleensä saa sovelluksen kuvakkeen liikkumaan jollain tapaa tehtäväpalk
<message>
<location line="+2"/>
<source>Set the notification sound to play when a call invite arrives</source>
- <translation>Aseta ilmoitusääni soimaan kun kutsu puheluun tulee.</translation>
+ <translation>Aseta ilmoitusääni soimaan kun kutsu puheluun tulee</translation>
</message>
<message>
<location line="+1"/>
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index e4e58845..60c04098 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -28,8 +28,8 @@ ScrollView {
model: room
// reuseItems still has a few bugs, see https://bugreports.qt.io/browse/QTBUG-95105 https://bugreports.qt.io/browse/QTBUG-95107
- onModelChanged: if (room) room.sendReset()
- reuseItems: true
+ //onModelChanged: if (room) room.sendReset()
+ //reuseItems: true
boundsBehavior: Flickable.StopAtBounds
pixelAligned: true
spacing: 4
diff --git a/resources/qml/RoomDirectory.qml b/resources/qml/RoomDirectory.qml
index b51c7bbc..54d405ff 100644
--- a/resources/qml/RoomDirectory.qml
+++ b/resources/qml/RoomDirectory.qml
@@ -192,6 +192,17 @@ ApplicationWindow {
onTextChanged: searchTimer.restart()
}
+ MatrixTextField {
+ id: chooseServer
+ Layout.minimumWidth: 0.3 * header.width
+ Layout.maximumWidth: 0.3 * header.width
+
+ padding: Nheko.paddingMedium
+ color: Nheko.colors.text
+ placeholderText: qsTr("Choose custom homeserver")
+ onTextChanged: publicRooms.setMatrixServer(text)
+ }
+
Timer {
id: searchTimer
diff --git a/src/RoomDirectoryModel.cpp b/src/RoomDirectoryModel.cpp
index de5d430a..cfa2b623 100644
--- a/src/RoomDirectoryModel.cpp
+++ b/src/RoomDirectoryModel.cpp
@@ -98,6 +98,15 @@ RoomDirectoryModel::getViasForRoom(const std::vector<std::string> &aliases)
std::back_inserter(vias),
[](const auto &alias) { return alias.substr(alias.find(":") + 1); });
+ // When joining a room hosted on a homeserver other than the one the
+ // account has been registered on, the room's server has to be explicitly
+ // specified in the "server_name=..." URL parameter of the Matrix Join Room
+ // request. For more details consult the specs:
+ // https://matrix.org/docs/spec/client_server/r0.6.1#post-matrix-client-r0-join-roomidoralias
+ if (!server_.empty()) {
+ vias.push_back(server_);
+ }
+
return vias;
}
|
