imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the code more readable

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-07-09 10:39:02 +02:00
parent f78ede9324
commit 84b00b5c38
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/components/structures/RoomDirectory.tsx
View file

@ -122,25 +122,26 @@ export default class RoomDirectory extends React.Component<IProps, IState> {
const myHomeserver = MatrixClientPeg.getHomeserverName(); const myHomeserver = MatrixClientPeg.getHomeserverName();
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 roomServer = (
const settingsServers = SettingsStore.getValue("room_directory_servers") || []; SdkConfig.get().roomDirectory?.servers?.includes(lsRoomServer) ||
const roomServer = [...configSevers, ...settingsServers].includes(lsRoomServer) SettingsStore.getValue("room_directory_servers")?.includes(lsRoomServer)
? lsRoomServer ) ? lsRoomServer : myHomeserver;
: myHomeserver;
const instanceIds = []; let instanceId: string = null;
if (roomServer === myHomeserver) { if (
Object.values(this.protocols).forEach((protocol) => { (lsInstanceId === ALL_ROOMS) ||
protocol.instances.forEach((instance) => instanceIds.push(instance.instance_id)); (
}); roomServer === myHomeserver &&
Object.values(this.protocols).some(p => p.instances.some(i => i.instance_id === lsInstanceId))
)
) {
instanceId = lsInstanceId;
} }
const instanceId = (instanceIds.includes(lsInstanceId) || lsInstanceId === ALL_ROOMS)
? lsInstanceId
: null;
this.setState({ this.setState({
protocolsLoading: false, protocolsLoading: false,
instanceId: instanceId, instanceId,
roomServer: roomServer, roomServer,
}); });
this.refreshRoomList(); this.refreshRoomList();
}, (err) => { }, (err) => {