feat: add websocket support for motd

Author: akinsey

src/components/layout/Header.vue

@@ -269,12 +269,15 @@ import BanStore from '@/composables/stores/ban'
 import NotificationsStore from '@/composables/stores/notifications'
 import humanDate from '@/composables/filters/humanDate'
 import { motdApi } from '@/api'
+import { watchPublicChannel } from '@/composables/services/websocket'
 
 export default {
   components: { Breadcrumbs, LoginModal, InviteModal, RegisterModal, Alert },
   setup() {
     onBeforeMount(() => {
-      motdApi.get().then(d => v.motdData = d).catch(() => {})
+      let fetchMotd = () => motdApi.get().then(d => v.motdData = d).catch(() => {})
+      fetchMotd()
+      watchPublicChannel(d => d.action === 'announcement' ? fetchMotd() : null)
     })
     /* Internal Methods */
     const scrollHeader = () => {

src/composables/services/websocket.js

@@ -8,6 +8,7 @@ const socketcluster = require('socketcluster-client')
 // Public channel idenitfier and general options
 let options = { waitForAuth: true }
 let userChannel
+let publicChannel
 let session = reactive({ user: {} })
 
 // Initiate the connection to the websocket server
@@ -39,6 +40,12 @@ export const socketLogout = socketUser => {
   socket.emit('loggedOut')
 }
 
+export const watchPublicChannel = handler => {
+  if (window.websocket_logs) console.log('Watching public channel.')
+  if (publicChannel) publicChannel.watch(handler)
+  else setTimeout(() => watchPublicChannel(handler), 1000)
+}
+
 export const watchUserChannel = handler => {
   if (window.websocket_logs) console.log('Watching user channel.')
   if (userChannel) userChannel.watch(handler)
@@ -87,7 +94,7 @@ export default {
        })
      }
      else if (JSON.parse(channelName).type === 'public') {
-       socket.watch(channelName, d => d.action === 'announcement' ? alertStore.warn(d.message) : null)
+      // Placeholder for future public notifications if necessary
      }
      else window.websocket_logs ? console.log('Not watching', channelName) : null
 
@@ -125,14 +132,15 @@ export default {
     socket.on('connect', status => status.isAuthenticated ? socket.emit('loggedIn') : null)
 
     // always subscribe to the public channel
-    socket.subscribe(publicChannelKey, options)
+    publicChannel = socket.subscribe(publicChannelKey, { waitForAuth: false })
 
     /* Provide Store Data */
     return provide(WebsocketService, {
       socketLogin,
       socketLogout,
       watchUserChannel,
       unwatchUserChannel,
+      watchPublicChannel,
       isOnline,
     })
   },