Remove current room from RoomSelector

Expose the Talk Vue instance on OCA.Talk.instance. In RoomSelector, grab the current room from that instance to filter it out, when applicableRemove current room from RoomSelector Expose the Talk Vue instance on OCA.Talk.instance. In RoomSelector, grab the current room from that instance to filter it out, when applicable. Signed-off-by: Vincent Petry <[email protected]>
nextcloud · Feb 12, 2021 · ab45b79 · ab45b79
1 parent fa55c6c
commit ab45b79
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main.js b/src/main.js
@@ -71,7 +71,7 @@ Vue.use(VueObserveVisibility)
 Vue.use(VueShortKey, { prevent: ['input', 'textarea', 'div'] })
 Vue.use(vOutsideEvents)
 
-export default new Vue({
+const instance = new Vue({
 	el: '#content',
 	store,
 	router,
@@ -155,3 +155,11 @@ Sidebar.prototype.close = function() {
 Object.assign(window.OCA.Files, {
 	Sidebar: new Sidebar(),
 })
+
+// make the instance available to global components that might run on the same page
+if (!window.OCA.Talk) {
+	window.OCA.Talk = {}
+}
+OCA.Talk.instance = instance
+
+export default instance
diff --git a/src/views/RoomSelector.vue b/src/views/RoomSelector.vue
@@ -87,13 +87,15 @@ export default {
 		return {
 			rooms: [],
 			selectedRoom: null,
+			currentRoom: null,
 			loading: true,
 		}
 	},
 	computed: {
 		availableRooms() {
 			return this.rooms.filter((room) => {
 				return room.type !== CONVERSATION.TYPE.CHANGELOG
+					&& (!this.currentRoom || this.currentRoom !== room.token)
 					&& (!this.showPostableOnly || room.readOnly === CONVERSATION.STATE.READ_WRITE)
 					&& room.objectType !== 'file'
 					&& room.objectType !== 'share:password'
@@ -102,6 +104,11 @@ export default {
 	},
 	beforeMount() {
 		this.fetchRooms()
+
+		const $store = OCA.Talk?.instance?.$store
+		if ($store) {
+			this.currentRoom = $store.getters.getToken()
+		}
 	},
 	methods: {
 		fetchRooms() {