From e762e894850a724d24987140578a7b59cb915ad3 Mon Sep 17 00:00:00 2001
From: nicfreeman1209 <nicfreeman1209@gmail.com>
Date: Mon, 3 May 2021 17:55:11 +0100
Subject: [PATCH] nlc: toggle within session.js

---
 src/components/Menu.vue      |  4 +++-
 src/store/index.js           |  7 -------
 src/store/modules/session.js |  9 +++++++++
 src/store/socket.js          | 10 +++++-----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 0bf2de2..d39239a 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -346,13 +346,15 @@ export default {
     clearVoteHistory() {
       this.$store.commit("session/clearVoteHistory");
     },
+    toggleRecordVoteHistory() {
+      this.$store.commit("session/toggleRecordVoteHistory");
+    },
     ...mapMutations([
       "toggleGrimoire",
       "toggleMenu",
       "toggleImageOptIn",
       "toggleMuted",
       "toggleNight",
-      "toggleRecordVoteHistory",
       "toggleNightOrder",
       "setZoom",
       "toggleModal"
diff --git a/src/store/index.js b/src/store/index.js
index 5151e73..06a03be 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -147,13 +147,6 @@ export default new Vuex.Store({
     toggleNight: toggle("isNight"),
     toggleGrimoire: toggle("isPublic"),
     toggleImageOptIn: toggle("isImageOptIn"),
-    toggleRecordVoteHistory(state, param) {
-      if (param === true || param === false) {
-        state.session.recordVoteHistory = param;
-      } else {
-        state.session.recordVoteHistory = !state.session.recordVoteHistory;
-      }
-    },
     toggleModal({ modals }, name) {
       if (name) {
         modals[name] = !modals[name];
diff --git a/src/store/modules/session.js b/src/store/modules/session.js
index ca5cd8b..14a590b 100644
--- a/src/store/modules/session.js
+++ b/src/store/modules/session.js
@@ -38,6 +38,14 @@ const set = key => (state, val) => {
   state[key] = val;
 };
 
+const toggle = key => (state, val) => {
+  if (val === true || val === false) {
+    state[key] = val;
+  } else {
+    state[key] = !state[key];
+  }
+};
+
 const mutations = {
   setPlayerId: set("playerId"),
   setSpectator: set("isSpectator"),
@@ -46,6 +54,7 @@ const mutations = {
   setPing: set("ping"),
   setVotingSpeed: set("votingSpeed"),
   setVoteInProgress: set("isVoteInProgress"),
+  toggleRecordVoteHistory: toggle("recordVoteHistory"),
   claimSeat: set("claimedSeat"),
   distributeRoles: set("isRolesDistributed"),
   setSessionId(state, sessionId) {
diff --git a/src/store/socket.js b/src/store/socket.js
index 7c7e199..41028e0 100644
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -174,7 +174,7 @@ class LiveSession {
         break;
       case "recordVoteHistory":
         if (!this._isSpectator) return;
-        this._store.commit("toggleRecordVoteHistory", params);
+        this._store.commit("session/toggleRecordVoteHistory", params);
         break;
       case "votingSpeed":
         if (!this._isSpectator) return;
@@ -346,7 +346,7 @@ class LiveSession {
     });
     if (!isLightweight) {
       this._store.commit("toggleNight", !!isNight);
-      this._store.commit("toggleRecordVoteHistory", recordVoteHistory);
+      this._store.commit("session/toggleRecordVoteHistory", recordVoteHistory);
       this._store.commit("session/nomination", {
         nomination,
         votes,
@@ -858,12 +858,12 @@ export default store => {
       case "session/clearVoteHistory":
         session.clearVoteHistory();
         break;
+      case "session/toggleRecordVoteHistory":
+        session.setRecordVoteHistory();
+        break;
       case "toggleNight":
         session.setIsNight();
         break;
-      case "toggleRecordVoteHistory":
-        session.setRecordVoteHistory();
-        break;
       case "setEdition":
         session.sendEdition();
         break;