From 4ecf5f637225c21e01652d1e8f733d4f2edc2939 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 26 Jul 2016 17:58:19 +0100
Subject: [PATCH] Fix bug where vector freezes on power level event

Make rate_limited_function accept functions with args so we can just ratelimit the event handler & be done with it.

Fixes https://github.com/vector-im/vector-web/issues/1877
---
 src/components/structures/RoomView.js | 6 ++++--
 src/ratelimitedfunc.js                | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index accf96f349..9aa192d9ca 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -482,7 +482,9 @@ module.exports = React.createClass({
         }
     },
 
-    onRoomStateMember: function(ev, state, member) {
+    // rate limited because a power level change will emit an event for every
+    // member in the room.
+    onRoomStateMember: new rate_limited_func(function(ev, state, member) {
         // ignore if we don't have a room yet
         if (!this.state.room) {
             return;
@@ -511,7 +513,7 @@ module.exports = React.createClass({
             member.userId === this.props.ConferenceHandler.getConferenceUserIdForRoom(member.roomId)) {
             this._updateConfCallNotification();
         }
-    },
+    }, 500),
 
     _hasUnsentMessages: function(room) {
         return this._getUnsentMessages(room).length > 0;
diff --git a/src/ratelimitedfunc.js b/src/ratelimitedfunc.js
index 453669b477..94626d5ad9 100644
--- a/src/ratelimitedfunc.js
+++ b/src/ratelimitedfunc.js
@@ -23,13 +23,13 @@ module.exports = function(f, minIntervalMs) {
         var now = Date.now();
 
         if (self.lastCall < now - minIntervalMs) {
-            f.apply(this);
+            f.apply(this, arguments);
             self.lastCall = now;
         } else if (self.scheduledCall === undefined) {
             self.scheduledCall = setTimeout(
                 () => {
                     self.scheduledCall = undefined;
-                    f.apply(this);
+                    f.apply(this, arguments);
                     self.lastCall = now;
                 },
                 (self.lastCall + minIntervalMs) - now