1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00

Handle servers from settings

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-07-07 13:59:02 +02:00
parent 255ab49ccb
commit 5b5ef5e04c

View File

@@ -123,7 +123,8 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
const lsRoomServer = localStorage.getItem(LAST_SERVER_KEY); const lsRoomServer = localStorage.getItem(LAST_SERVER_KEY);
const lsInstanceId = localStorage.getItem(LAST_INSTANCE_KEY); const lsInstanceId = localStorage.getItem(LAST_INSTANCE_KEY);
const configSevers = SdkConfig.get().roomDirectory?.servers || []; const configSevers = SdkConfig.get().roomDirectory?.servers || [];
const roomServer = configSevers.includes(lsRoomServer) const settingsServers = SettingsStore.getValue("room_directory_servers") || [];
const roomServer = [...configSevers, ...settingsServers].includes(lsRoomServer)
? lsRoomServer ? lsRoomServer
: myHomeserver; : myHomeserver;
const instanceIds = []; const instanceIds = [];