diff --git a/src/lib/matrixUtils.js b/src/lib/matrixUtils.js
index f44fef2..0d4c7ef 100644
--- a/src/lib/matrixUtils.js
+++ b/src/lib/matrixUtils.js
@@ -6,4 +6,7 @@ export function getUser(userId) {
export function calcUserName(userId){
if (matrix.user === userId) return 'you';
return matrix.client.getUser(userId).displayName || userId;
+}
+export function getRoom(roomId){
+ return matrix.client.getRoom(roomId);
}
\ No newline at end of file
diff --git a/src/views/rooms.vue b/src/views/rooms.vue
index 233b768..3a9bc23 100644
--- a/src/views/rooms.vue
+++ b/src/views/rooms.vue
@@ -20,14 +20,14 @@
Please select a room to be displayed.
-
+
@@ -38,6 +38,7 @@ import {matrix} from "@/main";
import ThrobberOverlay from "@/components/throbberOverlay";
import {getMxcFromRoom} from "@/lib/getMxc";
import roomListElement from "@/components/roomListElement";
+import {getRoom} from "@/lib/matrixUtils";
export default {
name: "rooms",
@@ -50,18 +51,25 @@ export default {
methods:{
openChat(room){
this.showChatInfo = false;
- this.currentRoom = undefined
- this.$nextTick(() => this.currentRoom = room);
+ this.showRoom = false;
this.$router.push(`/rooms/${room.roomId}`);
+ this.$nextTick(() => this.showRoom = true);
this.search = '';
},
- getMxcFromRoom
+ getMxcFromRoom,
+ getRoom,
+ getCurrentRoom(){
+ return getRoom(this.$route.path.split('/')[2]);
+ },
+ closeChat(){
+ this.$router.push('/rooms');
+ }
},
data(){
return {
matrix,
- currentRoom: undefined,
showChatInfo: false,
+ showRoom: true,
search: ''
}
},