merge from remote

client/src/store/emoji.ts

@@ -60,7 +60,7 @@ export const actions = actionTree(
   {
     initialise() {
       $http
-        .get<Emojis>('/emoji.json')
+        .get<Emojis>('emoji.json')
         .then((req) => {
           for (const group of req.data.groups) {
             accessor.emoji.addGroup(group)

client/src/store/remote.ts

@@ -3,12 +3,17 @@ import { Member } from '~/neko/types'
 import { EVENT } from '~/neko/events'
 import { accessor } from '~/store'
 
+const keyboardModifierState = (capsLock: boolean, numLock: boolean, scrollLock: boolean) =>
+  Number(capsLock) + 2 * Number(numLock) + 4 * Number(scrollLock)
+
 export const namespaced = true
 
 export const state = () => ({
   id: '',
   clipboard: '',
   locked: false,
+
+  keyboardModifierState: -1,
 })
 
 export const getters = getterTree(state, {
@@ -36,6 +41,10 @@ export const mutations = mutationTree(state, {
     state.clipboard = clipboard
   },
 
+  setKeyboardModifierState(state, { capsLock, numLock, scrollLock }) {
+    state.keyboardModifierState = keyboardModifierState(capsLock, numLock, scrollLock)
+  },
+
   setLocked(state, locked: boolean) {
     state.locked = locked
   },
@@ -44,6 +53,7 @@ export const mutations = mutationTree(state, {
     state.id = ''
     state.clipboard = ''
     state.locked = false
+    state.keyboardModifierState = -1
   },
 })
 
@@ -140,6 +150,15 @@ export const actions = actionTree(
       }
 
       $client.sendMessage(EVENT.CONTROL.KEYBOARD, { layout: accessor.settings.keyboard_layout })
-    }
+    },
+
+    syncKeyboardModifierState({ state, getters }, { capsLock, numLock, scrollLock }) {
+      if (state.keyboardModifierState === keyboardModifierState(capsLock, numLock, scrollLock)) {
+        return
+      }
+
+      accessor.remote.setKeyboardModifierState({ capsLock, numLock, scrollLock })
+      $client.sendMessage(EVENT.CONTROL.KEYBOARD, { capsLock, numLock, scrollLock })
+    },
   },
 )

client/src/store/settings.ts

@@ -1,5 +1,6 @@
 import { getterTree, mutationTree, actionTree } from 'typed-vuex'
 import { get, set } from '~/utils/localstorage'
+import { EVENT } from '~/neko/events'
 import { accessor } from '~/store'
 
 export const namespaced = true
@@ -18,6 +19,9 @@ export const state = () => {
     keyboard_layout: get<string>('keyboard_layout', 'us'),
 
     keyboard_layouts_list: {} as KeyboardLayouts,
+
+    broadcast_is_active: false,
+    broadcast_url: '',
   }
 }
 
@@ -57,6 +61,10 @@ export const mutations = mutationTree(state, {
   setKeyboardLayoutsList(state, value: KeyboardLayouts) {
     state.keyboard_layouts_list = value
   },
+  setBroadcastStatus(state, { url, isActive }) {
+    state.broadcast_url = url
+    state.broadcast_is_active = isActive
+  },
 })
 
 export const actions = actionTree(
@@ -64,12 +72,21 @@ export const actions = actionTree(
   {
     initialise() {
       $http
-        .get<KeyboardLayouts>('/keyboard_layouts.json')
+        .get<KeyboardLayouts>('keyboard_layouts.json')
         .then((req) => {
           accessor.settings.setKeyboardLayoutsList(req.data)
-          console.log(req.data)
         })
         .catch(console.error)
     },
+
+    broadcastStatus({ getters }, { url, isActive }) {
+      accessor.settings.setBroadcastStatus({ url, isActive })
+    },
+    broadcastCreate({ getters }, url: string) {
+      $client.sendMessage(EVENT.BROADCAST.CREATE, { url })
+    },
+    broadcastDestroy({ getters }) {
+      $client.sendMessage(EVENT.BROADCAST.DESTROY)
+    },
   },
 )

client/src/store/user.ts

@@ -48,6 +48,11 @@ export const mutations = mutationTree(state, {
     state.id = id
   },
   addMember(state, member: Member) {
+    // remove html tags
+    const tmp = document.createElement('div')
+    tmp.innerHTML = member.displayname
+    member.displayname = tmp.textContent || tmp.innerText || ''
+
     state.members = {
       ...state.members,
       [member.id]: {