Merge pull request #927 from traPtitech/fix/many-hearbeats

ハートビート送信中はハートビートを送信しないように close #911
traPtitech · Jun 23, 2019 · da81dbb · da81dbb
2 parents 8eda517 + 2f68824
commit da81dbb
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/pages/Main/Main.vue b/src/pages/Main/Main.vue
@@ -32,6 +32,7 @@ export default {
   data() {
     return {
       heartbeat: null,
+      heartbeatPending: false,
       swipeEvent: {
         isActive: false,
         startX: Number,
@@ -225,6 +226,8 @@ export default {
 
     this.heartbeat = setInterval(() => {
       if (this.$store.state.channelId !== this.$store.state.directMessageId) {
+        if (this.heartbeatPending) return
+        this.heartbeatPending = true
         client
           .postHeartbeat(
             this.getStatus(),
@@ -233,6 +236,9 @@ export default {
           .then(res => {
             this.$store.commit('updateHeartbeatStatus', res.data)
           })
+          .finally(() => {
+            this.heartbeatPending = false
+          })
       } else {
         this.$store.commit('updateHeartbeatStatus', {
           userStatuses: [
@@ -374,6 +380,8 @@ export default {
   },
   watch: {
     '$route.params.channel': function() {
+      if (this.heartbeatPending) return
+      this.heartbeatPending = true
       client
         .postHeartbeat(
           this.getStatus(),
@@ -382,6 +390,9 @@ export default {
         .then(res => {
           this.$store.commit('updateHeartbeatStatus', res.data)
         })
+        .finally(() => {
+          this.heartbeatPending = false
+        })
     },
     nowStatus(newStatus) {
       if (newStatus === 'none') {