bug fix showing of direct chat

zucchero-sintattico · Sep 21, 2023 · a7301f2 · a7301f2
1 parent 51dfe06
commit a7301f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/services/frontend/src/components/home-component/central-area/chat/ConversationHeader.vue b/services/frontend/src/components/home-component/central-area/chat/ConversationHeader.vue
@@ -17,11 +17,11 @@ const title = computed(() => {
     return userStore.selectedDirect
   } else if (userStore.inContentArea == ContentArea.Channel) {
     const server = serverStore.servers.filter(
-      (server) => server._id == userStore.selectedChannel[0]
+      (server) => server.id == userStore.selectedChannel[0]
     )[0]
     if (server) {
       const channel = server.channels.filter(
-        (channel) => channel._id == userStore.selectedChannel[1]
+        (channel) => channel.id == userStore.selectedChannel[1]
       )
       if (channel.length > 0) {
         return channel[0].name

diff --git a/services/frontend/src/components/home-component/central-area/chat/MessageInput.vue b/services/frontend/src/components/home-component/central-area/chat/MessageInput.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, ref } from 'vue'
 import { useMessageStore } from '@/stores/messages'
 import { ContentArea, useUserStore } from '@/stores/user'
 

diff --git a/services/frontend/src/components/home-component/left-bar/DirectsList.vue b/services/frontend/src/components/home-component/left-bar/DirectsList.vue
@@ -18,6 +18,7 @@ function setActiveDirect(directUsarname: string) {
 }
 onMounted(() => {
   friendStore.fetchFriends()
+  userStore.selectedDirect = ''
 })
 </script>
 

diff --git a/services/frontend/src/components/home-component/left-bar/LeftBar.vue b/services/frontend/src/components/home-component/left-bar/LeftBar.vue
@@ -12,6 +12,7 @@ const serverStore = useServerStore()
 onMounted(() => {
   serverStore.getServers()
   userStore.selectedTab = SelectedTab.Directs
+  userStore.selectedDirect = ''
 })
 </script>