fix merge conflicts

2 files changed, 39 insertions, 1 deletions

diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index b955729c..e13c66db 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -1,3 +1,4 @@
+import { mapState, mapGetters } from 'vuex'
 import UserCard from '../user_card/user_card.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
@@ -50,7 +51,11 @@ const SideDrawer = {
     },
     timelinesRoute () {
       return this.currentUser ? 'friends' : 'public-timeline'
-    }
+    },
+    ...mapState({
+      pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
+    }),
+    ...mapGetters(['unreadChatCount'])
   },
   methods: {
     toggleDrawer () {
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 5541b2cf..4a4e7610 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -47,6 +47,23 @@
             <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
           </router-link>
         </li>
+        <li
+          v-if="currentUser && pleromaChatMessagesAvailable"
+          @click="toggleDrawer"
+        >
+          <router-link
+            :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
+            style="position: relative"
+          >
+            <i class="button-icon icon-chat" /> {{ $t("nav.chats") }}
+            <span
+              v-if="unreadChatCount"
+              class="badge badge-notification unread-chat-count"
+            >
+              {{ unreadChatCount }}
+            </span>
+          </router-link>
+        </li>
       </ul>
       <ul v-if="currentUser">
         <li @click="toggleDrawer">
@@ -69,11 +86,27 @@
           </router-link>
         </li>
         <li
+<<<<<<< HEAD
           v-if="chat"
           @click="toggleDrawer"
         >
           <router-link :to="{ name: 'chat' }">
             <i class="button-icon icon-chat" /> {{ $t("nav.chat") }}
+=======
+          v-if="currentUser || !privateMode"
+          @click="toggleDrawer"
+        >
+          <router-link to="/main/public">
+            <i class="button-icon icon-users" /> {{ $t("nav.public_tl") }}
+          </router-link>
+        </li>
+        <li
+          v-if="federating && (currentUser || !privateMode)"
+          @click="toggleDrawer"
+        >
+          <router-link to="/main/all">
+            <i class="button-icon icon-globe" /> {{ $t("nav.twkn") }}
+>>>>>>> develop
           </router-link>
         </li>
       </ul>